Skip to content

Commit 134eda9

Browse files
parrtparrt
committed
bump version to 4.13.0-SNAPSHOT in poms, regen XPath lexers.
Signed-off-by: Terence Parr <[email protected]>
1 parent 6e03105 commit 134eda9

File tree

14 files changed

+129
-124
lines changed

14 files changed

+129
-124
lines changed

‎antlr4-maven-plugin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>org.antlr</groupId>
1010
<artifactId>antlr4-master</artifactId>
11-
<version>4.12.1-SNAPSHOT</version>
11+
<version>4.13.0-SNAPSHOT</version>
1212
</parent>
1313
<artifactId>antlr4-maven-plugin</artifactId>
1414
<packaging>maven-plugin</packaging>

‎doc/releasing-antlr.md

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ It's also worth doing a quick check to see if you find any other references to a
6868

6969
```bash
7070
mvn clean
71-
find . -type f -exec grep -l '4\.11.1' {} \; | grep -v -E '\.o|\.a|\.jar|\.dylib|node_modules/|\.class|tests/|CHANGELOG|\.zip|\.gz|.iml|.svg'
71+
find . -type f -exec grep -l '4\.12.0' {} \; | grep -v -E '\.o|\.a|\.jar|\.dylib|node_modules/|\.class|tests/|CHANGELOG|\.zip|\.gz|.iml|.svg'
7272
```
7373

7474
Commit to repository.
@@ -94,17 +94,20 @@ git push origin master
9494

