[pypy-svn] r29607 - in pypy/dist/pypy/translator/js: . demo/jsdemo/templates

Mon Jul 3 10:32:39 CEST 2006

Author: fijal
Date: Mon Jul  3 10:32:36 2006
New Revision: 29607

Added:
   pypy/dist/pypy/translator/js/demo/jsdemo/templates/console.kid
Modified:
   pypy/dist/pypy/translator/js/jsbuiltin.py
   pypy/dist/pypy/translator/js/opcodes.py
Log:
Fixed int() isssue.
Added console kid.


Added: pypy/dist/pypy/translator/js/demo/jsdemo/templates/console.kid
==============================================================================

--- (empty file)
+++ pypy/dist/pypy/translator/js/demo/jsdemo/templates/console.kid	Mon Jul  3 10:32:36 2006
@@ -0,0 +1,18 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+<head>
+    <meta content="text/html; charset=UTF-8" http-equiv="content-type"/>
+    <title>Python console</title>
+    <!--<script language="javascript" src="/tgtest${std.tg_js}/MochiKit.js"/>-->
+    <script language="javascript" src="${std.tg_js}/MochiKit.js"/>
+    <script type="text/javascript" src="js_basic.js"/>
+</head>
+<body onload="${onload}()">
+    <h3>This is console. You can just run commands</h3>
+    <p id="data">
+    </p>
+<!--    <pre>
+        ${code}
+    </pre> -->
+</body>
+</html>

Modified: pypy/dist/pypy/translator/js/jsbuiltin.py
==============================================================================
--- pypy/dist/pypy/translator/js/jsbuiltin.py	(original)
+++ pypy/dist/pypy/translator/js/jsbuiltin.py	Mon Jul  3 10:32:36 2006
@@ -24,6 +24,7 @@
             'll_int_str' : lambda g,op: Call._render_builtin_method(g, 'toString' , [op.args[2]]),
             'll_strconcat' : InstructionList([PushAllArgs, '+']),
             'll_int' : CallBuiltin('parseInt'),
+            #'ll_int' : lambda g,op: Call._render_builtin(g, 'parseInt', [op.args[0], op.args[0]]),
             'alert' : CallBuiltin('alert'),
             'seval' : CallBuiltin('seval'),
             'date': NewBuiltin('Date')

Modified: pypy/dist/pypy/translator/js/opcodes.py
==============================================================================
--- pypy/dist/pypy/translator/js/opcodes.py	(original)
+++ pypy/dist/pypy/translator/js/opcodes.py	Mon Jul  3 10:32:36 2006
@@ -122,7 +122,7 @@
     'oodowncast' : DoNothing,        
     'oononnull'  : [PushAllArgs,_Prefix('!!')],
     'oostring'   : [CastString],
-    'ooparse_int' : [CallBuiltin('parseInt')],
+    'ooparse_int' : [PushAllArgs,_CastFun("parseInt",2)],
     'oois'       : '===',
     # when casting from bool we want that every truth value is casted
     # to 1: we can't simply DoNothing, because the CLI stack could

