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

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

Author: cheton

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;

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');