[pull] master from nawforce:master

.github/workflows/Build-Base.yml

@@ -0,0 +1,33 @@
+name: Linux Java8/Node14 Build
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ '**' ]
+  workflow_dispatch:
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up Node 14
+      uses: actions/setup-node@v3
+      with:
+        node-version: 14
+
+    - name: Set up JDK 8
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: 8
+        cache: 'maven'
+
+    - name: Build & Test
+      run: |
+        npm ci
+        npm run build

.github/workflows/Build-Next.yml

@@ -0,0 +1,33 @@
+name: Linux Java11/Node18 Build
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ '**' ]
+  workflow_dispatch:
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up Node 18
+      uses: actions/setup-node@v3
+      with:
+        node-version: 18
+
+    - name: Set up JDK 11
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: 11
+        cache: 'maven'
+
+    - name: Build & Test
+      run: |
+        npm ci
+        npm run build

.github/workflows/Build-Windows.yml

@@ -0,0 +1,33 @@
+name: Windows Build
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ '**' ]
+  workflow_dispatch:
+
+jobs:
+  build:
+
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up Node 14
+      uses: actions/setup-node@v3
+      with:
+        node-version: 14
+
+    - name: Set up JDK 8
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: 8
+        cache: 'maven'
+
+    - name: Build & Test
+      run: |
+        npm ci
+        npm run build

.gitignore

@@ -0,0 +1 @@
+node_modules/

README.md

@@ -1,15 +1,19 @@
-apex-parser
-===========
+> This repository has been **archived**. The new home for the Apex Parser is https://github.com/apex-dev-tools/apex-parser
 
