fix(single function): comment reg and function body loop

yzw7489757 · Jun 18, 2020 · 9acba89 · 9acba89
1 parent 05517ef
commit 9acba89
Show file tree

Hide file tree

Showing 14 changed files with 86 additions and 53 deletions.
diff --git a/docs/index.js b/docs/index.js
diff --git a/docs/index.js.map b/docs/index.js.map
diff --git a/entry/demo/index.tsx b/entry/demo/index.tsx
@@ -37,6 +37,11 @@ const presetVal = {
     }
   }
 }
+new Parser().parseString(`function abs(a,b,c) { 
+  a = 5;
+  {};
+  return(a+b);
+}`)
 export default (): JSX.Element => {
   const parser = React.useRef((() => {
     const instance = new Parser({
@@ -46,6 +51,8 @@ export default (): JSX.Element => {
     return instance
   })());
 
+
+  console.log(parser.current.getCurrentValues())
   const [result, setResult] = React.useState(() => parser.current.getOptions().defaultReturnValues)
   const [time, setTime] = React.useState(0)
   const values = React.useRef(parser.current.getCurrentValues())

diff --git a/entry/index.html b/entry/index.html
@@ -2,14 +2,14 @@
 <html>
 <head>
   <title> cEval </title>
-  <link href="https://cdnjs.cloudflare.com/ajax/libs/antd/4.2.5/antd.css" rel="stylesheet">
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/react/16.13.1/umd/react.development.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/react-dom/16.13.1/umd/react-dom.development.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/react-router-dom/5.1.1/react-router-dom.js"></script>
-  <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/react-router/5.1.1/react-router.js"></script> -->
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.15/lodash.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.26.0/moment.min.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/antd/4.2.5/antd.js"></script>
+  <link href="https://g.alicdn.com/code/lib/antd/4.3.0/antd.css" rel="stylesheet">
+  <script src="https://g.alicdn.com/code/lib/react/16.13.1/umd/react.development.js"></script>
+  <script src="https://g.alicdn.com/code/lib/react-dom/16.13.1/umd/react-dom.development.js"></script>
+  <script src="https://g.alicdn.com/code/lib/react-router-dom/5.1.2/react-router-dom.js"></script>
+  <!-- <script src="https://g.alicdn.com/code/lib/react-router/6.0.0-alpha.5/react-router.development.js"></script> -->
+  <script src="https://g.alicdn.com/code/lib/lodash.js/4.17.15/lodash.js"></script>
+  <script src="https://g.alicdn.com/code/lib/moment.js/2.26.0/moment.js"></script>
+  <script src="https://g.alicdn.com/code/lib/antd/4.3.0/antd.js"></script>
 </head>
 
 <body>

diff --git a/entry/index.tsx b/entry/index.tsx
@@ -5,6 +5,4 @@ import { name } from '../package.json';
 import menuDataList from './ui-json';
 import './index.less';
 
-document.addEventListener('DOMContentLoaded', () => {
-  render(<Material routes={menuDataList} title={name} />,  document.getElementById('root'))
-})
+render(<Material routes={menuDataList} basePath={name} title={name} />,  document.getElementById('root'))
diff --git a/lib/index.js b/lib/index.js
diff --git a/lib/index.js.map b/lib/index.js.map
diff --git a/lib/parser.d.ts b/lib/parser.d.ts
@@ -53,7 +53,7 @@ export default class Parser {
      * @param {type} 约定的类型
      * @param {value} 明确规定的字面值，比如 ] , =
      */
-    expect: (type: string, value?: any) => never | void;
+    expect: (type: string, value?: any) => never | boolean;
     /**
      * 暂存指针，在某些情况下单一的nextToken已经不满足预判情况，例如 typeof(add) || add(1, 2) || 1 + add;
      */

diff --git a/package.json b/package.json
@@ -20,13 +20,13 @@
     "test"
   ],
   "scripts": {
-    "start": "webpack-dev-server --config script/webpack.dev.js --hot --inline --open-page '?dev'",
+    "start": "cross-env NODE_ENV=development webpack-dev-server --config script/webpack.dev.js --hot --inline",
     "https": "HTTPS=true npm start",
     "build:umd": "webpack --config script/webpack.umd.js --hide-modules --progress --colors",
     "build:typings": "tsc -p tsconfig.d.json",
     "build:docs": "webpack --config script/webpack.doc.js --hide-modules --progress --colors",
     "build:rollup": "rollup -c",
-    "build": "rm -rf lib/ && npm run test && npm run build:docs && npm run build:typings &&npm run build:rollup",
+    "build": "rm -rf lib/ && npm run test &&npm run build:docs && npm run build:typings && npm run build:rollup",
     "release": "standard-version --release-as",
     "publish:major": "npm run build && npm run release -- major && npm publish",
     "publish:minor": "npm run build && npm run release -- minor && npm publish",
@@ -58,8 +58,9 @@
     "@typescript-eslint/parser": "^2.0.0",
     "babel-cli": "^6.26.0",
     "babel-loader": "^8.0.0",
+    "cross-env": "^7.0.2",
     "css-loader": "^1.0.0",
-    "dev-dashboard": "^2.0.6",
+    "dev-dashboard": "^2.0.7",
     "eslint": "^6.8.0",
     "eslint-config-airbnb": "^18.0.0",
     "eslint-config-prettier": "^4.2.0",

diff --git a/script/webpack.dev.js b/script/webpack.dev.js
@@ -18,6 +18,8 @@ const devBaseConfig = {
     port: 8400,
     host: '0.0.0.0',
     stats: 'minimal',
+    open: true,
+    openPage: '?dev',
     historyApiFallback: true
   },
 

diff --git a/src/parser.ts b/src/parser.ts
@@ -97,13 +97,15 @@ export default class Parser {
    * @param {type} 约定的类型
    * @param {value} 明确规定的字面值，比如 ] , =
    */
-  expect = (type: string, value?): never | void => {
+  expect = (type: string, value?): never | boolean => {
     if (!this.accept(type, value)) {
       const { line, column } = this.tokens.getCoordinates()
       this.printLog(`> line:${line} column:${column - 1} "${this.current.value}"\nThe next tag should be "${value}", But the reality is`, `${this.nextToken.type === TOKEN_END ? 'empty content' : `"${this.nextToken.value}"`}`
         , console.error
       )
       throw new Error('Unexpected Tag');
+    } else {
+      return true
     }
   }
 
@@ -512,6 +514,9 @@ export default class Parser {
       do {
         this.parseExpression(instr)
       } while (this.accept(TOKEN_SEMICOLON, ';'))
+      if(this.current.type !== TOKEN_SEMICOLON) {
+        throw new SyntaxError(`Function parse error: Function body each line must end with semicolon ';'`)
+      }
       this.expect(TOKEN_CURLY, '}')
       this.accept(TOKEN_SEMICOLON, ';')
       exprInstr.push(new Instruction(INSTR_EXPRE, instr))

diff --git a/src/token-stream.ts b/src/token-stream.ts
@@ -433,13 +433,13 @@ export default class TokenStream {
     let line = 0;
     let column = 0;
     let index = -1;
-
+    
     do {
       line++;
       column = this.pos - index;
-      index = this.expression.substr(index + 1).indexOf('\n');
-    } while (index >= 0 && index < this.pos)
-
+      index += 1
+      index += this.expression.substr(index).indexOf('\n'); // 从每一行第一位开始寻找下一个换行符
+    } while (index >= 0 && index < this.pos && line < this.pos)
     return {
       line,
       column

diff --git a/src/utils/regExp.ts b/src/utils/regExp.ts
@@ -15,7 +15,7 @@ const supportOperator = Array.from(new Set(
 
 export const whitespaceReg = /(\t|\n|\r|\s+)/;
 export const booleanReg = /^(false|true)/;
-export const commentReg = /^\/\*(.*)\*\//;
+export const commentReg = /^\/\*(.*?)\*\//;
 export const stringReg = /^\'(.*?)\'|^\"(.*?)\"/;
 export const stringGreedyReg = /^\'(.*)\'|^\"(.*)\"/;
 // export const regExpReg = /^ExecReg\((.*)\)/;

diff --git a/test/function.test.js b/test/function.test.js
@@ -1,4 +1,3 @@
-
 /* eslint-disable no-undef */
 import Parser from '../src/index'
 
@@ -28,6 +27,13 @@ test('binary =', () => {
     };
     abs(3,4,8)`, value)).toEqual(5);
 
+  expect(() => parse(`
+  function abs(a,b,c) { 
+    a = 5;
+    return(a) /* Must End Of Semicolon*/
+  };
+  abs(3,4,8)`, value)).toThrow(SyntaxError);
+
   expect(parse(`
     function abs(a,b,c) { 
       a = 5;
@@ -63,7 +69,4 @@ test('binary =', () => {
       return(a+b+c);
     };
     abs(3,4,8)`, value)).toEqual(9);
-
-
-
 }, 0)