[Emc-commit] joints_axes3: Allow N words before O words

[Maximilian H <gi...@gi...>]

Allow N words before O words



http://git.linuxcnc.org/?p=emc2.git;a=commitdiff;h=4b145e6

---
 src/emc/rs274ngc/interp_read.cc |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/emc/rs274ngc/interp_read.cc b/src/emc/rs274ngc/interp_read.cc
index a7b90a5..4c378b9 100644
--- a/src/emc/rs274ngc/interp_read.cc
+++ b/src/emc/rs274ngc/interp_read.cc
@@ -761,6 +761,10 @@ int Interp::read_items(block_pointer block,      //!< pointer to a block being f
   if (line[counter] == '/')     /* skip the slash character if first */
     counter++;
 
+  if (line[counter] == 'n') {
+    CHP(read_n_number(line, &counter, block));
+  }
+
   if (line[counter] == 'o')
  /* Handle 'o' explicitly here. Default is
     to read letters via pointer calls to related
@@ -775,11 +779,7 @@ int Interp::read_items(block_pointer block,      //!< pointer to a block being f
       // if we are skipping, do NOT evaluate non-olines
       return INTERP_OK;
   }
-  else if (line[counter] == 'n')
-  {
 
-    CHP(read_n_number(line, &counter, block));
-  }
   for (; counter < length;) {
     CHP(read_one_item(line, &counter, block, parameters));
   }