Complete syntax parsing rework to preserve user formatting. - [merged]

[MicahGale]

Merges 48-add-support-for-keeping-comments -> alpha-test

Tests to add:

1. [ ] test tab expansion.
2. [ ] Test SC and FC tally comments
3. [ ] Ensure comments get placed with following object.
4. [ ] Clear out all TODO comments.
5. [ ] Clean up code and refactor.
6. [ ] Update all documentation.
7. [ ] Can I delete allowed_keywords?

[MicahGale]

added 1 commit

• 54a9f5e7 - Fixed lexer order breaking materials

Compare with previous version

[MicahGale]

added 1 commit

• cf797aac - Fixed RE for text and text subclassing to catch jumps properly

Compare with previous version

[MicahGale]

added 3 commits

• cf797aac...77c09d34 - 2 commits from branch develop
• e77712f0 - Merge branch 'develop' into 48-add-support-for-keeping-comments

Compare with previous version

[MicahGale]

added 7 commits

• 26ec50fa - Removed words from tests
• 0d6c14ab - Fixed volume to use valueNodes
• 9303c322 - Updated test to use ValueNode
• 00b7de4c - Cleaned up transform init bugs
• 029e896a - Made transform number a standard valuenode
• dd776dc7 - Updated format_for_mcnp
• 93b7136a - Updated format test to use user supplied formatting

Compare with previous version

[MicahGale]

added 2 commits

• bd3e4433 - Updated text to avoid matching float
• 4a8cdf25 - Made text re more robust to either match shortcut OR text

Compare with previous version

[MicahGale]

added 2 commits

• eb12d24d - Fixed bugs introduced in cells by Merge
• b8351c62 - Fixed push to cells with universe and fill

Compare with previous version

[MicahGale]

added 2 commits

• b13058aa - Updated comment RE to not overconsume one line Cs
• 88583ec7 - Fixed bug with cells class prefix not being property

Compare with previous version

[MicahGale]

added 1 commit

• 6987f248 - Pushed all new text RE out.

Compare with previous version

[MicahGale]

added 1 commit

• c294e3bb - Fixed text RE to not match starting decimal

Compare with previous version

[MicahGale]

added 1 commit

• f09fe411 - Updated text RE to push out universally

Compare with previous version

[MicahGale]

added 3 commits

• 02bcff7b - Switched patterns from being a complex RE to multiple simpler ones
• 450697fc - Made is_comment a top level function
• 9d52a575 - Fixed bug to do data type classing on first NON comment line

Compare with previous version

[MicahGale]

added 3 commits

• 22136b15 - Fixed bug in error handling
• eb015cc9 - Fixed bug with importance dict
• 0b824e05 - Fixed bug not allowing universe 0

Compare with previous version

[MicahGale]

added 2 commits

• aee4ea2a - Removed reference to geometry_logic_string
• 1350efca - Fixed bug with parameters format

Compare with previous version

[MicahGale]

added 3 commits

• ec73543c - Format for mcnp update to volume
• 8e77f9f3 - Switched push to cell iteration to access valueNode
• ed61b4bc - Fixed typo of CARDS_TO_PROPERTY

Compare with previous version

[MicahGale]

added 1 commit

• 549b0318 - Moved format_for_mcnp_input to top level

Compare with previous version

[MicahGale]

added 3 commits

• 68f1d66f - Updated lattice test to match user format
• cbf819c0 - Made particlesNode particles setter
• b3cf9fb8 - Made a default tree for importance

Compare with previous version

[MicahGale]

added 5 commits

• f630f46f - Made importance tree for cell too
• d4a2f6b0 - Pushed default tree to all cell modifiers
• 0faea98a - Implemented empyt guard for cell modifiers
• 1f0705e0 - Prevented jump from combining
• a8d820ba - Fixed bug with data universe information being stored wrong

Compare with previous version

[MicahGale]

changed target branch from develop to alpha-test

[MicahGale]

added 10 commits

• 825df1a2 - Made ValueNode convertible to enum
• 3f21f69f - Converted lattice over to using syntax tree storage with enum
• 6a2deeb3 - Centralized logic for cell_modifier printing
• f23d2b8d - Update repr for valueNode
• ee368dd2 - Updated test to compare Lattice enum values
• 01f5d76d - Made cell modifier able to write out without attached problem
• 2d35d489 - Fixed buggy name in repr
• dcb80274 - Made lattice use int for formatting
• 9d8304ad - Made format_for_mcnp default to [] not None
• a8ba4da2 - Fixed bug with formatting enum ValueNode

Compare with previous version

[MicahGale]

