Updated Differences for long, BitSet, and Scanner

hansonr · hansonr · commit e1fece528457 · 2020-12-06T11:52:35.000-06:00
diff --git a/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/differences.txt b/sources/net.sf.j2s.core/dist/swingjs/differences.txt
@@ -31,7 +31,7 @@ ever be shadowed or overridden by subclasses. For example, we see in java.lang.T
 ----------------------------------
 
 
-updated 12/6/2020 -- note about restrictions on long, including BitSet
+updated 12/6/2020 -- note about restrictions on long, including BitSet and Scanner
 updated 3/21/2020 -- adds note about HashMap, Hashtable, and HashSet iterator ordering
 updated 3/20/2020 -- adds note about interning, new String("xxx"), and "xxx"
 updated 2/26/2020 -- adds Graphics.setClip issue
@@ -481,7 +481,8 @@ MINOR ISSUES--requiring some rewriting/refactoring outside of SwingJS
 
 See below for a full discussion.
 
-Restrictions on long and BitSet
+Restrictions on long
+Restriction on BitSet and Scanner
 HashMap, Hashtable, and HashSet iterator ordering
 interning, new String("xxx") vs "xxx"
 Names with "$" and "_"
@@ -588,8 +589,8 @@ changed to JSToolkit.isDispatchThread()
 MINOR ISSUES--requiring some rewriting/refactoring outside of SwingJS  
 =====================================================================
 
-restrictions on long and BitSet
--------------------------------
+restrictions on long
+--------------------
 
 Java's 64-bit long type is not supported in JavaScript. There is no Int64Array in JavaScript,
 and 0x20000000000000 + 1 evaluates to 0x20000000000000, not 0x20000000000001. 
@@ -624,6 +625,24 @@ and also, in JavaScript only, we also have:
 		double d = 0x2000000000000L;
 		assert(((long) d) == 0);
 
+
+restrictions on BitSet and Scanner
+----------------------------------
+
+Because of the issue of long being only 53 bits, any time a method returns a long value, considerations must
+be made as to whether this will work in JavaScript. In particular, BitSet and Scanner have issues. 
+
+In SwingJS, java.util.BitSet has been implemented as a 32-bit integer-based bitset. This was no problem in
+Java 6, but starting with Java 7, a method was added to BitSet that allows for the extraction of the 
+underlying long[] word data. This is not work in JavaScript. Instead, SwingJS java.util.Bitset.toLongArray() will deliver 
+32-bit int[] data.
+
+SwingJS Scanner has hasNextLong() and nextLong(), and although it will scan through long numbers,
+Scanner will choke on long numbers greater than the JavaScript 53-bit limit. hasNextLong() will 
+return false, and nextLong() will throw an InputMismatchException triggered by the NumberFormatException
+thrown by Long.parseLong(). 
+
+
 HashMap, Hashtable, and HashSet iterator ordering
 -------------------------------------------------
 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20201206104919 
+20201206115202 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/differences.txt b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/differences.txt
@@ -31,7 +31,7 @@ ever be shadowed or overridden by subclasses. For example, we see in java.lang.T
 ----------------------------------
 
 
-updated 12/6/2020 -- note about restrictions on long, including BitSet
+updated 12/6/2020 -- note about restrictions on long, including BitSet and Scanner
 updated 3/21/2020 -- adds note about HashMap, Hashtable, and HashSet iterator ordering
 updated 3/20/2020 -- adds note about interning, new String("xxx"), and "xxx"
 updated 2/26/2020 -- adds Graphics.setClip issue
@@ -481,7 +481,8 @@ MINOR ISSUES--requiring some rewriting/refactoring outside of SwingJS
 
 See below for a full discussion.
 
-Restrictions on long and BitSet
+Restrictions on long
+Restriction on BitSet and Scanner
 HashMap, Hashtable, and HashSet iterator ordering
 interning, new String("xxx") vs "xxx"
 Names with "$" and "_"
