sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-15 16:28:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

First analysis towards eliminating enterRule / leaveRule

Browse source
This commit is contained in:
Sebastian Zarnekow 2020-05-01 17:09:08 +02:00
parent 72f74958fe
commit 5bb5adefe4
1 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
org.eclipse.xtext/src/org/eclipse/xtext/parser/antlr/AbstractInternalAntlrParser.java
View file

@ -205,7 +205,7 @@ public abstract class AbstractInternalAntlrParser extends Parser {
private ICompositeNode currentNode;
private INode lastConsumedNode;
private INode _lastConsumedNode;
private boolean hadErrors;
@ -357,13 +357,19 @@ public abstract class AbstractInternalAntlrParser extends Parser {
protected void setWithLastConsumed(EObject _this, String feature, Object value, String lexerRule) {
if (value != null) {
set(_this, feature, value, lexerRule, lastConsumedNode);
if (_lastConsumedNode != currentNode.getLastChild()) {
throw new AssertionError();
}
set(_this, feature, value, lexerRule, _lastConsumedNode);
}
}
protected void setWithLastConsumed(EObject _this, String feature, boolean value, String lexerRule) {
if (value) {
set(_this, feature, value, lexerRule, lastConsumedNode);
if (_lastConsumedNode != currentNode.getLastChild()) {
throw new AssertionError();
}
set(_this, feature, value, lexerRule, _lastConsumedNode);
}
}
@ -389,13 +395,19 @@ public abstract class AbstractInternalAntlrParser extends Parser {
protected void addWithLastConsumed(EObject _this, String feature, Object value, String lexerRule) {
if (value != null) {
add(_this, feature, value, lexerRule, lastConsumedNode);
if (_lastConsumedNode != currentNode.getLastChild()) {
throw new AssertionError();
}
add(_this, feature, value, lexerRule, _lastConsumedNode);
}
}
protected void addWithLastConsumed(EObject _this, String feature, boolean value, String lexerRule) {
if (value) {
add(_this, feature, value, lexerRule, lastConsumedNode);
if (_lastConsumedNode != currentNode.getLastChild()) {
throw new AssertionError();
}
add(_this, feature, value, lexerRule, _lastConsumedNode);
}
}
@ -667,8 +679,8 @@ public abstract class AbstractInternalAntlrParser extends Parser {
// currentNode = currentNode.getParent();
protected void afterParserOrEnumRuleCall() {
ICompositeNode newCurrent = nodeBuilder.compressAndReturnParent(currentNode);
if(currentNode == lastConsumedNode){
lastConsumedNode = newCurrent;
if(currentNode == _lastConsumedNode){
_lastConsumedNode = newCurrent;
}
currentNode = newCurrent;
}
@ -734,7 +746,7 @@ public abstract class AbstractInternalAntlrParser extends Parser {
}
protected void leaveRule() {
lastConsumedNode = currentNode;
_lastConsumedNode = currentNode;
}
// currentNode = createCompositeNode()
@ -755,7 +767,7 @@ public abstract class AbstractInternalAntlrParser extends Parser {
createLeafNode(hidden, null);
}
lastConsumedIndex = tokenIndex;
lastConsumedNode = createLeafNode(token, grammarElement);
_lastConsumedNode = createLeafNode(token, grammarElement);
}
}