Merge pull request #3002 from IBM/antlr-regen

Regenerate UCUM and FHIRPath lexers/parsers with latest antlr4
LinuxForHealth · Nov 17, 2021 · 6b5f17b · 6b5f17b
2 parents cbd235c + 27a82bc
commit 6b5f17b
Show file tree

Hide file tree

Showing 16 changed files with 14 additions and 796 deletions.
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/ucum/UCUM.interp b/fhir-model/src/main/java/com/ibm/fhir/model/ucum/UCUM.interp
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/ucum/UCUM.tokens b/fhir-model/src/main/java/com/ibm/fhir/model/ucum/UCUM.tokens
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/ucum/UCUMLexer.interp b/fhir-model/src/main/java/com/ibm/fhir/model/ucum/UCUMLexer.interp
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/ucum/UCUMLexer.java b/fhir-model/src/main/java/com/ibm/fhir/model/ucum/UCUMLexer.java
@@ -1,12 +1,11 @@
 /*
- * (C) Copyright IBM Corp. 2020, 2021
+ * (C) Copyright IBM Corp. 2021
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
-// Generated from UCUM.g4 by ANTLR 4.9.1
+// Generated from fhir-model/UCUM.g4 by ANTLR 4.9.3
 package com.ibm.fhir.model.ucum;
-
 import org.antlr.v4.runtime.CharStream;
 import org.antlr.v4.runtime.Lexer;
 import org.antlr.v4.runtime.RuntimeMetaData;
@@ -20,7 +19,7 @@
 
 @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
 public class UCUMLexer extends Lexer {
-    static { RuntimeMetaData.checkVersion("4.9.1", RuntimeMetaData.VERSION); }
+    static { RuntimeMetaData.checkVersion("4.9.3", RuntimeMetaData.VERSION); }
 
     protected static final DFA[] _decisionToDFA;
     protected static final PredictionContextCache _sharedContextCache =

diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/ucum/UCUMLexer.tokens b/fhir-model/src/main/java/com/ibm/fhir/model/ucum/UCUMLexer.tokens
diff --git a/fhir-model/src/main/java/com/ibm/fhir/model/ucum/UCUMParser.java b/fhir-model/src/main/java/com/ibm/fhir/model/ucum/UCUMParser.java
@@ -1,12 +1,11 @@
 /*
- * (C) Copyright IBM Corp. 2020, 2021
+ * (C) Copyright IBM Corp. 2021
  *
  * SPDX-License-Identifier: Apache-2.0
  */
 
-// Generated from UCUM.g4 by ANTLR 4.9.1
+// Generated from fhir-model/UCUM.g4 by ANTLR 4.9.3
 package com.ibm.fhir.model.ucum;
-
 import java.util.List;
 
 import org.antlr.v4.runtime.NoViableAltException;
@@ -27,7 +26,7 @@
 
 @SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
 public class UCUMParser extends Parser {
-    static { RuntimeMetaData.checkVersion("4.9.1", RuntimeMetaData.VERSION); }
+    static { RuntimeMetaData.checkVersion("4.9.3", RuntimeMetaData.VERSION); }
 
     protected static final DFA[] _decisionToDFA;
     protected static final PredictionContextCache _sharedContextCache =

diff --git a/fhir-parent/pom.xml b/fhir-parent/pom.xml
@@ -402,7 +402,7 @@
             <dependency>
                 <groupId>org.antlr</groupId>
                 <artifactId>antlr4-runtime</artifactId>
-                <version>4.9.1</version>
+                <version>4.9.3</version>
             </dependency>
             <dependency>
                 <groupId>jakarta.mail</groupId>

diff --git a/fhir-path/src/main/java/com/ibm/fhir/path/FHIRPath.interp b/fhir-path/src/main/java/com/ibm/fhir/path/FHIRPath.interp