Math.floorDiv(long,long)

hansonr · hansonr · commit 77b06c404e8d · 2021-01-01T11:57:52.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/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20210101091131 
+20210101115709 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.3.1/timestamp
@@ -1 +1 @@
-20210101091131 
+20210101115709 
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/src/test/JavaFiddle.java b/sources/net.sf.j2s.java.core/src/test/JavaFiddle.java
@@ -4,7 +4,39 @@ public class JavaFiddle extends javax.swing.JFrame implements java.awt.dnd.DropT
 
 	java.awt.dnd.DropTarget target;
 
+	public class ThreadTest {
+		
+		public String delayedReturn(String s) {
+			
+			try {
+				Thread.sleep(5000);
+			} catch (InterruptedException e) {
+				return e.getMessage();
+			}
+			return s;
+			
+		}
+	}
+
+	private javax.swing.JButton newTestButton() {
+		javax.swing.JButton b = new javax.swing.JButton("testing");
+		b.addActionListener(new java.awt.event.ActionListener() {
+
+			@Override
+			public void actionPerformed(java.awt.event.ActionEvent e) {				
+				javax.swing.JOptionPane.showConfirmDialog(null, new ThreadTest().delayedReturn("OK"));
+				System.out.println("ok");
+			}
+			
+		});
+		return b;
+	}
+
+
 	public JavaFiddle() {
+		
+		startFiddleFrame();
+		
 		setSize(new java.awt.Dimension(400,400));
 		//setPreferredSize(new java.awt.Dimension(400,400));
 			setTransferHandler(new javax.swing.TransferHandler() {
@@ -50,6 +82,14 @@ public boolean importData(javax.swing.TransferHandler.TransferSupport support) {
 
 	}
 
+	private void startFiddleFrame() {
+		
+		javax.swing.JFrame f = new javax.swing.JFrame();
+		f.setLocation(400, 400);
+		f.add(newTestButton());
+		f.pack();
+		f.setVisible(true);
+	}
 	@Override
 	public void dragEnter(java.awt.dnd.DropTargetDragEvent dtde) {		
 	}
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Long.java b/sources/net.sf.j2s.java.core/src/test/Test_Long.java
@@ -61,8 +61,22 @@ public static void main(String[] args) {
 
 	private static void testLongMath(long j, long k, long l) {
 		
-		// TODO Auto-generated method stub
+		k = -230842039822340L;
+		l = 23942392332L;
+		j = k/l;
+		assert(j == -9641);
 		
+		j = Math.floorDiv(k, l);
+		assert(j == -9642);
+
+		
+		l = -12323942392332L;
+		j = k/l;
+		assert(j == 18);
+		
+		j = Math.floorDiv(k, l);
+		assert(j == 18);
+
 	}
 
 	private static void testFieldAccess() {
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js
@@ -3455,7 +3455,7 @@ Math.subtractExact$J$J = function(x, y) {
 
 Math.floorDiv$J$J = function(x,y) { 
 	var r = Long.$div(x,y);
-	return (r < 0 && Long.$ne(Long.$mul(r,y), x) ? Long.$dec(r) : r);
+	return (r < 0 && Long.$ne(Long.$mul(r,y), x) ? Long.$inc(r, -1) : r);
 }
 
 Math.floorMod$J$J = function(x,y) { return Long.$sub(x, Long.$mul(Math.floorDiv(x, y), y)); }
diff --git a/sources/net.sf.j2s.java.core/srcjs/swingjs2.js b/sources/net.sf.j2s.java.core/srcjs/swingjs2.js
@@ -17470,7 +17470,7 @@ Math.subtractExact$J$J = function(x, y) {
 
 Math.floorDiv$J$J = function(x,y) { 
 	var r = Long.$div(x,y);
-	return (r < 0 && Long.$ne(Long.$mul(r,y), x) ? Long.$dec(r) : r);
+	return (r < 0 && Long.$ne(Long.$mul(r,y), x) ? Long.$inc(r, -1) : r);
 }
 
 Math.floorMod$J$J = function(x,y) { return Long.$sub(x, Long.$mul(Math.floorDiv(x, y), y)); }

Original file line number	Diff line number	Diff line change
`@@ -3455,7 +3455,7 @@ Math.subtractExact$J$J = function(x, y) {`
`3455`	`3455`
`3456`	`3456`	`Math.floorDiv$J$J = function(x,y) {`
`3457`	`3457`	`var r = Long.$div(x,y);`
`3458`		`- return (r < 0 && Long.$ne(Long.$mul(r,y), x) ? Long.$dec(r) : r);`
	`3458`	`+ return (r < 0 && Long.$ne(Long.$mul(r,y), x) ? Long.$inc(r, -1) : r);`
`3459`	`3459`	`}`
`3460`	`3460`
`3461`	`3461`	`Math.floorMod$J$J = function(x,y) { return Long.$sub(x, Long.$mul(Math.floorDiv(x, y), y)); }`
Original file line number	Diff line number	Diff line change
`@@ -17470,7 +17470,7 @@ Math.subtractExact$J$J = function(x, y) {`
`17470`	`17470`
`17471`	`17471`	`Math.floorDiv$J$J = function(x,y) {`
`17472`	`17472`	`var r = Long.$div(x,y);`
`17473`		`- return (r < 0 && Long.$ne(Long.$mul(r,y), x) ? Long.$dec(r) : r);`
	`17473`	`+ return (r < 0 && Long.$ne(Long.$mul(r,y), x) ? Long.$inc(r, -1) : r);`
`17474`	`17474`	`}`
`17475`	`17475`
`17476`	`17476`	`Math.floorMod$J$J = function(x,y) { return Long.$sub(x, Long.$mul(Math.floorDiv(x, y), y)); }`