also allow split refinements in @refinement and @refinementpredicate

CatarinaGamboa · CatarinaGamboa · commit ae57bd379bf3 · 2022-09-30T16:07:52.000-04:00
diff --git a/regen/regen-umbrella/regen-example/src/main/java/regen/test/project/SimpleTest.java b/regen/regen-umbrella/regen-example/src/main/java/regen/test/project/SimpleTest.java
@@ -1,14 +1,19 @@
 package regen.test.project;
 
+import repair.regen.specification.Refinement;
+
 class SimpleTest {
 	public static void main(String[] args) {
 
-		AccountClient ac = new AccountClient();
-		Account a = new Account();
-		a.add(100);
-		a.withdraw(100);
-		a.withdraw(1);
-		
+//		AccountClient ac = new AccountClient();
+//		Account a = new Account();
+//		a.add(100);
+//		a.withdraw(100);
+//		a.withdraw(1);
+
+		@Refinement("x > 0 &&"
+				+ "x < 100")
+		int x = 10;
 //		Account b = new Account();
 //		a.add(10);
 //		ac.transfer(a, b, 5);
diff --git a/regen/regen-umbrella/regen-verifier/spooned/regen/test/project/SimpleTest.java b/regen/regen-umbrella/regen-verifier/spooned/regen/test/project/SimpleTest.java
@@ -3,11 +3,13 @@
 
 class SimpleTest {
     public static void main(java.lang.String[] args) {
-        regen.test.project.AccountClient ac = new regen.test.project.AccountClient();
-        regen.test.project.Account a = new regen.test.project.Account();
-        a.add(100);
-        a.withdraw(100);
-        a.withdraw(1);
+        // AccountClient ac = new AccountClient();
+        // Account a = new Account();
+        // a.add(100);
+        // a.withdraw(100);
+        // a.withdraw(1);
+        @repair.regen.specification.Refinement("x > 0 &&" + "x < 100")
+        int x = 10;
         // Account b = new Account();
         // a.add(10);
         // ac.transfer(a, b, 5);
diff --git a/regen/regen-umbrella/regen-verifier/src/main/java/repair/regen/processor/refinement_checker/TypeChecker.java b/regen/regen-umbrella/regen-verifier/src/main/java/repair/regen/processor/refinement_checker/TypeChecker.java
@@ -78,16 +78,17 @@ public Optional<Constraint> getRefinementFromAnnotation(CtElement element) throw
         for (CtAnnotation<? extends Annotation> ann : element.getAnnotations()) {
             String an = ann.getActualAnnotation().annotationType().getCanonicalName();
             if (an.contentEquals("repair.regen.specification.Refinement")) {
-                CtLiteral<String> s = (CtLiteral<String>) ann.getAllValues().get("value");
-                ref = Optional.of(s.getValue());
+            	String st = TypeCheckingUtils.getStringFromAnnotation(ann.getValue("value"));
+                //CtLiteral<String> s = (CtLiteral<String>) ann.getAllValues().get("value");
+                ref = Optional.of(st);
 
             } else if (an.contentEquals("repair.regen.specification.RefinementPredicate")) {
-                CtLiteral<String> s = (CtLiteral<String>) ann.getAllValues().get("value");
-                getGhostFunction(s.getValue(), element);
+            	String st = TypeCheckingUtils.getStringFromAnnotation(ann.getValue("value"));
+                getGhostFunction(st, element);
 
             } else if (an.contentEquals("repair.regen.specification.RefinementAlias")) {
-                CtLiteral<String> s = (CtLiteral<String>) ann.getAllValues().get("value");
-                handleAlias(s.getValue(), element);
+                String st = TypeCheckingUtils.getStringFromAnnotation(ann.getValue("value"));
+                handleAlias(st, element);
 
             }
 
