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

potential fix for endless loop

Browse source 
check progress on smallest branch in every iteration not just the first
-> now loops in token analysis should always exit, either by being done
or by tripping the endless loop protection
This commit is contained in:
overflowerror 2022-02-01 15:55:50 +01:00
parent b7f69d8a65
commit 3af9fd0c4a
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -269,11 +269,11 @@ public class TokenAnalysis {
result = TokenAnalysisPaths.empty(prefix); result = TokenAnalysisPaths.empty(prefix);
} }
int currentPosition = result.getMinPosition();
do { do {
current = TokenAnalysisPaths.empty(result); current = TokenAnalysisPaths.empty(result);
current.resetProgress(); current.resetProgress();
int currentPosition = current.getMinPosition();
for (AbstractElement element : path.getElements()) { for (AbstractElement element : path.getElements()) {
current = current.merge(getTokenPaths(element, result, false, false, shortcutEndlessLoops)); current = current.merge(getTokenPaths(element, result, false, false, shortcutEndlessLoops));
} }
@ -283,7 +283,7 @@ public class TokenAnalysis {
if (current.getMinPosition() == currentPosition) { if (current.getMinPosition() == currentPosition) {
// endless loop // endless loop
// result will never be done since there is no progress to the shortest path // current will never be done since there is no progress to the shortest path
if (shortcutEndlessLoops) { if (shortcutEndlessLoops) {
if (!result.hasProgress()) { if (!result.hasProgress()) {
// no progress // no progress
@ -408,10 +408,10 @@ public class TokenAnalysis {
boolean loop = isVirtualMultipleCardinality(cardinality); boolean loop = isVirtualMultipleCardinality(cardinality);
int currentMinPosition = result.getMinPosition();
do { do {
int currentMinPosition = result.getMinPosition();
result.resetProgress(); result.resetProgress();
TokenAnalysisPaths tokenPaths = getTokenPathsTrivial(path, result, shortcutEndlessLoops); TokenAnalysisPaths tokenPaths = getTokenPathsTrivial(path, result, shortcutEndlessLoops);
if (tokenPaths.isDone()) { if (tokenPaths.isDone()) {
@ -533,7 +533,7 @@ public class TokenAnalysis {
} }
} }
private boolean tokenCombinations(long prefix, int prefixLength, int ones, Function<List<Integer>, Boolean> callback, MutableWrapper<Integer> limit) { private boolean tokenCombinations(long prefix, int prefixLength, int ones, Function<List<Integer>, Boolean> callback, MutableWrapper<Integer> limit) {
if (ones == 0) { if (ones <= 0) {
List<Integer> indexes = new ArrayList<>(limit.get()); List<Integer> indexes = new ArrayList<>(limit.get());
int l = limit.get(); int l = limit.get();
for (int i = 0; i < l; i++) { for (int i = 0; i < l; i++) {