Changeset 66 in default for v2/trunk/de.ugoe.cs.swe.bnftools.ebnf

Timestamp:

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

Author:

hkaulbersch

Message:

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

Location:

v2/trunk/de.ugoe.cs.swe.bnftools.ebnf

Files:

• src-gen/de/ugoe/cs/swe/bnftools/serializer/EbnfSyntacticSequencer.java (modified) (1 diff)
• src-gen/de/ugoe/cs/swe/bnftools/validation/AbstractEbnfValidator.java (modified) (1 diff)
• src/de/ugoe/cs/swe/bnftools/GenerateEBNF.mwe2 (modified) (2 diffs)
• src/de/ugoe/cs/swe/bnftools/validation/EbnfAnalysisUtils.java (modified) (2 diffs)
• src/de/ugoe/cs/swe/bnftools/validation/EbnfValidator.xtend (modified) (5 diffs)

v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src-gen/de/ugoe/cs/swe/bnftools/serializer/EbnfSyntacticSequencer.java

@@ -76 +76 @@
          * Syntax:
          *     (
+             '+' | 
+             '[' | 
+             ')' | 
              '{' | 
-             '+' | 
-             '}' | 
+             ']' | 
+             '|' | 
              '*' | 
-             ')' | 
-             '|' | 
-             '[' | 
              '(' | 
-             ']'
+             '}'
          )*
          */

v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src-gen/de/ugoe/cs/swe/bnftools/validation/AbstractEbnfValidator.java

@@ -9 +9 @@
 import org.eclipse.xtext.validation.ComposedChecks;
 
-@ComposedChecks(validators= {org.eclipse.xtext.validation.ImportUriValidator.class, org.eclipse.xtext.validation.NamesAreUniqueValidator.class})
+@ComposedChecks(validators= {org.eclipse.xtext.validation.ImportUriValidator.class})
 public class AbstractEbnfValidator extends org.eclipse.xtext.validation.AbstractDeclarativeValidator {
 

v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/GenerateEBNF.mwe2

@@ -74 +74 @@
                 fragment = validation.ValidatorFragment auto-inject {
                     composedCheck = "org.eclipse.xtext.validation.ImportUriValidator"
-                    composedCheck = "org.eclipse.xtext.validation.NamesAreUniqueValidator"
+                //    composedCheck = "org.eclipse.xtext.validation.NamesAreUniqueValidator"
                 }
     
@@ -115 +115 @@
     
                 // provides the necessary bindings for java types integration
-//              fragment = types.TypesGeneratorFragment auto-inject {}
+                //fragment = types.TypesGeneratorFragment auto-inject {}
     
                 // generates the required bindings only if the grammar inherits from Xbase

v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/validation/EbnfAnalysisUtils.java

@@ -5 +5 @@
 
 import org.eclipse.xtext.EcoreUtil2;
+import org.eclipse.xtext.resource.IReferenceDescription;
+import org.eclipse.xtext.resource.IResourceDescription;
+import org.eclipse.xtext.resource.IResourceDescriptions;
+
 import de.ugoe.cs.swe.bnftools.ebnf.Atom;
 import de.ugoe.cs.swe.bnftools.ebnf.DefinitionList;
@@ -83 +87 @@
                 return rules;
         }
+        
+        //----------------------------------------------------------------------------------------------------
+        static public List<Rule> findReferences(Rule rule, IResourceDescriptions resourceDescriptions) {
+                List<Rule> ruleReferences = new ArrayList<Rule>();
+                
+                final String ruleURIF = rule.eResource().getURIFragment(rule);
+                
+                for (IResourceDescription resourceDescription : resourceDescriptions
+                                .getAllResourceDescriptions()) {
+                        if (!resourceDescription.getURI().equals(rule.eResource().getURI()))
+                                continue;
+                        
+                        for (IReferenceDescription referenceDescription : resourceDescription
+                                        .getReferenceDescriptions()) {
+                                if (ruleURIF.equals(referenceDescription.getTargetEObjectUri()
+                                                .fragment())) {
+                                        ruleReferences.add((Rule) rule.eResource().getEObject(referenceDescription.getTargetEObjectUri().fragment()));
+                                }
+
+                        }
+                }
+                return ruleReferences;
+        }
 }

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 {