add support for "C_RET, S_RET, JustifyingPre/Postconditions"

diff --git a/src/edu/uci/eecs/codeGenerator/Environment.java b/src/edu/uci/eecs/codeGenerator/Environment.java
index f9665b7d008f64cddcbc1f2e33b4eeb646046639..9a7be19f01e66b33c1a7fa1402529b651385bf7c 100644 (file)
--- a/src/edu/uci/eecs/codeGenerator/Environment.java
+++ b/src/edu/uci/eecs/codeGenerator/Environment.java
@@ -36,20 +36,23 @@ public class Environment {
        public final static String SPSC = "spsc-bugfix";
        public final static String MPMC = "mpmc-queue";
        
+       public final static String BLOCKING_QUEUE_EXAMPLE = "blocking-mpmc-example";
+       
        public final static String[] Benchmarks = {
-//             REGISTER_ACQREL,
-//             REGISTER_RELAXED,
+               REGISTER_ACQREL,
+               REGISTER_RELAXED,
                MS_QUEUE,
-//             LINUXRWLOCKS,
-//             MCS_LOCK,
-//             DEQUE,
-//             TREIBER_STACK,
-//             TICKET_LOCK,
-//             SEQLOCK,
-//             READ_COPY_UPDATE,
-//             CONCURRENT_MAP,
-//             SPSC,
-//             MPMC
+               LINUXRWLOCKS,
+               MCS_LOCK,
+               DEQUE,
+               TREIBER_STACK,
+               TICKET_LOCK,
+               SEQLOCK,
+               READ_COPY_UPDATE,
+               CONCURRENT_MAP,
+               SPSC,
+               MPMC,
+               BLOCKING_QUEUE_EXAMPLE,
        }; 
 
 }

diff --git a/src/edu/uci/eecs/specExtraction/SpecExtractor.java b/src/edu/uci/eecs/specExtraction/SpecExtractor.java
index a12ce256cfe7e72f924524bdec7850117021daba..8c478557139570708c7709d50717ad6694032d5c 100644 (file)
--- a/src/edu/uci/eecs/specExtraction/SpecExtractor.java
+++ b/src/edu/uci/eecs/specExtraction/SpecExtractor.java
@@ -624,7 +624,7 @@ public class SpecExtractor {
                        lineReader = new LineNumberReader(br);
                        // "/\*\*\s*@(DeclareState|Interface)"
                        Pattern regexpBegin = Pattern
-                                       .compile("/\\*\\*\\s*@(DeclareState|Interface|PreCondition|JustifyingCondition|Transition|JustifyingPostcondition|PostCondition|Define)");
+                                       .compile("/\\*\\*\\s*@(DeclareState|Interface|PreCondition|JustifyingPrecondition|Transition|JustifyingPostcondition|PostCondition|Define)");
                        Matcher matcher = regexpBegin.matcher("");
 
                        String line;