lilonglong/magic-api-gitee
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化正则表达式匹配规则，解决部分情况语句解析不正确的问题

Browse Source
This commit is contained in:
mxd 2021-12-21 22:58:25 +08:00
parent 9d6627d33f
commit 7bec83e092
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
magic-editor/src/console/src/scripts/parsing/tokenizer.js
View File

@ -3,9 +3,31 @@ import {CharacterStream, LiteralToken, ParseException, Token, TokenStream, Token
const regexpToken = (stream, tokens) => {
if (tokens.length > 0) {
let token = tokens[tokens.length - 1];
if (token instanceof LiteralToken || token.getTokenType() === TokenType.Identifier) {
if (token instanceof LiteralToken) {
return false;
}
switch (token.getTokenType()){
case TokenType.Comma : // ,
case TokenType.Semicolon : // ;
case TokenType.Colon: // :
case TokenType.RightCurly: // }
case TokenType.LeftBracket: // [
case TokenType.LeftParantheses: // (
case TokenType.Assignment: // =
case TokenType.NotEqual: // !=
case TokenType.EqualEqualEqual: // ===
case TokenType.NotEqualEqual: // !==
case TokenType.Equal: // ==
case TokenType.And: // &&
case TokenType.Or: // ||
case TokenType.SqlAnd: // and
case TokenType.SqlOr: // or
case TokenType.SqlNotEqual: // <>
case TokenType.Questionmark: // ?
case TokenType.Lambda: // => ->
break;
default: return false;
}
}
if (stream.match("/", false)) {
let mark = stream.getPosition();