Fix #10: "key" builtin was a character code, not a string

jdf · Jul 7, 2012 · 6090135 · 6090135
1 parent 06607c0
commit 6090135
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/buildtime/template/DriverImpl.java.cog b/buildtime/template/DriverImpl.java.cog
@@ -50,5 +50,6 @@ public class DriverImpl extends PAppletJythonDriver {
            b.emit()
        ]]]*/
        /*[[[end]]] */
+       super.setFields();
 	}
 }
diff --git a/runtime/src/jycessing/PAppletJythonDriver.java b/runtime/src/jycessing/PAppletJythonDriver.java
@@ -25,6 +25,7 @@
 import org.python.core.PySet;
 import org.python.core.PyStringMap;
 import org.python.core.PyType;
+import org.python.core.PyUnicode;
 import org.python.util.InteractiveConsole;
 
 import processing.core.PApplet;
@@ -51,8 +52,6 @@ abstract public class PAppletJythonDriver extends PApplet {
 
     abstract protected void populateBuiltins();
 
-    abstract protected void setFields();
-
     protected final PyStringMap builtins;
     protected final InteractiveConsole interp;
     private final String pySketchPath;
@@ -96,6 +95,10 @@ CompileMode.exec, new CompilerFlags()), interp.getLocals(),
         }
     }
 
+    protected void setFields() {
+        builtins.__setitem__("key", new PyUnicode(Character.toString(key)));
+    }
+
     public PAppletJythonDriver(final InteractiveConsole interp,
             final String sketchPath, final String programText) {
         this.programText = programText;