Update of /cvsroot/jython/jython/Tools/jythonc
In directory usw-pr-cvs1:/tmp/cvs-serv25114
Modified Files:
BaseEvaluator.py Object.py proxies.py
Log Message:
+ resetting imp_accu with null for gc; same as in interp.
+ removed last(?) occurrences of fragile Py.tojava(PyObject obj,String className).
Index: BaseEvaluator.py
===================================================================
RCS file: /cvsroot/jython/jython/Tools/jythonc/BaseEvaluator.py,v
retrieving revision 2.12
retrieving revision 2.13
diff -C2 -d -r2.12 -r2.13
*** BaseEvaluator.py 2001/10/28 14:46:20 2.12
--- BaseEvaluator.py 2001/11/23 02:16:37 2.13
***************
*** 306,309 ****
--- 306,311 ----
module.getattr(modname).makeReference(code)))
+ stmts.append(jast.Set(imp_accu,jast.Null))
+
return stmts
Index: Object.py
===================================================================
RCS file: /cvsroot/jython/jython/Tools/jythonc/Object.py,v
retrieving revision 2.4
retrieving revision 2.5
diff -C2 -d -r2.4 -r2.5
*** Object.py 2000/10/13 19:06:01 2.4
--- Object.py 2001/11/23 02:16:38 2.5
***************
*** 135,139 ****
tname = type.__name__
tojava = jast.InvokeStatic('Py', 'tojava',
! [code, jast.StringConstant(tname)])
return jast.Cast(tname, tojava)
--- 135,139 ----
tname = type.__name__
tojava = jast.InvokeStatic('Py', 'tojava',
! [code, jast.GetStaticAttribute(tname,'class')])
return jast.Cast(tname, tojava)
Index: proxies.py
===================================================================
RCS file: /cvsroot/jython/jython/Tools/jythonc/proxies.py,v
retrieving revision 2.14
retrieving revision 2.15
diff -C2 -d -r2.14 -r2.15
*** proxies.py 2001/11/22 23:58:45 2.14
--- proxies.py 2001/11/23 02:16:38 2.15
***************
*** 59,65 ****
r = jast.InvokeStatic("Py", "py2"+ret.__name__, [code])
else:
r = jast.InvokeStatic("Py", "tojava",
! [code, jast.StringConstant(ret.__name__)])
! r = jast.Cast(typeName(ret), r)
return jast.Return(r)
--- 59,66 ----
r = jast.InvokeStatic("Py", "py2"+ret.__name__, [code])
else:
+ typname = typeName(ret)
r = jast.InvokeStatic("Py", "tojava",
! [code, jast.GetStaticAttribute(typname,'class')])
! r = jast.Cast(typname, r)
return jast.Return(r)
|
