Fixing a subtle bug: the method isParameterWithType() did not consider arbitrary...

diff --git a/examples/Empty.groovy b/examples/Empty.groovy
index b52e40db5e6f05549fdb65964ef6d74a2cf0029e..03a71018a16fc6540d67ccaf4b8537f0e03d6c2d 100644 (file)
--- a/examples/Empty.groovy
+++ b/examples/Empty.groovy
@@ -22,10 +22,10 @@ class Empty {
 
        static void main(String[] args) {               
 
-               Empty emp = new Empty();
+               Empty empty = new Empty();
                //int result = emp.installed();
                //println result;
-               emp.installed()
+               empty.installed()
                int x = 5;
                int y = 6;
                int result = x + y;

diff --git a/run.sh b/run.sh
index 85733b18ca0db8790cb1a45383a54f32b46b9f93..9a72f1fd1ae5167d6cefa7f88d33926375fa568a 100755 (executable)
--- a/run.sh
+++ b/run.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-java -classpath build/jpf.jar gov.nasa.jpf.JPF +classpath=examples:examples/groovy-2.5.7 $1
+java -classpath build/jpf.jar gov.nasa.jpf.JPF +classpath=examples:examples/groovy-2.5.7:../smartthings-infrastructure $1

diff --git a/src/main/gov/nasa/jpf/vm/Types.java b/src/main/gov/nasa/jpf/vm/Types.java
index 30efa1fe872d11b15957bf79763e0bde5526f8ef..ba71512c0b219217936e81a00cf803a0f7899476 100644 (file)
--- a/src/main/gov/nasa/jpf/vm/Types.java
+++ b/src/main/gov/nasa/jpf/vm/Types.java
@@ -1314,7 +1314,7 @@ public class Types {
 
   public static boolean isParameterWithType(String signature) {
     // Does not contain a class name
-    if (!signature.contains(".") && !signature.contains("/")) {
+    if (signature.charAt(0) != 'L' && !signature.contains(".") && !signature.contains("/")) {
       return true;
     }
     return false;