From: rtrimana <rtrimana@uci.edu>
Date: Thu, 20 Jun 2019 20:11:28 +0000 (-0700)
Subject: More tests on the Class<U> case.
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=jpf-core.git;a=commitdiff_plain;h=5c708da955457f05c9d544d430d6e9bd4da287d5

More tests on the Class<U> case.
---

diff --git a/examples/Reflection.java b/examples/Reflection.java
index c49ce47..f2bff8a 100644
--- a/examples/Reflection.java
+++ b/examples/Reflection.java
@@ -16,10 +16,10 @@ public class Reflection {
 	
 	}
 
-	class SampleClass<U> {
+	class SampleClass<VWXZ> {
 	   private String sampleField;
 
-	   public Generic<Integer,String,Double,Short> setSampleField(Class<U> clazz, List<String> listString, Map<Integer,String> mapString,
+	   public Generic<Integer,String,Double,Short> setSampleField(Class<VWXZ> clazz, List<String> listString, Map<Integer,String> mapString,
 	   			Generic<Integer,String,Double,Short> test,
 	   			String sampleField, int one, short two, double three, Object obj) {
 		  this.sampleField = sampleField; 
diff --git a/src/main/gov/nasa/jpf/vm/Types.java b/src/main/gov/nasa/jpf/vm/Types.java
index 2e98b25..16ee295 100644
--- a/src/main/gov/nasa/jpf/vm/Types.java
+++ b/src/main/gov/nasa/jpf/vm/Types.java
@@ -919,7 +919,8 @@ public class Types {
       return signature.substring(1, len1).replace('/', '.').
               replaceAll(";L", ", ").
               replace("<L","<").
-              replace(";>", ">");
+              replace(";>", ">").
+              replaceAll("<T", "<");
     }