Merge pull request #15 from cesarParra/null-coal

Null coalesce support.
cesarParra · Feb 17, 2024 · 7e31c39 · 7e31c39
2 parents 175db8e + ac7ddee
commit 7e31c39
Show file tree

Hide file tree

Showing 16 changed files with 3,343 additions and 3,263 deletions.
diff --git a/js/apex-reflection-node/__tests__/end-to-end.test.ts b/js/apex-reflection-node/__tests__/end-to-end.test.ts
@@ -257,7 +257,7 @@ describe('Class reflection', () => {
     const classBody = `
     public with sharing class MyClass {
       public virtual String method1() {
-        return '';
+        return null ?? '';
       }
     }
     `;

diff --git a/js/apex-reflection-node/package.json b/js/apex-reflection-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cparra/apex-reflection",
-  "version": "2.6.0",
+  "version": "2.7.0",
   "description": "",
   "main": "index.js",
   "scripts": {

diff --git a/lib/src/antlr/grammars/apex/ApexLexer.g4 b/lib/src/antlr/grammars/apex/ApexLexer.g4
@@ -375,6 +375,7 @@ BITOR           : '|';
 CARET           : '^';
 MOD             : '%';
 MAPTO           : '=>';
+NULL_COALESCE   : '??';
 
 ADD_ASSIGN      : '+=';
 SUB_ASSIGN      : '-=';

diff --git a/lib/src/antlr/grammars/apex/ApexParser.g4 b/lib/src/antlr/grammars/apex/ApexParser.g4
@@ -450,6 +450,7 @@ expression
     | expression BITOR expression                                                                     # bitOrExpression
     | expression AND expression                                                                       # logAndExpression
     | expression OR expression                                                                        # logOrExpression
+    | expression NULL_COALESCE expression                                                              # nullCoalesceExpression
     | <assoc=right> expression QUESTION expression COLON expression                                   # condExpression
     | <assoc=right> expression
       (   ASSIGN

diff --git a/lib/src/antlr/lib/apex/ApexLexer.dart b/lib/src/antlr/lib/apex/ApexLexer.dart
diff --git a/lib/src/antlr/lib/apex/ApexLexer.interp b/lib/src/antlr/lib/apex/ApexLexer.interp
diff --git a/lib/src/antlr/lib/apex/ApexLexer.tokens b/lib/src/antlr/lib/apex/ApexLexer.tokens
@@ -227,26 +227,27 @@ BITOR=226
 CARET=227
 MOD=228
 MAPTO=229
-ADD_ASSIGN=230
-SUB_ASSIGN=231
-MUL_ASSIGN=232
-DIV_ASSIGN=233
-AND_ASSIGN=234
-OR_ASSIGN=235
-XOR_ASSIGN=236
-MOD_ASSIGN=237
-LSHIFT_ASSIGN=238
-RSHIFT_ASSIGN=239
-URSHIFT_ASSIGN=240
-ATSIGN=241
-UNDERSCORE=242
-Identifier=243
-START_GROUP_COMMENT=244
-END_GROUP_COMMENT=245
-DOC_COMMENT=246
-WS=247
-COMMENT=248
-LINE_COMMENT=249
+NULL_COALESCE=230
+ADD_ASSIGN=231
+SUB_ASSIGN=232
+MUL_ASSIGN=233
+DIV_ASSIGN=234
+AND_ASSIGN=235
+OR_ASSIGN=236
+XOR_ASSIGN=237
+MOD_ASSIGN=238
+LSHIFT_ASSIGN=239
+RSHIFT_ASSIGN=240
+URSHIFT_ASSIGN=241
+ATSIGN=242
+UNDERSCORE=243
+Identifier=244
+START_GROUP_COMMENT=245
+END_GROUP_COMMENT=246
+DOC_COMMENT=247
+WS=248
+COMMENT=249
+LINE_COMMENT=250
 'abstract'=1
 'after'=2
 'before'=3
@@ -466,16 +467,17 @@ LINE_COMMENT=249
 '^'=227
 '%'=228
 '=>'=229
-'+='=230
-'-='=231
-'*='=232
-'/='=233
-'&='=234
-'|='=235
-'^='=236
-'%='=237
-'<<='=238
-'>>='=239
-'>>>='=240
-'@'=241
-'_'=242
+'??'=230
+'+='=231
+'-='=232
+'*='=233
+'/='=234
+'&='=235
+'|='=236
+'^='=237
+'%='=238
+'<<='=239
+'>>='=240
+'>>>='=241
+'@'=242
+'_'=243