endf-parserpy 0.10.3__tar.gz → 0.11.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (124) hide show
  1. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/PKG-INFO +2 -2
  2. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/build.py +1 -0
  3. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/__init__.py +3 -0
  4. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/cmd.py +47 -16
  5. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/code_generator_writing.py +8 -2
  6. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/cpp_boilerplate_writing.py +49 -25
  7. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/endf2cpp_aux.py +3 -5
  8. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/endf2cpp_aux_writing.py +7 -5
  9. endf_parserpy-0.11.0/endf_parserpy/compiler/mode_management.py +184 -0
  10. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/cpp_parsers/endf_parser_cpp.py +11 -2
  11. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/interpreter/endf_mapping_core.py +35 -16
  12. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/interpreter/endf_mapping_utils.py +1 -2
  13. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/interpreter/endf_mappings.py +34 -17
  14. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/interpreter/endf_parser.py +64 -32
  15. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/interpreter/endf_utils.py +31 -16
  16. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/interpreter/logging_utils.py +21 -3
  17. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/interpreter/meta_control_utils.py +59 -22
  18. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/pyproject.toml +16 -5
  19. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/setup.py +2 -2
  20. endf_parserpy-0.10.3/endf_parserpy/compiler/mode_management.py +0 -268
  21. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/LICENSE +0 -0
  22. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/README.md +0 -0
  23. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/__init__.py +0 -0
  24. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/code_generator_core.py +0 -0
  25. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/code_generator_parsing.py +0 -0
  26. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/code_generator_parsing_core.py +0 -0
  27. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/code_generator_writing_core.py +0 -0
  28. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/compiler.py +0 -0
  29. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/cpp_boilerplate.py +0 -0
  30. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/cpp_boilerplate_reading.py +0 -0
  31. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/cpp_primitives.py +0 -0
  32. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/cpp_types/__init__.py +0 -0
  33. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/cpp_types/cpp_dtype_aux.py +0 -0
  34. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/cpp_types/cpp_type_information.py +0 -0
  35. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/cpp_types/cpp_type_matrix2d/__init__.py +0 -0
  36. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/cpp_types/cpp_type_matrix2d/assign.py +0 -0
  37. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/cpp_types/cpp_type_matrix2d/definition.py +0 -0
  38. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/cpp_types/cpp_type_matrix2d/query.py +0 -0
  39. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/cpp_types/cpp_type_nested_vector/__init__.py +0 -0
  40. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/cpp_types/cpp_type_nested_vector/assign.py +0 -0
  41. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/cpp_types/cpp_type_nested_vector/auxiliary.py +0 -0
  42. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/cpp_types/cpp_type_nested_vector/definition.py +0 -0
  43. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/cpp_types/cpp_type_nested_vector/query.py +0 -0
  44. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/cpp_types/cpp_type_scalar/__init__.py +0 -0
  45. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/cpp_types/cpp_type_scalar/assign.py +0 -0
  46. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/cpp_types/cpp_type_scalar/auxiliary.py +0 -0
  47. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/cpp_types/cpp_type_scalar/definition.py +0 -0
  48. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/cpp_types/cpp_type_scalar/query.py +0 -0
  49. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/cpp_types/cpp_type_template/__init__.py +0 -0
  50. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/cpp_types/cpp_type_template/query.py +0 -0
  51. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/cpp_types/cpp_varaux.py +0 -0
  52. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/cpp_types/cpp_varops_assign.py +0 -0
  53. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/cpp_types/cpp_varops_query.py +0 -0
  54. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/cpp_types/cpp_vartype_handling.py +0 -0
  55. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/endf2cpp.py +0 -0
  56. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/expr_utils/__init__.py +0 -0
  57. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/expr_utils/conversion.py +0 -0
  58. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/expr_utils/custom_nodes.py +0 -0
  59. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/expr_utils/equation_utils.py +0 -0
  60. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/expr_utils/exceptions.py +0 -0
  61. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/expr_utils/node_checks.py +0 -0
  62. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/expr_utils/node_trafos.py +0 -0
  63. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/expr_utils/tree_trafos.py +0 -0
  64. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/expr_utils/tree_walkers.py +0 -0
  65. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/lookahead_management.py +0 -0
  66. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/node_aux.py +0 -0
  67. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/node_checks.py +0 -0
  68. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/compiler/variable_management.py +0 -0
  69. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/cpp_parsers/__init__.py +0 -0
  70. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/cpp_parsers/endf6.cpp +0 -0
  71. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/cpp_parsers/endf6_ext.cpp +0 -0
  72. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/cpp_parsers/jendl.cpp +0 -0
  73. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/__init__.py +0 -0
  74. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/__init__.py +0 -0
  75. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf0_mt0.py +0 -0
  76. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf10.py +0 -0
  77. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf12.py +0 -0
  78. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf13.py +0 -0
  79. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf14.py +0 -0
  80. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf15.py +0 -0
  81. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf1_mt451.py +0 -0
  82. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf1_mt452.py +0 -0
  83. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf1_mt455.py +0 -0
  84. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf1_mt456.py +0 -0
  85. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf1_mt458.py +0 -0
  86. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf1_mt460.py +0 -0
  87. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf23.py +0 -0
  88. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf26.py +0 -0
  89. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf27.py +0 -0
  90. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf28.py +0 -0
  91. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf2_mt151.py +0 -0
  92. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf3.py +0 -0
  93. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf31.py +0 -0
  94. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf31_mt452_455_456.py +0 -0
  95. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf32.py +0 -0
  96. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf33.py +0 -0
  97. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf34.py +0 -0
  98. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf35.py +0 -0
  99. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf4.py +0 -0
  100. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf40.py +0 -0
  101. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf5.py +0 -0
  102. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf6.py +0 -0
  103. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf7.py +0 -0
  104. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf8.py +0 -0
  105. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf8_mt454.py +0 -0
  106. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf8_mt457.py +0 -0
  107. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf8_mt459.py +0 -0
  108. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6/endf_recipe_mf9.py +0 -0
  109. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6_ext/__init__.py +0 -0
  110. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf6_ext/endf_recipe_mf4.py +0 -0
  111. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/endf_lark_ebnf.py +0 -0
  112. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/jendl/__init__.py +0 -0
  113. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/jendl/endf_recipe_mf8_mt457.py +0 -0
  114. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/endf_recipes/utils.py +0 -0
  115. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/interpreter/__init__.py +0 -0
  116. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/interpreter/custom_exceptions.py +0 -0
  117. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/interpreter/endf_recipe_utils.py +0 -0
  118. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/interpreter/fortran_utils.py +0 -0
  119. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/utils/accessories.py +0 -0
  120. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/utils/debugging_utils.py +0 -0
  121. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/utils/endf6_plumbing.py +0 -0
  122. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/utils/math_utils.py +0 -0
  123. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/utils/tree_utils.py +0 -0
  124. {endf_parserpy-0.10.3 → endf_parserpy-0.11.0}/endf_parserpy/utils/user_tools.py +0 -0
