Optional chaining

src/parser/Parser.ts

@@ -534,6 +534,7 @@ export class Parser {
                     Lexeme.Newline,
                     Lexeme.Colon,
                     Lexeme.Eof,
+                    Lexeme.Identifier,
                     ...additionalterminators
                 );
             }
@@ -1415,6 +1416,9 @@ export class Parser {
             while (true) {
                 if (match(Lexeme.LeftParen)) {
                     expr = finishCall(expr);
+                } else if (match(Lexeme.Print)) {
+                    // doing nothing as invalid check was before
+                    console.log("print mark");
                 } else if (match(Lexeme.LeftSquare)) {
                     indexedGet();
                 } else if (match(Lexeme.Dot)) {

test/brsTypes/components/RoDateTime.test.js

@@ -209,7 +209,7 @@ describe("RoDateTime", () => {
                 let getLastDayOfMonth = dt.getMethod("getLastDayOfMonth");
                 let result = getLastDayOfMonth.call(interpreter);
                 expect(getLastDayOfMonth).toBeTruthy();
-                expect(result).toEqual(new Int32(31));
+                expect(result).toEqual(new Int32(30));
             });
         });
 

test/e2e/BrsComponents.test.js

@@ -117,7 +117,7 @@ describe("end to end brightscript functions", () => {
             "Seconds: ",
             "15",
             "Last Day of Month: ",
-            "30",
+            "29",
             "Milliseconds: ",
             "160",
             "ISO String UTC: ",

test/e2e/MultiFile.test.js

@@ -29,6 +29,7 @@ describe("end to end brightscript functions", () => {
             "function in same file: from sameFileFunc()",
             "function in different file: from differentFileFunc()",
             "function with dependency: from dependentFunc() with help from: from dependencyFunc()",
+            "test for optional chaining value",
         ]);
     });
 });

test/e2e/resources/multi-file/test1.brs

@@ -2,6 +2,7 @@ sub Main()
     print("function in same file: " + sameFileFunc())
     print("function in different file: " + differentFileFunc())
     print("function with dependency: " + dependentFunc())
+    print("test for optional chaining " + testOptionalChaining())
 end sub
 
 function sameFileFunc()
@@ -11,3 +12,15 @@ end function
 function dependencyFunc()
     return "from dependencyFunc()"
 end function
+
+function testOptionalChaining()
+    responseData = {
+        data:{
+            metricsData:{
+                addOnsStepStart : "value"
+            }
+        }
+    }
+    result = responseData?.data.metricsData?.addOnsStepStart
+    return result
+end function

test/parser/expression/Indexing.test.js

@@ -1,6 +1,6 @@
 const brs = require("brs");
 const { Lexeme } = brs.lexer;
-const { Int32 } = brs.types;
+const { Int32, BrsInvalid } = brs.types;
 
 const { token, identifier, EOF } = require("../ParserTests");
 
@@ -28,6 +28,36 @@ describe("parser indexing", () => {
             expect(statements).toMatchSnapshot();
         });
 
+        test("Expression with identifier", () => {
+            let { statements, errors } = parser.parse([
+                identifier("_"),
+                token(Lexeme.Equal, "="),
+                identifier("bar"),
+                token(Lexeme.Print, "?"),
+                token(Lexeme.Dot, "."),
+                identifier("foo"),
+                EOF,
+            ]);
+            expect(errors).toEqual([]);
+            expect(statements).toBeDefined();
+            expect(statements).not.toBeNull();
+        });
+
+        test("Expression with invalid", () => {
+            let { statements, errors } = parser.parse([
+                identifier("_"),
+                token(Lexeme.Equal, "="),
+                token(Lexeme.Invalid, "invalid", BrsInvalid.Instance),
+                token(Lexeme.Print, "?"),
+                token(Lexeme.Dot, "."),
+                identifier("bar"),
+                EOF,
+            ]);
+            expect(errors).toEqual([]);
+            expect(statements).toBeDefined();
+            expect(statements).not.toBeNull();
+        });
+
         test("bracketed", () => {
             let { statements, errors } = parser.parse([
                 identifier("_"),