Merge branch 'dev'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gcode-interpreter",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "G-code Interpreter",
   "author": "Cheton Wu <[email protected]>",
   "homepage": "https://github.com/cheton/gcode-interpreter",

src/index.js

@@ -111,10 +111,11 @@ class GCodeInterpreter {
         });
         return s;
     }
-    loadFromFileSync(file) {
+    loadFromFileSync(file, callback = noop) {
         const list = parseFileSync(file);
         for (let i = 0; i < list.length; ++i) {
             interpret(this, list[i]);
+            callback(list[i], i);
         }
         return list;
     }
@@ -125,10 +126,11 @@ class GCodeInterpreter {
         });
         return s;
     }
-    loadFromStringSync(str) {
+    loadFromStringSync(str, callback = noop) {
         const list = parseStringSync(str);
         for (let i = 0; i < list.length; ++i) {
             interpret(this, list[i]);
+            callback(list[i], i);
         }
         return list;
     }

test/index.js

@@ -90,19 +90,27 @@ describe('G-code Interpreter', () => {
         });
 
         it('loadFromFileSync() should return expected result.', (done) => {
+            let i = 0;
             const file = 'test/fixtures/circle.nc';
             const runner = new GCodeInterpreter();
-            const results = runner.loadFromFileSync(file);
+            const results = runner.loadFromFileSync(file, (data, index) => {
+                expect(i).to.be.equal(index);
+                ++i;
+            });
             expect(results).to.be.an('array');
             expect(results.length).to.be.equal(7);
             done();
         });
 
         it('loadFromStringSync() should return expected result.', (done) => {
+            let i = 0;
             const file = 'test/fixtures/circle.nc';
             const string = fs.readFileSync(file, 'utf8');
             const runner = new GCodeInterpreter();
-            const results = runner.loadFromStringSync(string);
+            const results = runner.loadFromStringSync(string, (data, index) => {
+                expect(i).to.be.equal(index);
+                ++i;
+            });
             expect(results).to.be.an('array');
             expect(results.length).to.be.equal(7);
             done();