Fix issue with shortcut recompression

doc/source/changelog.rst

@@ -4,10 +4,17 @@ MontePy Changelog
 #Next Version#
 --------------
 
+**Features Added**
+
+* Added support for reading an input from either file paths or streams (file handles) with ``montepy.read_input`` (:issue:`519`).
+
 **Bug Fixes**
 
 * Fixed a bug where ``problem.materials.append_renumber`` would double add a material to ``problem.data_inputs`` (:issue:`516`).
 * Fixed bug where material-level library specifications (e.g., ``m1 plib=84p``) could not be fully parsed (:issue:`521`).
+* Fixed bug with shortcuts right after another shortcut (e.g., ``1 2M 3R``) not being properly recompressed on export (:issue:`499`).
+* Fixed bug with shortcuts in cell geometry definitions not being recompressed on export (:issue:`489`).
+* Fixed bug where leading comments were not always transferred to the appropriate input. (:issue:`352`, :issue:`526`).
 
 **Performance Improvement**
 

montepy/cell.py

@@ -142,7 +142,7 @@ def _parse_keyword_modifiers(self):
  break
  if (class_pref == "imp" and not has_imp) or class_pref != "imp":
  tree = getattr(self, attr)._tree
- self._tree["parameters"].append(tree)
+ self._tree["parameters"].append(tree, True)
 
  def _load_blank_modifiers(self):
  """

montepy/data_inputs/importance.py

@@ -29,6 +29,7 @@ class Importance(CellModifierInput):
  def __init__(self, input=None, in_cell_block=False, key=None, value=None):
  self._particle_importances = {}
  self._real_tree = {}
+ self._part_combos = []
  super().__init__(input, in_cell_block, key, value)
  if self.in_cell_block:
  if key:
@@ -39,6 +40,7 @@ def __init__(self, input=None, in_cell_block=False, key=None, value=None):
  raise ValueError(
  f"Cell importance must be a number ≥ 0. {val.value} was given"
  )
+ self._part_combos.append(self.particle_classifiers)
  for particle in self.particle_classifiers:
  self._particle_importances[particle] = value
  elif input:
@@ -52,6 +54,7 @@ def __init__(self, input=None, in_cell_block=False, key=None, value=None):
  raise MalformedInputError(
  input, f"Importances must be ≥ 0 value: {node} given"
  )
+ self._part_combos.append(self.particle_classifiers)
  for particle in self.particle_classifiers:
  self._particle_importances[particle] = copy.deepcopy(self._tree)
  self._real_tree[particle] = copy.deepcopy(self._tree)
@@ -340,6 +343,48 @@ def _try_combine_values(self, new_vals, particle_pairings):
  def _update_cell_values(self):
  pass
 
+ @property
+ def trailing_comment(self):
+ """
+ The trailing comments and padding of an input.
+
+ Generally this will be blank as these will be moved to be a leading comment for the next input.
+
+ :returns: the trailing ``c`` style comments and intermixed padding (e.g., new lines)
+ :rtype: list
+ """
+ last_tree = list(self._real_tree.values())[-1]
+ if last_tree:
+ return last_tree.get_trailing_comment()
+
+ def _delete_trailing_comment(self):
+ for part, tree in reversed(self._real_tree.items()):
+ tree._delete_trailing_comment()
+ self.__delete_common_trailing(part)
+ break
+
+ def __delete_common_trailing(self, part):
+ to_delete = {part}
+ for combo_set in self._part_combos:
+ if part in combo_set:
+ to_delete |= combo_set
+ for part in to_delete:
+ self._particle_importances[part]["data"]._delete_trailing_comment()
+
+ def _grab_beginning_comment(self, new_padding):
+ last_tree = None
+ last_padding = None
+ for part, tree in self._particle_importances.items():
+ if last_padding is not None and last_tree is not None:
+ last_tree._grab_beginning_comment(last_padding)
+ self.__delete_common_trailing(part)
+ last_padding = tree.get_trailing_comment()
+ last_tree = tree
+ if new_padding:
+ next(iter(self._particle_importances.values()))[
+ "start_pad"
+ ]._grab_beginning_comment(new_padding)
+
 
 def _generate_default_data_tree(particle):
  list_node = syntax_node.ListNode("number sequence")

montepy/data_inputs/universe_input.py

@@ -194,7 +194,7 @@ def __repr__(self):
  f"UNIVERSE: in_cell: {self._in_cell_block}"
  f" set_in_block: {self.set_in_cell_block}, "
  f"Universe : {self._universe}, "
- f"Old Numbers: {self._old_numbers}"
+ f"Old Numbers: {self._old_numbers if hasattr(self, '_old_numbers') else ''}"
  )
  return ret
 

montepy/data_inputs/volume.py

@@ -182,7 +182,7 @@ def __repr__(self):
  ret = (
  f"VOLUME: in_cell: {self._in_cell_block}, calc_by_mcnp: {self.is_mcnp_calculated},"
  f" set_in_block: {self.set_in_cell_block}, "
- f"Volume : {self._volume}"
+ f"Volume : {self._volume if hasattr(self, '_volume') else ''}"
  )
  return ret
 

montepy/input_parser/cell_parser.py

@@ -112,19 +112,25 @@ def geometry_term(self, p):
  "geometry_term LOG_INTERPOLATE padding number_phrase",
  )
  def geometry_term(self, p):
- shortcut = syntax_node.ShortcutNode(p)
+ shortcut = syntax_node.ShortcutNode(p, data_type=int)
  node_iter = iter(shortcut.nodes)
  if isinstance(p.geometry_term, syntax_node.GeometryTree):
  left = p.geometry_term
+ left.mark_last_leaf_shortcut(shortcut.type)
  else:
  left = next(node_iter)
+ left_type = None
+ if isinstance(left, syntax_node.ValueNode) and left == shortcut.nodes[0]:
+ left_type = shortcut.type
  for node in node_iter:
  new_tree = syntax_node.GeometryTree(
  "intersection",
  {"left": left, "operator": syntax_node.PaddingNode(), "right": node},
  "*",
  left,
  node,
+ left_short_type=left_type,
+ right_short_type=shortcut.type,
  )
  left = new_tree
  return new_tree

montepy/input_parser/input_reader.py

@@ -3,15 +3,17 @@
 from montepy.constants import DEFAULT_VERSION
 
 
-def read_input(input_file, mcnp_version=DEFAULT_VERSION, replace=True):
+def read_input(destination, mcnp_version=DEFAULT_VERSION, replace=True):
  """
  Reads the specified MCNP Input file.
 
  The MCNP version must be a three component tuple e.g., (6, 2, 0) and (5, 1, 60).
 