I'm thinking of not resolving #12 here. Rather allow this to go to alpha testing while I work on #12 separately. This is still critical path to next release though as not implementing #12 would make it impossible to alter a cell geometry.

[MicahGale]

added 1 commit

• 637b69de - Cleaned up simple bugs

Compare with previous version

[MicahGale]

added 4 commits

• a86e6634 - Made all data inputs get fully parsed no matter what
• 7cb6a182 - Updated write to file tests to test new data format
• 29127e49 - Made string changed to ValueNode
• 687c8962 - Made ListNode and ValueNode equatable

Compare with previous version

[MicahGale]

added 1 commit

• 1cf1ff28 - Yoloed a method to keep exponent length consistent.

Compare with previous version

[MicahGale]

Reduced scope in order to support MCCAFE critical path to SQA.

[MicahGale]

added 1 commit

• 53b58399 - Worked on method to map new to old values

Compare with previous version

[MicahGale]

added 2 commits

• 4affc26c - Started Shortcut Format
• 6e919a35 - Worked on having shortcut nodes consume their neighbors

Compare with previous version

[MicahGale]

added 8 commits

• 1f15a60e - Made shortcut node add final padding
• f89971fa - Made end padding for shortcuts more robust
• f9ee5e96 - Fixed ValueNode to add negative sign to negative identifiers.
• 9784e68f - Implemented new node checking for all types
• 409a9e5c - Fixed edge case of interpolation for starting edge
• 79bb73ad - Fully implemented shortcuts can recompress
• fbb864e9 - Implemented formatting for repeat shortcut
• a8d4c758 - Broke format into functions. Gave up on multiply for now

Compare with previous version

[MicahGale]

added 8 commits

• c2897b0f - Fixed issue with how data block importances are stored
• cc3fe33f - Fixed typo
• c95b69f7 - Fixed make_prop_pointer handle self types
• e41b0315 - Made periodic surface deletable
• 7394aa2f - Updated merged test to use refactored classes
• 531ab2eb - Fixed surface to have default nodes
• 8c758ac7 - Made tokens handle filenames better
• de5bf5a7 - Revert "Made tokens handle filenames better"

Compare with previous version

[MicahGale]

added 1 commit

• ecc41ca9 - Made parameter able to handle almost all file paths

Compare with previous version

[MicahGale]

added 7 commits

• 1ac48db2 - Excluded literals from filepath
• df8f0250 - Started working on catching end jumps
• ec6c0d9e - Made surfaces actually rely on ValueNodes
• a9109000 - Fixed bug not actually grabbing ValueNode for surfaces
• e38855b5 - Fixed bad test cases and imports
• cb5cfba0 - Created default cell tree
• f1917d64 - Fixed blank cells not having default tree

Compare with previous version

[MicahGale]

added 12 commits

• c0a55f3d - Fixed ValueNode format if value gets longer than the original value
• dc0208c2 - Made system to add default cell modifiers to parameters tree
• bdeaeda4 - Made generate default tree method for cell modifiers
• ca6cacbc - Made enum valueNode Nullable
• 4318c323 - Added blank parameters to tree
• 604fc50c - Made importance not push out blank data to the cells
• e28a04d2 - Avoided formatting blank ValueNode
• ae79343f - Removed hashing of ValueNode
• 838aab49 - Made test tolerant to keeping upper lower from user
• 8a7e0079 - Started process to update values in cell modifiers
• f155405f - Caught edge case I accidentally created
• 417fb9f4 - Found another case of hashing a ValueNode

Compare with previous version

[MicahGale]

added 1 commit

• 306ed002 - Worked on allowing Nullable ValueNode

Compare with previous version

[MicahGale]

added 5 commits

• 731e53de - Fixed cell modifier to not blank out a valid tree
• a1ebf536 - Fixed typo
• 9f0bb564 - Fixed bug of surfaces not updating values correctly
• 497927f1 - Also tested that transform is deleted from the output
• ab990228 - Made lattice default to node

Compare with previous version

[MicahGale]

added 3 commits

• 080d00b5 - Moved universe_input to using meta-props
• 69b1881b - Updated syntax tree from universe_input properly
• 5128b80f - Updated default capitalization for cell modifiers to upper case

Compare with previous version

[MicahGale]

added 2 commits

• 27c9482d - Updated lattice push to cell to get ValueNode in properly
• b1bc7cf5 - Removed Fill test due to use of old methodology

Compare with previous version

[MicahGale]

added 3 commits

• b89ebd6c - Made Comments a SyntaxNode Class, treated specially under PaddingNode
• b9b32447 - Made method to get all Comments from a syntax tree
• 3ff44a7c - Created method to get final trailing C comment

Compare with previous version