-Parser for Salesforce Apex (including Triggers & inline SOQL/SOQL). This is based on an [ANTLR4](https://www.antlr.org/) grammar, see antlr/ApexParser.g4. 
+-----
+
+# apex-parser
+
+Parser for Salesforce Apex (including Triggers & inline SOQL/SOQL). This is based on an [ANTLR4](https://www.antlr.org/) grammar, see antlr/ApexParser.g4.
 
 There are two builds of the parser available, a NPM module for use with Node and a Maven package for use on JVMs.
 
-These builds just contain the Parser & Lexer and provides no further support for analysing the generated parse trees beyond what is provided by ANTLR4. 
+These builds just contain the Parser & Lexer and provides no further support for analysing the generated parse trees beyond what is provided by ANTLR4.
 
-As Apex & SOQL/SOQL are case-insenstive languages you need to use the provided CaseInsensitiveInputStream for the parser to function correctly. When parsing Apex, inline SOQL/SOSL is automtaically parsed, but you can also parse SOQL/SOQL directly. You can find some minimal examples in the test classes. 
+As Apex & SOQL/SOQL are case-insensitive languages you need to use the provided CaseInsensitiveInputStream for the parser to function correctly. When parsing Apex, inline SOQL/SOSL is automatically parsed, but you can also parse SOQL/SOQL directly. You can find some minimal examples in the test classes.
+
+## Example
 
-### Example
 To parse a class file (NPM version):
 
     let lexer = new ApexLexer(new CaseInsensitiveInputStream("public class Hello {}"))
@@ -20,46 +24,54 @@ To parse a class file (NPM version):
 
 The 'context' is a CompilationUnitContext object which is the root of the parsed representation of the class. You can access the parse tree via functions on it.
 
-### antlr4ts versions
+## Unicode handling
+
+Prior to 2.12.0 the use of ANTLRInputStream for reading data in CaseInsensitiveStream would result character positions being given for UTF-16. The switch to CharStream input in 2.12.0 for JVM and 2.14.0 for node results in character positions reflecting Unicode code points.
 
-The npm module uses antlr4ts 0.5.0-alpha.4, this was updated from 0.5.0-alpha.3 in the 2.9.1 version. You should make
-sure that if you are using a matching verions of this dependency if you use it directly. To avoid issues you can 
-import 'CommonTokenStream' & 'ParseTreeWalker' from 'apex-parser' instead of from antlr4ts.
+## antlr4ts versions
+
+The npm module uses antlr4ts 0.5.0-alpha.4, this was updated from 0.5.0-alpha.3 in the 2.9.1 version. You should make sure that if you are using a matching versions of this dependency if you use it directly. To avoid issues you can import 'CommonTokenStream' & 'ParseTreeWalker' from 'apex-parser' instead of from antlr4ts.
 
     import { CommonTokenStream} from "apex-parser";
     import { ParseTreeWalker } from "apex-parser";
 
-### SOSL FIND quoting
+## SOSL FIND quoting
+
 SOSL FIND uses ' as a quoting character when embedded in Apex, in the API braces are used:
 
     Find {something} RETURNING Account
 
 To parse the API format there is an alternative parser rule, soslLiteralAlt, that you can use instead of soslLiteral. See SOSLParserTest for some examples of how these differ.
 
-### Packages
+## Packages
 
 Maven
 
     <dependency>
         <groupId>com.github.nawforce</groupId>
         <artifactId>apex-parser</artifactId>
-        <version>2.15.0</version>
+        <version>2.17.0</version>
     </dependency>
 
 NPM
 
-    "apex-parser": "^2.15.0"
+    "apex-parser": "^2.17.0"
+
+## Building
 
-### Building
 To build both distributions:
 
+    npm ci
     npm run build
 
-### History
+## History
+
+    2.17.0 - Adds user/system mode on DML and within SOQL queries, thanks to Aaron Hurst.
+    2.16.0 - Fixes for empty for & while loops, soql date formulas & distance functions, additional parenthesis on when clauses, SOSL find quoting, modulus support (removed), apexdoc newline handling - thanks to Aaron Hurst for most of these ;-) 
     2.15.0 - Revert 2.14.0 changes.
     2.14.0 - Change npm api to replace ANTLRInputStream with CharStream, for Unicode char positions  
     2.13.0 - Fixes for negative numerics & Currency literals in SOQL 
-    2.12.0 - Replace deprecated ANTLRINputStream, DateTime & Currency literals fixes (contrib Aaron Hurst) 
+    2.12.0 - Replace deprecated ANTLRInputStream, DateTime & Currency literals fixes (contrib Aaron Hurst) 
     2.11.0 - Fix for SOQL UPDATE VIEWSTAT/TRACKING & removal of class type arguments
     2.10.0 - Allow type arguments on Classes (non-standard!)
     2.9.2 - Generate .d.ts files 
@@ -78,6 +90,6 @@ To build both distributions:
     2.1.0 - Supports trigger parsing and switch statement parsing syntax was corrected
     1.0.0 - Initial version
 
-### Source & Licenses
+## Source & Licenses
 
 All the source code included uses a 3-clause BSD license. The only third-party component included is the Apex Antlr4 grammar originally from [Tooling-force.com](https://github.com/neowit/tooling-force.com), although this version used is now markedly different from the original.  

antlr/ApexLexer.g4

@@ -109,6 +109,10 @@ WITHOUT       : 'without';
 LIST          : 'list';
 MAP           : 'map';
 
+// DML keywords
+SYSTEM          : 'system';
+USER            : 'user';
+
 // Soql specific keywords
 SELECT          : 'select';
 COUNT           : 'count';
@@ -155,13 +159,17 @@ ABOVE           : 'above';
 BELOW           : 'below';
 ABOVE_OR_BELOW  : 'above_or_below';
 SECURITY_ENFORCED : 'security_enforced';
+SYSTEM_MODE     : 'system_mode';
+USER_MODE       : 'user_mode';
 REFERENCE       : 'reference';
 CUBE            : 'cube';
 FORMAT          : 'format';
 TRACKING        : 'tracking';
 VIEWSTAT        : 'viewstat';
 CUSTOM          : 'custom';
 STANDARD        : 'standard';
+DISTANCE        : 'distance';
+GEOLOCATION     : 'geolocation';
 
 // SOQL Date functions
 CALENDAR_MONTH      : 'calendar_month';
@@ -193,30 +201,37 @@ LAST_90_DAYS              : 'last_90_days';
 NEXT_90_DAYS              : 'next_90_days';
 LAST_N_DAYS_N             : 'last_n_days';
 NEXT_N_DAYS_N             : 'next_n_days';
+N_DAYS_AGO_N              : 'n_days_ago';
 NEXT_N_WEEKS_N            : 'next_n_weeks';
 LAST_N_WEEKS_N            : 'last_n_weeks';
+N_WEEKS_AGO_N             : 'n_weeks_ago';
 NEXT_N_MONTHS_N           : 'next_n_months';
 LAST_N_MONTHS_N           : 'last_n_months';
+N_MONTHS_AGO_N            : 'n_months_ago';
 THIS_QUARTER              : 'this_quarter';
 LAST_QUARTER              : 'last_quarter';
 NEXT_QUARTER              : 'next_quarter';
 NEXT_N_QUARTERS_N         : 'next_n_quarters';
 LAST_N_QUARTERS_N         : 'last_n_quarters';
+N_QUARTERS_AGO_N          : 'n_quarters_ago';
 THIS_YEAR                 : 'this_year';
 LAST_YEAR                 : 'last_year';
 NEXT_YEAR                 : 'next_year';
 NEXT_N_YEARS_N            : 'next_n_years';
 LAST_N_YEARS_N            : 'last_n_years';
+N_YEARS_AGO_N             : 'n_years_ago';
 THIS_FISCAL_QUARTER       : 'this_fiscal_quarter';
 LAST_FISCAL_QUARTER       : 'last_fiscal_quarter';
 NEXT_FISCAL_QUARTER       : 'next_fiscal_quarter';
 NEXT_N_FISCAL_QUARTERS_N  : 'next_n_fiscal_quarters';
 LAST_N_FISCAL_QUARTERS_N  : 'last_n_fiscal_quarters';
+N_FISCAL_QUARTERS_AGO_N   : 'n_fiscal_quarters_ago';
 THIS_FISCAL_YEAR          : 'this_fiscal_year';
 LAST_FISCAL_YEAR          : 'last_fiscal_year';
 NEXT_FISCAL_YEAR          : 'next_fiscal_year';
 NEXT_N_FISCAL_YEARS_N     : 'next_n_fiscal_years';
 LAST_N_FISCAL_YEARS_N     : 'last_n_fiscal_years';
+N_FISCAL_YEARS_AGO_N      : 'n_fiscal_years_ago';
 
 // SOQL Date literal
 DateLiteral: Digit Digit Digit Digit '-' Digit Digit '-' Digit Digit;
@@ -378,7 +393,6 @@ DIV             : '/';
 BITAND          : '&';
 BITOR           : '|';
 CARET           : '^';
-MOD             : '%';
 MAPTO           : '=>';
 
 ADD_ASSIGN      : '+=';
@@ -388,7 +402,6 @@ DIV_ASSIGN      : '/=';
 AND_ASSIGN      : '&=';
 OR_ASSIGN       : '|=';
 XOR_ASSIGN      : '^=';
-MOD_ASSIGN      : '%=';
 LSHIFT_ASSIGN   : '<<=';
 RSHIFT_ASSIGN   : '>>=';
 URSHIFT_ASSIGN  : '>>>=';
@@ -434,7 +447,7 @@ WS  :  [ \t\r\n\u000C]+ -> channel(WHITESPACE_CHANNEL)
     ;
 
 DOC_COMMENT
-    :   '/**' [\r\n] .*? '*/' -> channel(COMMENT_CHANNEL)
+    :   '/**' .*? '*/' -> channel(COMMENT_CHANNEL)
     ;
 
 COMMENT