+ .. note::
+ if a stream is provided. It will not be closed by this function.
 
- :param input_file: the path to the input file to read.
- :type input_file: str
+ :param destination: the path to the input file to read, or a readable stream.
+ :type destination: io.TextIOBase, str, os.PathLike
  :param mcnp_version: The version of MCNP that the input is intended for.
  :type mcnp_version: tuple
  :returns: The MCNP_Problem instance representing this file.
@@ -24,7 +26,7 @@ def read_input(input_file, mcnp_version=DEFAULT_VERSION, replace=True):
  :raises BrokenObjectLinkError: If a reference is made to an object that is not in the input file.
  :raises UnknownElement: If an isotope is specified for an unknown element.
  """
- problem = mcnp_problem.MCNP_Problem(input_file)
+ problem = mcnp_problem.MCNP_Problem(destination)
  problem.mcnp_version = mcnp_version
  problem.parse_input(replace=replace)
  return problem

montepy/input_parser/material_parser.py

@@ -18,8 +18,8 @@ def material(self, p):
  for key, node in p.introduction.nodes.items():
  ret[key] = node
  ret["data"] = p.isotopes
- if hasattr(p, "parameters"):
- ret["parameters"] = p.parameters
+ if len(p) > 2:
+ ret["parameters"] = p[2]
  return syntax_node.SyntaxNode("data", ret)
 
  @_("isotope_fractions", "number_sequence", "isotope_hybrid_fractions")