@@ -1,11 +1,11 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: endf-parserpy
3
- Version: 0.10.3
3
+ Version: 0.11.0
4
4
  Summary: A Python package for reading, writing, verifying and translating ENDF-6 files
5
5
  Home-page: https://github.com/iaea-nds/endf-parserpy
6
6
  License: MIT
7
7
  Author: Georg Schnabel
8
- Requires-Python: >=3.6.1
8
+ Requires-Python: >=3.7.0,<4.0.0
9
9
  Classifier: Development Status :: 4 - Beta
10
10
  Classifier: Intended Audience :: Developers
11
11
  Classifier: Intended Audience :: End Users/Desktop
@@ -39,6 +39,7 @@ class OptionalBuildExt(pybind11_build_ext):
39
39
 
40
40
 
41
41
  def build(setup_kwargs):
42
+ # perform option C++ module compilation
42
43
  compile_env_var = os.environ.get("INSTALL_ENDF_PARSERPY_CPP", "optional")
43
44
  if compile_env_var == "no":
44
45
  logger.info(
@@ -18,6 +18,9 @@ from .utils.user_tools import (
18
18
  from .utils.endf6_plumbing import update_directory
19
19
 
20
20
 
21
+ __version__ = "0.11.0"
22
+
23
+
21
24
  __all__ = (
22
25
  "EndfParser",
23
26
  "BasicEndfParser",
@@ -3,7 +3,7 @@
3
3
  # Author(s): Georg Schnabel
4
4
  # Email: g.schnabel@iaea.org
5
5
  # Creation date: 2024/02/05
6
- # Last modified: 2024/04/26
6
+ # Last modified: 2024/06/26
7
7
  # License: MIT
8
8
  # Copyright (c) 2024 International Atomic Energy Agency (IAEA)
9
9
  #
@@ -17,6 +17,8 @@ from glob import glob
17
17
  import os
18
18
  from endf_parserpy.utils.accessories import EndfPath
19
19
  from endf_parserpy.interpreter.endf_parser import EndfParser
20
+ from endf_parserpy.interpreter.logging_utils import setup_logger
21
+ from endf_parserpy.cpp_parsers.endf_parser_cpp import EndfParserCpp
20
22
  from endf_parserpy.utils.debugging_utils import compare_objects
21
23
  from endf_parserpy.utils.endf6_plumbing import (
22
24
  update_directory,
@@ -157,6 +159,11 @@ if __name__ == "__main__":
157
159
  action="store_true",
158
160
  help="suppress the message on cache location",
159
161
  )
162
+ parser.add_argument(
163
+ "--no-cpp",
164
+ action="store_true",
165
+ help="use Python parser instead of faster cpp parser",
166
+ )
160
167
  parser.add_argument(
161
168
  "-s", "--strict", action="store_true", help="switch to enable strict mode"
162
169
  )
@@ -236,25 +243,49 @@ if __name__ == "__main__":
236
243
  strict_mode = args.strict
237
244
  endf_format = args.format
238
245
 
239
- logger = logging.getLogger()
240
- logger.setLevel(logging.CRITICAL)
246
+ logger = setup_logger(__name__, logging.WARNING)
241
247
 
242
248
  print_cache_info = not args.no_cache_info
243
249
  ignore_number_mismatch = not strict_mode
244
250
  ignore_zero_mismatch = not strict_mode
245
- fuzzy_matching = not strict_mode
246
- parser = EndfParser(
247
- ignore_number_mismatch=ignore_number_mismatch,
248
- ignore_zero_mismatch=ignore_zero_mismatch,
249
- fuzzy_matching=fuzzy_matching,
250
- ignore_varspec_mismatch=False,
251
- accept_spaces=False,
252
- ignore_blank_lines=False,
253
- ignore_send_records=False,
254
- ignore_missing_tpid=False,
255
- print_cache_info=print_cache_info,
256
- endf_format=endf_format,
257
- )
251
+ fuzzy_matching = False
252
+ try:
253
+ if args.no_cpp:
254
+ raise NotImplementedError("Use Python parser instead of faster cpp parser")
255
+ if fuzzy_matching:
256
+ raise NotImplementedError(
257
+ "EndfParserCpp does not support (less strict) fuzzy matching: "
258
+ + "use the --no-cpp option to enable it."
259
+ )
260
+ if args.subcommand == "explain":
261
+ raise NotImplementedError(
262
+ "EndfParserCpp does not support the `explain` command "
263
+ + "- switching to EndfParser (slow)"
264
+ )
265
+ parser = EndfParserCpp(
266
+ ignore_number_mismatch=ignore_number_mismatch,
267
+ ignore_zero_mismatch=ignore_zero_mismatch,
268
+ ignore_varspec_mismatch=False,
269
+ accept_spaces=False,
270
+ ignore_blank_lines=False,
271
+ ignore_send_records=False,
272
+ ignore_missing_tpid=False,
273
+ endf_format=endf_format,
274
+ )
275
+ except:
276
+ parser = EndfParser(
277
+ ignore_number_mismatch=ignore_number_mismatch,
278
+ ignore_zero_mismatch=ignore_zero_mismatch,
279
+ fuzzy_matching=fuzzy_matching,
280
+ ignore_varspec_mismatch=False,
281
+ accept_spaces=False,
282
+ ignore_blank_lines=False,
283
+ ignore_send_records=False,
284
+ ignore_missing_tpid=False,
285
+ print_cache_info=print_cache_info,
286
+ endf_format=endf_format,
287
+ loglevel=logging.ERROR,
288
+ )
258
289
 
259
290
  if args.subcommand == "validate":
260
291
  files = []
@@ -3,7 +3,7 @@
3
3
  # Author(s): Georg Schnabel
4
4
  # Email: g.schnabel@iaea.org
5
5
  # Creation date: 2024/05/12
6
- # Last modified: 2024/05/28
6
+ # Last modified: 2024/07/23
7
7
  # License: MIT
8
8
  # Copyright (c) 2024 International Atomic Energy Agency (IAEA)
9
9
  #
@@ -204,7 +204,13 @@ def _prepare_send_func_wrapper(vardict):
204
204
 
205
205
  def _prepare_line_func_wrapper(vardict):
206
206
  code = prepare_line_la(
207
- "cpp_draft_line", "mat", "mf", "mt", "linenum", in_lookahead(vardict)
207
+ "cpp_draft_line",
208
+ "mat",
209
+ "mf",
210
+ "mt",
211
+ "linenum",
212
+ "write_opts",
213
+ in_lookahead(vardict),
208
214
  )
209
215
  return code
210
216
 
@@ -3,7 +3,7 @@
3
3
  # Author(s): Georg Schnabel
4
4
  # Email: g.schnabel@iaea.org
5
5
  # Creation date: 2024/05/18
6
- # Last modified: 2024/05/27
6
+ # Last modified: 2024/07/23
7
7
  # License: MIT
8
8
  # Copyright (c) 2024 International Atomic Energy Agency (IAEA)
9
9
  #
@@ -21,6 +21,7 @@ def module_header_writing():
21
21
  bool keep_E;
22
22
  bool prefer_noexp;
23
23
  bool skip_intzero;
24
+ bool include_linenum;
24
25
  };
25
26
 
26
27
 
@@ -29,7 +30,8 @@ def module_header_writing():
29
30
  false, // abuse_signpos
30
31
  false, // keep_E
31
32
  false, // prefer_noexp
32
- false // skip_intzero
33
+ false, // skip_intzero
34
+ true // include_linenum
33
35
  };
34
36
  }
