From: rtrimana <rtrimana@uci.edu>
Date: Mon, 1 Jul 2019 19:40:33 +0000 (-0700)
Subject: Fixing a subtle bug: the method isParameterWithType() did not consider arbitrary... 
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b81d0644f518284c029e20d175a3e7fc24615067;p=jpf-core.git

Fixing a subtle bug: the method isParameterWithType() did not consider arbitrary class names that are prefixed with 'L', e.g., LEmpty, LRandComplex.
---

diff --git a/examples/Empty.groovy b/examples/Empty.groovy
index b52e40d..03a7101 100644
--- 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 85733b1..9a72f1f 100755
--- 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 30efa1f..ba71512 100644
--- 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;