@@ -588,8 +589,8 @@ changed to JSToolkit.isDispatchThread()
 MINOR ISSUES--requiring some rewriting/refactoring outside of SwingJS  
 =====================================================================
 
-restrictions on long and BitSet
--------------------------------
+restrictions on long
+--------------------
 
 Java's 64-bit long type is not supported in JavaScript. There is no Int64Array in JavaScript,
 and 0x20000000000000 + 1 evaluates to 0x20000000000000, not 0x20000000000001. 
@@ -624,6 +625,24 @@ and also, in JavaScript only, we also have:
 		double d = 0x2000000000000L;
 		assert(((long) d) == 0);
 
+
+restrictions on BitSet and Scanner
+----------------------------------
+
+Because of the issue of long being only 53 bits, any time a method returns a long value, considerations must
+be made as to whether this will work in JavaScript. In particular, BitSet and Scanner have issues. 
+
+In SwingJS, java.util.BitSet has been implemented as a 32-bit integer-based bitset. This was no problem in
+Java 6, but starting with Java 7, a method was added to BitSet that allows for the extraction of the 
+underlying long[] word data. This is not work in JavaScript. Instead, SwingJS java.util.Bitset.toLongArray() will deliver 
+32-bit int[] data.
+
+SwingJS Scanner has hasNextLong() and nextLong(), and although it will scan through long numbers,
+Scanner will choke on long numbers greater than the JavaScript 53-bit limit. hasNextLong() will 
+return false, and nextLong() will throw an InputMismatchException triggered by the NumberFormatException
+thrown by Long.parseLong(). 
+
+
 HashMap, Hashtable, and HashSet iterator ordering
 -------------------------------------------------
 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/timestamp
@@ -1 +1 @@
-20201206104919 
+20201206115202 
diff --git a/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip b/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.java.core/dist/differences.txt b/sources/net.sf.j2s.java.core/dist/differences.txt
@@ -31,7 +31,7 @@ ever be shadowed or overridden by subclasses. For example, we see in java.lang.T
 ----------------------------------
 
 
-updated 12/6/2020 -- note about restrictions on long, including BitSet
+updated 12/6/2020 -- note about restrictions on long, including BitSet and Scanner
 updated 3/21/2020 -- adds note about HashMap, Hashtable, and HashSet iterator ordering
 updated 3/20/2020 -- adds note about interning, new String("xxx"), and "xxx"
 updated 2/26/2020 -- adds Graphics.setClip issue
@@ -481,7 +481,8 @@ MINOR ISSUES--requiring some rewriting/refactoring outside of SwingJS
 
 See below for a full discussion.
 
-Restrictions on long and BitSet
+Restrictions on long
+Restriction on BitSet and Scanner
 HashMap, Hashtable, and HashSet iterator ordering
 interning, new String("xxx") vs "xxx"
 Names with "$" and "_"
@@ -588,8 +589,8 @@ changed to JSToolkit.isDispatchThread()
 MINOR ISSUES--requiring some rewriting/refactoring outside of SwingJS  
 =====================================================================
 
-restrictions on long and BitSet
--------------------------------
+restrictions on long
+--------------------
 
 Java's 64-bit long type is not supported in JavaScript. There is no Int64Array in JavaScript,
 and 0x20000000000000 + 1 evaluates to 0x20000000000000, not 0x20000000000001. 
@@ -624,6 +625,24 @@ and also, in JavaScript only, we also have:
 		double d = 0x2000000000000L;
 		assert(((long) d) == 0);
 
