added string.join

hartsantler · hartsantler · commit bb86a85295ee · 2013-10-14T02:02:14.000-07:00
diff --git a/pythonscript.js b/pythonscript.js
@@ -1,4 +1,4 @@
-// PythonScript Runtime - regenerated on: Mon Oct 14 00:26:47 2013
+// PythonScript Runtime - regenerated on: Mon Oct 14 02:00:23 2013
 var jsrange = function(num) {
 "Emulates Python's range function";
 var i, r;
@@ -602,6 +602,34 @@ return false;
 }
 
 String.prototype.endswith=func;
+var func = function(a) {
+var i, out;
+out = "";
+if(a instanceof Array) {
+arr = a;
+}
+else {
+arr = a.__dict__.js_object;
+}
+
+i = 0;
+var iter = arr;
+for (var value=0; value < iter.length; value++) {
+var backup = value;
+value = iter[value];
+out += value;
+i += 1;
+if(i < arr.length) {
+out += this;
+}
+
+value = backup;
+}
+
+return out;
+}
+
+String.prototype.join=func;
 }
 window["_setup_str_prototype"] = _setup_str_prototype 
 
diff --git a/pythonscript/pythonjs.py b/pythonscript/pythonjs.py
@@ -128,19 +128,26 @@ def visit_keyword(self, node):
 
     def visit_Call(self, node):
         name = self.visit(node.func)
-        if name == 'JSObject':
+        if name == 'instanceof':  ## this gets used by "with javascript:" blocks to test if an instance is a JavaScript type
+            args = map(self.visit, node.args)
+            if len(args) == 2:
+                return '%s instanceof %s' %tuple(args)
+            else:
+                raise SyntaxError( args )
+
+        elif name == 'JSObject':
             if node.keywords:
                 kwargs = map(self.visit, node.keywords)
                 f = lambda x: '"%s": %s' % (x[0], x[1])
                 out = ', '.join(map(f, kwargs))
                 return '{%s}' % out
             else:
                 return 'Object()'
-        if name == 'var':
+        elif name == 'var':
             args = map(self.visit, node.args)
             out = ', '.join(args)
             return 'var %s' % out
-        if name == 'JSArray':
+        elif name == 'JSArray':
             if node.args:
                 args = map(self.visit, node.args)
                 out = ', '.join(args)
diff --git a/runtime/builtins.py b/runtime/builtins.py
@@ -12,7 +12,6 @@ def func(a):
                 return True
             else:
                 return False
-        #String.prototype.startswith = func  ## the problem with this is "this" gets lost when get_attribute(f,'__call__') is used.
 
         @String.prototype.endswith
         def func(a):
@@ -21,6 +20,21 @@ def func(a):
             else:
                 return False
 
+        @String.prototype.join
+        def func(a):
+            out = ''
+            if instanceof(a, Array):
+                arr = a
+            else:
+                arr = a.__dict__.js_object
+            i = 0
+            for value in arr:
+                out += value
+                i += 1
+                if i < arr.length:
+                    out += this
+            return out
+
 _setup_str_prototype()
 
 def range(num):
diff --git a/runtime/pythonpythonjs.py b/runtime/pythonpythonjs.py
@@ -121,7 +121,9 @@ def wrapper(args,kwargs): return attr.apply(object, args)
             ## F.pythonscript_function or F.is_wrapper, we could check if object has these props:
             ## bases, __name__, __dict__, __call__
             #print 'wrapping something external', object, attribute
-            def wrapper(args,kwargs): return attr.apply(object, args)
+
+            def wrapper(args,kwargs): return attr.apply(object, args)  ## THIS IS CORRECT
+            #def wrapper(args,kwargs): return attr.call(object, args)  ## this is not correct
             wrapper.is_wrapper = True
             return wrapper
         else:
diff --git a/tests/test_string.html b/tests/test_string.html
@@ -6,7 +6,7 @@
 
 
 def test():
-	global a, b
+	global a, b, c
 	a = 'hello'
 	b = 'world'
 	print a+b
@@ -18,13 +18,25 @@
 		if a.endswith('lo'):
 			print 'WITH - endswith test passed'
 
+
+		print 'WITH - testing string.join...'
+		d = ','.join( [1,2,3,4] )
+		print( d )
+
+	print '--testing string.join...'
+	c = [1,2,3,4,5]
+	d = ','.join( c )
+	print( d )
+
 	if a.startswith('he'):
 		print 'startswith test passed'
 
 	if a.endswith('llo'):
 		print 'endswith test passed'
 
 
+	print 'tests complete'
+
 </script>
 
 </head>
