Fix lexemes priority and optimize conditional expressions

Author: Kirill Nesmeyanov

resources/grammar.php

@@ -21,8 +21,8 @@
             'T_BOOL_LITERAL' => '(?i)(?:true|false)(?![a-zA-Z0-9\\-_\\x80-\\xff])',
             'T_NULL_LITERAL' => '(?i)(?:null)(?![a-zA-Z0-9\\-_\\x80-\\xff])',
             'T_THIS' => '\\$this(?![a-zA-Z0-9\\-_\\x80-\\xff])',
-            'T_EQ' => '(?i)is(?![a-zA-Z0-9\\-_\\x80-\\xff])',
             'T_NEQ' => '(?i)is\\h+not(?![a-zA-Z0-9\\-_\\x80-\\xff])',
+            'T_EQ' => '(?i)is(?![a-zA-Z0-9\\-_\\x80-\\xff])',
             'T_VARIABLE' => '\\$[a-zA-Z_\\x80-\\xff][a-zA-Z0-9\\-_\\x80-\\xff]*',
             'T_NAME' => '[a-zA-Z_\\x80-\\xff][a-zA-Z0-9\\-_\\x80-\\xff]*',
             'T_ANGLE_BRACKET_OPEN' => '<',
@@ -175,7 +175,7 @@
         113 => new \Phplrt\Parser\Grammar\Lexeme('T_EQ', true),
         114 => new \Phplrt\Parser\Grammar\Lexeme('T_NEQ', true),
         115 => new \Phplrt\Parser\Grammar\Alternation([113, 114]),
-        116 => new \Phplrt\Parser\Grammar\Alternation(['Type', 26]),
+        116 => new \Phplrt\Parser\Grammar\Alternation([26, 'Type']),
         117 => new \Phplrt\Parser\Grammar\Lexeme('T_QMARK', false),
         118 => new \Phplrt\Parser\Grammar\Lexeme('T_COLON', false),
         119 => new \Phplrt\Parser\Grammar\Concatenation([112]),

resources/grammar/lexemes.pp2

@@ -16,8 +16,8 @@
 // Identifier
 
 %token  T_THIS                  \$this(?![a-zA-Z0-9\-_\x80-\xff])
-%token  T_EQ                    (?i)is(?![a-zA-Z0-9\-_\x80-\xff])
 %token  T_NEQ                   (?i)is\h+not(?![a-zA-Z0-9\-_\x80-\xff])
+%token  T_EQ                    (?i)is(?![a-zA-Z0-9\-_\x80-\xff])
 %token  T_VARIABLE              \$[a-zA-Z_\x80-\xff][a-zA-Z0-9\-_\x80-\xff]*
 %token  T_NAME                  [a-zA-Z_\x80-\xff][a-zA-Z0-9\-_\x80-\xff]*
 

resources/grammar/ternary.pp2

@@ -41,7 +41,7 @@ OptionalTernaryExpressionSuffix
   ;
 
 TernaryExpressionSuffix
-  : (<T_EQ>|<T_NEQ>) (Type()|VariableLiteral())
+  : (<T_EQ>|<T_NEQ>) (VariableLiteral()|Type())
     ::T_QMARK:: Type()
     ::T_COLON:: Type()
   ;