refactor: clean parser files

Author: xepozz

src/main/kotlin/com/github/xepozz/php_opcodes_language/language/parser/PHPOp.bnf

@@ -13,26 +13,21 @@
   tokenTypeClass="com.github.xepozz.php_opcodes_language.language.psi.PHPOpTokenType"
 
   tokens = [
-    LBRACE = "LBRACE {"
-    RBRACE = "RBRACE }"
     LPAREN = "LPAREN ("
     RPAREN = "RPAREN )"
-    LBRACKET = "LBRACKET ["
-    RBRACKET = "RBRACKET ]"
     COMMENT = "COMMENT"
     EOL = "EOL"
-    SYMBOL = "SYMBOL"
     IDENTIFIER = "IDENTIFIER"
     NUMBER = "NUMBER"
     DOLLAR_SIGN = "DOLLAR_SIGN"
     EQUALS_SIGN = "EQUALS_SIGN"
     TEXT = "TEXT"
     IDENTIFIER = "IDENTIFIER"
     COLON = "COLON"
+    DASH = "DASH"
   ]
 }
 
-// Top level structure
 phpOpFile ::= item_*
 
 private item_ ::= block | COMMENT | EOL
@@ -53,7 +48,7 @@ instruction_name ::= IDENTIFIER
 
 argument ::= expr | paren_expr
 
-expr ::= var_name | string_literal | NUMBER | IDENTIFIER paren_expr | IDENTIFIER | '='
+expr ::= var_name | string_literal | NUMBER | IDENTIFIER paren_expr | IDENTIFIER | EQUALS_SIGN
 
 string_literal ::= TEXT
 {
@@ -73,5 +68,5 @@ live_range ::= 'LIVE RANGES:' live_range_statements
 live_range_statements ::= (live_range_statement | EOL)*
 
 live_range_statement ::= NUMBER COLON live_range_range LPAREN live_type RPAREN
-live_range_range ::= NUMBER '-' NUMBER
+live_range_range ::= NUMBER DASH NUMBER
 live_type::= IDENTIFIER (SLASH IDENTIFIER)?

src/main/kotlin/com/github/xepozz/php_opcodes_language/language/parser/PHPOp.flex

@@ -18,33 +18,22 @@ import java.util.Stack;
 %eof{  return;
 %eof}
 
-%state YYINITIAL
-%state IN_BLOCK
 
-// Common macros
 WHITESPACE = [ \t\f]
 NEWLINE = \r\n|\r|\n
 COMMENT = ";"[^\n]*
 
-// Identifier patterns
 IDENTIFIER = [_a-zA-Z][a-zA-Z0-9_\-\\]*
 NUMBER = [0-9]+
-//TEXT = [^\s{\}(\)\[\]<\>\|\#\'\`\-\+\?\@][^\s{\}(\)\[\]<\>]*
-SYMBOL = [\-\+\~\?\<\>\@]
-
 QUOTTED_STRING = "\""(\\\"|[^\"])*"\""
 
-// Special symbols
-LBRACE = "{"
-RBRACE = "}"
 LPAREN = "("
 RPAREN = ")"
-LBRACKET = "["
-RBRACKET = "]"
 DOLLAR_SIGN = "$"
 EQUALS_SIGN = "="
 COLON = ":"
 SLASH = "/"
+DASH = "-"
 
 %{
 private Stack<Integer> stack = new Stack<>();
@@ -59,34 +48,28 @@ public void yypopState() {
 }
 %}
 
-%%
 
-<YYINITIAL, IN_BLOCK> {
-    {LBRACE}                                     { yypushState(IN_BLOCK); return PHPOpTypes.LBRACE; }
-    {RBRACE}                                     { yypopState(); return PHPOpTypes.RBRACE; }
+%state YYINITIAL
+
+%%
 
-    // Special symbols
+<YYINITIAL> {
     {LPAREN}                                     { return PHPOpTypes.LPAREN; }
     {RPAREN}                                     { return PHPOpTypes.RPAREN; }
-    {LBRACKET}                                   { return PHPOpTypes.LBRACKET; }
-    {RBRACKET}                                   { return PHPOpTypes.RBRACKET; }
     {DOLLAR_SIGN}                                { return PHPOpTypes.DOLLAR_SIGN; }
     {EQUALS_SIGN}                                { return PHPOpTypes.EQUALS_SIGN; }
 
-    // Common elements
-    {IDENTIFIER}                                     { return PHPOpTypes.IDENTIFIER; }
-    {COLON}                                     { return PHPOpTypes.COLON; }
-    {SLASH}                                     { return PHPOpTypes.SLASH; }
+    {IDENTIFIER}                                 { return PHPOpTypes.IDENTIFIER; }
+    {COLON}                                      { return PHPOpTypes.COLON; }
+    {SLASH}                                      { return PHPOpTypes.SLASH; }
+    {DASH}                                       { return PHPOpTypes.DASH; }
     {NUMBER}                                     { return PHPOpTypes.NUMBER; }
-    {SYMBOL}                                     { return PHPOpTypes.SYMBOL; }
-//    {TEXT}|{QUOTTED_STRING}                      { return PHPOpTypes.TEXT; }
-    {QUOTTED_STRING}                      { return PHPOpTypes.TEXT; }
+    {QUOTTED_STRING}                             { return PHPOpTypes.TEXT; }
 
-    // Whitespace and comments
     {WHITESPACE}                                 { return TokenType.WHITE_SPACE; }
     {NEWLINE}                                    { return PHPOpTypes.EOL; }
     {COMMENT}                                    { return PHPOpTypes.COMMENT; }
 }
 
 // Catch any other character
-[^]                                             { return TokenType.BAD_CHARACTER; }
+[^]                                              { return TokenType.BAD_CHARACTER; }