Skip to content

Upgrade Painless from ANTLR 4.5.1-1 to ANTLR 4.5.3. #27153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 27, 2017
Merged

Upgrade Painless from ANTLR 4.5.1-1 to ANTLR 4.5.3. #27153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/lang-painless/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ integTestCluster {
}

dependencies {
compile 'org.antlr:antlr4-runtime:4.5.1-1'
compile 'org.antlr:antlr4-runtime:4.5.3'
compile 'org.ow2.asm:asm-debug-all:5.1'
}

Expand Down Expand Up @@ -71,7 +71,7 @@ configurations {
}

dependencies {
regenerate 'org.antlr:antlr4:4.5.1-1'
regenerate 'org.antlr:antlr4:4.5.3'
}

String grammarPath = 'src/main/antlr'
Expand Down
1 change: 0 additions & 1 deletion modules/lang-painless/licenses/antlr4-runtime-4.5.1-1.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions modules/lang-painless/licenses/antlr4-runtime-4.5.3.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2609e36f18f7e8d593cc1cddfb2ac776dc96b8e0
2 changes: 1 addition & 1 deletion modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessLexer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
abstract class PainlessLexer extends Lexer {
static { RuntimeMetaData.checkVersion("4.5.1", RuntimeMetaData.VERSION); }
static { RuntimeMetaData.checkVersion("4.5.3", RuntimeMetaData.VERSION); }

protected static final DFA[] _decisionToDFA;
protected static final PredictionContextCache _sharedContextCache =
Expand Down
17 changes: 16 additions & 1 deletion modules/lang-painless/src/main/java/org/elasticsearch/painless/antlr/PainlessParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
class PainlessParser extends Parser {
static { RuntimeMetaData.checkVersion("4.5.1", RuntimeMetaData.VERSION); }
static { RuntimeMetaData.checkVersion("4.5.3", RuntimeMetaData.VERSION); }

protected static final DFA[] _decisionToDFA;
protected static final PredictionContextCache _sharedContextCache =
Expand Down Expand Up @@ -579,6 +579,7 @@ public final StatementContext statement() throws RecognitionException {
try {
int _alt;
setState(185);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,11,_ctx) ) {
case 1:
_localctx = new IfContext(_localctx);
Expand All @@ -595,6 +596,7 @@ public final StatementContext statement() throws RecognitionException {
setState(103);
trailer();
setState(107);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,4,_ctx) ) {
case 1:
{
Expand Down Expand Up @@ -1127,6 +1129,7 @@ public final InitializerContext initializer() throws RecognitionException {
enterRule(_localctx, 14, RULE_initializer);
try {
setState(204);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,14,_ctx) ) {
case 1:
enterOuterAlt(_localctx, 1);
Expand Down Expand Up @@ -1653,6 +1656,7 @@ private ExpressionContext expression(int _p) throws RecognitionException {
_prevctx = _localctx;
{
setState(290);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,18,_ctx) ) {
case 1:
{
Expand Down Expand Up @@ -1979,6 +1983,7 @@ public final UnaryContext unary() throws RecognitionException {
int _la;
try {
setState(308);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,20,_ctx) ) {
case 1:
_localctx = new PreContext(_localctx);
Expand Down Expand Up @@ -2126,6 +2131,7 @@ public final ChainContext chain() throws RecognitionException {
try {
int _alt;
setState(326);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,23,_ctx) ) {
case 1:
_localctx = new DynamicContext(_localctx);
Expand Down Expand Up @@ -2342,6 +2348,7 @@ public final PrimaryContext primary() throws RecognitionException {
int _la;
try {
setState(346);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,24,_ctx) ) {
case 1:
_localctx = new PrecedenceContext(_localctx);
Expand Down Expand Up @@ -2493,6 +2500,7 @@ public final PostfixContext postfix() throws RecognitionException {
enterRule(_localctx, 36, RULE_postfix);
try {
setState(351);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,25,_ctx) ) {
case 1:
enterOuterAlt(_localctx, 1);
Expand Down Expand Up @@ -2551,6 +2559,7 @@ public final PostdotContext postdot() throws RecognitionException {
enterRule(_localctx, 38, RULE_postdot);
try {
setState(355);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,26,_ctx) ) {
case 1:
enterOuterAlt(_localctx, 1);
Expand Down Expand Up @@ -2803,6 +2812,7 @@ public final ArrayinitializerContext arrayinitializer() throws RecognitionExcept
try {
int _alt;
setState(412);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,34,_ctx) ) {
case 1:
_localctx = new NewstandardarrayContext(_localctx);
Expand Down Expand Up @@ -2837,6 +2847,7 @@ public final ArrayinitializerContext arrayinitializer() throws RecognitionExcept
_alt = getInterpreter().adaptivePredict(_input,27,_ctx);
} while ( _alt!=2 && _alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER );
setState(385);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,29,_ctx) ) {
case 1:
{
Expand Down Expand Up @@ -2974,6 +2985,7 @@ public final ListinitializerContext listinitializer() throws RecognitionExceptio
int _la;
try {
setState(427);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,36,_ctx) ) {
case 1:
enterOuterAlt(_localctx, 1);
Expand Down Expand Up @@ -3055,6 +3067,7 @@ public final MapinitializerContext mapinitializer() throws RecognitionException
int _la;
try {
setState(443);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,38,_ctx) ) {
case 1:
enterOuterAlt(_localctx, 1);
Expand Down Expand Up @@ -3252,6 +3265,7 @@ public final ArgumentContext argument() throws RecognitionException {
enterRule(_localctx, 56, RULE_argument);
try {
setState(465);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,41,_ctx) ) {
case 1:
enterOuterAlt(_localctx, 1);
Expand Down Expand Up @@ -3533,6 +3547,7 @@ public final FuncrefContext funcref() throws RecognitionException {
enterRule(_localctx, 62, RULE_funcref);
try {
setState(505);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,47,_ctx) ) {
case 1:
_localctx = new ClassfuncrefContext(_localctx);
Expand Down