feat: fix bug

.gitignore

@@ -7,4 +7,6 @@
 /dist/vm/*.js.map
 /dist/test/*.js.map
 /dist/src/*/*.js.map
-/dist/vm/*/*.js.map
+/dist/vm/*/*.js.map
+/vm.js/*
+/vm.ts/build/*

.vscode/launch.json

@@ -4,6 +4,24 @@
     // 欲了解更多信息，请访问: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+      {
+        "name": "test-ts",
+        "type": "node",
+        "request": "launch",
+        "args": [
+          "${workspaceRoot}\\${relativeFile}" // 入口文件
+        ],
+        "runtimeArgs": [
+          "--nolazy",
+          "-r",
+          "ts-node/register"
+        ],
+        "sourceMaps": true,
+        "cwd": "${workspaceRoot}",
+        "protocol": "inspector",
+        "console": "integratedTerminal",
+        "internalConsoleOptions": "neverOpen"
+      },
       {
         "name": "Test",
         "program": "${workspaceFolder}/test/test.js",

demo/hello-world-14.pineapple

@@ -0,0 +1,18 @@
+$a = 4 + ( ( 1 + 2 ) + 3) # 10
+$b = ( ( ( 1 + 2 ) + 3) + 4 ) + 5 # 15
+$c = 20 # 20
+$d = $a + 20 # 30
+$e = 20 + 30 # 50
+$f = "1" + 2 # "12"
+$p_a = "a: " + $a
+$p_b = "b: " + $b
+$p_c = "c: " + $c
+$p_d = "d: " + $d
+$p_e = "e: " + $e
+$p_f = "f: " + $f
+print($p_a)
+print($p_b)
+print($p_c)
+print($p_d)
+print($p_e)
+print($p_f)

demo/hello-world-15.pineapple

@@ -0,0 +1,3 @@
+$a = 10 # 10
+$p_a = "a: " + $a
+print($p_a)

dist/src/parser/Assignment.js

@@ -75,18 +75,11 @@ function parseAssignment(lexer) {
             VariableDeclarator.init = expression.expression;
             assignment.type = "VariableDeclaration";
         }
-        else if (tokenType === lexer1_1.NUMBER) {
+        else if (tokenType === lexer1_1.NUMBER || tokenType === lexer1_1.TOKEN_LEFT_PAREN) {
             // 需要Expressions处理
             let ex = new BinaryExpression('');
-            const lineNumber = lexer.GetLineNum();
-            while (lexer.GetLineNum() === lineNumber) {
-                const expr = Expressions(lexer, ex);
-                ex = expr;
-                // ex.left = expr;
-                // let ahead = lexer.LookAhead()
-                // ex.operator = ahead.token
-                console.log(expr);
-            }
+            const expr = Expressions(lexer, ex);
+            ex = expr;
             console.log(ex);
             // const literial = new Literal(parseNumber(lexer)) // 这里面会把邻近的空格回车删掉
             VariableDeclarator.init = ex;
@@ -180,9 +173,14 @@ exports.Trem_tail = Trem_tail;
 function Factor(lexer, expr) {
     let ahead = lexer.LookAhead();
     if (lexer.isNumber(ahead.token)) {
-        lexer.NextTokenIs(lexer1_1.NUMBER);
+        let token = "";
+        while (lexer.isNumber(ahead.token)) {
+            token += ahead.token;
+            lexer.NextTokenIs(lexer1_1.NUMBER);
+            ahead = lexer.LookAhead();
+        }
         lexer.LookAheadAndSkip(lexer1_1.TOKEN_IGNORED);
-        return new Literal(+ahead.token);
+        return new Literal(+token); // 转换为数字
     }
     else if (ahead.token === "(") {
         // (1 + 2)

dist/test/test.js

@@ -1,8 +1,8 @@
 "use strict";
 const fs = require('fs');
 const path = require('path');
-const Execute = require('../dist/src/backend.js').Execute;
-code = fs.readFileSync(path.resolve(__dirname, '../demo/hello-world-13.pineapple'), { encoding: 'utf-8' });
+const Execute = require('../src/backend.ts').Execute;
+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);

dist/vm.js/standard/es2015.js

@@ -1,20 +1,26 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function (o, m, k, k2) {
+    if (k2 === undefined)
+        k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function () { return m[k]; } });
+}) : (function (o, m, k, k2) {
+    if (k2 === undefined)
+        k2 = k;
     o[k2] = m[k];
 }));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function (o, v) {
     Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
+}) : function (o, v) {
     o["default"] = v;
 });
 var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
+    if (mod && mod.__esModule)
+        return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null)
+        for (var k in mod)
+            if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k))
+                __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };

dist/vm.js/standard/es2016.js

@@ -1,20 +1,26 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function (o, m, k, k2) {
+    if (k2 === undefined)
+        k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function () { return m[k]; } });
+}) : (function (o, m, k, k2) {
+    if (k2 === undefined)
+        k2 = k;
     o[k2] = m[k];
 }));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function (o, v) {
     Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
+}) : function (o, v) {
     o["default"] = v;
 });
 var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
+    if (mod && mod.__esModule)
+        return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null)
+        for (var k in mod)
+            if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k))
+                __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };

dist/vm.js/standard/es5.js

@@ -1,20 +1,26 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function (o, m, k, k2) {
+    if (k2 === undefined)
+        k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function () { return m[k]; } });
+}) : (function (o, m, k, k2) {
+    if (k2 === undefined)
+        k2 = k;
     o[k2] = m[k];
 }));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function (o, v) {
     Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
+}) : function (o, v) {
     o["default"] = v;
 });
 var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
+    if (mod && mod.__esModule)
+        return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null)
+        for (var k in mod)
+            if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k))
+                __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };

src/parser/Assignment.ts

@@ -98,18 +98,11 @@ export function parseAssignment(lexer: Lexer) {
             const expression = parseExpression(lexer)
             VariableDeclarator.init = expression.expression
             assignment.type = "VariableDeclaration"
-        } else if (tokenType === NUMBER) {
+        } else if (tokenType === NUMBER || tokenType === TOKEN_LEFT_PAREN) {
             // 需要Expressions处理
             let ex = new BinaryExpression('')
-            const lineNumber = lexer.GetLineNum()
-            while (lexer.GetLineNum() === lineNumber) {
-                const expr = Expressions(lexer, ex)
-                ex = expr
-                // ex.left = expr;
-                // let ahead = lexer.LookAhead()
-                // ex.operator = ahead.token
-                console.log(expr)
-            }
+            const expr = Expressions(lexer, ex)
+            ex = expr
             console.log(ex)
             // const literial = new Literal(parseNumber(lexer)) // 这里面会把邻近的空格回车删掉
             VariableDeclarator.init = ex
@@ -201,9 +194,14 @@ export function Trem_tail(lexer: Lexer, value: any) {
 export function Factor(lexer: Lexer, expr?: any) {
     let ahead = lexer.LookAhead()
     if (lexer.isNumber(ahead.token)) {
-        lexer.NextTokenIs(NUMBER)
-        lexer.LookAheadAndSkip(TOKEN_IGNORED)
-        return new Literal(+ahead.token)
+        let token = ""
+        while (lexer.isNumber(ahead.token)) {
+            token += ahead.token
+            lexer.NextTokenIs(NUMBER);
+            ahead = lexer.LookAhead();
+        }
+        lexer.LookAheadAndSkip(TOKEN_IGNORED);
+        return new Literal(+token); // 转换为数字
     } else if (ahead.token === "(") {
         // (1 + 2)
         lexer.NextTokenIs(TOKEN_LEFT_PAREN)

test/test.js

@@ -2,7 +2,7 @@ const fs = require('fs')
 const path = require('path')
 const Execute = require('../dist/src/backend.js').Execute
 
-code = fs.readFileSync(path.resolve(__dirname, '../demo/hello-world-13.pineapple'), {encoding: 'utf-8'})
+code = fs.readFileSync(path.resolve(__dirname, '../demo/hello-world-15.pineapple'), {encoding: 'utf-8'})
 console.log(code, 'code')
 if (code.length > 0) {
     Execute(code)

test/test.ts

@@ -0,0 +1,9 @@
+const fs = require('fs')
+const path = require('path')
+const Execute = require('../src/backend.ts').Execute
+
+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)
+}

tsconfig.json

@@ -68,6 +68,7 @@
     "forceConsistentCasingInFileNames": true  /* Disallow inconsistently-cased references to the same file. */
   },
   "exclude": [
-    "vm"
+    "vm",
+    "vm.ts",
   ],
 }

