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

analysis of path sets works now

Browse source
This commit is contained in:
overflowerror 2021-11-18 18:42:36 +01:00
parent 639c908c44
commit e2737eed25
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/hoisting/HoistingProcessor.java
View file

@ -280,6 +280,9 @@ public class HoistingProcessor {
return;
}
}
// we tried all possible combinations
// -> abort
throw new TokenAnalysisAbortedException();
}
private boolean tokenCombinations(long prefix, int prefixLength, int ones, Function<List<Integer>, Boolean> callback) {
if (ones == 0) {
@ -296,8 +299,15 @@ public class HoistingProcessor {
} else {
for (int i = prefixLength; i < TOKEN_ANALYSIS_LIMIT - ones + 1; i++) {
long current = prefix | (1 << i);
if (tokenCombinations(current, i + 1, ones - 1, callback)) {
return true;
try {
if (tokenCombinations(current, i + 1, ones - 1, callback)) {
return true;
}
} catch (TokenAnalysisAbortedException e) {
// tokens exhausted; abort current prefix
// TODO: add cache for current position in tokenCombinations-call
// we don't need to check this index in the future
return false;
}
}
return false;
@ -313,7 +323,6 @@ public class HoistingProcessor {
log.info("current index list: " + indexList);
// will throw TokenAnalysisAborted if any path is too short
// TODO: when TokenAnalysisAborted, add new index
List<Set<List<Token>>> tokenListSets = paths.stream()
.peek(p -> log.info("next path: " + p))
.map(p -> getTokenForIndexes(p, indexList))

2
org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/parser/antlr/hoisting/PredicateGuard.java
View file

@ -29,7 +29,7 @@ public class PredicateGuard implements HoistingGuard {
@Override
public String render() {
return JavaCodeUtils.getSource(element.getCode());
return "(" + JavaCodeUtils.getSource(element.getCode()) + ")";
}
@Override