Merge pull request #113 from Mingun/simplify-bc

Simplify bytecode: remove unnecessary opcode
peggyjs · Apr 23, 2021 · 375a8f1 · 375a8f1
2 parents 3d8ff0c + 8996c73
commit 375a8f1
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 70 deletions.
diff --git a/lib/compiler/passes/generate-bytecode.js b/lib/compiler/passes/generate-bytecode.js
@@ -427,11 +427,10 @@ function generateBytecode(ast) {
               [op.LOAD_SAVED_POS, node.elements.length],
               buildCall(
                 functionIndex,
-                node.elements.length,
+                node.elements.length + 1,
                 context.env,
                 context.sp
-              ),
-              [op.NIP]
+              )
             );
           } else {
             return buildSequence([op.WRAP, node.elements.length], [op.NIP]);

diff --git a/lib/parser.js b/lib/parser.js
diff --git a/test/unit/compiler/passes/generate-bytecode.spec.js b/test/unit/compiler/passes/generate-bytecode.spec.js
@@ -188,14 +188,13 @@ describe("compiler pass |generateBytecode|", function() {
         expect(pass).to.changeAST(grammar, bytecodeDetails([
           5,                           // PUSH_CURR_POS
           18, 0, 2, 2, 22, 0, 23, 1,   // <elements[0]>
-          15, 40, 3,                   // IF_NOT_ERROR
+          15, 39, 3,                   // IF_NOT_ERROR
           18, 2, 2, 2, 22, 2, 23, 3,   //   * <elements[1]>
-          15, 25, 4,                   //     IF_NOT_ERROR
+          15, 24, 4,                   //     IF_NOT_ERROR
           18, 4, 2, 2, 22, 4, 23, 5,   //       * <elements[2]>
-          15, 10, 4,                   //         IF_NOT_ERROR
+          15, 9, 4,                   //         IF_NOT_ERROR
           24, 3,                       //           * LOAD_SAVED_POS
-          26, 6, 3, 3, 2, 1, 0,        //             CALL
-          9,                           //             NIP
+          26, 6, 4, 3, 2, 1, 0,        //             CALL <6>
           8, 3,                        //           * POP_N
           7,                           //             POP_CURR_POS
           3,                           //             PUSH_FAILED