35
37
 
@@ -55,6 +57,8 @@ def module_header_writing():
55
57
  value.prefer_noexp = d["prefer_noexp"].cast<bool>();
56
58
  else if (key_str == "skip_intzero")
57
59
  value.skip_intzero = d["skip_intzero"].cast<bool>();
60
+ else if (key_str == "include_linenum")
61
+ value.include_linenum = d["include_linenum"].cast<bool>();
58
62
  else
59
63
  throw std::runtime_error("unknown option `" + key_str + "` provided");
60
64
  }
@@ -74,6 +78,9 @@ def module_header_writing():
74
78
  if (! d.contains("skip_intzero")) {
75
79
  value.skip_intzero = default_opts.skip_intzero;
76
80
  }
81
+ if (! d.contains("include_linenum")) {
82
+ value.include_linenum = default_opts.include_linenum;
83
+ }
77
84
  return true;
78
85
  }
79
86
 
@@ -84,6 +91,7 @@ def module_header_writing():
84
91
  d["keep_E"] = src.keep_E;
85
92
  d["prefer_noexp"] = src.prefer_noexp;
86
93
  d["skip_intzero"] = src.skip_intzero;
94
+ d["include_linenum"] = src.include_linenum;
87
95
  return d.release();
88
96
  }
89
97
 
