[pypy-svn] r45420 - in pypy/dist/pypy/translator/jvm: src/pypy test

[pdg at codespeak.net]

Author: pdg
Date: Fri Jul 27 22:35:17 2007
New Revision: 45420

Modified:
   pypy/dist/pypy/translator/jvm/src/pypy/PyPy.java
   pypy/dist/pypy/translator/jvm/test/test_string.py
Log:
translator/jvm - cleaned up some files and found that a new unichar test in test_string is failing. Looked into getting getitem working for lists and strings.  I think I might have something (pdg)

Modified: pypy/dist/pypy/translator/jvm/src/pypy/PyPy.java
==============================================================================
--- pypy/dist/pypy/translator/jvm/src/pypy/PyPy.java	(original)
+++ pypy/dist/pypy/translator/jvm/src/pypy/PyPy.java	Fri Jul 27 22:35:17 2007
@@ -418,8 +418,6 @@
         //    throwOverflowError();
     }
 
-    /* shifting */
-    /* Talk to Niko about how to get a workaround for PY_* functions in Java */
 
     /* floor division */
     public static int floordiv_ovf(int x, int y) 
@@ -460,6 +458,7 @@
             throw new ArithmeticException("Floor Division with integer by 0");
     }
 
+    /* modulo */
     public static int mod_ovf(int x, int y) 
     {
         if ((y == -1) && (x == INT_MIN))
@@ -478,6 +477,7 @@
         return x%y;
     }
 
+    /* shifting */
     public static int lshift_ovf(int x, int y) // x << y
     {
         int result = x << y;

Modified: pypy/dist/pypy/translator/jvm/test/test_string.py
==============================================================================
--- pypy/dist/pypy/translator/jvm/test/test_string.py	(original)
+++ pypy/dist/pypy/translator/jvm/test/test_string.py	Fri Jul 27 22:35:17 2007
@@ -14,12 +14,15 @@
     test_char_unichar_eq = test_unichar_const
     test_char_unichar_eq_2 = test_unichar_const
 
+    def test_convert_char_to_unichar(self):
+        py.test.skip("Fails with arguments, Expected to find an object/array on the stack")
+
     def test_upper(self):
         py.test.skip("eval has trouble with evaluation of null literals")
     test_lower = test_upper
 
-    #def test_float(self):
-    #    py.test.skip("JVM does not yet support ooparse_float")
+    def test_float(self):
+        py.test.skip("JVM does not yet support ooparse_float")
 
     def test_getitem_exc(self):
         # This test is supposed to crash in a system specific way;