From: Peizhao Ou <peizhaoo@uci.edu>
Date: Tue, 12 Jul 2016 08:58:40 +0000 (-0700)
Subject: add support for "C_RET, S_RET, JustifyingPre/Postconditions"
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=cdsspec-compiler.git;a=commitdiff_plain;h=6c052684208c5c9350ae50d532031ea0ee073d40

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 f9665b7..9a7be19 100644
--- 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 a12ce25..8c47855 100644
--- 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;