9595
This section addresses a [circular dependency regarding XPath](https://github.com/antlr/antlr4/issues/3600). In the java target I avoided a circular dependency (gen 4.12.0 parser for XPath using 4.12.0 which needs it to build) by hand building the parser: runtime/Java/src/org/antlr/v4/runtime/tree/xpath/XPath.java. Probably we won't have to rerun this for the patch releases, just major ones that alter the ATN serialization.
9696

97-
```
97+
```bash
98+
cd ~/antlr/code/antlr4/runtime/Cpp/runtime/src/tree/xpath
99+
java -cp ":/Users/parrt/.m2/repository/org/antlr/antlr4/4.13.0-SNAPSHOT/antlr4-4.13.0-SNAPSHOT-complete.jar:$CLASSPATH" org.antlr.v4.Tool -Dlanguage=Cpp XPathLexer.g4
100+
98101
cd ~/antlr/code/antlr4/runtime/CSharp/src/Tree/Xpath
99-
java -cp ":/Users/parrt/.m2/repository/org/antlr/antlr4/4.12.0-SNAPSHOT/antlr4-4.12.0-SNAPSHOT-complete.jar:$CLASSPATH" org.antlr.v4.Tool -Dlanguage=CSharp XPathLexer.g4
102+
java -cp ":/Users/parrt/.m2/repository/org/antlr/antlr4/4.13-0-SNAPSHOT/antlr4-4.13-0-SNAPSHOT-complete.jar:$CLASSPATH" org.antlr.v4.Tool -Dlanguage=CSharp XPathLexer.g4
100103

101-
cd ~/antlr/code/antlr4/runtime/Python3/tests/expr
102-
java -cp ":/Users/parrt/.m2/repository/org/antlr/antlr4/4.12.0-SNAPSHOT/antlr4-4.12.0-SNAPSHOT-complete.jar:$CLASSPATH" org.antlr.v4.Tool -Dlanguage=Python2 Expr.g4
103-
java -cp ":/Users/parrt/.m2/repository/org/antlr/antlr4/4.12.0-SNAPSHOT/antlr4-4.12.0-SNAPSHOT-complete.jar:$CLASSPATH" org.antlr.v4.Tool -Dlanguage=Python2 XPathLexer.g4
104+
cd ~/antlr/code/antlr4/runtime/Python2/src/antlr4/xpath
105+
java -cp ":/Users/parrt/.m2/repository/org/antlr/antlr4/4.13-0-SNAPSHOT/antlr4-4.13-0-SNAPSHOT-complete.jar:$CLASSPATH" org.antlr.v4.Tool -Dlanguage=Python2 XPathLexer.g4
104106

105107
cd ~/antlr/code/antlr4/runtime/Python3/tests/expr
106-
java -cp ":/Users/parrt/.m2/repository/org/antlr/antlr4/4.12.0-SNAPSHOT/antlr4-4.12.0-SNAPSHOT-complete.jar:$CLASSPATH" org.antlr.v4.Tool -Dlanguage=Python3 Expr.g4
107-
java -cp ":/Users/parrt/.m2/repository/org/antlr/antlr4/4.12.0-SNAPSHOT/antlr4-4.12.0-SNAPSHOT-complete.jar:$CLASSPATH" org.antlr.v4.Tool -Dlanguage=Python3 XPathLexer.g4
108+
java -cp ":/Users/parrt/.m2/repository/org/antlr/antlr4/4.13-0-SNAPSHOT/antlr4-4.13-0-SNAPSHOT-complete.jar:$CLASSPATH" org.antlr.v4.Tool -Dlanguage=Python3 Expr.g4
109+
cd ~/antlr/code/antlr4/runtime/Python3/src/antlr4/xpath
110+
java -cp ":/Users/parrt/.m2/repository/org/antlr/antlr4/4.13-0-SNAPSHOT/antlr4-4.13-0-SNAPSHOT-complete.jar:$CLASSPATH" org.antlr.v4.Tool -Dlanguage=Python3 XPathLexer.g4
108111
```
109112

110113
## Maven Repository Settings

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</parent>
1414
<groupId>org.antlr</groupId>
1515
<artifactId>antlr4-master</artifactId>
16-
<version>4.12.1-SNAPSHOT</version>
16+
<version>4.13.0-SNAPSHOT</version>
1717
<packaging>pom</packaging>
1818

1919
<name>ANTLR 4</name>

‎runtime-testsuite/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>org.antlr</groupId>
1212
<artifactId>antlr4-master</artifactId>
13-
<version>4.12.1-SNAPSHOT</version>
13+
<version>4.13.0-SNAPSHOT</version>
1414
</parent>
1515
<artifactId>antlr4-runtime-testsuite</artifactId>
1616
<name>ANTLR 4 Runtime Tests (4th generation)</name>

‎runtime/CSharp/src/Tree/Xpath/XPathLexer.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
//------------------------------------------------------------------------------
22
// <auto-generated>
33
// This code was generated by a tool.
4-
// ANTLR Version: 4.9.3
4+
// ANTLR Version: 4.12.0
55
//
66
// Changes to this file may cause incorrect behavior and will be lost if
77
// the code is regenerated.
88
// </auto-generated>
99
//------------------------------------------------------------------------------
1010

11-
// Generated from XPathLexer.g4 by ANTLR 4.9.3
11+
// Generated from XPathLexer.g4 by ANTLR 4.12.0
1212

1313
// Unreachable code detected
1414
#pragma warning disable 0162
@@ -27,7 +27,7 @@
2727
using Antlr4.Runtime.Misc;
2828
using DFA = Antlr4.Runtime.Dfa.DFA;
2929

30-
[System.CodeDom.Compiler.GeneratedCode("ANTLR", "4.9.3")]
30+
[System.CodeDom.Compiler.GeneratedCode("ANTLR", "4.12.0")]
3131
[System.CLSCompliant(false)]
3232
public partial class XPathLexer : Lexer {
3333
protected static DFA[] decisionToDFA;

‎runtime/Cpp/runtime/src/tree/xpath/XPathLexer.cpp

Lines changed: 62 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
11

2-
// Generated from XPathLexer.g4 by ANTLR 4.9.3
2+
// Generated from XPathLexer.g4 by ANTLR 4.12.0
33

44

55
#include "XPathLexer.h"
66

77

8+
using namespace antlr4;
9+
10+
11+
812
using namespace antlr4;
913

1014
namespace {
1115

1216
struct XPathLexerStaticData final {
1317
XPathLexerStaticData(std::vector<std::string> ruleNames,
14-
std::vector<std::string> channelNames,
15-
std::vector<std::string> modeNames,
16-
std::vector<std::string> literalNames,
17-
std::vector<std::string> symbolicNames)
18+
std::vector<std::string> channelNames,
19+
std::vector<std::string> modeNames,
20+
std::vector<std::string> literalNames,
21+
std::vector<std::string> symbolicNames)
1822
: ruleNames(std::move(ruleNames)), channelNames(std::move(channelNames)),
1923
modeNames(std::move(modeNames)), literalNames(std::move(literalNames)),
2024
symbolicNames(std::move(symbolicNames)),
@@ -37,14 +41,23 @@ struct XPathLexerStaticData final {
3741
std::unique_ptr<antlr4::atn::ATN> atn;
3842
};
3943

40-
::antlr4::internal::OnceFlag xpathLexerOnceFlag;
41-
XPathLexerStaticData *xpathLexerStaticData = nullptr;
44+
::antlr4::internal::OnceFlag xpathlexerLexerOnceFlag;
45+
#if ANTLR4_USE_THREAD_LOCAL_CACHE
46+
static thread_local
47+
#endif
48+
XPathLexerStaticData *xpathlexerLexerStaticData = nullptr;
4249

43-
void xpathLexerInitialize() {
44-
assert(xpathLexerStaticData == nullptr);
50+
void xpathlexerLexerInitialize() {
51+
#if ANTLR4_USE_THREAD_LOCAL_CACHE
52+
if (xpathlexerLexerStaticData != nullptr) {
53+
return;
54+
}
55+
#else
56+
assert(xpathlexerLexerStaticData == nullptr);
57+
#endif
4558
auto staticData = std::make_unique<XPathLexerStaticData>(
4659
std::vector<std::string>{
47-
"ANYWHERE", "ROOT", "WILDCARD", "BANG", "ID", "NameChar", "NameStartChar",
60+
"ANYWHERE", "ROOT", "WILDCARD", "BANG", "ID", "NameChar", "NameStartChar",
4861
"STRING"
4962
},
5063
std::vector<std::string>{
@@ -57,69 +70,47 @@ void xpathLexerInitialize() {
5770
"", "", "", "'//'", "'/'", "'*'", "'!'"
5871
},
5972
std::vector<std::string>{
60-
"", "TOKEN_REF", "RULE_REF", "ANYWHERE", "ROOT", "WILDCARD", "BANG", "ID",
61-
"STRING"
73+
"", "TOKEN_REF", "RULE_REF", "ANYWHERE", "ROOT", "WILDCARD", "BANG",
74+
"ID", "STRING"
6275
}
6376
);
6477
static const int32_t serializedATNSegment[] = {
65-
0x4, 0x0, 0x8, 0x32, 0x6, -1, 0x2, 0x0, 0x7, 0x0, 0x2, 0x1, 0x7,
66-
0x1, 0x2, 0x2, 0x7, 0x2, 0x2, 0x3, 0x7, 0x3, 0x2, 0x4, 0x7, 0x4,
67-
0x2, 0x5, 0x7, 0x5, 0x2, 0x6, 0x7, 0x6, 0x2, 0x7, 0x7, 0x7, 0x1,
68-
0x0, 0x1, 0x0, 0x1, 0x0, 0x1, 0x1, 0x1, 0x1, 0x1, 0x2, 0x1, 0x2,
69-
0x1, 0x3, 0x1, 0x3, 0x1, 0x4, 0x1, 0x4, 0x5, 0x4, 0x1d, 0x8, 0x4,
70-
0xa, 0x4, 0xc, 0x4, 0x20, 0x9, 0x4, 0x1, 0x4, 0x1, 0x4, 0x1, 0x5,
71-
0x1, 0x5, 0x3, 0x5, 0x26, 0x8, 0x5, 0x1, 0x6, 0x1, 0x6, 0x1, 0x7,
72-
0x1, 0x7, 0x5, 0x7, 0x2c, 0x8, 0x7, 0xa, 0x7, 0xc, 0x7, 0x2f, 0x9,
73-
0x7, 0x1, 0x7, 0x1, 0x7, 0x1, 0x2d, 0x0, 0x8, 0x1, 0x3, 0x3, 0x4,
74-
0x5, 0x5, 0x7, 0x6, 0x9, 0x7, 0xb, 0x0, 0xd, 0x0, 0xf, 0x8, 0x1,
75-
0x0, 0x2, 0x5, 0x0, 0x30, 0x39, 0x5f, 0x5f, 0xb7, 0xb7, 0x300, 0x36f,
76-
0x203f, 0x2040, 0xd, 0x0, 0x41, 0x5a, 0x61, 0x7a, 0xc0, 0xd6, 0xd8,
77-
0xf6, 0xf8, 0x2ff, 0x370, 0x37d, 0x37f, 0x1fff, 0x200c, 0x200d, 0x2070,
78-
0x218f, 0x2c00, 0x2fef, 0x3001, 0xd7ff, 0xf900, 0xfdcf, 0xfdf0, -1,
79-
0x0, 0x32, 0x0, 0x1, 0x1, 0x0, 0x0, 0x0, 0x0, 0x3, 0x1, 0x0, 0x0,
80-
0x0, 0x0, 0x5, 0x1, 0x0, 0x0, 0x0, 0x0, 0x7, 0x1, 0x0, 0x0, 0x0,
81-
0x0, 0x9, 0x1, 0x0, 0x0, 0x0, 0x0, 0xf, 0x1, 0x0, 0x0, 0x0, 0x1,
82-
0x11, 0x1, 0x0, 0x0, 0x0, 0x3, 0x14, 0x1, 0x0, 0x0, 0x0, 0x5, 0x16,
83-
0x1, 0x0, 0x0, 0x0, 0x7, 0x18, 0x1, 0x0, 0x0, 0x0, 0x9, 0x1a, 0x1,
84-
0x0, 0x0, 0x0, 0xb, 0x25, 0x1, 0x0, 0x0, 0x0, 0xd, 0x27, 0x1, 0x0,
85-
0x0, 0x0, 0xf, 0x29, 0x1, 0x0, 0x0, 0x0, 0x11, 0x12, 0x5, 0x2f, 0x0,
86-
0x0, 0x12, 0x13, 0x5, 0x2f, 0x0, 0x0, 0x13, 0x2, 0x1, 0x0, 0x0, 0x0,
87-
0x14, 0x15, 0x5, 0x2f, 0x0, 0x0, 0x15, 0x4, 0x1, 0x0, 0x0, 0x0, 0x16,
88-
0x17, 0x5, 0x2a, 0x0, 0x0, 0x17, 0x6, 0x1, 0x0, 0x0, 0x0, 0x18, 0x19,
89-
0x5, 0x21, 0x0, 0x0, 0x19, 0x8, 0x1, 0x0, 0x0, 0x0, 0x1a, 0x1e, 0x3,
90-
0xd, 0x6, 0x0, 0x1b, 0x1d, 0x3, 0xb, 0x5, 0x0, 0x1c, 0x1b, 0x1, 0x0,
91-
0x0, 0x0, 0x1d, 0x20, 0x1, 0x0, 0x0, 0x0, 0x1e, 0x1c, 0x1, 0x0, 0x0,
92-
0x0, 0x1e, 0x1f, 0x1, 0x0, 0x0, 0x0, 0x1f, 0x21, 0x1, 0x0, 0x0, 0x0,
93-
0x20, 0x1e, 0x1, 0x0, 0x0, 0x0, 0x21, 0x22, 0x6, 0x4, 0x0, 0x0, 0x22,
94-
0xa, 0x1, 0x0, 0x0, 0x0, 0x23, 0x26, 0x3, 0xd, 0x6, 0x0, 0x24, 0x26,
95-
0x7, 0x0, 0x0, 0x0, 0x25, 0x23, 0x1, 0x0, 0x0, 0x0, 0x25, 0x24, 0x1,
96-
0x0, 0x0, 0x0, 0x26, 0xc, 0x1, 0x0, 0x0, 0x0, 0x27, 0x28, 0x7, 0x1,
97-
0x0, 0x0, 0x28, 0xe, 0x1, 0x0, 0x0, 0x0, 0x29, 0x2d, 0x5, 0x27, 0x0,
98-
0x0, 0x2a, 0x2c, 0x9, 0x0, 0x0, 0x0, 0x2b, 0x2a, 0x1, 0x0, 0x0, 0x0,
99-
0x2c, 0x2f, 0x1, 0x0, 0x0, 0x0, 0x2d, 0x2e, 0x1, 0x0, 0x0, 0x0, 0x2d,
100-
0x2b, 0x1, 0x0, 0x0, 0x0, 0x2e, 0x30, 0x1, 0x0, 0x0, 0x0, 0x2f, 0x2d,
101-
0x1, 0x0, 0x0, 0x0, 0x30, 0x31, 0x5, 0x27, 0x0, 0x0, 0x31, 0x10,
102-
0x1, 0x0, 0x0, 0x0, 0x4, 0x0, 0x1e, 0x25, 0x2d, 0x1, 0x1, 0x4, 0x0,
78+
4,0,8,50,6,-1,2,0,7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,4,7,4,2,5,7,5,2,6,7,6,
79+
2,7,7,7,1,0,1,0,1,0,1,1,1,1,1,2,1,2,1,3,1,3,1,4,1,4,5,4,29,8,4,10,4,12,
80+
4,32,9,4,1,4,1,4,1,5,1,5,3,5,38,8,5,1,6,1,6,1,7,1,7,5,7,44,8,7,10,7,12,
81+
7,47,9,7,1,7,1,7,1,45,0,8,1,3,3,4,5,5,7,6,9,7,11,0,13,0,15,8,1,0,2,5,
82+
0,48,57,95,95,183,183,768,879,8255,8256,13,0,65,90,97,122,192,214,216,
83+
246,248,767,880,893,895,8191,8204,8205,8304,8591,11264,12271,12289,55295,
84+
63744,64975,65008,65535,50,0,1,1,0,0,0,0,3,1,0,0,0,0,5,1,0,0,0,0,7,1,
85+
0,0,0,0,9,1,0,0,0,0,15,1,0,0,0,1,17,1,0,0,0,3,20,1,0,0,0,5,22,1,0,0,0,
86+
7,24,1,0,0,0,9,26,1,0,0,0,11,37,1,0,0,0,13,39,1,0,0,0,15,41,1,0,0,0,17,
87+
18,5,47,0,0,18,19,5,47,0,0,19,2,1,0,0,0,20,21,5,47,0,0,21,4,1,0,0,0,22,
88+
23,5,42,0,0,23,6,1,0,0,0,24,25,5,33,0,0,25,8,1,0,0,0,26,30,3,13,6,0,27,
89+
29,3,11,5,0,28,27,1,0,0,0,29,32,1,0,0,0,30,28,1,0,0,0,30,31,1,0,0,0,31,
90+
33,1,0,0,0,32,30,1,0,0,0,33,34,6,4,0,0,34,10,1,0,0,0,35,38,3,13,6,0,36,
91+
38,7,0,0,0,37,35,1,0,0,0,37,36,1,0,0,0,38,12,1,0,0,0,39,40,7,1,0,0,40,
92+
14,1,0,0,0,41,45,5,39,0,0,42,44,9,0,0,0,43,42,1,0,0,0,44,47,1,0,0,0,45,
93+
46,1,0,0,0,45,43,1,0,0,0,46,48,1,0,0,0,47,45,1,0,0,0,48,49,5,39,0,0,49,
94+
16,1,0,0,0,4,0,30,37,45,1,1,4,0
10395
};
104-
10596
staticData->serializedATN = antlr4::atn::SerializedATNView(serializedATNSegment, sizeof(serializedATNSegment) / sizeof(serializedATNSegment[0]));
10697

107-
atn::ATNDeserializer deserializer;
98+
antlr4::atn::ATNDeserializer deserializer;
10899
staticData->atn = deserializer.deserialize(staticData->serializedATN);
109100

110-
size_t count = staticData->atn->getNumberOfDecisions();
101+
const size_t count = staticData->atn->getNumberOfDecisions();
111102
staticData->decisionToDFA.reserve(count);
112-
for (size_t i = 0; i < count; i++) {
103+
for (size_t i = 0; i < count; i++) {
113104
staticData->decisionToDFA.emplace_back(staticData->atn->getDecisionState(i), i);
114105
}
115-
xpathLexerStaticData = staticData.release();
106+
xpathlexerLexerStaticData = staticData.release();
116107
}
117108

118109
}
119110

120111
XPathLexer::XPathLexer(CharStream *input) : Lexer(input) {
121112
XPathLexer::initialize();
122-
_interpreter = new atn::LexerATNSimulator(this, *xpathLexerStaticData->atn, xpathLexerStaticData->decisionToDFA, xpathLexerStaticData->sharedContextCache);
113+
_interpreter = new atn::LexerATNSimulator(this, *xpathlexerLexerStaticData->atn, xpathlexerLexerStaticData->decisionToDFA, xpathlexerLexerStaticData->sharedContextCache);
123114
}
124115

125116
XPathLexer::~XPathLexer() {
@@ -131,29 +122,30 @@ std::string XPathLexer::getGrammarFileName() const {
131122
}
132123

133124
const std::vector<std::string>& XPathLexer::getRuleNames() const {
134-
return xpathLexerStaticData->ruleNames;
125+
return xpathlexerLexerStaticData->ruleNames;
135126
}
136127

137128
const std::vector<std::string>& XPathLexer::getChannelNames() const {
138-
return xpathLexerStaticData->channelNames;
129+
return xpathlexerLexerStaticData->channelNames;
139130
}
140131

141132
const std::vector<std::string>& XPathLexer::getModeNames() const {
142-
return xpathLexerStaticData->modeNames;
133+
return xpathlexerLexerStaticData->modeNames;
143134
}
144135

145136
const dfa::Vocabulary& XPathLexer::getVocabulary() const {
146-
return xpathLexerStaticData->vocabulary;
137+
return xpathlexerLexerStaticData->vocabulary;
147138
}
148139

149140
antlr4::atn::SerializedATNView XPathLexer::getSerializedATN() const {
150-
return xpathLexerStaticData->serializedATN;
141+
return xpathlexerLexerStaticData->serializedATN;
151142
}
152143

153144
const atn::ATN& XPathLexer::getATN() const {
154-
return *xpathLexerStaticData->atn;
145+
return *xpathlexerLexerStaticData->atn;
155146
}
156147

148+
157149
void XPathLexer::action(RuleContext *context, size_t ruleIndex, size_t actionIndex) {
158150
switch (ruleIndex) {
159151
case 4: IDAction(antlrcpp::downCast<antlr4::RuleContext *>(context), actionIndex); break;
@@ -165,7 +157,7 @@ void XPathLexer::action(RuleContext *context, size_t ruleIndex, size_t actionInd
165157

166158
void XPathLexer::IDAction(antlr4::RuleContext *context, size_t actionIndex) {
167159
switch (actionIndex) {
168-
case 0:
160+
case 0:
169161
if (isupper(getText()[0]))
170162
setType(TOKEN_REF);
171163
else
@@ -177,6 +169,12 @@ void XPathLexer::IDAction(antlr4::RuleContext *context, size_t actionIndex) {
177169
}
178170
}
179171

172+
173+
180174
void XPathLexer::initialize() {
181-
::antlr4::internal::call_once(xpathLexerOnceFlag, xpathLexerInitialize);
175+
#if ANTLR4_USE_THREAD_LOCAL_CACHE
176+
xpathlexerLexerInitialize();
177+
#else
178+
::antlr4::internal::call_once(xpathlexerLexerOnceFlag, xpathlexerLexerInitialize);
179+
#endif
182180
}

‎runtime/Cpp/runtime/src/tree/xpath/XPathLexer.h

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,53 @@
11

2-
// Generated from XPathLexer.g4 by ANTLR 4.9.3
2+
// Generated from XPathLexer.g4 by ANTLR 4.12.0
33

44
#pragma once
55

66

77
#include "antlr4-runtime.h"
88

99

10+
11+
1012
class XPathLexer : public antlr4::Lexer {
1113
public:
1214
enum {
13-
TOKEN_REF = 1, RULE_REF = 2, ANYWHERE = 3, ROOT = 4, WILDCARD = 5, BANG = 6,
15+
TOKEN_REF = 1, RULE_REF = 2, ANYWHERE = 3, ROOT = 4, WILDCARD = 5, BANG = 6,
1416
ID = 7, STRING = 8
1517
};
1618

1719
explicit XPathLexer(antlr4::CharStream *input);
1820

1921
~XPathLexer() override;
2022

21-
virtual std::string getGrammarFileName() const override;
2223

23-
virtual const std::vector<std::string>& getRuleNames() const override;
24+
std::string getGrammarFileName() const override;
25+
26+
const std::vector<std::string>& getRuleNames() const override;
2427

25-
virtual const std::vector<std::string>& getChannelNames() const override;
28+
const std::vector<std::string>& getChannelNames() const override;
2629

27-
virtual const std::vector<std::string>& getModeNames() const override;
30+
const std::vector<std::string>& getModeNames() const override;
2831

29-
virtual const antlr4::dfa::Vocabulary& getVocabulary() const override;
32+
const antlr4::dfa::Vocabulary& getVocabulary() const override;
3033

31-
virtual antlr4::atn::SerializedATNView getSerializedATN() const override;
34+
antlr4::atn::SerializedATNView getSerializedATN() const override;
3235

33-
virtual const antlr4::atn::ATN& getATN() const override;
36+
const antlr4::atn::ATN& getATN() const override;
3437

35-
virtual void action(antlr4::RuleContext *context, size_t ruleIndex, size_t actionIndex) override;
38+
void action(antlr4::RuleContext *context, size_t ruleIndex, size_t actionIndex) override;
3639

3740
// By default the static state used to implement the lexer is lazily initialized during the first
3841
// call to the constructor. You can call this function if you wish to initialize the static state
3942
// ahead of time.
4043
static void initialize();
44+
4145
private:
46+
4247
// Individual action functions triggered by action() above.
4348
void IDAction(antlr4::RuleContext *context, size_t actionIndex);
4449

4550
// Individual semantic predicate functions triggered by sempred() above.
51+
4652
};
4753

‎runtime/Java/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>org.antlr</groupId>
1111
<artifactId>antlr4-master</artifactId>
12-
<version>4.12.1-SNAPSHOT</version>
12+
<version>4.13.0-SNAPSHOT</version>
1313
<relativePath>../../pom.xml</relativePath>
1414
</parent>
1515
<artifactId>antlr4-runtime</artifactId>

0 commit comments

Comments
 (0)