[MicahGale]

added 6 commits

• 9a67a43c - Updated test since comments aren't independent now
• cb3cc226 - Exposed tailing comment for the object
• a744ecf2 - Started machinery to shift around trailing comments
• 0004e674 - Fixed first order bugs with trailing comment implementation
• 77e1fb70 - Fixed bug with SyntaxNode.comments
• 143701de - Added temporary test for comments system

Compare with previous version

[MicahGale]

added 3 commits

• 87dfc335 - Fixed bug where comments weren't being converted
• adbebda9 - Rewored Comment splitting RE to just match the whole thing
• f6db8e8c - Fixed paddingNode to not have a bunch of blank strings

Compare with previous version

[MicahGale]

added 8 commits

• efd1ef46 - Removed multiline comments due to \n being own padding
• 940e869a - Fixed Padding format to work with CommentNode
• ea2af2b2 - Fixed trailing_comment to return all lines of final comment
• 239d9dde - Fixed trailing comment to exclude dollar sign comments
• cea908a8 - Fixed bug with mislabeling dollar sign comments
• 136293f1 - simplified is_dollar to one liner
• 8eb2c617 - Corrected list comprehension syntax
• 54af25fc - Added another trailing comment to be a more thurough test

Compare with previous version

[MicahGale]

added 4 commits

• 8948e9f0 - Created machinery to move last comments around
• e502a1d4 - Fixed typo
• 0d524224 - Allowed making a blank paddingNode
• 37a6b002 - Added starting_pad to all syntax trees

Compare with previous version

[MicahGale]

added 9 commits

• 909e45c6 - Removed comment imports from test
• 3c17fa7f - Removed comment from cell test
• d9c0effa - removed comments from init test
• 632aa57f - Fixed bug to format padding with Comments
• 1a1513a6 - Removed Comment from tests
• 2c643c7b - Updated how importance stores trees
• 2a0b96c4 - Made particles node printable
• b78c041c - Decoupled multi-particle syntax tree
• 988f9f3a - Updated __getitem__, __setitem__ to work with syntax tree

Compare with previous version

[MicahGale]

added 5 commits

• 9a86fba4 - Updated test to new interface
• 02013977 - Updated all setter to work with new syntax tree
• b63e37b0 - Updated fill test to use user formatting
• 441542fb - Fixed PaddingNode value for CommentNode
• 3f1444d9 - Worked on updating fill values with transform data

Compare with previous version

[MicahGale]

added 2 commits

• 91e3162f - Distinguish between cell and data tree generator
• 3413e62a - Played with specifying python version and breaking it

Compare with previous version

[MicahGale]

added 1 commit

• 823543b8 - Switched test environment to python 3.8

Compare with previous version

[MicahGale]

added 3 commits

• eee95bca - Fixed bug with surface validator and coordinates
• e791c518 - Better understood what that one line of testing was doing
• 84b1175f - Made the test much more pythonic

Compare with previous version

[MicahGale]

added 7 commits

• 4a5dcf5c - Fixed TypeError bug
• e08edd2d - Updated what error should be raised
• 14fbaada - Made it so enums could switch to upper case first
• 9844ac05 - Started enforcing positive radii again
• 29d6b45d - Updated test to use tuples
• 6721cffa - Updated comment test for new API
• 92fe658b - Removed comment finding test

Compare with previous version

[MicahGale]

added 3 commits

• 221bb570 - removed reference to Comment
• 3668503a - Removed bug supressing new lines
• 7bb79c3c - Removed bug supressing trailing spaces in some circumstances

Compare with previous version

[MicahGale]

added 4 commits

• 38fe5021 - worked on Volume value update
• 3650ba1f - Filled in a blank keyword for all trees
• 0442e237 - Fixed bug with default construction of ClassifierNode
• 0ed12849 - Fixed Cell format to only print cell modifiers if the problem says so

Compare with previous version

[MicahGale]

added 2 commits

• 78104aa3 - Fixed bug stripping trailing whitespace on partial inputs
• 25ce8444 - Fixed bug where beginning comments rammed into start of next input

Compare with previous version

[MicahGale]

added 8 commits

• 2e3aef92 - Made ParticleNode iterable
• 6f71334e - Made tree formatting own function to own overloading without needing format_for_mcnp logic
• 15660880 - Moved constants to top_level of package
• 4df83d3e - Updated imports for moved constants
• 519c53e0 - Created universal constant for isclose tolerances
• bd57a5d5 - Made particleNode sorted, and added add and remove functions
• f5ce0233 - Implemented importance print in cell block, preserving user combining particles
• 8da229f8 - Added guard to avoid repeating importance printing

Compare with previous version