fixed string.isdigit, deprecated _create_empty_object.

hartsantler · hartsantler · commit 6d7d1174f43a · 2013-10-20T18:53:00.000-07:00
fixed "in" javascript test for things without special "__contains__"
diff --git a/README.rst b/README.rst
@@ -44,7 +44,7 @@ Getting Started - Experimental Development Branch
 
 Get Source Code::
 
-	git clone -b develop https://github.com/PythonScript-/PythonJS.git
+	git clone -b develop https://github.com/PythonJS/PythonJS.git
 
 Install Tornado for Python3::
 
diff --git a/pythonscript.js b/pythonscript.js
@@ -1,8 +1,4 @@
-
-
-
-
-
+// PythonScript Runtime - regenerated on: Sun Oct 20 18:46:57 2013
 var jsrange = function(num) {
 "Emulates Python's range function";
 var i, r;
@@ -306,6 +302,19 @@ return attr;
 base = backup;
 }
 
+var iter = bases;
+for (var base=0; base < iter.length; base++) {
+var backup = base;
+base = iter[base];
+var getter;
+getter = _get_upstream_property(base, attribute);
+if(getter) {
+return getter([object]);
+}
+
+base = backup;
+}
+
 if("__getattr__"  in  __dict__) {
 return __dict__["__getattr__"]([object, attribute]);
 }
@@ -390,6 +399,22 @@ parent = backup;
 }
 window["_get_upstream_attribute"] = _get_upstream_attribute 
 
+var _get_upstream_property = function(base, attr) {
+if(attr  in  base.__properties__) {
+return base.__properties__[attr];
+}
+
+var iter = base.bases;
+for (var parent=0; parent < iter.length; parent++) {
+var backup = parent;
+parent = iter[parent];
+return _get_upstream_property(parent, attr);
+parent = backup;
+}
+
+}
+window["_get_upstream_property"] = _get_upstream_property 
+
 var set_attribute = function(object, attribute, value) {
 "Set an attribute on an object by updating its __dict__ property";
 var __dict__, __class__;
@@ -635,32 +660,14 @@ key = backup;
 
 return output;
 }
-window["json_to_pythonscript"] = json_to_pythonscript 
-
+window["json_to_pythonscript"] = json_to_pythonscript
 _PythonJS_UID = 0;
 var _JSNew = function(T) {
-console.log("_JSNew->", T);
 return new T;
 }
 window["_JSNew"] = _JSNew 
 
 _JSNew.pythonscript_function=true;
