Add "$this" variable reference as single expression and add basic conditional gte/lte/gt/lt tokens

Author: Kirill Nesmeyanov

resources/grammar.pp2

@@ -140,6 +140,7 @@ TypesList -> {
 
 PrimaryType
   : ::T_PARENTHESIS_OPEN:: Type() ::T_PARENTHESIS_CLOSE::
+  | ThisLiteral()
   | Literal()
   | CallableType()
   | NamedType()

resources/grammar/callable.pp2

@@ -46,6 +46,7 @@ OptionalCallableParameter -> {
 
 NamedCallableParameter -> {
     if (\count($children) === 1) {
+
         return $children[0];
     }
 

resources/grammar/lexemes.pp2

@@ -17,12 +17,15 @@
 
 %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_THIS                  \$this\b
 %token  T_VARIABLE              \$[a-zA-Z_\x80-\xff][a-zA-Z0-9\-_\x80-\xff]*
 %token  T_NAME_WITH_SPACE       [a-zA-Z_\x80-\xff][a-zA-Z0-9\-_\x80-\xff]*\s+?
 %token  T_NAME                  [a-zA-Z_\x80-\xff][a-zA-Z0-9\-_\x80-\xff]*
 
 // Special Chars
 
+%token  T_LTE                   <=
+%token  T_GTE                   >=
 %token  T_ANGLE_BRACKET_OPEN    <
 %token  T_ANGLE_BRACKET_CLOSE   >
 %token  T_PARENTHESIS_OPEN      \(

resources/grammar/literals.pp2

@@ -22,6 +22,13 @@ VariableLiteral -> {
     return Node\Literal\VariableLiteralNode::parse($token->getValue());
 }
   : <T_VARIABLE>
+  | <T_THIS>
+  ;
+
+ThisLiteral -> {
+    return Node\Literal\VariableLiteralNode::parse($token->getValue());
+}
+  : <T_THIS>
   ;
 
 StringLiteral -> { return $this->stringPool[$token] ??= $children; }

resources/grammar/ternary.pp2

@@ -40,7 +40,16 @@ OptionalTernaryExpressionSuffix
   ;
 
 TernaryExpressionSuffix
-  : (<T_EQ>|<T_NEQ>) (VariableLiteral()|Type())
+  : TernaryExpressionOperator() Type()
     ::T_QMARK:: Type()
     ::T_COLON:: Type()
   ;
+
+TernaryExpressionOperator
+  : <T_EQ>
+  | <T_NEQ>
+  | <T_LTE>
+  | <T_GTE>
+  | <T_ANGLE_BRACKET_OPEN>
+  | <T_ANGLE_BRACKET_CLOSE>
+  ;