Skip to content

Commit 5738f9d

Browse files
committed
Regenerate UCUM and FHIRPath lexers/parsers with latest antlr4
And update to 4.9.3. I also removed the generated tokens and interp files as those are not needed at runtime (source: https://stackoverflow.com/questions/59734259/antlr-generated-files). Commands for regenerating: ``` antlr4 -no-listener -package com.ibm.fhir.model.ucum fhir-model/UCUM.g4 && sed -i.bak $'s/\t/ /g' fhir-model/UCUM*.java && mv fhir-model/UCUM*.java fhir-model/src/main/java/com/ibm/fhir/model/ucum/ ``` ``` antlr4 -visitor -no-listener -package com.ibm.fhir.path fhir-path/FHIRPath.g4 && sed -i.bak $'s/\t/ /g' fhir-path/FHIRPath*.java && mv fhir-path/FHIRPath*.java fhir-path/src/main/java/com/ibm/fhir/path/ ``` Signed-off-by: Lee Surprenant <[email protected]>
1 parent cbd235c commit 5738f9d

File tree

15 files changed

+13
-795
lines changed

15 files changed

+13
-795
lines changed

fhir-model/src/main/java/com/ibm/fhir/model/ucum/UCUM.interp

Lines changed: 0 additions & 55 deletions
This file was deleted.

fhir-model/src/main/java/com/ibm/fhir/model/ucum/UCUM.tokens

Lines changed: 0 additions & 28 deletions
This file was deleted.

fhir-model/src/main/java/com/ibm/fhir/model/ucum/UCUMLexer.interp

Lines changed: 0 additions & 62 deletions
This file was deleted.

fhir-model/src/main/java/com/ibm/fhir/model/ucum/UCUMLexer.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
/*
2-
* (C) Copyright IBM Corp. 2020, 2021
2+
* (C) Copyright IBM Corp. 2021
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
// Generated from UCUM.g4 by ANTLR 4.9.1
7+
// Generated from fhir-model/UCUM.g4 by ANTLR 4.9.3
88
package com.ibm.fhir.model.ucum;
9-
109
import org.antlr.v4.runtime.CharStream;
1110
import org.antlr.v4.runtime.Lexer;
1211
import org.antlr.v4.runtime.RuntimeMetaData;
@@ -20,7 +19,7 @@
2019

2120
@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
2221
public class UCUMLexer extends Lexer {
23-
static { RuntimeMetaData.checkVersion("4.9.1", RuntimeMetaData.VERSION); }
22+
static { RuntimeMetaData.checkVersion("4.9.3", RuntimeMetaData.VERSION); }
2423

2524
protected static final DFA[] _decisionToDFA;
2625
protected static final PredictionContextCache _sharedContextCache =

fhir-model/src/main/java/com/ibm/fhir/model/ucum/UCUMLexer.tokens

Lines changed: 0 additions & 28 deletions
This file was deleted.

fhir-model/src/main/java/com/ibm/fhir/model/ucum/UCUMParser.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
/*
2-
* (C) Copyright IBM Corp. 2020, 2021
2+
* (C) Copyright IBM Corp. 2021
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
66

7-
// Generated from UCUM.g4 by ANTLR 4.9.1
7+
// Generated from fhir-model/UCUM.g4 by ANTLR 4.9.3
88
package com.ibm.fhir.model.ucum;
9-
109
import java.util.List;
1110

1211
import org.antlr.v4.runtime.NoViableAltException;
@@ -27,7 +26,7 @@
2726

2827
@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
2928
public class UCUMParser extends Parser {
30-
static { RuntimeMetaData.checkVersion("4.9.1", RuntimeMetaData.VERSION); }
29+
static { RuntimeMetaData.checkVersion("4.9.3", RuntimeMetaData.VERSION); }
3130

3231
protected static final DFA[] _decisionToDFA;
3332
protected static final PredictionContextCache _sharedContextCache =

fhir-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@
402402
<dependency>
403403
<groupId>org.antlr</groupId>
404404
<artifactId>antlr4-runtime</artifactId>
405-
<version>4.9.1</version>
405+
<version>4.9.3</version>
406406
</dependency>
407407
<dependency>
408408
<groupId>jakarta.mail</groupId>

fhir-path/src/main/java/com/ibm/fhir/path/FHIRPath.interp

Lines changed: 0 additions & 153 deletions
This file was deleted.

0 commit comments

Comments
 (0)