-var _create_empty_object = function(arr) {
-var o;
-o = Object.create( null );
-var iter = arr;
-for (var i=0; i < iter.length; i++) {
-var backup = i;
-i = iter[i];
-o[ i ] = true;
-i = backup;
-}
-
-return o;
-}
-window["_create_empty_object"] = _create_empty_object 
-
-_create_empty_object.pythonscript_function=true;
 var int = function(args, kwargs) {
 var signature, arguments;
 signature = {"kwargs": Object(), "args": create_array("a")};
@@ -785,12 +792,12 @@ return this.indexOf( a );
 String.prototype.index=func;
 var func = function() {
 var digits;
-digits = _create_empty_object( ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"] );
+digits = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"];
 var iter = this;
 for (var char=0; char < iter.length; char++) {
 var backup = char;
 char = iter[char];
-if(char  in  digits || digits["__contains__"](char)) {
+if(char  in  digits || Object.hasOwnProperty(digits, "__contains__") && digits["__contains__"](char)) {
 /*pass*/
 }
 else {
@@ -811,15 +818,16 @@ _setup_str_prototype.pythonscript_function = true;
 _setup_str_prototype(create_array(), Object());
 var _setup_array_prototype = function(args, kwargs) {
 var func = function(a) {
-var e;
-e = _create_empty_object( this );
-if(a  in  e) {
+var i;
+i = 0;
+while(i < this.length) {
+if(this[i] == a) {
 return true;
 }
-else {
-return false;
-}
 
+i += 1;
+}
+return false;
 }
 
 Array.prototype.__contains__=func;
@@ -2160,4 +2168,4 @@ window["__array_to_ascii"] = __array_to_ascii
 
 __array_to_ascii.pythonscript_function = true;
 window["__array_attrs"]["to_ascii"] = __array_to_ascii;
-array = create_class("array", window["__array_parents"], window["__array_attrs"], window["__array_properties"]);
+array = create_class("array", window["__array_parents"], window["__array_attrs"], window["__array_properties"]);
diff --git a/pythonscript/python_to_pythonjs.py b/pythonscript/python_to_pythonjs.py
@@ -392,7 +392,7 @@ def visit_ClassDef(self, node):
         writer.write('window["__%s_properties"] = JSObject()' % name)
 
         for base in node.bases:
-            code = '__%s_parents.push(%s)' % (name, self.visit(base))
+            code = 'window["__%s_parents"].push(%s)' % (name, self.visit(base))
             writer.write(code)
             if isinstance(base, Name):
                 self._class_parents[ name ].add( base.id )
@@ -591,6 +591,7 @@ def visit_Compare(self, node):
                 a = ( self.visit(node.comparators[i]), left )
                 if self._with_js:  ## this makes "if 'x' in Array" work like Python: "if 'x' in list" - TODO fix this for js-objects
                     comp.append( '%s in %s or' %(a[1], a[0]) )  ## this is ugly, but it works
+                    comp.append( 'Object.hasOwnProperty(%s, "__contains__") and' %a[0])
                     comp.append( "%s['__contains__'](%s)" %a )
                 else:
                     comp.append( "get_attribute(get_attribute(%s, '__contains__'), '__call__')([%s], JSObject())" %a )
diff --git a/runtime/builtins.py b/runtime/builtins.py
@@ -3,14 +3,18 @@
 
 with javascript:
     def _JSNew(T):
-        print '_JSNew->', T
         return JS("new T")
 
-    def _create_empty_object(arr):
-            o = Object.create(null)
-            for i in arr:
-                o[ i ] = True
-            return o
+    ## This can not be trusted because Object.hasOwnProperty will fail on an empty object with
+    ## TypeError: Cannot convert object to primitive value
+    ## It was not a good idea in the first place to try to use Javascript's "in" operator to
+    ## test if something had an attribute, because if something was a string that throws an error
+    ## note: Object.hasOwnProperty always returns false with strings and numbers.
+    #def _create_empty_object(arr):
+    #        o = Object.create(null)
+    #        for i in arr:
+    #            o[ i ] = True
+    #        return o
 
 def int(a):
     with javascript:
@@ -88,7 +92,7 @@ def func(a):
 
         @String.prototype.isdigit
         def func():
-            digits = _create_empty_object( ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'] )
+            digits = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9']
             for char in this:
                 if char in digits: pass
                 else: return False
@@ -102,11 +106,11 @@ def _setup_array_prototype():
 
         @Array.prototype.__contains__
         def func(a):
-            e = _create_empty_object( this )
-            if JS("a in e"):  ## JS() so that we don't call __contains__ again
-                return True
-            else:
-                return False
+            i = 0
+            while i < this.length:
+                if this[i] == a: return True
+                i += 1
+            return False
 
         @Array.prototype.__len__
         def func():
diff --git a/runtime/pythonpythonjs.py b/runtime/pythonpythonjs.py
@@ -224,25 +224,11 @@ def method():
                 else:
                     return attr
 
-
-        #for i in jsrange(bases.length):  ## this calls get_attribute, ugly!
-        #    var(base, attr)
-        #    base = bases[i]
-        #    attr = get_attribute(base, attribute)
-        #    if attr:
-        #        if JS("{}.toString.call(attr) === '[object Function]'"):
-        #            def method():
-        #                var(args)
-        #                args = arguments
-        #                if(args.length > 0):
-        #                    args[0].splice(0, 0, object)
-        #                else:
-        #                    args = [object]
-        #                return attr.apply(None, args)
-        #            method.is_wrapper = True
-        #            return method
-        #        else:
-        #            return attr
+        for base in bases:  ## upstream property getters come before __getattr__
+            var( getter )
+            getter = _get_upstream_property(base, attribute)
+            if getter:
+                return getter( [object] )
 
         if '__getattr__' in __dict__:
             return __dict__['__getattr__']( [object, attribute])
@@ -281,7 +267,11 @@ def _get_upstream_attribute(base, attr):
     for parent in base.bases:
         return _get_upstream_attribute(parent, attr)
 
-
+def _get_upstream_property(base, attr):
+    if attr in base.__properties__:
+        return base.__properties__[ attr ]
+    for parent in base.bases:
+        return _get_upstream_property(parent, attr)
 
 def set_attribute(object, attribute, value):
     """Set an attribute on an object by updating its __dict__ property"""
diff --git a/tests/property_decorator.html b/tests/property_decorator.html
@@ -2,10 +2,12 @@
 <head>
 <script src="pythonscript.js"></script>
 
-<script type="text/python" closure="true">
+<script type="text/python" closure="false">
+
 
 class A:
 	def __init__(self):
+		print 'A.init-------'
 		self._x = 1
 		self._y = 2
 		self._z = 3
@@ -15,7 +17,7 @@
 		return self._x
 	@x.setter
 	def x(self,value):
-		self._x = value
+		self._x = value + 1000
 
 	@property
 	def y(self):
@@ -31,7 +33,15 @@
 	def z(self,value):
 		self._z = value
 
+class B( A ):
+	pass
+
+def unknown(x):  ## TODO make closure compatible
+	return x
+
 def test():
+	global a, b, c
+	print 'testing A...'
 	a = A()
 	print( a.x )
 	print( a.y )
@@ -40,6 +50,23 @@
 	a.x = 100
 	print( a.x )
 
+	print 'testing B...'
+	b = B()
+	print( b.x )
+	print( b.y )
+	print( b.z )
+
+	b.x = 100
+	print( b.x )
+
+	print 'testing B as unknown type'
+	c = unknown( b )
+	print( c.x )
+	print( c.y )
+	print( c.z )
+	c.x = 101	## TODO fix setters on unknown types
+	print( c.x )
+
 </script>
 </head>
 
diff --git a/tests/test_string.html b/tests/test_string.html
@@ -37,9 +37,11 @@
 	print a.upper()
 	print 'LOWERED'.lower()
 	print a.index( 'e' )
+	print 'testing isdigit'
 	print a, '.isdigit->', a.isdigit()
 	print '100.isdigit->', '100'.isdigit()
 
+	print 'testing functional style str(x)'
 	s = str('functional style ok')
 	print s
 	e = str( 100 )
diff --git a/tests/threejs_nested_attribute_lookup_decorators.html b/tests/threejs_nested_attribute_lookup_decorators.html
@@ -10,7 +10,7 @@
 from three import *
 
 def test():
-	cam = PerspectiveCamera( 45, 640, 480, 0.01, 10000)
+	cam = PerspectiveCamera( 45, 640/480, 0.01, 10000)
 	p = cam.position
 	p.z = 100
 	print( p.z )