+
+restrictions on BitSet and Scanner
+----------------------------------
+
+Because of the issue of long being only 53 bits, any time a method returns a long value, considerations must
+be made as to whether this will work in JavaScript. In particular, BitSet and Scanner have issues. 
+
+In SwingJS, java.util.BitSet has been implemented as a 32-bit integer-based bitset. This was no problem in
+Java 6, but starting with Java 7, a method was added to BitSet that allows for the extraction of the 
+underlying long[] word data. This is not work in JavaScript. Instead, SwingJS java.util.Bitset.toLongArray() will deliver 
+32-bit int[] data.
+
+SwingJS Scanner has hasNextLong() and nextLong(), and although it will scan through long numbers,
+Scanner will choke on long numbers greater than the JavaScript 53-bit limit. hasNextLong() will 
+return false, and nextLong() will throw an InputMismatchException triggered by the NumberFormatException
+thrown by Long.parseLong(). 
+
+
 HashMap, Hashtable, and HashSet iterator ordering
 -------------------------------------------------
 
diff --git a/sources/net.sf.j2s.java.core/doc/Differences.txt b/sources/net.sf.j2s.java.core/doc/Differences.txt
@@ -31,7 +31,7 @@ ever be shadowed or overridden by subclasses. For example, we see in java.lang.T
 ----------------------------------
 
 
-updated 12/6/2020 -- note about restrictions on long, including BitSet
+updated 12/6/2020 -- note about restrictions on long, including BitSet and Scanner
 updated 3/21/2020 -- adds note about HashMap, Hashtable, and HashSet iterator ordering
 updated 3/20/2020 -- adds note about interning, new String("xxx"), and "xxx"
 updated 2/26/2020 -- adds Graphics.setClip issue
@@ -481,7 +481,8 @@ MINOR ISSUES--requiring some rewriting/refactoring outside of SwingJS
 
 See below for a full discussion.
 
-Restrictions on long and BitSet
+Restrictions on long
+Restriction on BitSet and Scanner
 HashMap, Hashtable, and HashSet iterator ordering
 interning, new String("xxx") vs "xxx"
 Names with "$" and "_"
@@ -588,8 +589,8 @@ changed to JSToolkit.isDispatchThread()
 MINOR ISSUES--requiring some rewriting/refactoring outside of SwingJS  
 =====================================================================
 
-restrictions on long and BitSet
--------------------------------
+restrictions on long
+--------------------
 
 Java's 64-bit long type is not supported in JavaScript. There is no Int64Array in JavaScript,
 and 0x20000000000000 + 1 evaluates to 0x20000000000000, not 0x20000000000001. 
@@ -624,6 +625,24 @@ and also, in JavaScript only, we also have:
 		double d = 0x2000000000000L;
 		assert(((long) d) == 0);
 
+
+restrictions on BitSet and Scanner
+----------------------------------
+
+Because of the issue of long being only 53 bits, any time a method returns a long value, considerations must
+be made as to whether this will work in JavaScript. In particular, BitSet and Scanner have issues. 
+
+In SwingJS, java.util.BitSet has been implemented as a 32-bit integer-based bitset. This was no problem in
+Java 6, but starting with Java 7, a method was added to BitSet that allows for the extraction of the 
+underlying long[] word data. This is not work in JavaScript. Instead, SwingJS java.util.Bitset.toLongArray() will deliver 
+32-bit int[] data.
+
+SwingJS Scanner has hasNextLong() and nextLong(), and although it will scan through long numbers,
+Scanner will choke on long numbers greater than the JavaScript 53-bit limit. hasNextLong() will 
+return false, and nextLong() will throw an InputMismatchException triggered by the NumberFormatException
+thrown by Long.parseLong(). 
+
+
 HashMap, Hashtable, and HashSet iterator ordering
 -------------------------------------------------
 
diff --git a/sources/net.sf.j2s.java.core/src/java/util/BitSet.java b/sources/net.sf.j2s.java.core/src/java/util/BitSet.java
@@ -20,12 +20,12 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.IntBuffer;
-import java.nio.LongBuffer;
 import java.util.stream.IntStream;
 import java.util.stream.StreamSupport;
 
 import javajs.api.JSONEncodable;
 import javajs.util.SB;
