Fixed a bug that cannot properly handle invalid G-code words (#3)

cncjs · May 24, 2019 · 5aaf935 · 5aaf935
1 parent 12f427a
commit 5aaf935
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/src/index.js b/src/index.js
@@ -72,7 +72,7 @@ const parseLine = (() => {
         const re3 = new RegExp(/\s+/g);
         return (line => line.replace(re1, '').replace(re2, '').replace(re3, ''));
     })();
-    const re = /(%.*)|({.*)|((?:\$\$)|(?:\$[a-zA-Z0-9#]*))|([a-zA-Z][0-9\+\-\.]*)|(\*[0-9]+)/igm;
+    const re = /(%.*)|({.*)|((?:\$\$)|(?:\$[a-zA-Z0-9#]*))|([a-zA-Z][0-9\+\-\.]+)|(\*[0-9]+)/igm;
 
     return (line, options) => {
         options = options || {};
@@ -105,7 +105,7 @@ const parseLine = (() => {
                 continue;
             }
 
-            // Parser JSON commands for TinyG and g2core
+            // Parse JSON commands for TinyG and g2core
             if (letter === '{') {
                 result.cmds = (result.cmds || []).concat(line.trim());
                 continue;

diff --git a/test/fixtures/messed-up.gcode b/test/fixtures/messed-up.gcode
@@ -0,0 +1 @@
+messed up
diff --git a/test/index.js b/test/index.js
@@ -63,6 +63,16 @@ describe('gcode-parser', () => {
         });
     });
 
+    describe('Invalid G-code words', () => {
+        it('should ignore invalid g-code words', (done) => {
+            const data = parseLine('messed up');
+            expect(data).to.be.an('object');
+            expect(data.line).to.be.equal('messed up');
+            expect(data.words).to.be.empty;
+            done();
+        });
+    });
+
     describe('Commands', () => {
         it('should be able to parse $ command (e.g. Grbl).', (done) => {
             const data = parseLine('$H $C');