[pypy-svn] r36317 - pypy/dist/pypy/lang/js

[santagada at codespeak.net]

Author: santagada
Date: Mon Jan  8 22:03:58 2007
New Revision: 36317

Modified:
   pypy/dist/pypy/lang/js/interpreter.py
   pypy/dist/pypy/lang/js/jsobj.py
Log:
more rpython stuff


Modified: pypy/dist/pypy/lang/js/interpreter.py
==============================================================================
--- pypy/dist/pypy/lang/js/interpreter.py	(original)
+++ pypy/dist/pypy/lang/js/interpreter.py	Mon Jan  8 22:03:58 2007
@@ -72,11 +72,11 @@
 
 class PropertyInit(Node):
     def __init__(self, name, value):
-        self.name = name
+        self.namein = name
         self.value = value
     
     def __repr__(self):
-        return "<%s : %s>"%(str(self.name), str(self.value))
+        return "<%s : %s>"%(str(self.namein), str(self.value))
 
 
 class Array(Expression):
@@ -340,7 +340,7 @@
         w_obj = W_Object()
         ##print "properties = ", self.properties
         for property in self.properties:
-            name = property.name.get_literal()
+            name = property.namein.get_literal()
             #print "prop name = ", name
             w_expr = property.value.eval(ctx).GetValue()
             w_obj.Put(name, w_expr)
@@ -428,6 +428,7 @@
 
     def execute(self, ctx):
         e = None
+        tryresult = w_Undefined
         try:
             tryresult = self.tryblock.execute(ctx)
         except ThrowException, excpt:
@@ -508,8 +509,9 @@
     elif tp == 'AND':
         return And(from_tree(gettreeitem(t, '0')), from_tree(gettreeitem(t, '1')))
     elif tp == 'FUNCTION':        
-        name = gettreeitem(t, 'name')
-        if name is not None:
+        namesimb = gettreeitem(t, 'name')
+        name = None
+        if namesimb is not None:
             name = name.additional_info
         body = from_tree(gettreeitem(t, 'body'))
         if gettreeitem(t, 'params').additional_info == '':

Modified: pypy/dist/pypy/lang/js/jsobj.py
==============================================================================
--- pypy/dist/pypy/lang/js/jsobj.py	(original)
+++ pypy/dist/pypy/lang/js/jsobj.py	Mon Jan  8 22:03:58 2007
@@ -55,11 +55,12 @@
     def ToNumber(self):
         return NaN
     
-    def get_literal(self):
+    # def get_literal(self):
+    #     return self.ToString()
+    # 
+    def __str__(self):
         return self.ToString()
-    
-    __str__ = get_literal
-    
+        
     def __repr__(self):
         return "<%s(%s)>" % (self.__class__.__name__, self.ToString())
 
@@ -199,8 +200,6 @@
         self.Put('length', W_Number(0))
     
     def Put(self, P, V):
-        if not isinstance(P, str):
-            P = P.ToString()
         if not self.CanPut(P): return
         if P in self.propdict:
             self.propdict[P].value = V