Merge pull request #8 from yokljo/master

Generated parser compiles with TypeScript's strict mode
metadevpro · Jan 29, 2018 · 6f68ff5 · 6f68ff5
2 parents de78193 + ac79b11
commit 6f68ff5
Show file tree

Hide file tree

Showing 4 changed files with 157 additions and 103 deletions.
diff --git a/examples/arithmetics.pegjs b/examples/arithmetics.pegjs
@@ -5,15 +5,15 @@
 
 Expression
   = head:Term tail:(_ ("+" / "-") _ Term)* {
-      return tail.reduce(function(result, element) {
+      return tail.reduce(function(result: number, element: any[]) {
         if (element[1] === "+") { return result + element[3]; }
         if (element[1] === "-") { return result - element[3]; }
       }, head);
     }
 
 Term
   = head:Factor tail:(_ ("*" / "/") _ Factor)* {
-      return tail.reduce(function(result, element) {
+      return tail.reduce(function(result: number, element: any[]) {
         if (element[1] === "*") { return result * element[3]; }
         if (element[1] === "/") { return result / element[3]; }
       }, head);

diff --git a/src/passes/generate-bytecode-ts.js b/src/passes/generate-bytecode-ts.js
@@ -200,7 +200,7 @@ function generateBytecode(ast) {
 
   function addFunctionConst(params, code) {
     return addConst(
-      "function(" + params.join(", ") + ") {" + code + "}"
+      "function(" + params.map(v => v + ": any").join(", ") + ") {" + code + "}"
     );
   }