Merge pull request ikvmnet#578 from ikvmnet/stubenc

Rewrite StubGen around IKVM.ByteCode.Encoding

IKVM.deps.targets

@@ -1,7 +1,7 @@
 <Project>
 
     <ItemGroup>
-        <PackageReference Include="IKVM.ByteCode" Version="9.1.0" />
+        <PackageReference Include="IKVM.ByteCode" Version="9.1.3" />
     </ItemGroup>
 
     <Choose>

src/IKVM.Java.Extensions/java/util/CollectionExtensions.cs

@@ -1,5 +1,4 @@
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace java.util
 {

src/IKVM.Java.Tests/java/lang/ByteTests.java

@@ -0,0 +1,33 @@
+package ikvm.tests.java.java.lang;
+
+import java.lang.*;
+
+@cli.Microsoft.VisualStudio.TestTools.UnitTesting.TestClassAttribute.Annotation()
+public class ByteTests {
+
+    @cli.Microsoft.VisualStudio.TestTools.UnitTesting.TestMethodAttribute.Annotation()
+    public void canCastMinMax() throws Throwable {
+        if (!String.valueOf(Byte.MAX_VALUE).equals("127"))
+            throw new Exception();
+        if (!String.valueOf(Byte.MIN_VALUE).equals("-128"))
+            throw new Exception();
+        if (!String.valueOf((short)Byte.MAX_VALUE).equals("127"))
+            throw new Exception();
+        if (!String.valueOf((short)Byte.MIN_VALUE).equals("-128"))
+            throw new Exception();
+        if (!String.valueOf((int)Byte.MAX_VALUE).equals("127"))
+            throw new Exception();
+        if (!String.valueOf((int)Byte.MIN_VALUE).equals("-128"))
+            throw new Exception();
+        if (!String.valueOf((long)Byte.MAX_VALUE).equals("127"))
+            throw new Exception();
+        if (!String.valueOf((long)Byte.MIN_VALUE).equals("-128"))
+            throw new Exception();
+
+        if (!Integer.valueOf(Byte.MAX_VALUE).equals(Integer.valueOf(127)))
+            throw new Exception();
+        if (!Integer.valueOf(Byte.MIN_VALUE).equals(Integer.valueOf(-128)))
+            throw new Exception();
+    }
+
+}

src/IKVM.Runtime/Attributes/AnnotationDefaultAttribute.cs

@@ -37,7 +37,32 @@ public sealed class AnnotationDefaultAttribute : Attribute
         public const byte TAG_ANNOTATION = (byte)'@';
         public const byte TAG_ARRAY = (byte)'[';
         public const byte TAG_ERROR = (byte)'?';
-        private object defaultValue;
+
+        internal static object Escape(object obj)
+        {
+            return EscapeOrUnescape(obj, true);
+        }
+
+        internal static object Unescape(object obj)
+        {
+            return EscapeOrUnescape(obj, false);
+        }
+
+        static object EscapeOrUnescape(object obj, bool escape)
+        {
+            var str = obj as string;
+            if (str != null)
+                return escape ? UnicodeUtil.EscapeInvalidSurrogates(str) : UnicodeUtil.UnescapeInvalidSurrogates(str);
+
+            var arr = obj as object[];
+            if (arr != null)
+                for (int i = 0; i < arr.Length; i++)
+                    arr[i] = EscapeOrUnescape(arr[i], escape);
+
+            return obj;
+        }
+
+        object defaultValue;
 
         // element_value encoding:
         // primitives:
@@ -59,41 +84,7 @@ public AnnotationDefaultAttribute(object defaultValue)
             this.defaultValue = Unescape(defaultValue);
         }
 
-        public object Value
-        {
-            get
-            {
-                return defaultValue;
-            }
-        }
-
-        internal static object Escape(object obj)
-        {
-            return EscapeOrUnescape(obj, true);
-        }
-
-        internal static object Unescape(object obj)
-        {
-            return EscapeOrUnescape(obj, false);
-        }
-
-        private static object EscapeOrUnescape(object obj, bool escape)
-        {
-            string str = obj as string;
-            if (str != null)
-            {
-                return escape ? UnicodeUtil.EscapeInvalidSurrogates(str) : UnicodeUtil.UnescapeInvalidSurrogates(str);
-            }
-            object[] arr = obj as object[];
-            if (arr != null)
-            {
-                for (int i = 0; i < arr.Length; i++)
-                {
-                    arr[i] = EscapeOrUnescape(arr[i], escape);
-                }
-            }
-            return obj;
-        }
+        public object Value => defaultValue;
 
     }
 

src/IKVM.Runtime/Attributes/ImplementsAttribute.cs

@@ -32,9 +32,12 @@ namespace IKVM.Attributes
 	public sealed class ImplementsAttribute : Attribute
 	{
 
-		private string[] interfaces;
+		string[] interfaces;
 
-		// NOTE this is not CLS compliant, so maybe we should have a couple of overloads
+        /// <summary>
+        /// Initializes a new instance.
+        /// </summary>
+        /// <param name="interfaces"></param>
 		public ImplementsAttribute(string[] interfaces)
 		{
 			this.interfaces = UnicodeUtil.UnescapeInvalidSurrogates(interfaces);

src/IKVM.Runtime/Java/Externs/sun/net/www/protocol/ikvmres/Handler.cs

@@ -43,7 +43,7 @@ public static byte[] GenerateStub(global::java.lang.Class c)
             throw new NotImplementedException();
 #else
             using var mem = new MemoryStream();
-            JVM.Context.StubGenerator.WriteClass(mem, RuntimeJavaType.FromClass(c), true, true, true, true, false);
+            JVM.Context.StubGenerator.Write(mem, RuntimeJavaType.FromClass(c), true, true, true, true, false);
             return mem.ToArray();
 #endif
         }

src/IKVM.Runtime/RuntimeContext.cs

@@ -10,7 +10,7 @@
 #endif
 
 #if IMPORTER == false
-using IKVM.StubGen;
+using IKVM.Runtime.StubGen;
 #endif
 
 namespace IKVM.Runtime