Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ protected List<CommonToken> getTokens(String model) {
do {
currentToken = (CommonToken) tokenSource.nextToken();
tokens.add(currentToken);
} while(currentToken != Token.EOF_TOKEN);
} while (currentToken.getType() != Token.EOF);
return tokens;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ protected LazyLinkingResource createResource(final String model) throws IOExcept
Lexer lexer = lexerProvider.get();
lexer.setCharStream(new ANTLRStringStream(string));
Token token = lexer.nextToken();
while(token != Token.EOF_TOKEN) {
while(token.getType() != Token.EOF) {
tokenList.add((CommonToken) token);
token = lexer.nextToken();
}
Expand Down Expand Up @@ -233,7 +233,7 @@ protected LazyLinkingResource createResource(final String model) throws IOExcept
Lexer lexer = lexerProvider.get();
lexer.setCharStream(new ANTLRStringStream(string));
Token token = lexer.nextToken();
while(token != Token.EOF_TOKEN) {
while (token.getType() != Token.EOF) {
tokenList.add((CommonToken) token);
token = lexer.nextToken();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public Lexer get() {
Lexer lexer = lexerProvider.get();
lexer.setCharStream(new ANTLRStringStream(string));
Token token = lexer.nextToken();
while(token != Token.EOF_TOKEN) {
while (token.getType() != Token.EOF) {
tokenList.add((CommonToken) token);
token = lexer.nextToken();
}
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtend.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.34.100",
org.eclipse.xtext.common.types;bundle-version="2.43.0";visibility:=reexport,
org.eclipse.xtext.xbase;bundle-version="2.43.0";visibility:=reexport,
org.eclipse.xtext;bundle-version="2.43.0",
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
org.eclipse.jdt.core;bundle-version="3.44.0";resolution:=optional;x-installation:=greedy,
org.eclipse.xtext.xbase.lib;bundle-version="2.43.0",
org.eclipse.xtend.lib;bundle-version="2.43.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public Token nextToken() {
try {
int type = flexer.advance();
if (type == Token.EOF) {
return Token.EOF_TOKEN;
return new CommonToken(Token.EOF);
}
int length = flexer.getTokenLength();
final String tokenText = flexer.getTokenText();
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtend.ide.common/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtend.core;bundle-version="2.43.0",
org.eclipse.xtext.ide;bundle-version="2.43.0";visibility:=reexport,
org.eclipse.xtext.xbase.ide;bundle-version="2.43.0",
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
org.eclipse.core.runtime;bundle-version="3.34.100";resolution:=optional
Bundle-RequiredExecutionEnvironment: JavaSE-21
Export-Package: org.eclipse.xtend.ide.common.contentassist.antlr;version="2.43.0";x-friends:="org.eclipse.xtend.ide",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public Token nextToken() {
try {
int type = flexer.advance();
if (type == Token.EOF) {
return Token.EOF_TOKEN;
return new CommonToken(Token.EOF);
}
int length = flexer.getTokenLength();
CommonToken result = new CommonTokenWithoutText(type, Token.DEFAULT_CHANNEL, offset, length);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class FlexerBasedTemplateBodyHighlighter extends TemplateBodyHighlighter {
override doProvideHighlightingFor(String body, IHighlightedPositionAcceptor acceptor) {
val tokenSource = createTokenSource(new StringReader(body))
var token = tokenSource.nextToken
while (token != Token.EOF_TOKEN) {
while (token.type !== Token.EOF) {
val id = token.type.id
val offset = token.offset
val length = token.length
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

import com.google.inject.Inject;
import java.io.StringReader;
import java.util.Objects;
import org.antlr.runtime.Token;
import org.eclipse.xtend.core.parser.antlr.internal.FlexTokenSource;
import org.eclipse.xtend.core.parser.antlr.internal.FlexerFactory;
Expand Down Expand Up @@ -38,7 +37,7 @@ public void doProvideHighlightingFor(final String body, final IHighlightedPositi
StringReader _stringReader = new StringReader(body);
final FlexTokenSource tokenSource = this._flexerFactory.createTokenSource(_stringReader);
Token token = tokenSource.nextToken();
while ((!Objects.equals(token, Token.EOF_TOKEN))) {
while ((token.getType() != Token.EOF)) {
{
final String id = this._abstractAntlrTokenToAttributeIdMapper.getId(token.getType());
final int offset = TokenTool.getOffset(token);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0",
org.eclipse.xtext.testing;bundle-version="2.43.0",
org.eclipse.emf.ecore;bundle-version="2.36.0",
org.eclipse.emf.common;bundle-version="2.30.0",
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
org.eclipse.xtext.xbase.lib;bundle-version="2.43.0",
org.eclipse.xtext.xbase.testlanguages;bundle-version="2.43.0",
org.eclipse.xtext.xtext.generator;bundle-version="2.43.0",
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.builder.tests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0",
org.eclipse.ui;bundle-version="3.207.400",
org.eclipse.jdt.core;bundle-version="3.44.0";resolution:=optional,
org.eclipse.xtext.ui.shared;bundle-version="2.43.0",
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
org.eclipse.xtext.ecore;bundle-version="2.43.0",
org.eclipse.ui.ide;bundle-version="3.22.800",
org.eclipse.xtext.builder.standalone;bundle-version="2.43.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Require-Bundle: org.eclipse.xtext.common.types;bundle-version="2.43.0",
org.eclipse.compare;bundle-version="3.11.600",
org.eclipse.xtext.xbase.testing;bundle-version="2.43.0",
org.eclipse.ui.workbench;bundle-version="3.137.0";resolution:=optional,
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
org.eclipse.xtext.testing;bundle-version="2.43.0"
Export-Package: org.eclipse.xtext.common.types.access;version="2.43.0",
org.eclipse.xtext.common.types.access.impl;version="2.43.0",
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.eclipse.tests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0",
org.eclipse.emf.mwe2.runtime;bundle-version="2.25.0",
org.eclipse.xtext.ecore;bundle-version="2.43.0",
org.eclipse.xtext.testlanguages;bundle-version="2.43.0",
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
org.hamcrest.core;bundle-version="2.2.0",
org.eclipse.core.runtime;bundle-version="3.34.100",
org.eclipse.xtend.lib;bundle-version="2.43.0",
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Export-Package: org.eclipse.xtext.enumrules;version="2.43.0",
org.eclipse.xtext.generator.grammarAccess.serializer;version="2.43.0",
org.eclipse.xtext.generator.grammarAccess.services;version="2.43.0",
org.eclipse.xtext.metamodelreferencing.tests;version="2.43.0"
Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
Require-Bundle: org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
org.eclipse.emf.common;bundle-version="2.30.0",
org.eclipse.emf.ecore;bundle-version="2.36.0",
org.eclipse.equinox.common;bundle-version="3.20.300",
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.extras.tests/META-INF/MANIFEST.MF_gen
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Export-Package: org.eclipse.xtext.enumrules,
org.eclipse.xtext.generator.grammarAccess.parser.antlr.internal,
org.eclipse.xtext.generator.grammarAccess.serializer,
org.eclipse.xtext.generator.grammarAccess.services
Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
Require-Bundle: org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
org.eclipse.emf.common,
org.eclipse.emf.ecore,
org.eclipse.xtext,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,14 @@ public boolean existsConflict(String lastCompleteText, String proposal, ContentA
if (!equalTokenSequence(getProposalLexer(), getCombinedLexer()))
return true;
Token lastToken = getProposalLexer().nextToken();
if (!lastToken.equals(Token.EOF_TOKEN))
return true;
return false;
return lastToken.getType() != Token.EOF;
}

protected boolean equalTokenSequence(TokenSource first, TokenSource second) {
Token token = null;
while (!(token = first.nextToken()).equals(Token.EOF_TOKEN)) {
while ((token = first.nextToken()).getType() != Token.EOF) {
Token otherToken = second.nextToken();
if (otherToken.equals(Token.EOF_TOKEN)) {
if (otherToken.getType() == Token.EOF) {
return false;
}
if (!token.getText().equals(otherToken.getText())) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -285,10 +285,10 @@ protected void createContextsForLastCompleteNode(EObject previousModel, boolean
if (!Strings.isEmpty(currentNodePrefix) && !currentNode.getText().equals(currentNodePrefix)) {
lexer.setCharStream(new ANTLRStringStream(currentNodePrefix));
Token token = lexer.nextToken();
if (token == Token.EOF_TOKEN) { // error case - nothing could be parsed
if (token.getType() == Token.EOF) { // error case - nothing could be parsed
return;
}
while(token != Token.EOF_TOKEN) {
while(token.getType() != Token.EOF) {
if (isErrorToken(token))
return;
token = lexer.nextToken();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

import java.util.Iterator;

import org.antlr.runtime.CommonToken;
import org.antlr.runtime.Token;
import org.antlr.runtime.TokenSource;

Expand All @@ -30,7 +31,7 @@ public Token nextToken() {
ILookAheadTerminal lookAhead = iter.next();
return lookAhead.getToken();
}
return Token.EOF_TOKEN;
return new CommonToken(Token.EOF);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.eclipse.emf.ecore.EObject;
import org.eclipse.xtext.nodemodel.ILeafNode;
import org.eclipse.xtext.nodemodel.INode;
import org.eclipse.xtext.parser.antlr.Lexer;
import org.eclipse.xtext.util.Strings;

/**
Expand All @@ -27,10 +28,10 @@ protected void createContextsForLastCompleteNode(EObject previousModel, boolean
if (!Strings.isEmpty(currentNodePrefix) && !currentNode.getText().equals(currentNodePrefix)) {
lexer.setCharStream(new ANTLRStringStream(currentNodePrefix));
Token token = lexer.nextToken();
if (token == Token.EOF_TOKEN) {
if (token.getType() == Token.EOF) {
return;
}
while (token != Token.EOF_TOKEN) {
while (token.getType() != Token.EOF) {
if (isErrorToken(token)) {
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ protected IUnorderedGroupHelper getUnorderedGroupHelper() {

@Override
protected void error(NoViableAltException nvae) {
if (nvae.token == Token.EOF_TOKEN) {
if (nvae.token.getType() == Token.EOF) {
int lookAheadAddOn = getRecognizer().lookAheadAddOn;
int lookAhead = ((XtextTokenStream)nvae.input).getCurrentLookAhead();
if ((lookAhead >= lookAheadAddOn && lookAheadAddOn > 0) || (lookAhead == 0 && lookAheadAddOn > 0) || lookAhead == -1)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
package org.eclipse.xtext.ide.editor.contentassist.antlr.internal;

import org.antlr.runtime.CharStream;
import org.antlr.runtime.CommonToken;
import org.antlr.runtime.FailedPredicateException;
import org.antlr.runtime.NoViableAltException;
import org.antlr.runtime.RecognitionException;
Expand All @@ -22,7 +23,7 @@
public abstract class Lexer extends org.antlr.runtime.Lexer {

private static final Logger logger = Logger.getLogger(Lexer.class);

protected Lexer(CharStream input) {
super(input);
}
Expand All @@ -45,7 +46,7 @@ public Token nextToken() {
state.tokenStartLine = input.getLine();
state.text = null;
if ( input.LA(1)==CharStream.EOF ) {
return Token.EOF_TOKEN;
return new CommonToken(Token.EOF);
}
try {
mTokens();
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.junit6.tests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0",
org.eclipse.emf.common;bundle-version="2.30.0",
org.eclipse.emf.mwe2.launch;bundle-version="2.25.0";resolution:=optional;x-installation:=greedy,
org.eclipse.xtext.testlanguages;bundle-version="2.43.0",
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
org.eclipse.xtext.testing;bundle-version="2.43.0",
org.eclipse.core.runtime;bundle-version="3.34.100",
org.eclipse.xtend.lib;bundle-version="2.43.0",
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.purexbase.ide/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.xtext.purexbase;bundle-version="2.43.0",
org.eclipse.xtext.ide;bundle-version="2.43.0",
org.eclipse.xtext.xbase.ide;bundle-version="2.43.0",
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)"
org.antlr.runtime;bundle-version="[3.5.3,4.5.4)"
Bundle-RequiredExecutionEnvironment: JavaSE-21
Export-Package: org.eclipse.xtext.purexbase.ide;version="2.43.0";x-internal:=true,
org.eclipse.xtext.purexbase.ide.contentassist.antlr;version="2.43.0",
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.purexbase.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.xtext.purexbase;bundle-version="2.43.0";visibility:=
org.eclipse.xtext.ui.shared;bundle-version="2.43.0",
org.eclipse.ui;bundle-version="3.207.400",
org.eclipse.xtext.builder;bundle-version="2.43.0",
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
org.eclipse.xtext.common.types.ui;bundle-version="2.43.0",
org.eclipse.xtext.xbase.ui;bundle-version="2.43.0",
org.eclipse.jdt.core;bundle-version="3.44.0",
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.purexbase/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0",
org.eclipse.equinox.common;bundle-version="3.20.300",
org.eclipse.emf.ecore;bundle-version="2.36.0",
org.eclipse.xtext.xbase.lib;bundle-version="2.43.0",
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
org.eclipse.xtend.lib;bundle-version="2.43.0",
org.eclipse.emf.common;bundle-version="2.30.0",
org.eclipse.xtext.common.types;bundle-version="2.43.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@

/**
* Base class for smoke tests.
*
*
* Clients may want to use the {@link XtextSmokeTestRunner} instead.
*
*
* @author Sebastian Zarnekow - Initial contribution and API
* @author Sven Efftinge
*/
Expand Down Expand Up @@ -83,7 +83,7 @@ public void testSkipTokensInBetween() throws Exception {
Lexer lexer = lexerProvider.get();
lexer.setCharStream(new ANTLRStringStream(string));
Token token = lexer.nextToken();
while (token != Token.EOF_TOKEN) {
while (token.getType() != Token.EOF) {
tokenList.add((CommonToken) token);
token = lexer.nextToken();
}
Expand Down Expand Up @@ -157,7 +157,7 @@ public void testSkipTokensInBetweenWithoutResourceSet() throws Exception {
Lexer lexer = lexerProvider.get();
lexer.setCharStream(new ANTLRStringStream(string));
Token token = lexer.nextToken();
while (token != Token.EOF_TOKEN) {
while (token.getType() != Token.EOF) {
tokenList.add((CommonToken) token);
token = lexer.nextToken();
}
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.testlanguages.ide/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ Export-Package: org.eclipse.xtext.testlanguages.backtracking.ide;version="2.43.0
Require-Bundle: org.eclipse.xtext.ide;bundle-version="2.43.0";visibility:=reexport,
org.eclipse.xtext.testlanguages;bundle-version="2.43.0",
org.eclipse.xtext.testing;bundle-version="2.43.0",
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
org.eclipse.xtend.lib;bundle-version="2.43.0"
Automatic-Module-Name: org.eclipse.xtext.testlanguages.ide
2 changes: 1 addition & 1 deletion org.eclipse.xtext.testlanguages.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.xtext.testlanguages;bundle-version="2.43.0";visibili
org.eclipse.xtext.ui.shared;bundle-version="2.43.0",
org.eclipse.ui;bundle-version="3.207.400",
org.eclipse.xtext.builder;bundle-version="2.43.0",
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.43.0",
org.eclipse.compare;bundle-version="3.11.600",
org.eclipse.xtend.lib;bundle-version="2.43.0";resolution:=optional,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.testlanguages/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0",
org.eclipse.emf.codegen.ecore;bundle-version="2.37.0";resolution:=optional;x-installation:=greedy,
org.eclipse.emf.ecore;bundle-version="2.36.0",
org.eclipse.emf.common;bundle-version="2.30.0",
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
org.eclipse.xtext.xbase.lib;bundle-version="2.43.0",
org.eclipse.xtend.lib;bundle-version="2.43.0",
org.eclipse.xtext.testing;bundle-version="2.43.0",
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.tests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.43.0",
org.eclipse.emf.common;bundle-version="2.30.0",
org.eclipse.emf.mwe2.launch;bundle-version="2.25.0";resolution:=optional;x-installation:=greedy,
org.eclipse.xtext.testlanguages;bundle-version="2.43.0",
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
org.eclipse.xtext.testing;bundle-version="2.43.0",
org.eclipse.core.runtime;bundle-version="3.34.100",
org.eclipse.xtend.lib;bundle-version="2.43.0",
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.tests/META-INF/MANIFEST.MF_gen
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ Export-Package: org.eclipse.xtext,
org.eclipse.xtext.xtextTest,
org.eclipse.xtext.xtextTest.impl,
org.eclipse.xtext.xtextTest.util
Require-Bundle: org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
Require-Bundle: org.antlr.runtime;bundle-version="[3.5.3,4.5.4)",
org.eclipse.emf.common,
org.eclipse.emf.ecore,
org.eclipse.xtext,
Expand Down
Loading
Loading