Changeset 66 in default for v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/validation/EbnfValidator.xtend

Timestamp:

05/14/14 10:07:49 (10 years ago)

Author:

hkaulbersch

Message:

Changed Validation:
Validation now works between different files
-unused rule
-referenced only ones
-passthrough

File:

• v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/validation/EbnfValidator.xtend (modified) (5 diffs)

v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/validation/EbnfValidator.xtend

@@ -15 +15 @@
 import de.ugoe.cs.swe.bnftools.ebnf.SingleDefinition
 import java.util.ArrayList
+import com.google.inject.Inject
+import org.eclipse.xtext.resource.IResourceDescriptions
 
 //import java.util.HashMap
@@ -27 +29 @@
 class EbnfValidator extends AbstractEbnfValidator {
 
+
+        @Inject
+        IResourceDescriptions resourceDescriptions;
+        
+        
         public static final String ruleReferencedOneDescription = "The rule is only referenced by one other rule";
         public static final String passthroughRuleDescription = "The rule is a passthrough rule";
@@ -48 +55 @@
                         return;
 
-                var List<RuleReference> references = EbnfAnalysisUtils.findReferences(rule);
-
-                if (references.size() == 1 && rule.rulenumber != 1) {
+                var List<Rule> references = EbnfAnalysisUtils.findReferences(rule,resourceDescriptions);
+                var List<RuleReference> references1 = EbnfAnalysisUtils.findReferences(rule);
+                if (references.size+references1.size == 1 && rule.rulenumber != 1) {
                         warning(ruleReferencedOneDescription, EbnfPackage$Literals::RULE__NAME, ruleReferencedOneDescription,
                                 rule.name);
@@ -172 +179 @@
 
                 var List<RuleReference> references = EbnfAnalysisUtils.findReferences(rule);
-
-                if ((references.size() == 0) && (rule.getRulenumber() != 1))
+                var List<Rule> references1 = EbnfAnalysisUtils.findReferences(rule,resourceDescriptions);
+                if ((references.size+references1.size == 0) && (rule.getRulenumber() != 1))
                         warning(unusedRuleDescription, EbnfPackage$Literals::RULE__NAME, unusedRuleDescription, rule.name);
         }
@@ -214 +221 @@
 
                 var List<RuleReference> references = EbnfAnalysisUtils.findReferences(rule);
-
+                var List<Rule> references1 = EbnfAnalysisUtils.findReferences(rule,resourceDescriptions);
                 if (EbnfAnalysisUtils.isPassthroughRule(rule) && rule.rulenumber != 1) {
-                        if (references.size() == 0) {
+                        if (references.size+references1.size == 0) {
                                 warning(unreferencedPassthroughRuleDescription, EbnfPackage$Literals::RULE__NAME);
                         } else {