Fix Exception on State Refinement Syntax Errors

Author: rcosta358

…rc/main/java/testSuite/ErrorSyntax1.java …ava/testSuite/ErrorSyntaxRefinement.javaliquidjava-example/src/main/java/testSuite/ErrorSyntax1.java renamed to liquidjava-example/src/main/java/testSuite/ErrorSyntaxRefinement.java liquidjava-example/src/main/java/testSuite/ErrorSyntax1.java renamed to liquidjava-example/src/main/java/testSuite/ErrorSyntaxRefinement.java

@@ -4,7 +4,7 @@
 import liquidjava.specification.Refinement;
 
 @SuppressWarnings("unused")
-public class ErrorSyntax1 {
+public class ErrorSyntaxRefinement {
     public static void main(String[] args) {
         @Refinement("_ < 100 +")
         int value = 90 + 4;

liquidjava-example/src/main/java/testSuite/ErrorSyntaxStateRefinement.java

@@ -0,0 +1,10 @@
+// Syntax Error
+package testSuite;
+
+import liquidjava.specification.StateRefinement;
+
+public class ErrorSyntaxStateRefinement {
+    
+    @StateRefinement(from="$", to="#")
+    void test() {}
+}

liquidjava-verifier/src/main/java/liquidjava/processor/refinement_checker/TypeChecker.java

@@ -235,7 +235,7 @@ protected void handleAlias(String ref, CtElement element) throws LJError {
             }
         } catch (LJError e) {
             // add location info to error
-            SourcePosition pos = Utils.getRefinementAnnotationPosition(element, ref);
+            SourcePosition pos = Utils.getAnnotationPosition(element);
             e.setPosition(pos);
             throw e;
         }

liquidjava-verifier/src/main/java/liquidjava/rj_language/Predicate.java

@@ -87,7 +87,7 @@ protected Expression parse(String ref, CtElement element) throws LJError {
             return RefinementsParser.createAST(ref, prefix);
         } catch (LJError e) {
             // add location info to error
-            SourcePosition pos = Utils.getRefinementAnnotationPosition(element, ref);
+            SourcePosition pos = Utils.getAnnotationPosition(element);
             e.setPosition(pos);
             throw e;
         }

liquidjava-verifier/src/main/java/liquidjava/utils/Utils.java

@@ -35,11 +35,9 @@ public static String qualifyName(String prefix, String name) {
         return String.format("%s.%s", prefix, name);
     }
 
-    public static SourcePosition getRefinementAnnotationPosition(CtElement element, String refinement) {
-        return element.getAnnotations().stream().filter(a -> {
-            String value = a.getValue("value").toString();
-            String unquoted = value.substring(1, value.length() - 1);
-            return unquoted.equals(refinement);
-        }).findFirst().map(CtElement::getPosition).orElse(element.getPosition());
+    public static SourcePosition getAnnotationPosition(CtElement element) {
+        return element.getAnnotations().stream()
+                .filter(a -> a.getAnnotationType().getQualifiedName().startsWith("liquidjava.specification"))
+                .findFirst().map(CtElement::getPosition).orElse(element.getPosition());
     }
 }