Add OctetLiteral support;

keweishang · Jun 5, 2019 · 4f5984d · 4f5984d
1 parent 201ecef
commit 4f5984d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 19 deletions.
diff --git a/kirikiri-tjs/README.md b/kirikiri-tjs/README.md
@@ -11,7 +11,6 @@ Tested on [KAG3](https://github.com/krkrz/kag3), [KAG3-HAM](https://github.com/k
 Only Java Runtime have tested. All other runtime is directly copy-paste-rename without test.
 
 Known issue:
-- OctetLiteral (e.g: `<% 00 a2 f3 45%>`) is a parser rule, not a single token.
 - Now consider `¥`(`\u00a5`,japanese yen) as UnexpectedCharacter insteadof Backslash(`\`,`\u005c`).
 - TJS2 bytecode also use *.tjs extension, this script can't parse them.
 - Need an preprocessor (`preprocessor.js`) to handle preprocess command.
diff --git a/kirikiri-tjs/TJSLexer.g4 b/kirikiri-tjs/TJSLexer.g4
@@ -6,9 +6,7 @@ options { superClass=TJSBaseLexer; }
 MultiLineComment:               '/*' .*? '*/'             -> channel(HIDDEN);
 SingleLineComment:              '//' ~[\r\n\u2028\u2029]* -> channel(HIDDEN);
 RegularExpressionLiteral:       {this.IsRegexPossible()}? '/' RegularExpressionFirstChar RegularExpressionChar* '/' IdentifierPart*;
-
-StartOctet:                     '<%';
-EndOctet:                       '%>';
+OctetLiteral:                   '<%' .*? '%>';
 
 OpenBracket:                    '[';
 CloseBracket:                   ']';

diff --git a/kirikiri-tjs/TJSParser.g4 b/kirikiri-tjs/TJSParser.g4
@@ -58,10 +58,10 @@ ifStatement
     ;
 
 iterationStatement
-    : Do statement While '(' expressions ')' eos                                                         # DoStatement
-    | While '(' expressions ')' statement                                                                # WhileStatement
-    | For '(' expressions? ';' expressions? ';' expressions? ')' statement                 # ForStatement
-    | For '(' varModifier variables ';' expressions? ';' expressions? ')' statement    # ForVarStatement
+    : Do statement While '(' expressions ')' eos                                    # DoStatement
+    | While '(' expressions ')' statement                                           # WhileStatement
+    | For '(' expressions? ';' expressions? ';' expressions? ')' statement          # ForStatement
+    | For '(' varModifier variables ';' expressions? ';' expressions? ')' statement # ForVarStatement
     ;
 
 varModifier
@@ -179,7 +179,6 @@ expressions
     : expression (',' expression)*
     ;
 
-
 // TODO: can we optimize it?
 expression
     : anoymousFunctionDeclaration                           # FunctionExpression
@@ -253,21 +252,12 @@ literal
     : NullLiteral
     | BooleanLiteral
     | (StringLiteral | TemplateStringLiteral)+
-    | octetLiteral
+    | OctetLiteral
     | RegularExpressionLiteral
     | numericLiteral
     | Void
     ;
 
-octetLiteral
-    : '<%'                  // Hack for octet literal
-    ( NonIdentHexByte       // 0f 7a 08.....
-    | OctalIntegerLiteral   // 00 07 .....
-    | DecimalLiteral        // 13 75 .....
-    | Identifier)*          // ef b9 .....
-    '%>'                    // Remember handle it in type recognization
-    ;
-
 numericLiteral
     : DecimalLiteral
     | HexIntegerLiteral