vm.ts/README.md

@@ -0,0 +1,3 @@
+```
+npm run build
+```

vm.js/context.ts → vm.ts/context.ts

@@ -169,7 +169,7 @@ export class Context {
     for (const attr in ctx) {
       /* istanbul ignore next */
       if (ctx.hasOwnProperty(attr)) {
-        this[attr] = ctx[attr];
+        (this as any)[attr] = ctx[attr];
       }
     }
   }

vm.js/evaluate.ts → vm.ts/evaluate.ts

@@ -17,6 +17,6 @@ const visitors: IEcmaScriptMap = {
 
 export default function evaluate(path: Path<types.Node>) {
   path.evaluate = evaluate;
-  const handler = visitors[path.node.type];
+  const handler = (visitors as any)[path.node.type];
   return handler(path);
 }

vm.ts/package.json

@@ -0,0 +1,5 @@
+{
+    "scripts": {
+        "build": "rm -rf ./build/ && tsc"
+    }
+}

vm.js/tsconfig.json → vm.ts/tsconfig.json

@@ -10,13 +10,13 @@
     "noImplicitThis": false,
     "rootDirs": ["."],
     // "inlineSourceMap": true,
-    "inlineSources": true,
+    // "inlineSources": true,
     "outDir": "./build",
     "typeRoots": ["node_modules/@types"],
     "types": ["node"],
-    "sourceMap": true,
+    "sourceMap": false,
     "declaration": true
   },
-  "include": ["src/**/*.ts", "test/**/*.ts"],
+  "include": ["./*.ts"],
   "exclude": ["node_modules"]
 }