feat: Continue add function

liulinboyi · Feb 27, 2021 · 60f7ce8 · 60f7ce8
1 parent 8c7b56d
commit 60f7ce8
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 3 deletions.
diff --git a/demo/hello-world-7.pineapple b/demo/hello-world-7.pineapple
@@ -0,0 +1,10 @@
+
+func add($a,$b) {
+	$_a = $a + $b
+	print($_a)
+	return $_a + 1
+}
+
+$res = add(1,2)
+
+print($res)
diff --git a/dist/src/parser/Function.js b/dist/src/parser/Function.js
@@ -4,6 +4,7 @@ exports.paseReturnStatement = exports.paseBlock = exports.parseFunction = void 0
 const lexer1_1 = require("../lexer1");
 const parser_1 = require("../parser");
 const Assignment_1 = require("./Assignment");
+const Print_1 = require("./Print");
 function parseFunction(lexer) {
     const FunctionDeclaration = {
         type: "FunctionDeclaration",
@@ -88,6 +89,12 @@ function paseBlock(lexer) {
         });
         paseBlock(lexer);
     }
+    else if (ahead.tokenType === lexer1_1.TOKEN_PRINT) {
+        const print = Print_1.parsePrint(lexer);
+        console.log(print);
+        BlockStatementBody.push(print);
+        paseBlock(lexer);
+    }
     return BlockStatementBody;
 }
 exports.paseBlock = paseBlock;

diff --git a/dist/test/test.js b/dist/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-6.pineapple'), { encoding: 'utf-8' });
+code = fs.readFileSync(path.resolve(__dirname, '../demo/hello-world-7.pineapple'), { encoding: 'utf-8' });
 console.log(code, 'code');
 if (code.length > 0) {
     Execute(code);

diff --git a/src/parser/Function.ts b/src/parser/Function.ts
@@ -1,6 +1,7 @@
-import { TOKEN_IGNORED, TOKEN_LEFT_PAREN, Lexer, TOKEN_RIGHT_PAREN, TOKEN_FUNC_PARAMS_DIV, TOKEN_FUNC, BLOCK_START, TOKEN_RETURN, NUMBER, TOKEN_VAR_PREFIX, Operator, BLOCK_END } from "../lexer1";
+import { TOKEN_IGNORED, TOKEN_LEFT_PAREN, Lexer, TOKEN_RIGHT_PAREN, TOKEN_FUNC_PARAMS_DIV, TOKEN_FUNC, BLOCK_START, TOKEN_RETURN, NUMBER, TOKEN_VAR_PREFIX, Operator, BLOCK_END, TOKEN_PRINT } from "../lexer1";
 import { parseName, parseNumber, parseString, parseVariable } from "../parser";
 import { Assignment, Identifier, Literal, parseAssignment, parseBinaryExpression } from "./Assignment";
+import { parsePrint } from "./Print";
 
 export function parseFunction(lexer: Lexer) {
     const FunctionDeclaration: any = {
@@ -87,6 +88,11 @@ export function paseBlock(lexer: Lexer) {
             kind: VariableDeclaration.kind
         })
         paseBlock(lexer)
+    } else if (ahead.tokenType === TOKEN_PRINT) {
+        const print = parsePrint(lexer)
+        console.log(print)
+        BlockStatementBody.push(print)
+        paseBlock(lexer)
     }
     return BlockStatementBody
 }

diff --git a/test/test.js b/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-6.pineapple'), {encoding: 'utf-8'})
+code = fs.readFileSync(path.resolve(__dirname, '../demo/hello-world-7.pineapple'), {encoding: 'utf-8'})
 console.log(code, 'code')
 if (code.length > 0) {
     Execute(code)