[Jython-checkins] SF.net SVN: jython:[5655] trunk/jython

[<pj...@us...>]

Revision: 5655
          http://jython.svn.sourceforge.net/jython/?rev=5655&view=rev
Author:   pjenvey
Date:     2008-11-28 21:10:39 +0000 (Fri, 28 Nov 2008)

Log Message:
-----------
have exposed methods and fields convert null Strings results to Py.None

Modified Paths:
--------------
    trunk/jython/src/org/python/expose/generate/Exposer.java
    trunk/jython/tests/java/org/python/expose/generate/DescriptorExposerTest.java
    trunk/jython/tests/java/org/python/expose/generate/ExposedTypeProcessorTest.java
    trunk/jython/tests/java/org/python/expose/generate/MethodExposerTest.java
    trunk/jython/tests/java/org/python/expose/generate/SimpleExposed.java

Modified: trunk/jython/src/org/python/expose/generate/Exposer.java
===================================================================
--- trunk/jython/src/org/python/expose/generate/Exposer.java	2008-11-28 10:06:54 UTC (rev 5654)
+++ trunk/jython/src/org/python/expose/generate/Exposer.java	2008-11-28 21:10:39 UTC (rev 5655)
@@ -5,6 +5,7 @@
 
 import org.python.objectweb.asm.ClassVisitor;
 import org.python.objectweb.asm.ClassWriter;
+import org.python.objectweb.asm.Label;
 import org.python.objectweb.asm.MethodVisitor;
 import org.python.objectweb.asm.Opcodes;
 import org.python.objectweb.asm.Type;
@@ -228,7 +229,16 @@
         if(inputType.equals(VOID)) {
             getStatic(PY, "None", PYOBJ);
         } else if(inputType.equals(STRING)) {
+            Label newString = new Label();
+            Label end = new Label();
+            mv.visitInsn(DUP);
+            mv.visitJumpInsn(IFNONNULL, newString);
+            mv.visitInsn(POP);
+            getStatic(PY, "None", PYOBJ);
+            mv.visitJumpInsn(GOTO, end);
+            mv.visitLabel(newString);
             callStatic(PY, "newString", PYSTR, STRING);
+            mv.visitLabel(end);
         } else if(inputType.equals(BOOLEAN)) {
             callStatic(PY, "newBoolean", PYBOOLEAN, BOOLEAN);
         } else if(inputType.equals(INT) || inputType.equals(BYTE) || inputType.equals(SHORT)) {

Modified: trunk/jython/tests/java/org/python/expose/generate/DescriptorExposerTest.java
===================================================================
--- trunk/jython/tests/java/org/python/expose/generate/DescriptorExposerTest.java	2008-11-28 10:06:54 UTC (rev 5654)
+++ trunk/jython/tests/java/org/python/expose/generate/DescriptorExposerTest.java	2008-11-28 21:10:39 UTC (rev 5655)
@@ -76,7 +76,17 @@
         assertFalse(instance.implementsDescrSet());
         assertFalse(instance.implementsDescrDelete());
     }
+    
+    public void testNullReturns() throws Exception {
+        PyDataDescr instance = makeDescriptor(new DescSetup() {
 
+            public void setup(DescriptorExposer de) {
+                de.addFieldGetter("nullString", STRING);
+            }
+        });
+        assertEquals(Py.None, instance.__get__(se, PY_TYPE));
+    }
+
     public void testMethodSetter() throws Exception {
         PyDataDescr instance = makeDescriptor(new DescSetup() {
 
@@ -224,5 +234,7 @@
         public boolean bool;
 
         public String toStringVal = SimpleExposed.TO_STRING_RETURN;
+        
+        public String nullString = null;
     }
 }

Modified: trunk/jython/tests/java/org/python/expose/generate/ExposedTypeProcessorTest.java
===================================================================
--- trunk/jython/tests/java/org/python/expose/generate/ExposedTypeProcessorTest.java	2008-11-28 10:06:54 UTC (rev 5654)
+++ trunk/jython/tests/java/org/python/expose/generate/ExposedTypeProcessorTest.java	2008-11-28 21:10:39 UTC (rev 5655)
@@ -18,7 +18,7 @@
                 .getResourceAsStream("org/python/expose/generate/SimpleExposed.class");
         ExposedTypeProcessor ice = new ExposedTypeProcessor(in);
         assertEquals("simpleexposed", ice.getName());
-        assertEquals(18, ice.getMethodExposers().size());
+        assertEquals(19, ice.getMethodExposers().size());
         assertNotNull(ice.getNewExposer());
         assertEquals(1, ice.getDescriptorExposers().size());
         assertEquals("simpleexposed", ice.getTypeExposer().getName());

Modified: trunk/jython/tests/java/org/python/expose/generate/MethodExposerTest.java
===================================================================
--- trunk/jython/tests/java/org/python/expose/generate/MethodExposerTest.java	2008-11-28 10:06:54 UTC (rev 5654)
+++ trunk/jython/tests/java/org/python/expose/generate/MethodExposerTest.java	2008-11-28 21:10:39 UTC (rev 5655)
@@ -189,6 +189,10 @@
         assertEquals("a", createBound("charReturn", CHAR).__call__().toString());
     }
 
+    public void testNullReturns() throws Exception {
+        assertEquals(Py.None, createBound("stringReturnNull", STRING).__call__());
+    }
+
     public void testClassMethod() throws Exception {
         ClassMethodExposer exp = new ClassMethodExposer(Type.getType(SimpleExposed.class),
                                                         Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC,

Modified: trunk/jython/tests/java/org/python/expose/generate/SimpleExposed.java
===================================================================
--- trunk/jython/tests/java/org/python/expose/generate/SimpleExposed.java	2008-11-28 10:06:54 UTC (rev 5654)
+++ trunk/jython/tests/java/org/python/expose/generate/SimpleExposed.java	2008-11-28 21:10:39 UTC (rev 5655)
@@ -123,6 +123,11 @@
         return 'a';
     }
 
+    @ExposedMethod
+    public String stringReturnNull() {
+        return null;
+    }
+
     @ExposedClassMethod 
     public static char classmethod(PyType onType) {
         return 'a';


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.