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

fixed bug in context analysis

Browse source 
when the following context element is optional, the minimal sequence is
not going to get bigger. in this case further context analysis is
blocked by the exception.
=> removed exception

also made sure getNextElementsInContext() won't return non-token,
non-compound elements like actions or predicates.
This commit is contained in:
overflowerror 2022-01-11 22:07:33 +01:00
parent edbc920247
commit e5f08c34aa
1 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/hoisting/pathAnalysis/TokenAnalysis.java
View file

@ -24,12 +24,15 @@ import org.apache.log4j.Logger;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.xtext.AbstractElement;
import org.eclipse.xtext.AbstractRule;
import org.eclipse.xtext.AbstractSemanticPredicate;
import org.eclipse.xtext.Action;
import org.eclipse.xtext.Alternatives;
import org.eclipse.xtext.Assignment;
import org.eclipse.xtext.CompoundElement;
import org.eclipse.xtext.Grammar;
import org.eclipse.xtext.GrammarUtil;
import org.eclipse.xtext.Group;
import org.eclipse.xtext.JavaAction;
import org.eclipse.xtext.RuleCall;
import org.eclipse.xtext.UnorderedGroup;
import org.eclipse.xtext.util.XtextSwitch;
@ -82,6 +85,7 @@ public class TokenAnalysis {
}
private List<AbstractElement> getNextElementsInContext(AbstractElement last) {
// TODO: deal with non-trivial cardinalities
CompoundElement container = getCompoundContainer(last);
while (container instanceof Alternatives ||
last.eContainer() instanceof Assignment
@ -112,8 +116,24 @@ public class TokenAnalysis {
log.info(last.eClass().getName());
log.info(abstractElementToString(container));
}
if (index < elements.size() - 1) {
return Arrays.asList(elements.get(index + 1));
int size = elements.size();
AbstractElement next = null;
while (index < size - 1) {
next = elements.get(index + 1);
if (!(
(next instanceof Action) ||
(next instanceof JavaAction) ||
(next instanceof AbstractSemanticPredicate)
)) {
break;
}
index++;
}
if (index < size - 1) {
return Arrays.asList(next);
} else {
// this is the last element
return getNextElementsInContext(container);
@ -155,17 +175,12 @@ public class TokenAnalysis {
// TODO: is this special case necessary?
throw new TokenAnalysisAbortedException("context analysis failed: no context");
}
int currentPosition = prefix.getMinPosition();
for (AbstractElement element : context) {
for (AbstractElement element : context) {
log.info("context element: " + abstractElementToShortString(element));
TokenAnalysisPaths path = new TokenAnalysisPaths(prefix);
path = getTokenPaths(element, path, false, false, shortcutEndlessLoops);
if (!path.isDone() && element != null) {
if (path.getMinPosition() == currentPosition) {
throw new TokenAnalysisAbortedException("no progress in context analysis");
}
if (!path.isDone() && element != null) {
path = getTokenPathsContext(element, path, shortcutEndlessLoops);
}
if (path.isDone()) {