nc-gcode-interpreter 0.1.4__tar.gz → 0.1.5__tar.gz

{nc_gcode_interpreter-0.1.4 → nc_gcode_interpreter-0.1.5}/Cargo.lock

@@ -724,7 +724,7 @@ dependencies = [
 
 [[package]]
 name = "nc-gcode-interpreter"
-version = "0.1.4"
+version = "0.1.5"
 dependencies = [
  "clap",
  "csv",

{nc_gcode_interpreter-0.1.4 → nc_gcode_interpreter-0.1.5}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nc-gcode-interpreter"
-version = "0.1.4"
+version = "0.1.5"
 edition = "2021"
 
 [lib]

{nc_gcode_interpreter-0.1.4 → nc_gcode_interpreter-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: nc-gcode-interpreter
-Version: 0.1.4
+Version: 0.1.5
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: 3.12
@@ -84,7 +84,7 @@ Options:
   -a, --axes <AXIS>                    Override default axis identifiers (comma-separated, e.g., "X,Y,Z")
   -e, --extra-axes <EXTRA_AXIS>        Add extra axis identifiers (comma-separated, e.g., "RA1,RA2")
   -i, --initial_state <INITIAL_STATE>  Optional initial_state file to initialize state
-  -l, --iteration_limit <LIMIT>             Maximum number of iterations for loops [default: 10000]
+  -l, --iteration_limit <LIMIT>        Maximum number of iterations for loops [default: 10000]
   -f, --disable-forward-fill           Disable forward-filling of null values in axes columns
   -h, --help                           Print help
   -V, --version                        Print version

{nc_gcode_interpreter-0.1.4 → nc_gcode_interpreter-0.1.5}/README.md

@@ -64,7 +64,7 @@ Options:
   -a, --axes <AXIS>                    Override default axis identifiers (comma-separated, e.g., "X,Y,Z")
   -e, --extra-axes <EXTRA_AXIS>        Add extra axis identifiers (comma-separated, e.g., "RA1,RA2")
   -i, --initial_state <INITIAL_STATE>  Optional initial_state file to initialize state
-  -l, --iteration_limit <LIMIT>             Maximum number of iterations for loops [default: 10000]
+  -l, --iteration_limit <LIMIT>        Maximum number of iterations for loops [default: 10000]
   -f, --disable-forward-fill           Disable forward-filling of null values in axes columns
   -h, --help                           Print help
   -V, --version                        Print version

{nc_gcode_interpreter-0.1.4 → nc_gcode_interpreter-0.1.5}/ggroups/generate_pest.py

@@ -18,6 +18,10 @@ def create_pest_grammar(g_groups):
     grammar_parts.append(
         "// Due to the way pest works, the sorting of the literals is important."
     )
+    all_words = [
+        f'^"{entry["id"]}"' for group in g_groups for entry in group["entries"]
+    ]
+
     ggroup_names = []
     for group in g_groups:
         group_rules = []
@@ -28,7 +32,15 @@ def create_pest_grammar(g_groups):
         grammar_parts.append(
             f"{ggroup_name} = @{{({' | '.join(reversed(sorted(group_rules)))}) ~ !(ASCII_ALPHANUMERIC) }}"
         )
-    grammar_parts.append(f"g_command = {{{' | '.join(ggroup_names)}}}")
+
+    grammar_parts.append(
+        f"\ngcommand_list = @{{({' | '.join(reversed(sorted(all_words)))}) ~ !(ASCII_ALPHANUMERIC) }}"
+    )
+
+    grammar_parts.append('g_command_numbered = { &("G" ~ ASCII_DIGIT+) ~ g_command }')
+    grammar_parts.append(
+        f"g_command = {{ &gcommand_list ~ ({' | '.join(ggroup_names)})}}"
+    )
     return "\n".join(grammar_parts)
 
 

{nc_gcode_interpreter-0.1.4 → nc_gcode_interpreter-0.1.5}/ggroups/ggroups.pest

@@ -60,4 +60,7 @@ gg59_area_limit = @{(^"WALCS9" | ^"WALCS8" | ^"WALCS7" | ^"WALCS6" | ^"WALCS5" |
 gg61_tool_orient_smooth = @{(^"ORISON" | ^"ORISOF") ~ !(ASCII_ALPHANUMERIC) }
 gg62_repos_non_modal = @{(^"RMNBL" | ^"RMIBL" | ^"RMEBL" | ^"RMBBL") ~ !(ASCII_ALPHANUMERIC) }
 gg64_grinding_frames = @{(^"GFRAME[9]" | ^"GFRAME[99]" | ^"GFRAME[98]" | ^"GFRAME[97]" | ^"GFRAME[96]" | ^"GFRAME[95]" | ^"GFRAME[94]" | ^"GFRAME[93]" | ^"GFRAME[92]" | ^"GFRAME[91]" | ^"GFRAME[90]" | ^"GFRAME[8]" | ^"GFRAME[89]" | ^"GFRAME[88]" | ^"GFRAME[87]" | ^"GFRAME[86]" | ^"GFRAME[85]" | ^"GFRAME[84]" | ^"GFRAME[83]" | ^"GFRAME[82]" | ^"GFRAME[81]" | ^"GFRAME[80]" | ^"GFRAME[7]" | ^"GFRAME[79]" | ^"GFRAME[78]" | ^"GFRAME[77]" | ^"GFRAME[76]" | ^"GFRAME[75]" | ^"GFRAME[74]" | ^"GFRAME[73]" | ^"GFRAME[72]" | ^"GFRAME[71]" | ^"GFRAME[70]" | ^"GFRAME[6]" | ^"GFRAME[69]" | ^"GFRAME[68]" | ^"GFRAME[67]" | ^"GFRAME[66]" | ^"GFRAME[65]" | ^"GFRAME[64]" | ^"GFRAME[63]" | ^"GFRAME[62]" | ^"GFRAME[61]" | ^"GFRAME[60]" | ^"GFRAME[5]" | ^"GFRAME[59]" | ^"GFRAME[58]" | ^"GFRAME[57]" | ^"GFRAME[56]" | ^"GFRAME[55]" | ^"GFRAME[54]" | ^"GFRAME[53]" | ^"GFRAME[52]" | ^"GFRAME[51]" | ^"GFRAME[50]" | ^"GFRAME[4]" | ^"GFRAME[49]" | ^"GFRAME[48]" | ^"GFRAME[47]" | ^"GFRAME[46]" | ^"GFRAME[45]" | ^"GFRAME[44]" | ^"GFRAME[43]" | ^"GFRAME[42]" | ^"GFRAME[41]" | ^"GFRAME[40]" | ^"GFRAME[3]" | ^"GFRAME[39]" | ^"GFRAME[38]" | ^"GFRAME[37]" | ^"GFRAME[36]" | ^"GFRAME[35]" | ^"GFRAME[34]" | ^"GFRAME[33]" | ^"GFRAME[32]" | ^"GFRAME[31]" | ^"GFRAME[30]" | ^"GFRAME[2]" | ^"GFRAME[29]" | ^"GFRAME[28]" | ^"GFRAME[27]" | ^"GFRAME[26]" | ^"GFRAME[25]" | ^"GFRAME[24]" | ^"GFRAME[23]" | ^"GFRAME[22]" | ^"GFRAME[21]" | ^"GFRAME[20]" | ^"GFRAME[1]" | ^"GFRAME[19]" | ^"GFRAME[18]" | ^"GFRAME[17]" | ^"GFRAME[16]" | ^"GFRAME[15]" | ^"GFRAME[14]" | ^"GFRAME[13]" | ^"GFRAME[12]" | ^"GFRAME[11]" | ^"GFRAME[10]" | ^"GFRAME[100]" | ^"GFRAME[0]") ~ !(ASCII_ALPHANUMERIC) }
-g_command = {gg01_motion | gg02_wait | gg03_frame_area_limit | gg04_fifo | gg06_plane_select | gg07_tool_radius | gg08_work_offset | gg09_frame_tool_suppress | gg10_exact_stop_mode | gg11_exact_stop_non_modal | gg12_block_change_g60_g9 | gg13_wp_measure | gg14_wp_measure_mode | gg15_feed_type | gg16_feedrate_override | gg17_approach_retract_tool | gg18_corner_behavior | gg19_curve_start_spline | gg20_curve_end_spline | gg21_accel_profile | gg22_tool_offset_type | gg23_collision_monitor | gg24_precontrol | gg25_tool_orient_ref | gg26_repos_mode | gg27_tool_offset_change | gg28_area_limit | gg29_rad_diam_prog | gg30_nc_compress | gg31_oem_g | gg32_oem_g | gg33_fine_tool_offset | gg34_tool_orient_smooth | gg35_punch_nibble | gg36_punch_delay | gg37_feedrate_profile | gg39_contour_acc | gg40_tool_radius_const | gg41_thread_interrupt | gg42_tool_carrier | gg43_sar_approach | gg44_sar_segment | gg45_path_ref_fgroup | gg46_plane_fast_retract | gg47_mode_switchover | gg48_approach_retract_trc | gg49_ptp_motion | gg50_orient_prog | gg51_interp_type_orient | gg52_frame_rot_wp | gg53_tool_wear | gg54_vector_rot_poly | gg55_rapid_traverse | gg56_frame_rot_tool | gg57_corner_decel | gg58_dyn_resp_path | gg59_area_limit | gg61_tool_orient_smooth | gg62_repos_non_modal | gg64_grinding_frames}
+
+gcommand_list = @{(^"WALIMON" | ^"WALIMOF" | ^"WALCS9" | ^"WALCS8" | ^"WALCS7" | ^"WALCS6" | ^"WALCS5" | ^"WALCS4" | ^"WALCS3" | ^"WALCS2" | ^"WALCS10" | ^"WALCS1" | ^"WALCS0" | ^"UPATH" | ^"TRANS" | ^"TOWWCS" | ^"TOWTCS" | ^"TOWSTD" | ^"TOWMCS" | ^"TOWKCS" | ^"TOWBCS" | ^"TOROTZ" | ^"TOROTY" | ^"TOROTX" | ^"TOROTOF" | ^"TOROT" | ^"TOFRAMEZ" | ^"TOFRAMEY" | ^"TOFRAMEX" | ^"TOFRAME" | ^"TCOFRZ" | ^"TCOFRY" | ^"TCOFRX" | ^"TCOFR" | ^"TCOABS" | ^"SUPD" | ^"SUPA" | ^"STOPFIFO" | ^"STARTFIFO" | ^"SPOF" | ^"SPATH" | ^"SONS" | ^"SON" | ^"SOFT" | ^"SCALE" | ^"RTLION" | ^"RTLIOF" | ^"ROTS" | ^"ROT" | ^"RMNBL" | ^"RMN" | ^"RMIBL" | ^"RMI" | ^"RMEBL" | ^"RME" | ^"RMBBL" | ^"RMB" | ^"REPOSQA" | ^"REPOSQ" | ^"REPOSL" | ^"REPOSHA" | ^"REPOSH" | ^"REPOSA" | ^"PTPWOC" | ^"PTPG0" | ^"PTP" | ^"PONS" | ^"PON" | ^"POLY" | ^"PDELAYON" | ^"PDELAYOF" | ^"PAROTOF" | ^"PAROT" | ^"OST" | ^"OSSE" | ^"OSS" | ^"OSOF" | ^"OSD" | ^"OSC" | ^"ORIWKS" | ^"ORIVIRT2" | ^"ORIVIRT1" | ^"ORIVECT" | ^"ORISON" | ^"ORISOF" | ^"ORIRPY2" | ^"ORIRPY" | ^"ORIROTT" | ^"ORIROTR" | ^"ORIROTC" | ^"ORIROTA" | ^"ORIPLANE" | ^"ORIPATHS" | ^"ORIPATH" | ^"ORIMKS" | ^"ORIEULER" | ^"ORID" | ^"ORICURVE" | ^"ORICONTO" | ^"ORICONIO" | ^"ORICONCW" | ^"ORICONCCW" | ^"ORIC" | ^"ORIAXPOS" | ^"ORIAXES" | ^"OEMIPO2" | ^"OEMIPO1" | ^"NORM" | ^"MIRROR" | ^"LFWP" | ^"LFTXT" | ^"LFPOS" | ^"LFON" | ^"LFOF" | ^"KONTT" | ^"KONTC" | ^"KONT" | ^"INVCW" | ^"INVCCW" | ^"GFRAME[9]" | ^"GFRAME[99]" | ^"GFRAME[98]" | ^"GFRAME[97]" | ^"GFRAME[96]" | ^"GFRAME[95]" | ^"GFRAME[94]" | ^"GFRAME[93]" | ^"GFRAME[92]" | ^"GFRAME[91]" | ^"GFRAME[90]" | ^"GFRAME[8]" | ^"GFRAME[89]" | ^"GFRAME[88]" | ^"GFRAME[87]" | ^"GFRAME[86]" | ^"GFRAME[85]" | ^"GFRAME[84]" | ^"GFRAME[83]" | ^"GFRAME[82]" | ^"GFRAME[81]" | ^"GFRAME[80]" | ^"GFRAME[7]" | ^"GFRAME[79]" | ^"GFRAME[78]" | ^"GFRAME[77]" | ^"GFRAME[76]" | ^"GFRAME[75]" | ^"GFRAME[74]" | ^"GFRAME[73]" | ^"GFRAME[72]" | ^"GFRAME[71]" | ^"GFRAME[70]" | ^"GFRAME[6]" | ^"GFRAME[69]" | ^"GFRAME[68]" | ^"GFRAME[67]" | ^"GFRAME[66]" | ^"GFRAME[65]" | ^"GFRAME[64]" | ^"GFRAME[63]" | ^"GFRAME[62]" | ^"GFRAME[61]" | ^"GFRAME[60]" | ^"GFRAME[5]" | ^"GFRAME[59]" | ^"GFRAME[58]" | ^"GFRAME[57]" | ^"GFRAME[56]" | ^"GFRAME[55]" | ^"GFRAME[54]" | ^"GFRAME[53]" | ^"GFRAME[52]" | ^"GFRAME[51]" | ^"GFRAME[50]" | ^"GFRAME[4]" | ^"GFRAME[49]" | ^"GFRAME[48]" | ^"GFRAME[47]" | ^"GFRAME[46]" | ^"GFRAME[45]" | ^"GFRAME[44]" | ^"GFRAME[43]" | ^"GFRAME[42]" | ^"GFRAME[41]" | ^"GFRAME[40]" | ^"GFRAME[3]" | ^"GFRAME[39]" | ^"GFRAME[38]" | ^"GFRAME[37]" | ^"GFRAME[36]" | ^"GFRAME[35]" | ^"GFRAME[34]" | ^"GFRAME[33]" | ^"GFRAME[32]" | ^"GFRAME[31]" | ^"GFRAME[30]" | ^"GFRAME[2]" | ^"GFRAME[29]" | ^"GFRAME[28]" | ^"GFRAME[27]" | ^"GFRAME[26]" | ^"GFRAME[25]" | ^"GFRAME[24]" | ^"GFRAME[23]" | ^"GFRAME[22]" | ^"GFRAME[21]" | ^"GFRAME[20]" | ^"GFRAME[1]" | ^"GFRAME[19]" | ^"GFRAME[18]" | ^"GFRAME[17]" | ^"GFRAME[16]" | ^"GFRAME[15]" | ^"GFRAME[14]" | ^"GFRAME[13]" | ^"GFRAME[12]" | ^"GFRAME[11]" | ^"GFRAME[10]" | ^"GFRAME[100]" | ^"GFRAME[0]" | ^"G973" | ^"G972" | ^"G971" | ^"G97" | ^"G962" | ^"G961" | ^"G96" | ^"G952" | ^"G95" | ^"G942" | ^"G94" | ^"G931" | ^"G93" | ^"G91" | ^"G90" | ^"G9" | ^"G829" | ^"G828" | ^"G827" | ^"G826" | ^"G825" | ^"G824" | ^"G823" | ^"G822" | ^"G821" | ^"G820" | ^"G819" | ^"G818" | ^"G817" | ^"G816" | ^"G815" | ^"G814" | ^"G813" | ^"G812" | ^"G811" | ^"G810" | ^"G75" | ^"G74" | ^"G710" | ^"G71" | ^"G700" | ^"G70" | ^"G7" | ^"G645" | ^"G644" | ^"G643" | ^"G642" | ^"G641" | ^"G64" | ^"G63" | ^"G621" | ^"G62" | ^"G603" | ^"G602" | ^"G601" | ^"G60" | ^"G599" | ^"G598" | ^"G597" | ^"G596" | ^"G595" | ^"G594" | ^"G593" | ^"G592" | ^"G591" | ^"G590" | ^"G59" | ^"G589" | ^"G588" | ^"G587" | ^"G586" | ^"G585" | ^"G584" | ^"G583" | ^"G582" | ^"G581" | ^"G580" | ^"G58" | ^"G579" | ^"G578" | ^"G577" | ^"G576" | ^"G575" | ^"G574" | ^"G573" | ^"G572" | ^"G571" | ^"G570" | ^"G57" | ^"G569" | ^"G568" | ^"G567" | ^"G566" | ^"G565" | ^"G564" | ^"G563" | ^"G562" | ^"G561" | ^"G560" | ^"G56" | ^"G559" | ^"G558" | ^"G557" | ^"G556" | ^"G555" | ^"G554" | ^"G553" | ^"G552" | ^"G551" | ^"G550" | ^"G55" | ^"G549" | ^"G548" | ^"G547" | ^"G546" | ^"G545" | ^"G544" | ^"G543" | ^"G542" | ^"G541" | ^"G540" | ^"G54" | ^"G539" | ^"G538" | ^"G537" | ^"G536" | ^"G535" | ^"G534" | ^"G533" | ^"G532" | ^"G531" | ^"G530" | ^"G53" | ^"G529" | ^"G528" | ^"G527" | ^"G526" | ^"G525" | ^"G524" | ^"G523" | ^"G522" | ^"G521" | ^"G520" | ^"G519" | ^"G518" | ^"G517" | ^"G516" | ^"G515" | ^"G514" | ^"G513" | ^"G512" | ^"G511" | ^"G510" | ^"G509" | ^"G508" | ^"G507" | ^"G506" | ^"G505" | ^"G500" | ^"G5" | ^"G462" | ^"G461" | ^"G460" | ^"G451" | ^"G450" | ^"G42" | ^"G41" | ^"G40" | ^"G4" | ^"G35" | ^"G348" | ^"G347" | ^"G341" | ^"G340" | ^"G34" | ^"G336" | ^"G335" | ^"G332" | ^"G331" | ^"G33" | ^"G3" | ^"G291" | ^"G290" | ^"G26" | ^"G25" | ^"G248" | ^"G247" | ^"G2" | ^"G19" | ^"G18" | ^"G17" | ^"G153" | ^"G148" | ^"G147" | ^"G143" | ^"G142" | ^"G141" | ^"G140" | ^"G112" | ^"G111" | ^"G110" | ^"G1" | ^"G0" | ^"FTOCON" | ^"FTOCOF" | ^"FNORM" | ^"FLIN" | ^"FIFOCTRL" | ^"FFWON" | ^"FFWOF" | ^"FENDNORM" | ^"FCUB" | ^"ETAN" | ^"ENAT" | ^"EAUTO" | ^"DYNSEMIFIN" | ^"DYNROUGH" | ^"DYNPREC" | ^"DYNPOS" | ^"DYNNORM" | ^"DYNFINISH" | ^"DRIVE" | ^"DIAMON" | ^"DIAMOF" | ^"DIAMCYCOF" | ^"DIAM90" | ^"CUTCONON" | ^"CUTCONOF" | ^"CUT3DFS" | ^"CUT3DFF" | ^"CUT3DFD" | ^"CUT3DF" | ^"CUT3DCD" | ^"CUT3DCCD" | ^"CUT3DCC" | ^"CUT3DC" | ^"CUT2DFD" | ^"CUT2DF" | ^"CUT2DD" | ^"CUT2D" | ^"CT" | ^"CSPLINE" | ^"CPRECON" | ^"CPRECOF" | ^"CP" | ^"COMPSURF" | ^"COMPON" | ^"COMPOF" | ^"COMPCURV" | ^"COMPCAD" | ^"CIP" | ^"CFTCP" | ^"CFIN" | ^"CFC" | ^"CDON" | ^"CDOF2" | ^"CDOF" | ^"BTAN" | ^"BSPLINE" | ^"BRISK" | ^"BNAT" | ^"BAUTO" | ^"ATRANS" | ^"ASPLINE" | ^"ASCALE" | ^"AROTS" | ^"AROT" | ^"AMIRROR") ~ !(ASCII_ALPHANUMERIC) }
+g_command_numbered = { &("G" ~ ASCII_DIGIT+) ~ g_command }
+g_command = { &gcommand_list ~ (gg01_motion | gg02_wait | gg03_frame_area_limit | gg04_fifo | gg06_plane_select | gg07_tool_radius | gg08_work_offset | gg09_frame_tool_suppress | gg10_exact_stop_mode | gg11_exact_stop_non_modal | gg12_block_change_g60_g9 | gg13_wp_measure | gg14_wp_measure_mode | gg15_feed_type | gg16_feedrate_override | gg17_approach_retract_tool | gg18_corner_behavior | gg19_curve_start_spline | gg20_curve_end_spline | gg21_accel_profile | gg22_tool_offset_type | gg23_collision_monitor | gg24_precontrol | gg25_tool_orient_ref | gg26_repos_mode | gg27_tool_offset_change | gg28_area_limit | gg29_rad_diam_prog | gg30_nc_compress | gg31_oem_g | gg32_oem_g | gg33_fine_tool_offset | gg34_tool_orient_smooth | gg35_punch_nibble | gg36_punch_delay | gg37_feedrate_profile | gg39_contour_acc | gg40_tool_radius_const | gg41_thread_interrupt | gg42_tool_carrier | gg43_sar_approach | gg44_sar_segment | gg45_path_ref_fgroup | gg46_plane_fast_retract | gg47_mode_switchover | gg48_approach_retract_trc | gg49_ptp_motion | gg50_orient_prog | gg51_interp_type_orient | gg52_frame_rot_wp | gg53_tool_wear | gg54_vector_rot_poly | gg55_rapid_traverse | gg56_frame_rot_tool | gg57_corner_decel | gg58_dyn_resp_path | gg59_area_limit | gg61_tool_orient_smooth | gg62_repos_non_modal | gg64_grinding_frames)}

{nc_gcode_interpreter-0.1.4 → nc_gcode_interpreter-0.1.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "nc-gcode-interpreter"
-version = "0.1.4"
+version = "0.1.5"
 description = "A interpreter for NC (Numerical Control) code"
 authors = [{ name = "CEAD Group", email = "software@ceadgroup.com" }]
 requires-python = ">=3.12"

{nc_gcode_interpreter-0.1.4 → nc_gcode_interpreter-0.1.5}/src/grammar.pest

@@ -31,10 +31,11 @@ condition           =  { base_condition | ("(" ~ base_condition ~ ")") }
 base_condition      = _{ (expression ~ relational_operator ~ expression) | expression }
 relational_operator =  { "<=" | ">=" | "<" | ">" | "==" | "<>" }
 statement           =  {
-    g_command
+    g_command_numbered
   | m_command
   | assignment_multi
   | assignment
+  | g_command
   | function_call
   | tool_selection
 }
@@ -124,7 +125,6 @@ m_command = { "M" ~ ASCII_DIGIT+ }
 // G-Code ggroups
 // This Pest grammar file is auto-generated from G-Code definitions.
 // Due to the way pest works, the sorting of the literals is important.
-
 gg01_motion                = @{ (^"POLY" | ^"OEMIPO2" | ^"OEMIPO1" | ^"INVCW" | ^"INVCCW" | ^"G35" | ^"G34" | ^"G336" | ^"G335" | ^"G332" | ^"G331" | ^"G33" | ^"G3" | ^"G2" | ^"G1" | ^"G0" | ^"CT" | ^"CSPLINE" | ^"CIP" | ^"BSPLINE" | ^"ASPLINE") ~ !(ASCII_ALPHANUMERIC) }
 gg02_wait                  = @{ (^"REPOSQA" | ^"REPOSQ" | ^"REPOSL" | ^"REPOSHA" | ^"REPOSH" | ^"REPOSA" | ^"G75" | ^"G74" | ^"G7" | ^"G63" | ^"G5" | ^"G4" | ^"G348" | ^"G347" | ^"G248" | ^"G247" | ^"G148" | ^"G147") ~ !(ASCII_ALPHANUMERIC) }
 gg03_frame_area_limit      = @{ (^"TRANS" | ^"SCALE" | ^"ROTS" | ^"ROT" | ^"MIRROR" | ^"G59" | ^"G58" | ^"G26" | ^"G25" | ^"G112" | ^"G111" | ^"G110" | ^"ATRANS" | ^"ASCALE" | ^"AROTS" | ^"AROT" | ^"AMIRROR") ~ !(ASCII_ALPHANUMERIC) }
@@ -185,65 +185,7 @@ gg59_area_limit            = @{ (^"WALCS9" | ^"WALCS8" | ^"WALCS7" | ^"WALCS6" |
 gg61_tool_orient_smooth    = @{ (^"ORISON" | ^"ORISOF") ~ !(ASCII_ALPHANUMERIC) }
 gg62_repos_non_modal       = @{ (^"RMNBL" | ^"RMIBL" | ^"RMEBL" | ^"RMBBL") ~ !(ASCII_ALPHANUMERIC) }
 gg64_grinding_frames       = @{ (^"GFRAME[9]" | ^"GFRAME[99]" | ^"GFRAME[98]" | ^"GFRAME[97]" | ^"GFRAME[96]" | ^"GFRAME[95]" | ^"GFRAME[94]" | ^"GFRAME[93]" | ^"GFRAME[92]" | ^"GFRAME[91]" | ^"GFRAME[90]" | ^"GFRAME[8]" | ^"GFRAME[89]" | ^"GFRAME[88]" | ^"GFRAME[87]" | ^"GFRAME[86]" | ^"GFRAME[85]" | ^"GFRAME[84]" | ^"GFRAME[83]" | ^"GFRAME[82]" | ^"GFRAME[81]" | ^"GFRAME[80]" | ^"GFRAME[7]" | ^"GFRAME[79]" | ^"GFRAME[78]" | ^"GFRAME[77]" | ^"GFRAME[76]" | ^"GFRAME[75]" | ^"GFRAME[74]" | ^"GFRAME[73]" | ^"GFRAME[72]" | ^"GFRAME[71]" | ^"GFRAME[70]" | ^"GFRAME[6]" | ^"GFRAME[69]" | ^"GFRAME[68]" | ^"GFRAME[67]" | ^"GFRAME[66]" | ^"GFRAME[65]" | ^"GFRAME[64]" | ^"GFRAME[63]" | ^"GFRAME[62]" | ^"GFRAME[61]" | ^"GFRAME[60]" | ^"GFRAME[5]" | ^"GFRAME[59]" | ^"GFRAME[58]" | ^"GFRAME[57]" | ^"GFRAME[56]" | ^"GFRAME[55]" | ^"GFRAME[54]" | ^"GFRAME[53]" | ^"GFRAME[52]" | ^"GFRAME[51]" | ^"GFRAME[50]" | ^"GFRAME[4]" | ^"GFRAME[49]" | ^"GFRAME[48]" | ^"GFRAME[47]" | ^"GFRAME[46]" | ^"GFRAME[45]" | ^"GFRAME[44]" | ^"GFRAME[43]" | ^"GFRAME[42]" | ^"GFRAME[41]" | ^"GFRAME[40]" | ^"GFRAME[3]" | ^"GFRAME[39]" | ^"GFRAME[38]" | ^"GFRAME[37]" | ^"GFRAME[36]" | ^"GFRAME[35]" | ^"GFRAME[34]" | ^"GFRAME[33]" | ^"GFRAME[32]" | ^"GFRAME[31]" | ^"GFRAME[30]" | ^"GFRAME[2]" | ^"GFRAME[29]" | ^"GFRAME[28]" | ^"GFRAME[27]" | ^"GFRAME[26]" | ^"GFRAME[25]" | ^"GFRAME[24]" | ^"GFRAME[23]" | ^"GFRAME[22]" | ^"GFRAME[21]" | ^"GFRAME[20]" | ^"GFRAME[1]" | ^"GFRAME[19]" | ^"GFRAME[18]" | ^"GFRAME[17]" | ^"GFRAME[16]" | ^"GFRAME[15]" | ^"GFRAME[14]" | ^"GFRAME[13]" | ^"GFRAME[12]" | ^"GFRAME[11]" | ^"GFRAME[10]" | ^"GFRAME[100]" | ^"GFRAME[0]") ~ !(ASCII_ALPHANUMERIC) }
-g_command                  =  {
-    gg01_motion
-  | gg02_wait
-  | gg03_frame_area_limit
-  | gg04_fifo
-  | gg06_plane_select
-  | gg07_tool_radius
-  | gg08_work_offset
-  | gg09_frame_tool_suppress
-  | gg10_exact_stop_mode
-  | gg11_exact_stop_non_modal
-  | gg12_block_change_g60_g9
-  | gg13_wp_measure
-  | gg14_wp_measure_mode
-  | gg15_feed_type
-  | gg16_feedrate_override
-  | gg17_approach_retract_tool
-  | gg18_corner_behavior
-  | gg19_curve_start_spline
-  | gg20_curve_end_spline
-  | gg21_accel_profile
-  | gg22_tool_offset_type
-  | gg23_collision_monitor
-  | gg24_precontrol
-  | gg25_tool_orient_ref
-  | gg26_repos_mode
-  | gg27_tool_offset_change
-  | gg28_area_limit
-  | gg29_rad_diam_prog
-  | gg30_nc_compress
-  | gg31_oem_g
-  | gg32_oem_g
-  | gg33_fine_tool_offset
-  | gg34_tool_orient_smooth
-  | gg35_punch_nibble
-  | gg36_punch_delay
-  | gg37_feedrate_profile
-  | gg39_contour_acc
-  | gg40_tool_radius_const
-  | gg41_thread_interrupt
-  | gg42_tool_carrier
-  | gg43_sar_approach
-  | gg44_sar_segment
-  | gg45_path_ref_fgroup
-  | gg46_plane_fast_retract
-  | gg47_mode_switchover
-  | gg48_approach_retract_trc
-  | gg49_ptp_motion
-  | gg50_orient_prog
-  | gg51_interp_type_orient
-  | gg52_frame_rot_wp
-  | gg53_tool_wear
-  | gg54_vector_rot_poly
-  | gg55_rapid_traverse
-  | gg56_frame_rot_tool
-  | gg57_corner_decel
-  | gg58_dyn_resp_path
-  | gg59_area_limit
-  | gg61_tool_orient_smooth
-  | gg62_repos_non_modal
-  | gg64_grinding_frames
-}
+
+gcommand_list      = @{ (^"WALIMON" | ^"WALIMOF" | ^"WALCS9" | ^"WALCS8" | ^"WALCS7" | ^"WALCS6" | ^"WALCS5" | ^"WALCS4" | ^"WALCS3" | ^"WALCS2" | ^"WALCS10" | ^"WALCS1" | ^"WALCS0" | ^"UPATH" | ^"TRANS" | ^"TOWWCS" | ^"TOWTCS" | ^"TOWSTD" | ^"TOWMCS" | ^"TOWKCS" | ^"TOWBCS" | ^"TOROTZ" | ^"TOROTY" | ^"TOROTX" | ^"TOROTOF" | ^"TOROT" | ^"TOFRAMEZ" | ^"TOFRAMEY" | ^"TOFRAMEX" | ^"TOFRAME" | ^"TCOFRZ" | ^"TCOFRY" | ^"TCOFRX" | ^"TCOFR" | ^"TCOABS" | ^"SUPD" | ^"SUPA" | ^"STOPFIFO" | ^"STARTFIFO" | ^"SPOF" | ^"SPATH" | ^"SONS" | ^"SON" | ^"SOFT" | ^"SCALE" | ^"RTLION" | ^"RTLIOF" | ^"ROTS" | ^"ROT" | ^"RMNBL" | ^"RMN" | ^"RMIBL" | ^"RMI" | ^"RMEBL" | ^"RME" | ^"RMBBL" | ^"RMB" | ^"REPOSQA" | ^"REPOSQ" | ^"REPOSL" | ^"REPOSHA" | ^"REPOSH" | ^"REPOSA" | ^"PTPWOC" | ^"PTPG0" | ^"PTP" | ^"PONS" | ^"PON" | ^"POLY" | ^"PDELAYON" | ^"PDELAYOF" | ^"PAROTOF" | ^"PAROT" | ^"OST" | ^"OSSE" | ^"OSS" | ^"OSOF" | ^"OSD" | ^"OSC" | ^"ORIWKS" | ^"ORIVIRT2" | ^"ORIVIRT1" | ^"ORIVECT" | ^"ORISON" | ^"ORISOF" | ^"ORIRPY2" | ^"ORIRPY" | ^"ORIROTT" | ^"ORIROTR" | ^"ORIROTC" | ^"ORIROTA" | ^"ORIPLANE" | ^"ORIPATHS" | ^"ORIPATH" | ^"ORIMKS" | ^"ORIEULER" | ^"ORID" | ^"ORICURVE" | ^"ORICONTO" | ^"ORICONIO" | ^"ORICONCW" | ^"ORICONCCW" | ^"ORIC" | ^"ORIAXPOS" | ^"ORIAXES" | ^"OEMIPO2" | ^"OEMIPO1" | ^"NORM" | ^"MIRROR" | ^"LFWP" | ^"LFTXT" | ^"LFPOS" | ^"LFON" | ^"LFOF" | ^"KONTT" | ^"KONTC" | ^"KONT" | ^"INVCW" | ^"INVCCW" | ^"GFRAME[9]" | ^"GFRAME[99]" | ^"GFRAME[98]" | ^"GFRAME[97]" | ^"GFRAME[96]" | ^"GFRAME[95]" | ^"GFRAME[94]" | ^"GFRAME[93]" | ^"GFRAME[92]" | ^"GFRAME[91]" | ^"GFRAME[90]" | ^"GFRAME[8]" | ^"GFRAME[89]" | ^"GFRAME[88]" | ^"GFRAME[87]" | ^"GFRAME[86]" | ^"GFRAME[85]" | ^"GFRAME[84]" | ^"GFRAME[83]" | ^"GFRAME[82]" | ^"GFRAME[81]" | ^"GFRAME[80]" | ^"GFRAME[7]" | ^"GFRAME[79]" | ^"GFRAME[78]" | ^"GFRAME[77]" | ^"GFRAME[76]" | ^"GFRAME[75]" | ^"GFRAME[74]" | ^"GFRAME[73]" | ^"GFRAME[72]" | ^"GFRAME[71]" | ^"GFRAME[70]" | ^"GFRAME[6]" | ^"GFRAME[69]" | ^"GFRAME[68]" | ^"GFRAME[67]" | ^"GFRAME[66]" | ^"GFRAME[65]" | ^"GFRAME[64]" | ^"GFRAME[63]" | ^"GFRAME[62]" | ^"GFRAME[61]" | ^"GFRAME[60]" | ^"GFRAME[5]" | ^"GFRAME[59]" | ^"GFRAME[58]" | ^"GFRAME[57]" | ^"GFRAME[56]" | ^"GFRAME[55]" | ^"GFRAME[54]" | ^"GFRAME[53]" | ^"GFRAME[52]" | ^"GFRAME[51]" | ^"GFRAME[50]" | ^"GFRAME[4]" | ^"GFRAME[49]" | ^"GFRAME[48]" | ^"GFRAME[47]" | ^"GFRAME[46]" | ^"GFRAME[45]" | ^"GFRAME[44]" | ^"GFRAME[43]" | ^"GFRAME[42]" | ^"GFRAME[41]" | ^"GFRAME[40]" | ^"GFRAME[3]" | ^"GFRAME[39]" | ^"GFRAME[38]" | ^"GFRAME[37]" | ^"GFRAME[36]" | ^"GFRAME[35]" | ^"GFRAME[34]" | ^"GFRAME[33]" | ^"GFRAME[32]" | ^"GFRAME[31]" | ^"GFRAME[30]" | ^"GFRAME[2]" | ^"GFRAME[29]" | ^"GFRAME[28]" | ^"GFRAME[27]" | ^"GFRAME[26]" | ^"GFRAME[25]" | ^"GFRAME[24]" | ^"GFRAME[23]" | ^"GFRAME[22]" | ^"GFRAME[21]" | ^"GFRAME[20]" | ^"GFRAME[1]" | ^"GFRAME[19]" | ^"GFRAME[18]" | ^"GFRAME[17]" | ^"GFRAME[16]" | ^"GFRAME[15]" | ^"GFRAME[14]" | ^"GFRAME[13]" | ^"GFRAME[12]" | ^"GFRAME[11]" | ^"GFRAME[10]" | ^"GFRAME[100]" | ^"GFRAME[0]" | ^"G973" | ^"G972" | ^"G971" | ^"G97" | ^"G962" | ^"G961" | ^"G96" | ^"G952" | ^"G95" | ^"G942" | ^"G94" | ^"G931" | ^"G93" | ^"G91" | ^"G90" | ^"G9" | ^"G829" | ^"G828" | ^"G827" | ^"G826" | ^"G825" | ^"G824" | ^"G823" | ^"G822" | ^"G821" | ^"G820" | ^"G819" | ^"G818" | ^"G817" | ^"G816" | ^"G815" | ^"G814" | ^"G813" | ^"G812" | ^"G811" | ^"G810" | ^"G75" | ^"G74" | ^"G710" | ^"G71" | ^"G700" | ^"G70" | ^"G7" | ^"G645" | ^"G644" | ^"G643" | ^"G642" | ^"G641" | ^"G64" | ^"G63" | ^"G621" | ^"G62" | ^"G603" | ^"G602" | ^"G601" | ^"G60" | ^"G599" | ^"G598" | ^"G597" | ^"G596" | ^"G595" | ^"G594" | ^"G593" | ^"G592" | ^"G591" | ^"G590" | ^"G59" | ^"G589" | ^"G588" | ^"G587" | ^"G586" | ^"G585" | ^"G584" | ^"G583" | ^"G582" | ^"G581" | ^"G580" | ^"G58" | ^"G579" | ^"G578" | ^"G577" | ^"G576" | ^"G575" | ^"G574" | ^"G573" | ^"G572" | ^"G571" | ^"G570" | ^"G57" | ^"G569" | ^"G568" | ^"G567" | ^"G566" | ^"G565" | ^"G564" | ^"G563" | ^"G562" | ^"G561" | ^"G560" | ^"G56" | ^"G559" | ^"G558" | ^"G557" | ^"G556" | ^"G555" | ^"G554" | ^"G553" | ^"G552" | ^"G551" | ^"G550" | ^"G55" | ^"G549" | ^"G548" | ^"G547" | ^"G546" | ^"G545" | ^"G544" | ^"G543" | ^"G542" | ^"G541" | ^"G540" | ^"G54" | ^"G539" | ^"G538" | ^"G537" | ^"G536" | ^"G535" | ^"G534" | ^"G533" | ^"G532" | ^"G531" | ^"G530" | ^"G53" | ^"G529" | ^"G528" | ^"G527" | ^"G526" | ^"G525" | ^"G524" | ^"G523" | ^"G522" | ^"G521" | ^"G520" | ^"G519" | ^"G518" | ^"G517" | ^"G516" | ^"G515" | ^"G514" | ^"G513" | ^"G512" | ^"G511" | ^"G510" | ^"G509" | ^"G508" | ^"G507" | ^"G506" | ^"G505" | ^"G500" | ^"G5" | ^"G462" | ^"G461" | ^"G460" | ^"G451" | ^"G450" | ^"G42" | ^"G41" | ^"G40" | ^"G4" | ^"G35" | ^"G348" | ^"G347" | ^"G341" | ^"G340" | ^"G34" | ^"G336" | ^"G335" | ^"G332" | ^"G331" | ^"G33" | ^"G3" | ^"G291" | ^"G290" | ^"G26" | ^"G25" | ^"G248" | ^"G247" | ^"G2" | ^"G19" | ^"G18" | ^"G17" | ^"G153" | ^"G148" | ^"G147" | ^"G143" | ^"G142" | ^"G141" | ^"G140" | ^"G112" | ^"G111" | ^"G110" | ^"G1" | ^"G0" | ^"FTOCON" | ^"FTOCOF" | ^"FNORM" | ^"FLIN" | ^"FIFOCTRL" | ^"FFWON" | ^"FFWOF" | ^"FENDNORM" | ^"FCUB" | ^"ETAN" | ^"ENAT" | ^"EAUTO" | ^"DYNSEMIFIN" | ^"DYNROUGH" | ^"DYNPREC" | ^"DYNPOS" | ^"DYNNORM" | ^"DYNFINISH" | ^"DRIVE" | ^"DIAMON" | ^"DIAMOF" | ^"DIAMCYCOF" | ^"DIAM90" | ^"CUTCONON" | ^"CUTCONOF" | ^"CUT3DFS" | ^"CUT3DFF" | ^"CUT3DFD" | ^"CUT3DF" | ^"CUT3DCD" | ^"CUT3DCCD" | ^"CUT3DCC" | ^"CUT3DC" | ^"CUT2DFD" | ^"CUT2DF" | ^"CUT2DD" | ^"CUT2D" | ^"CT" | ^"CSPLINE" | ^"CPRECON" | ^"CPRECOF" | ^"CP" | ^"COMPSURF" | ^"COMPON" | ^"COMPOF" | ^"COMPCURV" | ^"COMPCAD" | ^"CIP" | ^"CFTCP" | ^"CFIN" | ^"CFC" | ^"CDON" | ^"CDOF2" | ^"CDOF" | ^"BTAN" | ^"BSPLINE" | ^"BRISK" | ^"BNAT" | ^"BAUTO" | ^"ATRANS" | ^"ASPLINE" | ^"ASCALE" | ^"AROTS" | ^"AROT" | ^"AMIRROR") ~ !(ASCII_ALPHANUMERIC) }
+g_command_numbered =  { &("G" ~ ASCII_DIGIT+) ~ g_command }
+g_command          =  { &gcommand_list ~ (gg01_motion | gg02_wait | gg03_frame_area_limit | gg04_fifo | gg06_plane_select | gg07_tool_radius | gg08_work_offset | gg09_frame_tool_suppress | gg10_exact_stop_mode | gg11_exact_stop_non_modal | gg12_block_change_g60_g9 | gg13_wp_measure | gg14_wp_measure_mode | gg15_feed_type | gg16_feedrate_override | gg17_approach_retract_tool | gg18_corner_behavior | gg19_curve_start_spline | gg20_curve_end_spline | gg21_accel_profile | gg22_tool_offset_type | gg23_collision_monitor | gg24_precontrol | gg25_tool_orient_ref | gg26_repos_mode | gg27_tool_offset_change | gg28_area_limit | gg29_rad_diam_prog | gg30_nc_compress | gg31_oem_g | gg32_oem_g | gg33_fine_tool_offset | gg34_tool_orient_smooth | gg35_punch_nibble | gg36_punch_delay | gg37_feedrate_profile | gg39_contour_acc | gg40_tool_radius_const | gg41_thread_interrupt | gg42_tool_carrier | gg43_sar_approach | gg44_sar_segment | gg45_path_ref_fgroup | gg46_plane_fast_retract | gg47_mode_switchover | gg48_approach_retract_trc | gg49_ptp_motion | gg50_orient_prog | gg51_interp_type_orient | gg52_frame_rot_wp | gg53_tool_wear | gg54_vector_rot_poly | gg55_rapid_traverse | gg56_frame_rot_tool | gg57_corner_decel | gg58_dyn_resp_path | gg59_area_limit | gg61_tool_orient_smooth | gg62_repos_non_modal | gg64_grinding_frames) }

{nc_gcode_interpreter-0.1.4 → nc_gcode_interpreter-0.1.5}/src/interpret_rules.rs

@@ -139,7 +139,10 @@ fn interpret_assignment(element: Pair<Rule>, state: &mut State) -> Result<(Strin
     let (key, value, translate) = match (variable_pair.as_rule(), expression_pair.as_rule()) {
         (Rule::variable_single_char, Rule::value) => {
             let key = variable_pair.as_str().to_string();
-            let value = expression_pair.as_str().parse::<f32>().expect("Failed to interpret value");
+            let value = expression_pair
+                .as_str()
+                .parse::<f32>()
+                .expect("Failed to interpret value");
             (key, value, true)
         }
         (Rule::variable, Rule::axis_increment) => {
@@ -495,28 +498,29 @@ fn insert_m_key(last: &mut HashMap<String, Value>, value: &str) -> Result<(), Pa
             if let Value::StrList(ref mut vec) = existing_value {
                 if vec.len() < 5 {
                     vec.push(value.to_string());
-                    return Ok(());  // Successfully added to the list
+                    return Ok(()); // Successfully added to the list
                 }
             }
         } else {
             // If the key doesn't exist, insert a new StrList with the first value
             last.insert(m_key.to_owned(), Value::StrList(vec![value.to_string()]));
-            return Ok(());  // Exit early after insertion
+            return Ok(()); // Exit early after insertion
         }
     }
-    Err(ParsingError::TooManyMCommands)  // Return error if all keys are full
+    Err(ParsingError::TooManyMCommands) // Return error if all keys are full
 }
 
 fn interpret_statement(element: Pair<Rule>, output: &mut Output, state: &mut State) -> Result<(), ParsingError> {
     // Grammar:
-    // statement =  {
-    //      g_command
-    //    | m_command
-    //    | assignment_multi
-    //    | assignment
-    //    | function_call
-    //    | tool_selection
-    //  }
+    // statement           =  {
+    //     g_command_numbered
+    //   | m_command
+    //   | assignment_multi
+    //   | assignment
+    //   | g_command
+    //   | function_call
+    //   | tool_selection
+    // }
 
     for statement in element.into_inner() {
         let last = output.last_mut().expect("Output vector should not be empty");
@@ -529,6 +533,11 @@ fn interpret_statement(element: Pair<Rule>, output: &mut Output, state: &mut Sta
                 let (key, value) = interpret_g_command(statement);
                 last.insert(key, Value::Str(value));
             }
+            Rule::g_command_numbered => {
+                let (key, value) =
+                    interpret_g_command(statement.into_inner().next().expect("Error parsing g_command_numbered"));
+                last.insert(key, Value::Str(value));
+            }
             Rule::m_command => {
                 let (_key, value) = interpret_m_command(statement);
                 // there are 5 M codes allowed in a block. Store them in separate columns in the output

{nc_gcode_interpreter-0.1.4 → nc_gcode_interpreter-0.1.5}/src/interpreter.rs

@@ -1,16 +1,15 @@
 //interpreter.rs
 use pest::Parser;
+use polars::chunked_array::ops::FillNullStrategy;
 use polars::prelude::*;
 use std::collections::HashMap;
 use std::io::{self};
-use polars::chunked_array::ops::FillNullStrategy;
 
 use crate::errors::ParsingError;
 use crate::interpret_rules::interpret_blocks;
+use crate::modal_groups::MODAL_GROUPS;
 use crate::state::{self, State};
 use crate::types::{NCParser, Rule, Value};
-use crate::modal_groups::MODAL_GROUPS;
-
 
 /// Helper function to convert PolarsError to ParsingError
 impl From<PolarsError> for ParsingError {
@@ -29,7 +28,6 @@ pub fn nc_to_dataframe(
     extra_axes: Option<Vec<String>>,
     iteration_limit: usize,
     disable_forward_fill: bool,
-
 ) -> Result<(DataFrame, state::State), ParsingError> {
     // Default axis identifiers
     const DEFAULT_AXIS_IDENTIFIERS: &[&str] = &[
@@ -37,9 +35,8 @@ pub fn nc_to_dataframe(
     ];
 
     // Use the override if provided, otherwise use the default identifiers
-    let axis_identifiers: Vec<String> = axis_identifiers.unwrap_or_else(|| {
-        DEFAULT_AXIS_IDENTIFIERS.iter().map(|&s| s.to_string()).collect()
-    });
+    let axis_identifiers: Vec<String> =
+        axis_identifiers.unwrap_or_else(|| DEFAULT_AXIS_IDENTIFIERS.iter().map(|&s| s.to_string()).collect());
 
     // Add extra axes to the existing list if provided
     let mut axis_identifiers = axis_identifiers;
@@ -65,44 +62,35 @@ pub fn nc_to_dataframe(
     // Get the column names and reorder them
     let ordered_columns = reorder_columns(
         axis_identifiers,
-        df.get_column_names().into_iter().map(|s| s.to_string()).collect()
+        df.get_column_names().into_iter().map(|s| s.to_string()).collect(),
     );
 
     // Select the columns in the specified order and return
     df = df.select(&ordered_columns).map_err(ParsingError::from)?;
 
-
-
     if !disable_forward_fill {
-
         let fill_columns: Vec<String> = df
-        .get_column_names()
-        .iter()
-        .map(|col| col.to_string())
-        .filter(|col| state.is_axis(col) || MODAL_GROUPS.contains(&col.as_str()))
-        .collect();
-
-        
-
-    for col_name in fill_columns {
-        let column = df
-            .column(&col_name)
-            .map_err(|e| io::Error::new(io::ErrorKind::Other, e.to_string()))?;
-        let filled_column = column
-            .fill_null(FillNullStrategy::Forward(None))
-            .map_err(|e| io::Error::new(io::ErrorKind::Other, e.to_string()))?;
-        df.with_column(filled_column)
-            .map_err(|e| io::Error::new(io::ErrorKind::Other, e.to_string()))?;
-    }
+            .get_column_names()
+            .iter()
+            .map(|col| col.to_string())
+            .filter(|col| state.is_axis(col) || MODAL_GROUPS.contains(&col.as_str()))
+            .collect();
+
+        for col_name in fill_columns {
+            let column = df
+                .column(&col_name)
+                .map_err(|e| io::Error::new(io::ErrorKind::Other, e.to_string()))?;
+            let filled_column = column
+                .fill_null(FillNullStrategy::Forward(None))
+                .map_err(|e| io::Error::new(io::ErrorKind::Other, e.to_string()))?;
+            df.with_column(filled_column)
+                .map_err(|e| io::Error::new(io::ErrorKind::Other, e.to_string()))?;
+        }
     }
 
-
-
-
     Ok((df, state))
 }
 
-
 #[allow(dead_code)] // Only used in main.rs, not in lib.rs
 pub fn dataframe_to_csv(df: &mut DataFrame, path: &str) -> Result<(), PolarsError> {
     // Get all column names that are of List type
@@ -125,8 +113,7 @@ pub fn dataframe_to_csv(df: &mut DataFrame, path: &str) -> Result<(), PolarsErro
         *df = exploded_df;
     }
 
-    let mut file = std::fs::File::create(path)
-        .map_err(|e| PolarsError::ComputeError(format!("{:?}", e).into()))?;
+    let mut file = std::fs::File::create(path).map_err(|e| PolarsError::ComputeError(format!("{:?}", e).into()))?;
 
     CsvWriter::new(&mut file)
         .with_float_precision(Some(3))
@@ -135,7 +122,6 @@ pub fn dataframe_to_csv(df: &mut DataFrame, path: &str) -> Result<(), PolarsErro
     Ok(())
 }
 
-
 /// Parse file and return results as a vector of HashMaps
 fn interpret_file(input: &str, state: &mut State) -> Result<Vec<HashMap<String, Value>>, ParsingError> {
     let blocks = NCParser::parse(Rule::file, input)
@@ -162,21 +148,21 @@ fn interpret_file(input: &str, state: &mut State) -> Result<Vec<HashMap<String,
 
 fn results_to_dataframe(data: Vec<HashMap<String, Value>>) -> PolarsResult<DataFrame> {
     // Step 1: Collect all unique keys (column names)
-    let columns: Vec<String> = data.iter()
+    let columns: Vec<String> = data
+        .iter()
         .flat_map(|row| row.keys().cloned())
-        .collect::<std::collections::HashSet<String>>()  // Deduplicate keys
+        .collect::<std::collections::HashSet<String>>() // Deduplicate keys
         .into_iter()
         .collect();
 
     // Step 2: Initialize empty columns (vectors) for each key
-    let mut series_map: HashMap<String, Vec<Option<AnyValue>>> = columns
-        .iter()
-        .map(|key| (key.clone(), Vec::new()))
-        .collect();
+    let mut series_map: HashMap<String, Vec<Option<AnyValue>>> =
+        columns.iter().map(|key| (key.clone(), Vec::new())).collect();
 
     // Step 3: Populate the columns with data, inserting None where keys are missing
     for row in &data {
-        if row.is_empty() {  // Skip rows with no values
+        if row.is_empty() {
+            // Skip rows with no values
             continue;
         }
 
@@ -187,12 +173,16 @@ fn results_to_dataframe(data: Vec<HashMap<String, Value>>) -> PolarsResult<DataF
     }
 
     // Step 4: Convert each column to a Polars Series
-    let polars_series: Vec<Series> = columns.iter()
+    let polars_series: Vec<Series> = columns
+        .iter()
         .map(|key| {
             let column_data = series_map.remove(key).unwrap();
             Series::new(
-                key.as_str().into(),  // Convert `&String` to `PlSmallStr` using `Into::into`
-                column_data.into_iter().map(|opt| opt.unwrap_or(AnyValue::Null)).collect::<Vec<AnyValue>>(),
+                key.as_str().into(), // Convert `&String` to `PlSmallStr` using `Into::into`
+                column_data
+                    .into_iter()
+                    .map(|opt| opt.unwrap_or(AnyValue::Null))
+                    .collect::<Vec<AnyValue>>(),
             )
         })
         .collect();
@@ -202,13 +192,10 @@ fn results_to_dataframe(data: Vec<HashMap<String, Value>>) -> PolarsResult<DataF
 }
 
 /// Helper function to reorder DataFrame columns
-fn reorder_columns(
-    axis_identifiers: Vec<String>,
-    mut df_columns: Vec<String>
-) -> Vec<String> {
+fn reorder_columns(axis_identifiers: Vec<String>, mut df_columns: Vec<String>) -> Vec<String> {
     let mut ordered_columns = Vec::new();
-    df_columns.sort();  // Sort columns alphabetically
-    // Move axis columns first
+    df_columns.sort(); // Sort columns alphabetically
+                       // Move axis columns first
     for axis in axis_identifiers {
         if let Some(index) = df_columns.iter().position(|col| col == &axis) {
             ordered_columns.push(df_columns.remove(index));
@@ -226,5 +213,3 @@ fn reorder_columns(
 
     ordered_columns
 }
-
-

{nc_gcode_interpreter-0.1.4 → nc_gcode_interpreter-0.1.5}/src/lib.rs

@@ -10,8 +10,8 @@ use std::collections::HashMap;
 mod errors;
 mod interpret_rules;
 mod interpreter;
-mod state;
 mod modal_groups;
+mod state;
 
 use pyo3::prelude::*;
 use pyo3::wrap_pyfunction;
@@ -28,13 +28,19 @@ fn nc_to_dataframe(
     iteration_limit: usize,
     disable_forward_fill: bool,
 ) -> PyResult<(PyDataFrame, HashMap<String, HashMap<String, f32>>)> {
-    let (df,state) = nc_to_dataframe_rust(input, initial_state.as_deref(), axis_identifiers, extra_axes, iteration_limit, disable_forward_fill)
-        .map_err(|e| PyErr::new::<PyValueError, _>(format!("Error creating DataFrame: {:?}", e)))?;
+    let (df, state) = nc_to_dataframe_rust(
+        input,
+        initial_state.as_deref(),
+        axis_identifiers,
+        extra_axes,
+        iteration_limit,
+        disable_forward_fill,
+    )
+    .map_err(|e| PyErr::new::<PyValueError, _>(format!("Error creating DataFrame: {:?}", e)))?;
 
     Ok((PyDataFrame(df), state.to_python_dict()))
 }
 
-
 /// Define the Python module
 #[pymodule]
 fn nc_gcode_interpreter(_py: Python<'_>, m: &Bound<'_, PyModule>) -> PyResult<()> {

{nc_gcode_interpreter-0.1.4 → nc_gcode_interpreter-0.1.5}/src/main.rs

@@ -8,9 +8,9 @@ use std::io::{self};
 mod errors;
 mod interpret_rules;
 mod interpreter;
+mod modal_groups;
 mod state;
 mod types;
-mod modal_groups;
 
 use interpreter::{dataframe_to_csv, nc_to_dataframe};
 use std::path::PathBuf;
@@ -91,13 +91,17 @@ fn main() -> io::Result<()> {
 
     let input = std::fs::read_to_string(matches.get_one::<String>("input").unwrap())
         .map_err(|e| io::Error::new(io::ErrorKind::Other, format!("Error reading input file: {:?}", e)))?;
-    
 
-    let initial_state = matches.get_one::<String>("initial_state")
+    let initial_state = matches
+        .get_one::<String>("initial_state")
         .map(std::fs::read_to_string)
         .transpose()
-        .map_err(|e| io::Error::new(io::ErrorKind::Other, format!("Error reading initial state file: {:?}", e)))?;
-
+        .map_err(|e| {
+            io::Error::new(
+                io::ErrorKind::Other,
+                format!("Error reading initial state file: {:?}", e),
+            )
+        })?;
 
     let (mut df, _state) = nc_to_dataframe(
         &input,
@@ -105,7 +109,7 @@ fn main() -> io::Result<()> {
         axes_override.clone(),
         extra_axes,
         *iteration_limit,
-        disable_forward_fill
+        disable_forward_fill,
     )?;
 
     let mut output_path = PathBuf::from(input_path.clone());

{nc_gcode_interpreter-0.1.4 → nc_gcode_interpreter-0.1.5}/src/state.rs

@@ -54,12 +54,12 @@ impl State {
         *self.translation.get(axis).unwrap_or(&0.0)
     }
 
-    pub fn update_axis(&mut self, key: &str, value: f32, translate:bool) -> Result<f32, ParsingError> {
+    pub fn update_axis(&mut self, key: &str, value: f32, translate: bool) -> Result<f32, ParsingError> {
         let translation_value = self.get_translation(key);
         let mut updated_value = value;
         if translate {
-            updated_value+= translation_value;
-        } 
+            updated_value += translation_value;
+        }
         self.axes.insert(key.to_string(), updated_value);
         Ok(updated_value)
     }

{nc_gcode_interpreter-0.1.4 → nc_gcode_interpreter-0.1.5}/src/types.rs

@@ -19,9 +19,7 @@ impl Value {
         match self {
             Value::Str(s) => AnyValue::String(s),
             Value::Float(f) => AnyValue::Float32(*f),
-            Value::StrList(vec) => {
-                AnyValue::List(vec.iter().map(|s| s.as_str()).collect())
-            }
+            Value::StrList(vec) => AnyValue::List(vec.iter().map(|s| s.as_str()).collect()),
         }
     }
 }