Elvis and null-safe access

grammar/src/expressions.grm

@@ -49,7 +49,12 @@ expressionWithPrecedences // See the precedence table, everything associates to
   ;
 
 memberAccessExpression
-  : (expression ".")? memberAccess
+  : (expression accessOp)? memberAccess
+  ;
+
+accessOp
+  : "."
+  : "?."
   ;
 
 typingExpression
@@ -78,6 +83,7 @@ binaryOperation // Decreasing precedence
   // No | & ^ ~
   : "&&"
   : "||"
+  : "?:"
   // assignments
   ;
 

grammar/src/lexical.grm

@@ -25,6 +25,8 @@ NoEscapeString : /* """-quoted string */;
 =>
 ..
 ?
+?:
+?.
 */
 
 /* Keywords:

grammar/src/types.grm

@@ -41,6 +41,4 @@ tupleType
   : "(" parameter{","} ")" // tuple with named entries, the names do not affect assignment compatibility
   ;
 
-
-////////////////////////////////////////
-
+////////////////////////////////////////