[Jython-checkins] SF.net SVN: jython:[6803] trunk/sandbox/wierzbicki/indy_jython

[<fwi...@us...>]

Revision: 6803
          http://jython.svn.sourceforge.net/jython/?rev=6803&view=rev
Author:   fwierzbicki
Date:     2009-09-22 18:00:39 +0000 (Tue, 22 Sep 2009)

Log Message:
-----------
null MethodHandles as placeholders.

Modified Paths:
--------------
    trunk/sandbox/wierzbicki/indy_jython/IndyDump.java
    trunk/sandbox/wierzbicki/indy_jython/indy

Modified: trunk/sandbox/wierzbicki/indy_jython/IndyDump.java
===================================================================
--- trunk/sandbox/wierzbicki/indy_jython/IndyDump.java	2009-09-22 17:17:27 UTC (rev 6802)
+++ trunk/sandbox/wierzbicki/indy_jython/IndyDump.java	2009-09-22 18:00:39 UTC (rev 6803)
@@ -11,7 +11,7 @@
 MethodVisitor mv;
 AnnotationVisitor av0;
 
-cw.visit(V1_5, ACC_PUBLIC + ACC_SUPER, "Hello", null, "org/python/core/PyFunctionTable", new String[] { "org/python/core/PyRunnable" });
+cw.visit(V1_5, ACC_PUBLIC + ACC_SUPER, "Hello", null, "org/python/core/IndyFunctionTable", new String[] { "org/python/core/PyRunnable" });
 
 {
 av0 = cw.visitAnnotation("Lorg/python/compiler/APIVersion;", true);
@@ -112,7 +112,7 @@
 mv = cw.visitMethod(ACC_PUBLIC, "<init>", "(Ljava/lang/String;)V", null, null);
 mv.visitCode();
 mv.visitVarInsn(ALOAD, 0);
-mv.visitMethodInsn(INVOKESPECIAL, "org/python/core/PyFunctionTable", "<init>", "()V");
+mv.visitMethodInsn(INVOKESPECIAL, "org/python/core/IndyFunctionTable", "<init>", "()V");
 mv.visitVarInsn(ALOAD, 0);
 mv.visitFieldInsn(PUTSTATIC, "Hello", "self", "LHello;");
 mv.visitLdcInsn("Frank");
@@ -135,12 +135,15 @@
 mv.visitInsn(ICONST_0);
 mv.visitInsn(ICONST_0);
 mv.visitFieldInsn(GETSTATIC, "Hello", "self", "LHello;");
-mv.visitInsn(ICONST_0);
+
 mv.visitInsn(ACONST_NULL);
+////mv.visitInsn(ICONST_0);
+
 mv.visitInsn(ACONST_NULL);
+mv.visitInsn(ACONST_NULL);
 mv.visitInsn(ICONST_0);
 mv.visitIntInsn(SIPUSH, 4096);
-mv.visitMethodInsn(INVOKESTATIC, "org/python/core/Py", "newCode", "(I[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IZZLorg/python/core/PyFunctionTable;I[Ljava/lang/String;[Ljava/lang/String;II)Lorg/python/core/PyCode;");
+mv.visitMethodInsn(INVOKESTATIC, "org/python/core/Py", "newCode", "(I[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IZZLorg/python/core/IndyFunctionTable;Ljava/dyn/MethodHandle;[Ljava/lang/String;[Ljava/lang/String;II)Lorg/python/core/PyCode;");
 mv.visitFieldInsn(PUTSTATIC, "Hello", "f$0", "Lorg/python/core/PyCode;");
 mv.visitInsn(ICONST_1);
 mv.visitInsn(ICONST_1);
@@ -157,12 +160,15 @@
 mv.visitInsn(ICONST_0);
 mv.visitInsn(ICONST_0);
 mv.visitFieldInsn(GETSTATIC, "Hello", "self", "LHello;");
-mv.visitInsn(ICONST_1);
+
 mv.visitInsn(ACONST_NULL);
+////mv.visitInsn(ICONST_1);
+
 mv.visitInsn(ACONST_NULL);
+mv.visitInsn(ACONST_NULL);
 mv.visitInsn(ICONST_0);
 mv.visitIntInsn(SIPUSH, 4097);
-mv.visitMethodInsn(INVOKESTATIC, "org/python/core/Py", "newCode", "(I[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IZZLorg/python/core/PyFunctionTable;I[Ljava/lang/String;[Ljava/lang/String;II)Lorg/python/core/PyCode;");
+mv.visitMethodInsn(INVOKESTATIC, "org/python/core/Py", "newCode", "(I[Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;IZZLorg/python/core/IndyFunctionTable;Ljava/dyn/MethodHandle;[Ljava/lang/String;[Ljava/lang/String;II)Lorg/python/core/PyCode;");
 mv.visitFieldInsn(PUTSTATIC, "Hello", "greet$1", "Lorg/python/core/PyCode;");
 mv.visitInsn(RETURN);
 mv.visitMaxs(13, 3);

Modified: trunk/sandbox/wierzbicki/indy_jython/indy
===================================================================
--- trunk/sandbox/wierzbicki/indy_jython/indy	2009-09-22 17:17:27 UTC (rev 6802)
+++ trunk/sandbox/wierzbicki/indy_jython/indy	2009-09-22 18:00:39 UTC (rev 6803)
@@ -1,5 +1,8 @@
-JYTHON_HOME=/Users/frank/svn/jython/trunk/jython
+JYTHON_HOME=/Users/frank/svn/jython/branches/indy
+JAVA_HOME=/Users/frank/work/davinci/sources/build/bsd-i586
 
-$JAVA_HOME/bin/javac -classpath $JYTHON_HOME/extlibs/asm-3.1.jar:asm-util-3.1.jar:. IndyDump.java 
-$JAVA_HOME/bin/java -classpath $JYTHON_HOME/extlibs/asm-3.1.jar:asm-util-3.1.jar:. IndyDump
-$JAVA_HOME/bin/java -classpath $JYTHON_HOME/extlibs/asm-3.1.jar:asm-util-3.1.jar:$JYTHON_HOME/dist/jython.jar:. Hello
+JARS=$JYTHON_HOME/dist/jython-dev.jar:$JYTHON_HOME/extlibs/antlr-runtime-3.1.3.jar:$JYTHON_HOME/extlibs/constantine-0.4.jar:$JYTHON_HOME/extlibs/jna-posix.jar:$JYTHON_HOME/extlibs/jna.jar:$JYTHON_HOME/extlibs/asm-all-3.2.jar
+
+$JAVA_HOME/bin/javac -classpath $JARS:. IndyDump.java 
+$JAVA_HOME/bin/java -classpath $JARS:. IndyDump
+$JAVA_HOME/bin/java -classpath $JARS:. Hello


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