@@ -118,13 +126,19 @@ def module_header_writing():
118
126
  }
119
127
 
120
128
 
121
- std::string cpp_prepare_line(int mat, int mf, int mt, int &linenum) {
122
- std::string line(80, ' ');
129
+ std::string cpp_prepare_line(
130
+ int mat, int mf, int mt, int &linenum, WritingOptions &write_opts
131
+ ) {
132
+ int line_width = (write_opts.include_linenum) ? 80 : 75;
133
+ std::string line(line_width, ' ');
123
134
  line += '\n';
124
135
  cpp_write_mat_number(line, mat);
125
136
  cpp_write_mf_number(line, mf);
126
137
  cpp_write_mt_number(line, mt);
127
- cpp_write_line_number(line, ++linenum);
138
+ if (write_opts.include_linenum) {
139
+ cpp_write_line_number(line, (linenum % 99999)+1);
140
+ }
141
+ linenum++;
128
142
  return line;
129
143
  }
130
144
 
@@ -278,27 +292,27 @@ def module_header_writing():
278
292
  int nr = tab_body.INT.size();
279
293
  int np = tab_body.X.size();
280
294
  std::ostringstream oss;
281
- std::string curline = cpp_prepare_line(mat, mf, mt, linenum);
295
+ std::string curline = cpp_prepare_line(mat, mf, mt, linenum, write_opts);
282
296
  int j = 0;
283
297
  for (int i=0; i < nr; i++) {
284
298
  cpp_write_field(curline, j++, tab_body.NBT[i], write_opts);
285
299
  cpp_write_field(curline, j++, tab_body.INT[i], write_opts);
286
300
  if (j > 5 && i+1 < nr) {
287
301
  oss << curline;
288
- curline = cpp_prepare_line(mat, mf, mt, linenum);
302
+ curline = cpp_prepare_line(mat, mf, mt, linenum, write_opts);
289
303
  j = 0;
290
304
  }
291
305
  }
292
306
  oss << curline;
293
307
 
294
308
  j = 0;
295
- curline = cpp_prepare_line(mat, mf, mt, linenum);
309
+ curline = cpp_prepare_line(mat, mf, mt, linenum, write_opts);
296
310
  for (int i=0; i < np; i++) {
297
311
  cpp_write_field(curline, j++, tab_body.X[i], write_opts);
298
312
  cpp_write_field(curline, j++, tab_body.Y[i], write_opts);
299
313
  if (j > 5 && i+1 < np) {
300
314
  oss << curline;
301
- curline = cpp_prepare_line(mat, mf, mt, linenum);
315
+ curline = cpp_prepare_line(mat, mf, mt, linenum, write_opts);
302
316
  j = 0;
303
317
  }
304
318
  }
@@ -313,14 +327,14 @@ def module_header_writing():
313
327
  assert(tab_body.INT.size() == tab_body.NBT.size() && "INT and NBT must have same size");
314
328
  int nr = tab_body.INT.size();
315
329
  std::ostringstream oss;
316
- std::string curline = cpp_prepare_line(mat, mf, mt, linenum);
330
+ std::string curline = cpp_prepare_line(mat, mf, mt, linenum, write_opts);
317
331
  int j = 0;
318
332
  for (int i=0; i < nr; i++) {
319
333
  cpp_write_field(curline, j++, tab_body.NBT[i], write_opts);
320
334
  cpp_write_field(curline, j++, tab_body.INT[i], write_opts);
321
335
  if (j > 5 && i+1 < nr) {
322
336
  oss << curline;
323
- curline = cpp_prepare_line(mat, mf, mt, linenum);
337
+ curline = cpp_prepare_line(mat, mf, mt, linenum, write_opts);
324
338
  j = 0;
325
339
  }
326
340
  }
@@ -330,7 +344,8 @@ def module_header_writing():
330
344
 
331
345
 
332
346
  std::string cpp_prepare_send(int mat, int mf, WritingOptions &write_opts) {
333
- std::string line(80, ' ');
347
+ int line_width = (write_opts.include_linenum) ? 80 : 75;
348
+ std::string line(line_width, ' ');
334
349
  line += '\n';
335
350
  cpp_write_mat_number(line, mat);
336
351
  cpp_write_mf_number(line, mf);
@@ -341,11 +356,13 @@ def module_header_writing():
341
356
  cpp_write_field(line, 3, 0, write_opts);
342
357
  cpp_write_field(line, 4, 0, write_opts);
343
358
  cpp_write_field(line, 5, 0, write_opts);
344
- if (mf == 0) {
345
- // for writing FEND/MEND/TEND record
346
- cpp_write_line_number(line, 0);
347
- } else {
348
- cpp_write_line_number(line, 99999);
359
+ if (write_opts.include_linenum) {
360
+ if (mf == 0) {
361
+ // for writing FEND/MEND/TEND record
362
+ cpp_write_line_number(line, 0);
363
+ } else {
364
+ cpp_write_line_number(line, 99999);
365
+ }
349
366
  }
350
367
  return line;
351
368
  }
@@ -380,21 +397,28 @@ def module_header_writing():
380
397
  if (mfmt_section.size() == 0) {
381
398
  throw std::runtime_error("an MF/MT section must not be represented by an empty list");
382
399
  }
383
- int mat;
384
- int mf;
385
- int mt;
400
+ std::string first_line = py::cast<std::string>(mfmt_section[0]);
401
+ int mat = cpp_read_mat_number(first_line.c_str());
402
+ int mf = cpp_read_mf_number(first_line.c_str());
403
+ int mt = cpp_read_mt_number(first_line.c_str());
404
+ int linenum = (mf != 0) ? 1 : 0; // linenum starts at 0 for tape head
386
405
  for (const auto& item : mfmt_section) {
387
406
  std::string linestr = py::cast<std::string>(item);
407
+ if (write_opts.include_linenum) {
408
+ linestr.resize(80);
409
+ cpp_write_line_number(linestr, linenum++);
410
+ } else {
411
+ linestr.erase(75, std::string::npos);
412
+ }
388
413
  if (linestr.back() != '\n') {
389
414
  linestr.push_back('\n');
390
415
  }
391
- mat = cpp_read_mat_number(linestr.c_str());
392
- mf = cpp_read_mf_number(linestr.c_str());
393
- mt = cpp_read_mt_number(linestr.c_str());
394
416
  oss << linestr;
395
417
  }
396
- std::string send_line = cpp_prepare_send(mat, mf, write_opts);
397
- oss << send_line;
418
+ if (mf != 0) {
419
+ std::string send_line = cpp_prepare_send(mat, mf, write_opts);
420
+ oss << send_line;
421
+ }
398
422
  }
399
423
  """
400
424
  return cpp.indent_code(code, -4)
@@ -3,7 +3,7 @@
3
3
  # Author(s): Georg Schnabel
4
4
  # Email: g.schnabel@iaea.org
5
5
  # Creation date: 2024/03/28
6
- # Last modified: 2024/05/27
6
+ # Last modified: 2024/06/01
7
7
  # License: MIT
8
8
  # Copyright (c) 2024 International Atomic Energy Agency (IAEA)
9
9
  #
@@ -148,14 +148,12 @@ def validate_field(
148
148
 
149
149
 
150
150
  def get_tab1_body(xvar, yvar, nr, np, mat, mf, mt, parse_opts):
151
- code = f"read_tab1_body_debug(cont, cpp_line, {nr}, {np}, {mat}, {mf}, {mt}, {parse_opts})"
151
+ code = f"read_tab1_body(cont, {nr}, {np}, {mat}, {mf}, {mt}, {parse_opts})"
152
152
  return code
153
153
 
154
154
 
155
155
  def get_tab2_body(nr, mat, mf, mt, parse_opts):
156
- code = (
157
- f"read_tab2_body_debug(cont, cpp_line, {nr}, {mat}, {mf}, {mt}, {parse_opts})"
158
- )
156
+ code = f"read_tab2_body(cont, {nr}, {mat}, {mf}, {mt}, {parse_opts})"
159
157
  return code
160
158
 
161
159
 
@@ -3,7 +3,7 @@
3
3
  # Author(s): Georg Schnabel
4
4
  # Email: g.schnabel@iaea.org
5
5
  # Creation date: 2024/05/18
6
- # Last modified: 2024/05/26
6
+ # Last modified: 2024/07/23
7
7
  # License: MIT
8
8
  # Copyright (c) 2024 International Atomic Energy Agency (IAEA)
9
9
  #
@@ -13,15 +13,17 @@
13
13
  from . import cpp_primitives as cpp
14
14
 
15
15
 
16
- def prepare_line(linevar, mat, mf, mt, linenum):
17
- code = cpp.statement(f"{linevar} = cpp_prepare_line({mat}, {mf}, {mt}, {linenum})")
16
+ def prepare_line(linevar, mat, mf, mt, linenum, write_opts):
17
+ code = cpp.statement(
18
+ f"{linevar} = cpp_prepare_line({mat}, {mf}, {mt}, {linenum}, {write_opts})"
19
+ )
18
20
  return code
19
21
 
20
22
 
21
- def prepare_line_la(linevar, mat, mf, mt, linenum, lookahead):
23
+ def prepare_line_la(linevar, mat, mf, mt, linenum, write_opts, lookahead):
22
24
  if lookahead:
23
25
  return ""
24
- return prepare_line(linevar, mat, mf, mt, linenum)
26
+ return prepare_line(linevar, mat, mf, mt, linenum, write_opts)
25
27
 
26
28
 
27
29
  def prepare_send(linevar, mat, mf, write_opts):
@@ -0,0 +1,184 @@
1
+ ############################################################
2
+ #
3
+ # Author(s): Georg Schnabel
4
+ # Email: g.schnabel@iaea.org
5
+ # Creation date: 2024/05/12
6
+ # Last modified: 2024/06/09
7
+ # License: MIT
8
+ # Copyright (c) 2024 International Atomic Energy Agency (IAEA)
9
+ #
10
+ ############################################################
11
+
12
+
13
+ def _find_parent_dict(varname, vardict):
14
+ curdict = vardict
15
+ while varname not in curdict and "__up" in curdict:
16
+ curdict = curdict["__up"]
17
+ if varname not in curdict:
18
+ raise TypeError(f"{varname} not found in dictionary hierarchy")
19
+ return curdict
20
+
21
+
22
+ def _register_getter(name, vardict, funcname, params):
23
+ if params is not None and not callable(name):
24
+ raise TypeError("func must be a callable with parameters " + ", ".join(params))
25
+ basic_ops = vardict.setdefault("__basic_ops", {})
26
+ basic_ops[funcname] = name
27
+
28
+
29
+ def _get_getter(name, vardict):
30
+ pardict = _find_parent_dict("__basic_ops", vardict)
31
+ basic_ops = pardict["__basic_ops"]
32
+ return basic_ops[name]
33
+
34
+
35
+ def register_numeric_field_getter(func, vardict):
36
+ _register_getter(
37
+ func, vardict, "numeric_field_getter", ("node", "idx", "dtype", "lookahead")
38
+ )
39
+
40
+
41
+ def get_numeric_field_getter(vardict):
42
+ return _get_getter("numeric_field_getter", vardict)
43
+
44
+
45
+ def register_text_field_getter(func, vardict):
46
+ _register_getter(
47
+ func, vardict, "text_field_getter", ("node", "start", "length", "lookahead")
48
+ )
49
+
50
+
51
+ def get_text_field_getter(vardict):
52
+ return _get_getter("text_field_getter", vardict)
53
+
54
+
55
+ def register_custom_int_field_getter(func, vardict):
56
+ _register_getter(
57
+ func,
58
+ vardict,
59
+ "custom_int_field_getter",
60
+ ("node", "start", "length", "lookahead"),
61
+ )
62
+
63
+
64
+ def get_custom_int_field_getter(vardict):
65
+ return _get_getter("custom_int_field_getter", vardict)
66
+
67
+
68
+ def register_counter_field_getter(func, vardict):
69
+ _register_getter(
70
+ func, vardict, "counter_field_getter", ("node", "idx", "lookahead")
71
+ )
72
+
73
+
74
+ def get_counter_field_getter(vardict):
75
+ return _get_getter("counter_field_getter", vardict)
76
+
77
+
78
+ def register_tab1_body_getter(func, vardict):
79
+ _register_getter(
80
+ func, vardict, "tab1_body_getter", ("xvar", "yvar", "nr", "np", "lookahead")
81
+ )
82
+
83
+
84
+ def get_tab1_body_getter(vardict):
85
+ return _get_getter("tab1_body_getter", vardict)
86
+
87
+
88
+ def register_tab2_body_getter(func, vardict):
89
+ _register_getter(func, vardict, "tab2_body_getter", ("nr", "lookahead"))
90
+
91
+
92
+ def get_tab2_body_getter(vardict):
93
+ return _get_getter("tab2_body_getter", vardict)
94
+
95
+
96
+ def register_prepare_line_func(func, vardict):
97
+ _register_getter(func, vardict, "prepare_line_func", ("lookahead",))
98
+
99
+
100
+ def get_prepare_line_func(vardict):
101
+ return _get_getter("prepare_line_func", vardict)
102
+
103
+
104
+ def register_send_line_func(func, vardict):
105
+ _register_getter(func, vardict, "send_func", ("lookahead",))
106
+
107
+
108
+ def get_send_line_func(vardict):
109
+ return _get_getter("send_func", vardict)
110
+
111
+
112
+ def register_finalize_line_func(func, vardict):
113
+ _register_getter(func, vardict, "finalize_line_func", ("lookahead",))
114
+
115
+
116
+ def get_finalize_line_func(vardict):
117
+ return _get_getter("finalize_line_func", vardict)
118
+
119
+
120
+ def register_prepare_line_tape_func(func, vardict):
121
+ _register_getter(func, vardict, "prepare_line_tape", tuple())
122
+
123
+
124
+ def get_prepare_line_tape_func(vardict):
125
+ return _get_getter("prepare_line_tape", vardict)
126
+
127
+
128
+ def register_finalize_line_tape_func(func, vardict):
129
+ _register_getter(func, vardict, "finalize_line_tape", tuple())
130
+
131
+
132
+ def get_finalize_line_tape_func(vardict):
133
+ return _get_getter("finalize_line_tape", vardict)
134
+
135
+
136
+ def register_prepare_section_func(func, vardict):
137
+ _register_getter(func, vardict, "prepare_section_func", ("vartok", "vardict"))
138
+
139
+
140
+ def get_prepare_section_func(vardict):
141
+ return _get_getter("prepare_section_func", vardict)
142
+
143
+
144
+ def register_finalize_section_func(func, vardict):
145
+ _register_getter(func, vardict, "finalize_section_func", ("vartok", "vardict"))
146
+
147
+
148
+ def get_finalize_section_func(vardict):
149
+ return _get_getter("finalize_section_func", vardict)
150
+
151
+
152
+ def register_lookahead_tellg_statement(statement, vardict):
153
+ basic_ops = vardict.setdefault("__basic_ops", {})
154
+ basic_ops["lookahead_tellg_statement"] = statement
155
+
156
+
157
+ def get_lookahead_tellg_statement(vardict):
158
+ pardict = _find_parent_dict("__basic_ops", vardict)
159
+ basic_ops = pardict["__basic_ops"]
160
+ return basic_ops["lookahead_tellg_statement"]
161
+
162
+
163
+ def register_lookahead_seekg_statement(statement, vardict):
164
+ basic_ops = vardict.setdefault("__basic_ops", {})
165
+ basic_ops["lookahead_seekg_statement"] = statement
166
+
167
+
168
+ def get_lookahead_seekg_statement(vardict):
169
+ pardict = _find_parent_dict("__basic_ops", vardict)
170
+ basic_ops = pardict["__basic_ops"]
171
+ return basic_ops["lookahead_seekg_statement"]
172
+
173
+
174
+ def register_generate_expr_validation_func(func, vardict):
175
+ _register_getter(
176
+ func,
177
+ vardict,
178
+ "generate_expr_validation_func",
179
+ ("actual_value", "node", "vardict"),
180
+ )
181
+
182
+
183
+ def get_generate_expr_validation_func(vardict):
184
+ return _get_getter("generate_expr_validation_func", vardict)
@@ -3,7 +3,7 @@
3
3
  # Author(s): Georg Schnabel
4
4
  # Email: g.schnabel@iaea.org
5
5
  # Creation date: 2024/05/29
6
- # Last modified: 2024/05/29
6
+ # Last modified: 2024/07/23
7
7
  # License: MIT
8
8
  # Copyright (c) 2024 International Atomic Energy Agency (IAEA)
9
9
  #
@@ -51,6 +51,7 @@ class EndfParserCpp:
51
51
  validate_control_records=False,
52
52
  abuse_signpos=False,
53
53
  keep_E=False,
54
+ include_linenum=True,
54
55
  skip_intzero=False,
55
56
  prefer_noexp=False,
56
57
  endf_format="endf6-ext",
@@ -106,6 +107,9 @@ class EndfParserCpp:
106
107
  e.g. `1.23e-8` instead of `1.23-8`. The inclusion establishes
107
108
  compatibility with programming languages different from Fortran
108
109
  while the omission enhances numerical precision. *(writing)*
110
+ include_linenum : bool
111
+ Controls whether the 5-digit line number should be
112
+ included at the end of each line. *(writing)*
109
113
  skip_intzero: bool
110
114
  For numbers written out in decimal notation, eliminate
111
115
  the integer part if zero, e.g. `0.12` becomes `.12` to
@@ -135,6 +139,7 @@ class EndfParserCpp:
135
139
  self.write_opts = {
136
140
  "abuse_signpos": abuse_signpos,
137
141
  "keep_E": keep_E,
142
+ "include_linenum": include_linenum,
138
143
  "skip_intzero": skip_intzero,
139
144
  "prefer_noexp": prefer_noexp,
140
145
  }
@@ -246,7 +251,11 @@ class EndfParserCpp:
246
251
  """
247
252
  if isinstance(endf_dict, EndfDict):
248
253
  endf_dict = endf_dict.unwrap()
249
- return self._write_endf(endf_dict, exclude, include, self.write_opts)
254
+ cont = self._write_endf(endf_dict, exclude, include, self.write_opts)
255
+ lines = cont.split("\n")
256
+ if lines[-1] == "":
257
+ lines.pop()
258
+ return lines
250
259
 
251
260
  def writefile(
252
261
  self, filename, endf_dict, exclude=None, include=None, overwrite=False