From 621f37874f7aa18259e213452d9719400c1ebc7b Mon Sep 17 00:00:00 2001 From: overflowerror Date: Tue, 7 Dec 2021 18:55:01 +0100 Subject: [PATCH] changed terminal token condition to use LA syntax --- .../xtext/xtext/generator/hoisting/HoistingProcessorTest.java | 2 +- .../parser/antlr/hoisting/token/TerminalRuleToken.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/generator/hoisting/HoistingProcessorTest.java b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/generator/hoisting/HoistingProcessorTest.java index d9607577f..ea3567a47 100644 --- a/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/generator/hoisting/HoistingProcessorTest.java +++ b/org.eclipse.xtext.tests/src/org/eclipse/xtext/xtext/generator/hoisting/HoistingProcessorTest.java @@ -69,7 +69,7 @@ public class HoistingProcessorTest extends AbstractXtextTests { return "!\"" + keyword + "\".equals(input.LT(" + offset + ").getText())"; } private String getSyntaxForTerminalToken(String terminal, int offset) { - return "input.LT(" + offset + ").getType() != " + terminal; + return "input.LA(" + offset + ") != " + terminal; } @Test diff --git a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/hoisting/token/TerminalRuleToken.java b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/hoisting/token/TerminalRuleToken.java index 77f922d1f..99a82b1cf 100644 --- a/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/hoisting/token/TerminalRuleToken.java +++ b/org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/hoisting/token/TerminalRuleToken.java @@ -24,7 +24,7 @@ public class TerminalRuleToken implements Token { @Override public String negatedCondition() { - return "input.LT(" + position + ").getType() != " + rule.getName(); + return "input.LA(" + position + ") != " + rule.getName(); } @Override