+import swingjs.JSUtil;
 
 
 /**
@@ -1028,6 +1028,7 @@ public BitSet get(int fromIndex, int toIndex) {
         * @return
         */
        public long[] toLongArray() {
+    	   JSUtil.notImplemented("BitSet.toLongArray returns a 32-bit array");
     	   long[] a = new long[words.length];
     	   for (int i = a.length; --i >= 0;)
     		   a[i] = words[i];
diff --git a/sources/net.sf.j2s.java.core/src/java/util/Scanner.java b/sources/net.sf.j2s.java.core/src/java/util/Scanner.java
@@ -52,6 +52,7 @@
 import java.util.regex.Pattern;
 
 import sun.misc.LRUCache;
+import swingjs.JSUtil;
 
 /**
  * A simple text scanner which can parse primitive types and strings using
@@ -2194,12 +2195,22 @@ public boolean hasNextLong(int radix) {
         boolean result = hasNext(integerPattern());
         if (result) { // Cache it
             try {
-                String s = (matcher.group(SIMPLE_GROUP_INDEX) == null) ?
-                    processIntegerToken(hasNextResult) :
-                    hasNextResult;
+                String s = (matcher.group(SIMPLE_GROUP_INDEX) == null ?
+                    processIntegerToken(hasNextResult) : hasNextResult);
+                // SwingJS may choke here
                 typeCache = Long.parseLong(s, radix);
             } catch (NumberFormatException nfe) {
-                result = false;
+            	/** @j2sNative 
+            	var l = parseInt(s, radix);
+            	result = (l < -0x1FFFFFFFFFFFFF || l > 0x1FFFFFFFFFFFFF);
+            	*/
+    			{
+    				result = false;
+    			}
+    			if (result) {
+    				JSUtil.notImplemented("Scanner found long value with > 53 bits");
+    				result = false;
+    			}
             }
         }
         return result;
diff --git a/sources/net.sf.j2s.java.core/src/test/ScanTest.java b/sources/net.sf.j2s.java.core/src/test/ScanTest.java
@@ -1335,16 +1335,19 @@ private static void intTest(int sourceType) throws Exception {
 		report("Scan ints");
 	}
 
+	@SuppressWarnings("unused")
 	private static void longTest(int sourceType) throws Exception {
 //		Scanner s = scannerFor("022 9223372036854775807 0x8000000000000000 9223372036854775808 dog ", sourceType);
-		Scanner s = scannerFor("022 9007199254740991 -9007199254740991 1FFFFFFFFFFFFF -1FFFFFFFFFFFFF 9223372036854775808  dog ", sourceType);
+		Scanner s = scannerFor(
+				"022 9007199254740991 -9007199254740991 1FFFFFFFFFFFFF -1FFFFFFFFFFFFF 9007199254740992 9223372036854775808  dog ",
+				sourceType);
 		if (!s.hasNextLong())
 			failed();
 		if (s.nextLong() != (long) 22)
 			failed();
 		if (!s.hasNextLong())
 			failed();
-		
+
 		if (s.nextLong() != 0x1FFFFFFFFFFFFFL)
 			failed();
 		if (!s.hasNextLong())
@@ -1360,6 +1363,22 @@ private static void longTest(int sourceType) throws Exception {
 			failed();
 		if (s.nextLong(16) != -0x1FFFFFFFFFFFFFL)
 			failed();
+
+		try {
+			// SwingJS will fail here because the long value is too large for JavaScript.
+			if (!s.hasNextLong()) {
+				if (/** @j2sNative false && */
+				true)
+					failed();
+			}
+			long l = s.nextLong();
+			if (l != 0x20000000000000L)
+				failed();
+		} catch (InputMismatchException e) {
+			// SwingJS will throw this, because the number is too large
+			System.err.println("!!!!!!!!!! SwingJS cannot read 0x20000000000000 as a long: " + s.next());
+		}
+
 		for (int i = 0; i < 2; i++) {
 			if (s.hasNextLong())
 				failed();
