Changeset 53 in default

Timestamp:

12/01/10 16:49:04 (14 years ago)

Author:

zeiss

Message:

 

Location:

trunk/de.ugoe.cs.swe.bnftools.ebnf/src/de/ugoe/cs/swe/bnftools/validation

Files:

• DuplicateEntry.java (modified) (1 diff)
• EbnfJavaValidator.java (modified) (3 diffs)
• RuleDuplication.java (added)

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

@@ -27 +27 @@
 
         public void addRule(Rule r) {
-                rules.add(r);
+                if (!rules.contains(r))
+                        rules.add(r);
         }
         

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

@@ -2 +2 @@
 
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -383 +385 @@
                 }
                 
-                // create warnings
-                
+                // create longest matches
+                HashMap<String, RuleDuplication> rulePairMap = new HashMap<String, RuleDuplication>();
                 Iterator<String> it = taggedEntries.iterator();
                 
@@ -390 +392 @@
                         String entry = it.next();
                         DuplicateEntry dupeEntry = dupesMap.get(entry);
+                        
                         if (dupeEntry.getRules().size() < 2)
                                 continue;
                         
-                        String warningText = "";
-                        warningText += ">>" + entry + "<< is duplicated in the following rules: ";
+                        ArrayList<Integer> matchingLines = new ArrayList<Integer>(); 
                         for (int i=0; i < dupeEntry.getRules().size(); i++) {
                                 Rule rule = dupeEntry.getRules().get(i);
                                 CompositeNode parserNode = NodeUtil.getNodeAdapter(rule).getParserNode();
-
-                                if (rule.getRulenumber() > 0) {
-                                        String ruleNumber = Integer.toString(rule.getRulenumber()).replaceAll("[ \t\n\r]", ""); 
-                                        warningText += ruleNumber;
-                                }
-                                warningText += " (Line ";
-                                warningText += parserNode.getLine();
-                                warningText += ")";
+                                matchingLines.add(parserNode.getLine());
+                        }
+                        
+                        Collections.sort(matchingLines);
+                        
+                        RuleDuplication rulePair = rulePairMap.get(matchingLines.toString());
+                        if (rulePair == null) {
+                                rulePair = new RuleDuplication();
+                        } 
+                        rulePair.addDupe(dupeEntry);
+                        rulePairMap.put(matchingLines.toString(), rulePair);
+                }
+
+                // create warnings
+                Iterator<RuleDuplication> it2 = rulePairMap.values().iterator();
+                
+                while (it2.hasNext()) {
+                        RuleDuplication rulePair = it2.next();
+                        List<DuplicateEntry> dupes = rulePair.getFilteredDupes();
+                        
+                        for (int i=0; i < dupes.size(); i++) {
+                                DuplicateEntry dupeEntry = dupes.get(i);
                                 
-                                if (i+1 < dupeEntry.getRules().size())
-                                        warningText += ", ";
-
-                        }
-
-                        Rule rule = dupeEntry.getRules().get(0);
-                        CompositeNode parserNode = NodeUtil.getNodeAdapter(rule).getParserNode();
-                        warning(warningText, parserNode.getElement(), 1);
-                }
-                
+                                String warningText = "";
+                                warningText += ">>" + dupeEntry.getSnippet() + "<< is duplicated in the following rules: ";
+                                for (int j=0; j < dupeEntry.getRules().size(); j++) {
+                                        Rule rule = dupeEntry.getRules().get(j);
+                                        CompositeNode parserNode = NodeUtil.getNodeAdapter(rule).getParserNode();
+        
+                                        if (rule.getRulenumber() > 0) {
+                                                String ruleNumber = Integer.toString(rule.getRulenumber()).replaceAll("[ \t\n\r]", ""); 
+                                                warningText += ruleNumber;
+                                        }
+                                        warningText += " (Line ";
+                                        warningText += parserNode.getLine();
+                                        warningText += ")";
+                                        
+                                        if (j+1 < dupeEntry.getRules().size())
+                                                warningText += ", ";
+        
+                                }
+        
+                                Rule rule = dupeEntry.getRules().get(0);
+                                CompositeNode parserNode = NodeUtil.getNodeAdapter(rule).getParserNode();
+                                warning(warningText, parserNode.getElement(), 1);
+                        }
+                }
         }