feat: fix bug

liulinboyi · Jul 27, 2021 · 4bd68cd · 4bd68cd
1 parent 2f2c41d
commit 4bd68cd
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 5 deletions.
diff --git a/demo/hello-world-15.pineapple b/demo/hello-world-15.pineapple
@@ -1,3 +1,7 @@
 $a = 10 # 10
-$p_a = "a: " + $a
+$b = 30 # 30
+$p_a = "a: " + $a + $b # a: 1030
+$c = 50 # 50
+$d = $a + $b + $c # 90
 print($p_a)
+print($c)
diff --git a/dist/src/parser/Assignment.js b/dist/src/parser/Assignment.js
@@ -231,6 +231,9 @@ function parseBinaryExpression(lexer, idAndinit, assignment, leftType) {
     else if (leftType === 'Literal') {
         BinaryExpression.left = new Literal(idAndinit.init.value);
     }
+    else if (leftType === "BinaryExpression") {
+        BinaryExpression.left = idAndinit.init;
+    }
     if (ahead.tokenType === lexer1_1.NUMBER) {
         const literial = new Literal(parser_1.parseNumber(lexer));
         BinaryExpression.right = literial;
@@ -245,6 +248,14 @@ function parseBinaryExpression(lexer, idAndinit, assignment, leftType) {
     VariableDeclarator.id.name = idAndinit.id.name;
     VariableDeclarator.init = BinaryExpression;
     assignment.declarations.push(VariableDeclarator);
+    let oahead = lexer.LookAhead();
+    if (oahead.tokenType === lexer1_1.Operator) {
+        lexer.NextTokenIs(lexer1_1.Operator); // +-*/
+        // lexer.LookAheadAndSkip(TOKEN_IGNORED); // 空格
+        lexer.isIgnored();
+        const idAndinits = assignment.declarations.pop();
+        parseBinaryExpression(lexer, idAndinits, assignment, "BinaryExpression");
+    }
     return assignment;
 }
 exports.parseBinaryExpression = parseBinaryExpression;
diff --git a/dist/test/test.js b/dist/test/test.js
@@ -1,9 +1,10 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require('fs');
 const path = require('path');
-const Execute = require('../src/backend.ts').Execute;
+const backend_1 = require("../src/backend");
 let code = fs.readFileSync(path.resolve(__dirname, '../demo/hello-world-15.pineapple'), { encoding: 'utf-8' });
 console.log(code, 'code');
 if (code.length > 0) {
-    Execute(code);
+    backend_1.Execute(code);
 }
diff --git a/src/parser/Assignment.ts b/src/parser/Assignment.ts
@@ -271,6 +271,8 @@ export function parseBinaryExpression(lexer: Lexer, idAndinit: { init: Literal |
         BinaryExpression.left = new Identifier((idAndinit.init as Identifier).name)
     } else if (leftType === 'Literal') {
         BinaryExpression.left = new Literal((idAndinit.init as Literal).value)
+    } else if (leftType === "BinaryExpression") {
+        BinaryExpression.left = idAndinit.init
     }
     if (ahead.tokenType === NUMBER) {
         const literial = new Literal(parseNumber(lexer))
@@ -286,5 +288,17 @@ export function parseBinaryExpression(lexer: Lexer, idAndinit: { init: Literal |
     VariableDeclarator.id.name = idAndinit.id.name;
     VariableDeclarator.init = BinaryExpression;
     (assignment as any).declarations.push(VariableDeclarator)
+
+    let oahead = lexer.LookAhead()
+
+    if (oahead.tokenType === Operator) {
+        lexer.NextTokenIs(Operator); // +-*/
+        // lexer.LookAheadAndSkip(TOKEN_IGNORED); // 空格
+        lexer.isIgnored()
+        const idAndinits = (assignment as any).declarations.pop();
+        parseBinaryExpression(lexer, idAndinits, assignment, "BinaryExpression");
+    }
+
+
     return assignment
 }
diff --git a/test/test.ts b/test/test.ts
@@ -1,8 +1,8 @@
 const fs = require('fs')
 const path = require('path')
-const Execute = require('../src/backend.ts').Execute
+import { Execute } from '../src/backend'
 
-let code = fs.readFileSync(path.resolve(__dirname, '../demo/hello-world-15.pineapple'), {encoding: 'utf-8'})
+let code = fs.readFileSync(path.resolve(__dirname, '../demo/hello-world-15.pineapple'), { encoding: 'utf-8' })
 console.log(code, 'code')
 if (code.length > 0) {
     Execute(code)