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

Merge "[xtext][validation] Fixed performance problem in OverriddenValueInspector"

Browse source
This commit is contained in:
Dennis Huebner 2015-01-06 10:13:13 -05:00 committed by Gerrit Code Review @ Eclipse.org
commit c085070155
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
plugins/org.eclipse.xtext/src/org/eclipse/xtext/xtext/OverriddenValueInspector.java
View file

@ -9,6 +9,7 @@ package org.eclipse.xtext.xtext;
import java.util.Collection;
import java.util.Collections;
import java.util.Set;
import org.eclipse.xtext.AbstractElement;
import org.eclipse.xtext.AbstractRule;
@ -26,6 +27,7 @@ import org.eclipse.xtext.validation.ValidationMessageAcceptor;
import com.google.common.collect.LinkedHashMultimap;
import com.google.common.collect.Lists;
import com.google.common.collect.Multimap;
import com.google.common.collect.Sets;
/**
* @author Sebastian Zarnekow - Initial contribution and API
@ -33,12 +35,24 @@ import com.google.common.collect.Multimap;
public class OverriddenValueInspector extends XtextRuleInspector<Boolean, ParserRule> {
private Multimap<String, AbstractElement> assignedFeatures;
/**
* Remember all visited unassigned rule calls in case the grammar is broken, e.g. has
* no assignments (yet).
*/
private Set<AbstractRule> permanentlyVisited;
public OverriddenValueInspector(ValidationMessageAcceptor acceptor) {
super(acceptor);
assignedFeatures = newMultimap();
permanentlyVisited = Sets.newHashSet();
}
@Override
public boolean addVisited(AbstractRule rule) {
return permanentlyVisited.add(rule) && super.addVisited(rule);
}
@Override
protected boolean canInspect(ParserRule rule) {
if (GrammarUtil.isDatatypeRule(rule) || rule.getAlternatives() == null)
@ -105,7 +119,7 @@ public class OverriddenValueInspector extends XtextRuleInspector<Boolean, Parser
@Override
public Boolean caseRuleCall(RuleCall object) {
AbstractRule calledRule = object.getRule();
if (calledRule == null || calledRule instanceof TerminalRule || calledRule instanceof EnumRule)
if (calledRule == null || calledRule.eIsProxy() || calledRule instanceof TerminalRule || calledRule instanceof EnumRule)
return Boolean.FALSE;
ParserRule parserRule = (ParserRule) calledRule;
if (GrammarUtil.isDatatypeRule(parserRule))
@ -126,10 +140,14 @@ public class OverriddenValueInspector extends XtextRuleInspector<Boolean, Parser
public Boolean caseAlternatives(Alternatives object) {
Multimap<String, AbstractElement> prevAssignedFeatures = assignedFeatures;
Multimap<String, AbstractElement> mergedAssignedFeatures = LinkedHashMultimap.create();
Set<AbstractRule> prevPermanentlyVisited = permanentlyVisited;
Set<AbstractRule> mergedPermanentlyVisited = Sets.newHashSet();
for (AbstractElement element : object.getElements()) {
assignedFeatures = newMultimap(prevAssignedFeatures);
permanentlyVisited = Sets.newHashSet(prevPermanentlyVisited);
doSwitch(element);
mergedAssignedFeatures.putAll(assignedFeatures);
mergedPermanentlyVisited.addAll(prevPermanentlyVisited);
}
if (GrammarUtil.isOptionalCardinality(object)) {
mergedAssignedFeatures.putAll(prevAssignedFeatures);
@ -139,11 +157,13 @@ public class OverriddenValueInspector extends XtextRuleInspector<Boolean, Parser
prevAssignedFeatures = assignedFeatures;
for (AbstractElement element : object.getElements()) {
assignedFeatures = newMultimap(prevAssignedFeatures);
permanentlyVisited = Sets.newHashSet(prevPermanentlyVisited);
doSwitch(element);
mergedAssignedFeatures.putAll(assignedFeatures);
}
assignedFeatures = mergedAssignedFeatures;
}
permanentlyVisited = mergedPermanentlyVisited;
return Boolean.FALSE;
}