Doing some renaming like @dwightguth suggested.

radumereuta · radumereuta · commit 96323b75811e · 2015-03-16T10:34:03.000-05:00
Former-commit-id: ea6e55768fa472351ea5a6eac06daecf71d8c9c2 [formerly 655519577dac4616f7e36a870a824928000b90c3]
Former-commit-id: e5524b5f2ba06ca13260b28330abfefb414ea58a
diff --git a/kernel/src/main/java/org/kframework/kil/loader/Constants.java b/kernel/src/main/java/org/kframework/kil/loader/Constants.java
@@ -16,6 +16,8 @@ public class Constants {
     public static final String BODY = "body";
     public static final String REWRITE = "rewrite";
     public static final String LEFT = "left";
+    public static final String AUTOREJECT = "autoReject";
+    public static final String REJECT2 = "reject2";
     public static final String TERM = "term";
     public static final String SYN = "Syn";
     public static final String BRACKET = "bracket";
diff --git a/kernel/src/main/java/org/kframework/parser/concrete2kore/kernel/KSyntax2GrammarStatesFilter.java b/kernel/src/main/java/org/kframework/parser/concrete2kore/kernel/KSyntax2GrammarStatesFilter.java
@@ -2,6 +2,7 @@
 package org.kframework.parser.concrete2kore.kernel;
 
 import org.kframework.Collection;
+import org.kframework.kil.loader.Constants;
 import org.kframework.kore.Sort;
 import org.kframework.definition.Module;
 import org.kframework.definition.Production;
@@ -137,12 +138,12 @@ public static void processProduction(Production prd, Grammar grammar, String rej
         Pattern pattern = null;
         if (prd.att().contains("token")) {
             // TODO: calculate reject list
-            if (prd.att().contains("autoReject") && prd.att().contains("rejectt"))
-                pattern = Pattern.compile("(" + prd.att().get("rejectt").get().toString() + ")|(" + rejectPattern + ")");
-            else if (prd.att().contains("autoReject"))
+            if (prd.att().contains(Constants.AUTOREJECT) && prd.att().contains(Constants.REJECT2))
+                pattern = Pattern.compile("(" + prd.att().get(Constants.REJECT2).get().toString() + ")|(" + rejectPattern + ")");
+            else if (prd.att().contains(Constants.AUTOREJECT))
                 pattern = Pattern.compile(rejectPattern);
-            else if (prd.att().contains("rejectt"))
-                pattern = Pattern.compile(prd.att().get("rejectt").get().toString());
+            else if (prd.att().contains(Constants.REJECT2))
+                pattern = Pattern.compile(prd.att().get(Constants.REJECT2).get().toString());
         }
         RuleState labelRule = new RuleState("AddLabelRS", nt, new WrapLabelRule(prd, pattern));
         previous.next.add(labelRule);
diff --git a/kernel/src/main/java/org/kframework/parser/concrete2kore/kernel/Rule.java b/kernel/src/main/java/org/kframework/parser/concrete2kore/kernel/Rule.java
@@ -73,24 +73,22 @@ public Set<KList> apply(Set<KList> set, MetaData metaData) {
      */
     public static class WrapLabelRule extends KListRule {
         private final Production label;
-        public final Pattern pattern;
-        public WrapLabelRule(Production label, Pattern pattern) {
+        public final Pattern rejectPattern;
+        public WrapLabelRule(Production label, Pattern rejectPattern) {
             assert label != null;
             this.label = label;
-            this.pattern = pattern;
+            this.rejectPattern = rejectPattern;
         }
         public WrapLabelRule(Production label) {
             assert label != null;
             this.label = label;
-            pattern = null;
+            rejectPattern = null;
         }
         protected KList apply(KList klist, MetaData metaData) {
-            //Term term = new KApp(label, klist);
             Term term;
             if (label.att().contains("token")) {
-                // TODO: radum, figure out how to reject constants from here.
                 String value = metaData.input.subSequence(metaData.start.position, metaData.end.position).toString();
-                if (pattern != null && pattern.matcher(value).matches()) {
+                if (rejectPattern != null && rejectPattern.matcher(value).matches()) {
                     return null;
                 }
                 term = Constant.apply(value, label, Optional.empty());
diff --git a/kernel/src/main/resources/e-kore.k b/kernel/src/main/resources/e-kore.k
@@ -67,8 +67,7 @@ module BUBBLE
 
   syntax Bubble ::= Bubble BubbleItem [token]
                   | BubbleItem        [token]
-  syntax BubbleItem ::= r"((?!rule|syntax|endmodule|configuration|context)\\S+)" [token]
-                         // the proper way to reject would be: reject("rule|syntax|endmodule|configuration|context")
+  syntax BubbleItem ::= r"\\S+" [token, reject2("rule|syntax|endmodule|configuration|context")]
 
 endmodule
 
