From 2ae0b40cd875c1f87330533b3ff7801951ddb5ea Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Fri, 12 Sep 2014 03:14:23 -0700
Subject: [PATCH 01/58] forked PythonJS and started Gython. updated readme,
 added gython.py build script.

---
 README.md | 382 +++---------------------------------------------------
 gython.py |   4 +
 2 files changed, 19 insertions(+), 367 deletions(-)
 create mode 100755 gython.py

diff --git a/README.md b/README.md
index db3e43f..3169577 100644
--- a/README.md
+++ b/README.md
@@ -1,117 +1,29 @@
 Introduction
 ------------
-PythonJS is a transpiler written in Python that converts a python like language into fast
-JavaScript.  It also includes experimental backends that translate to: Dart, Lua, CoffeeScript, and Go.
-
-[Syntax Documentation](https://github.com/PythonJS/PythonJS/blob/master/doc/syntax.md)
-
-
-Go backend
-----------
-The Go backend uses a fully typed subset of Python, mixed with extra syntax inspired by Golang to output Go programs that can be compiled to native executeables, or translated to JavaScript using GopherJS.
+Gython is a transpiler written in Python that converts a python like language into Go.
 
 [Syntax Documentation](https://github.com/PythonJS/PythonJS/blob/master/doc/go_syntax.md)
 
 
 Getting Started
 ===============
-PythonJS can be run with regular Python, or fully self-hosted within
-NodeJS using Empythoned. 
-
-To get started, you have two options:
-1. install NodeJS, python-js package, and write a build script.
-2. or install Python2 and use translator.py from this repo directly.
-
-
-1. Installing NodeJS Package
--------------
-You can quickly get started with the stable version of PythonJS by installing the NodeJS package,
-and writing a build script in javascript to compile your python scripts to javascript.
-(Python2.7 is not required)
-
-```
-npm install python-js
-```
-
-NodeJS Quick Example
---------------
-
-```
-var pythonjs = require('python-js');
-var pycode = "a = []; a.append('hello'); a.append('world'); print(a)";
-var jscode = pythonjs.translator.to_javascript( pycode );
-eval( pythonjs.runtime.javascript + jscode );
-
-```
 
 
-Example Projects
-----------------
-The example projects below, require the NodeJS python-js package.
-
-[https://github.com/PythonJS/pythonjs-demo-server-nodejs](https://github.com/PythonJS/pythonjs-demo-server-nodejs)
-
-[https://github.com/PythonJS/pypubjs](https://github.com/PythonJS/pypubjs)
-
-
-
-2. translator.py
+gython.py
 --------------------------------------
-If you want to run the latest version of the translator, you will need to install
-Python2.7 and git clone this repo.  (the NodeJS package above is not required)
-Then, to translate your python script, directly run the `translator.py` script in the "pythonjs" directory.  You can give it a list of python files to translate at once.  
-It will output the translation to stdout.  The default output type is JavaScript.  
-An html file can also be used as input, python code inside a script tag: `<script type="text/python">`
-will be converted into JavaScript.
+Install Python2.7 and git clone this repo, in the toplevel is the build script `gython.py`.  
+Running gython.py from the command line and passing it one or more python scripts outputs
+the Go translation to stdout.
 
 Usage::
 
-	translator.py [--help|--go|--dart|--coffee|--lua|--no-wrapper|--analyzer] file.py
-
-Examples::
-
-	cd pythonjs
-	./translator.py myscript.py > myscript.js
-	./translator.py myapp.html > app.html
-
-The option `--no-wrapper` will output the raw JavaScript, by default the output is wrapped as a requirejs module.
-
-The option `--analyzer` requires the Dart SDK is installed to your home directory: `~/dart-sdk`,
-if this option is used then your script is also translated using the dart backend and fed to
-`dartanalyzer` which will perform static analysis of your code.  Dartanalyzer is able to catch many types of errors, like: missing functions, invalid names, calling a function with the wrong argument types.  The quality of the analysis will depend on how much type information can be
-inferred from your code, combined with the variables you have manually typed.  If dartanalyzer detects an error in your code, translation will abort, and debugging information is printed.
-
+	gython.py file.py
 
+Example::
 
-Speed
----------------
-PythonJS gives you the option to optimize your program for speed with a new syntax for static typing, in some cases this results in code that is 20X faster.
-A variable can be statically typed as: int, float, long, str, list, or dict.  
-The translator then uses this type information to speed up runtime checks and method calls.
-In the example below `x` and `y` are typed as `int`.
-```
-def f(x,y):
-	int x
-	int y
-	return x+y
-
-```
-
-The `int` type is accurate up to 53bits, if you need true 64bit integer math you can use the `long` type.  Note using `long` requires the Long.js library.
-
-You can further optimize your code with `pythonjs.configure` or special with statements that mark sections of the code as less dynamic.
-
-N-Body benchmark
-
-![nbody](http://2.bp.blogspot.com/-pylzspKRu6M/UqbAv3qIGTI/AAAAAAAAAkE/NnsAM5DZ_8M/s400/nbody.png)
-
-[More benchmarks: Richards, n-body, Pystone, Fannkuch](http://pythonjs.blogspot.com/2014/06/pythonjs-faster-than-cpython-part2.html)
-
-
-GPU Translation
----------------
-A Python typed subset can be translated to a GLSL fragment shader to speed up math on large arrays.
-[GPU Documentation](https://github.com/PythonJS/PythonJS/blob/master/doc/gpu.md)
+	git clone https://github.com/gython/Gython.git
+	cd Gython
+	./gython.py myscript.py > myscript.go
 
 
 
@@ -120,15 +32,14 @@ Supported Features
 
 ####Language Overview
 	
+	go static types
+	go channel syntax
 	classes
 	multiple inheritance
-	operator overloading
-	function and class decorators
-	getter/setter function decorators
 	list comprehensions
-	yield (generator functions)
-	regular and lambda functions
-	function calls with *args and **kwargs
+	yield (generator functions)  TODO
+	regular and lambda functions  TODO nested functions
+	function calls with keywords and defaults
 
 ####Language Keywords
 
@@ -143,266 +54,3 @@ Supported Features
 	and, or, is, in, not
 	return, yield
 
-####HTML DOM: for item in iterable
-	NodeList
-	FileList
-	ClientRectList
-	DOMSettableTokenList
-	DOMStringList
-	DataTransferItemList
-	HTMLCollection
-	HTMLAllCollection
-	SVGElementInstanceList
-	SVGNumberList
-	SVGTransformList
-
-
-####Operator Overloading
-
-	__getattr__
-	__getattribute__
-	__getitem__
-	__setitem__
-	__call__
-	__iter__
-	__add__
-	__mul__
-
-####builtins
-
-	dir
-	type
-	hasattr
-	getattr
-	setattr
-	issubclass
-	isinstance
-	dict
-	list
-	tuple
-	int
-	float
-	str
-	round
-	range
-	sum
-	len
-	map
-	filter
-	min
-	max
-	abs
-	ord
-	chr
-	open  (nodejs only)
-
-####List
-
-	list.append
-	list.extend
-	list.remove
-	list.insert
-	list.index
-	list.count
-	list.pop
-	list.__len__
-	list.__contains__
-	list.__getitem__
-	list.__setitem__
-	list.__iter__
-	list.__getslice__
-
-####Set
-
-	set.bisect
-	set.difference
-	set.intersection
-	set.issubset
-
-####String
-
-	str.split
-	str.splitlines
-	str.strip
-	str.startswith
-	str.endswith
-	str.join
-	str.upper
-	str.lower
-	str.index
-	str.find
-	str.isdigit
-	str.format
-	str.__iter__
-	str.__getitem__
-	str.__len__
-	str.__getslice__
-
-####Dict
-
-	dict.copy
-	dict.clear
-	dict.has_key
-	dict.update
-	dict.items
-	dict.keys
-	dict.get
-	dict.set
-	dict.pop
-	dict.values
-	dict.__contains__
-	dict.__iter__
-	dict.__len__
-	dict.__getitem__
-	dict.__setitem__
-
-####Libraries
-
-	time.time
-	time.sleep
-	math.sin
-	math.cos
-	math.sqrt
-	array.array
-	os.path.dirname
-	bisect.bisect
-	random.random
-	threading.start_new_thread
-
-#####Libraries (nodejs only)
-	tempfile.gettempdir
-	sys.stdin
-	sys.stdout
-	sys.stderr
-	sys.argv
-	sys.exit
-	subprocess.Popen
-	subprocess.call
-	os.path.*
-
-------------------------------
-
-Regression Tests
-================
-
-The best way to see what features are currently supported with each of the backends
-is to run the automated regression tests in PythonJS/regtests.  To test all the backends
-you need to install NodeJS, CoffeeScript, and Dart2JS.  You should download the Dart SDK,
-and make sure that the executeable `dart2js` is in `~/dart-sdk/bin/`
-
-####Run Regression Tests
-
-	cd PythonJS/regtests
-	./run.py
-
-
-Community
----------
-
-[https://groups.google.com/forum/#!forum/pythonjs](https://groups.google.com/forum/#!forum/pythonjs)
-
-irc freenode::
-
-	#pythonjs
-
-
-pythonjs.configure
-------------------
-The special function call `pythonjs.configure` can be inserted anywhere in your code to turn off an on dynamic
-features of the language.
-
-If the option `direct_keys` is True then dictionary key lookups are done directly (faster),
-objects can not be used as keys, only strings and numbers can then be used as dictionary keys.
-
-The option `direct_operator` controls operator overloading for a given operator: '+', '*'.
-If '+' is declared a direct operator then `__add__` overload methods are not called,
-the operands are always assumed to be compatible with javascript addition.
-
-The option `runtime_exceptions` if False disables extra runtime checking of expressions and assignments,
-note this is always False in javascript mode.
-
-```
-pythonjs.configure(
-	javascript=True/False,          ## default False
-	runtime_exceptions=True/False,  ## default True
-	direct_keys=True/False,         ## default False
-	direct_operator=string          ## default 'None'
-)
-```
-
-Gotchas
----------
-0. in a dictionary number keys will be converted to strings.
-In the example below the key `100` and `"100"` are the same key.
-```
-a = {"100": 'X'}
-a[ 100 ] = 'Y'
-```
-
-1. The calling context of `this` must be taken into account when using fast javascript mode, code that comes after: `pythonjs.configure(javascript=True)` or is inside a `with javascript:` block.  When in javascript mode, passing a method as a callback, or setting it as an attribute on another object, requires you call `f.bind(self)` to ensure that `self` within the method points to the class instance.  This is not required when using classes defined normal mode, because the `this` calling context is automatically managed.
-Note: you can use the special `->` syntax in place of the attribute operator `.` to call `bind` automatically.
-
-```
-class A:
-	def method(self):
-		print(self)
-
-a = A()
-
-with javascript:
-	class B:
-		def method(self):
-			print(self)
-
-	b = B()
-	a.b_method1 = b.method
-	a.b_method2 = b.method.bind(b)
-	a.b_method3 = b->method
-
-	a.method()     ## OK: prints a
-	a.b_method1()  ## FAILS: prints a, should have printed b
-	a.b_method2()  ## OK: prints b
-	a.b_method3()  ## OK: prints b
-
-	b.a_method = a.method
-	b.a_method()   ## OK: prints a
-
-```
-
-2. When using direct operators, builtins are also affected.  List + list will no longer return a new array of items from both lists.  String * N will no longer return the string multipled by the number.
-
-```
-a = [1,2] + [3,4]  ## OK: a is [1,2,3,4]
-pythonjs.configure(direct_operator="+")
-b = [1,2] + [3,4]  ## FAILS
-
-c = "HI" * 2  ## OK: c is "HIHI"
-pythonjs.configure(direct_operator="*")
-d = "HI" * 2  ## FAILS
-
-```
-
-3. The syntax `from mymodule import *` allows you to import another python script from the same folder,
-but both mymodule and the parent will share the same namespace, mymodule can use global variables defined in the parent.
-
-4. Using tuples as keys in a dict is allowed, the tuple may contain other tuples, objects, and a mix of numbers or strings.
-Note that tuples in PythonJS are actually JavaScript arrays, so if you modify the contents of the tuple, it would no
-longer be the same key in a dict.
-```
-a = (1,2,3)
-b = ("1","2","3")
-D = { a: 'hello', b: 'world' }
-D[ a ] == 'hello'  ## OK
-D[ b ] == 'world'  ## OK
-```
-
-5. AttributeError and KeyError are only raised in javascript mode when inside a block that catches those errors.
-In the default python mode these errors will always be thrown, and halt the program.
-```
-pythonjs.configure(javascript=True)
-a = {}
-# this will not throw any error
-b = a['xxx']
-# this works as expected, "b" will be set to "my-default"
-b = a['xxx'] except KeyError: 'my-default'
-```
diff --git a/gython.py b/gython.py
new file mode 100755
index 0000000..f809862
--- /dev/null
+++ b/gython.py
@@ -0,0 +1,4 @@
+#!/usr/bin/env python
+import sys, subprocess
+cmd = ['./pythonjs/translator.py', '--go'] + sys.argv[1:]
+subprocess.check_call( cmd )
\ No newline at end of file

From 0424a9ee0263f5b5cfe9e9536d0b74a8b1b5749b Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Sun, 14 Sep 2014 04:26:27 -0700
Subject: [PATCH 02/58] improved static type syntax: `[]int  self.x = XXX`.
 allow subclasses to call parent class methods (extend).

---
 pythonjs/ministdlib.py         |  6 ++++++
 pythonjs/python_to_pythonjs.py |  2 ++
 pythonjs/pythonjs.py           |  7 +++++++
 pythonjs/pythonjs_to_go.py     | 35 +++++++++++++++++++++++++++++-----
 pythonjs/typedpython.py        | 29 +++++++++++++++++++++++++---
 5 files changed, 71 insertions(+), 8 deletions(-)

diff --git a/pythonjs/ministdlib.py b/pythonjs/ministdlib.py
index e9a83d6..8cc9a46 100644
--- a/pythonjs/ministdlib.py
+++ b/pythonjs/ministdlib.py
@@ -55,4 +55,10 @@
 	'os.path' : {
 		'dirname' : "function dirname(s) { return s.slice(0, s.lastIndexOf('/')+1)}; var os = {'path':{'dirname':dirname}}"
 	}
+}
+
+GO = {
+	'time': {
+		'clock': 'func clock() float64 { return float64(time.Now().Unix()); }'
+	},
 }
\ No newline at end of file
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
index f05a92c..09c178f 100755
--- a/pythonjs/python_to_pythonjs.py
+++ b/pythonjs/python_to_pythonjs.py
@@ -464,6 +464,8 @@ def visit_ImportFrom(self, node):
 			lib = ministdlib.DART
 		elif self._with_lua:
 			lib = ministdlib.LUA
+		elif self._with_go:
+			lib = ministdlib.GO
 		else:
 			lib = ministdlib.JS
 
diff --git a/pythonjs/pythonjs.py b/pythonjs/pythonjs.py
index 159f25c..20de63c 100755
--- a/pythonjs/pythonjs.py
+++ b/pythonjs/pythonjs.py
@@ -37,6 +37,7 @@ def __init__(self, requirejs=True, insert_runtime=True, webworker=False, functio
 		self._webworker = webworker
 		self._exports = set()
 		self._inline_lambda = False
+		self.catch_call = set()  ## subclasses can use this to catch special calls
 
 		self.special_decorators = set(['__typedef__', '__glsl__', '__pyfunction__', 'expression'])
 		self._glsl = False
@@ -691,12 +692,18 @@ def _visit_call_helper_new(self, node):
 	def _visit_call_helper_go( self, node ):
 		raise NotImplementedError('go call')
 
+	def _visit_call_special( self, node ):
+		raise NotImplementedError('special call')
+
 
 	def visit_Call(self, node):
 		name = self.visit(node.func)
 		if name in typedpython.GO_SPECIAL_CALLS.values():
 			return self._visit_call_helper_go( node )
 
+		elif name in self.catch_call:
+			return self._visit_call_special( node )
+
 		elif self._glsl and isinstance(node.func, ast.Attribute):
 			if isinstance(node.func.value, ast.Name) and node.func.value.id in self._typed_vars:
 				args = ','.join( [self.visit(a) for a in node.args] )
diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index c0ff87c..2e5db32 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -81,7 +81,7 @@ def visit_ClassDef(self, node):
 		for b in node.body:
 			assert isinstance(b, ast.FunctionDef)
 			method_names.add( b.name )
-			out.append( self.visit(b) )
+			#out.append( self.visit(b) )
 			if b.name == '__init__':
 				init = b
 
@@ -92,12 +92,22 @@ def visit_ClassDef(self, node):
 				for b in bnode.body:
 					if isinstance(b, ast.FunctionDef):
 						if b.name in method_names:
+							self.catch_call.add( '%s.%s' %(bnode.name, b.name))
+							n = b.name
+							b.name = '%s_%s'%(bnode.name, b.name)
+							out.append( self.visit(b) )
+							b.name = n
 							continue
 						if b.name == '__init__':
 							parent_init = {'class':bnode, 'init':b}
 							#continue
 						out.append( self.visit(b) )
 
+
+		for b in node.body:
+			assert isinstance(b, ast.FunctionDef)
+			out.append( self.visit(b) )
+
 		if init or parent_init:
 			if parent_init:
 				classname = parent_init['class'].name
@@ -114,11 +124,25 @@ def visit_ClassDef(self, node):
 		else:
 			out.append( 'func __new__%s() *%s { return &%s{} }' %(node.name, node.name, node.name))
 
-
+		self.catch_call = set()
 		self._class_stack.pop()
 		return '\n'.join(out)
 
 
+	def _visit_call_special( self, node ):
+		fname = self.visit(node.func)
+		assert fname in self.catch_call
+		assert len(self._class_stack)
+		if len(node.args):
+			if isinstance(node.args[0], ast.Name) and node.args[0].id == 'self':
+				node.args.remove( node.args[0] )
+
+		#name = '_%s_' %self._class_stack[-1].name
+		name = 'self.'
+		name += fname.replace('.', '_')
+		return self._visit_call_helper(node, force_name=name)
+
+
 	def visit_Slice(self, node):
 		lower = upper = step = None
 		if node.lower:
@@ -161,7 +185,8 @@ def visit_Import(self, node):
 	def visit_Module(self, node):
 		header = [
 			'package main',
-			'import "fmt"'
+			'import "fmt"',
+			#'import "time"'
 		]
 		lines = []
 
@@ -251,8 +276,8 @@ def visit_For(self, node):
 		return '\n'.join(lines)
 
 
-	def _visit_call_helper(self, node):
-		fname = self.visit(node.func)
+	def _visit_call_helper(self, node, force_name=None):
+		fname = force_name or self.visit(node.func)
 		if fname=='__DOLLAR__': fname = '$'
 		elif fname == 'range':
 			assert len(node.args)
diff --git a/pythonjs/typedpython.py b/pythonjs/typedpython.py
index f5bf3f3..468e2bc 100644
--- a/pythonjs/typedpython.py
+++ b/pythonjs/typedpython.py
@@ -53,7 +53,7 @@ def transform_source( source, strip=False ):
 					gotype.append(b)
 					b = a.pop()
 				gotype.reverse()
-				gotype = ''.join(gotype)
+				gotype = ''.join(gotype).strip()  ## fixes spaces inside brackets `[ 1 ]string()`
 				if not gotype:
 					if nextchar=='[':
 						a.append('__go__array__<<')
@@ -77,14 +77,30 @@ def transform_source( source, strip=False ):
 				#a.append(', type=True),')  ## this breaks function annotations that splits on ','
 				a.append('<<typedef),')
 				hit_go_typedef = False
+			elif hit_go_typedef and char in (' ', '\t'):
+				aa = []
+				for xx in a:
+					if xx == '__go__array__(':
+						aa.append('__go__array__[')
+					else:
+						aa.append( xx )
+				a = aa
+				a.append(']=\t\t\t\t')
+				hit_go_typedef = False
 
 
 			elif a and char in __whitespace:
 				b = ''.join(a)
 				b = b.strip()
-				if b in types and nextchar != '=':
+				is_class_type = b.startswith('class:') and len(b.split(':'))==2
+				if (b in types or is_class_type) and nextchar != '=':
 					if strip:
 						a = a[ : -len(b) ]
+					elif is_class_type:
+						cls = b.split(':')[-1]
+						a = a[ : -len('class:')-len(cls)]
+						a.append('__go__class__[%s]=\t\t\t\t' %cls)
+
 					else:
 						if a[-1]=='*':
 							a.pop()
@@ -424,7 +440,7 @@ def wrapper(a:int, c:chan int):
 
 ## in go becomes: [3]int{x,y,z}
 ## becomes: __go__arrayfixed__(3, string) << (x,y,z)
-a = [3]int(x,y,z)
+a = [ 3 ]int(x,y,z)
 
 ## in go becomes: map[string]int{x,y,z}
 ## becomes: __go__map__(string, int) << {'x':x, 'y':y, 'z':z}
@@ -448,6 +464,13 @@ def f(*args:int, **kwargs:int) ->int:
 def plot(id:string, latency:[]float64, xlabel:string, title:string ):
 	pass
 
+class A:
+	def __init__(self):
+		int 		self.x = 1
+		[]int		self.y = []int()
+		class:ABS     self.z = A()
+		[]A     self.z = A()
+
 '''
 
 if __name__ == '__main__':

From a32946fde78235828c15256cf7a719599218bd5d Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Sun, 14 Sep 2014 05:00:48 -0700
Subject: [PATCH 03/58] updated docs

---
 README.md        | 71 ++++++++++++++++++++++++++++++++----------------
 doc/go_syntax.md | 34 +++++++++++++++++++++--
 2 files changed, 79 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index 3169577..9336e51 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Gython is a transpiler written in Python that converts a python like language in
 [Syntax Documentation](https://github.com/PythonJS/PythonJS/blob/master/doc/go_syntax.md)
 
 
-Getting Started
+Installing
 ===============
 
 
@@ -26,31 +26,54 @@ Example::
 	./gython.py myscript.py > myscript.go
 
 
+Getting Started
+===============
+Gython supports classes and multiple inheritance, with method overrides and calling the parent class methods.
+
+```
+	class A:
+		def foo(self) -> int:
+			return 1
+
+	class B:
+		def bar(self) -> int:
+			return 2
+
+	class C( A, B ):
+		def call_foo_bar(self) -> int:
+			a = self.foo()
+			a += self.bar()
+			return a
+
+		def foo(self) -> int:
+			a = A.foo(self)
+			a += 100
+			return a
+
+```
+
+Gython supports list comprehensions.
+Below is an array of integers.
+
+```
+	a = []int(x for x in range(3))
+```
+
+Gython supports Go's send data to channel syntax
 
-Supported Features
-================
+```
+	a = go.channel( int )
+	a <- 1
 
-####Language Overview
-	
-	go static types
-	go channel syntax
-	classes
-	multiple inheritance
-	list comprehensions
-	yield (generator functions)  TODO
-	regular and lambda functions  TODO nested functions
-	function calls with keywords and defaults
+```
 
-####Language Keywords
+Gython supports Go's typed maps.
 
-	global, nonlocal
-	while, for, continue, break
-	if, elif, else
-	try, except, raise
-	def, lambda
-	new, class
-	from, import, as
-	pass, assert
-	and, or, is, in, not
-	return, yield
+```
+	a = map[string]int{
+		'x': 1,
+		'y': 2,
+		'z': 3,
+	}
 
+```
diff --git a/doc/go_syntax.md b/doc/go_syntax.md
index 598778a..00fd87a 100644
--- a/doc/go_syntax.md
+++ b/doc/go_syntax.md
@@ -1,9 +1,37 @@
-PythonJS Go Syntax
+Gython Syntax
 ===============
 
 PythonJS supports a fully typed subset of Python with extra syntax to support the Golang backend.
 
 
+General Features
+================
+	
+	go static types
+	go channel syntax
+	classes
+	multiple inheritance
+	list comprehensions
+	yield (generator functions)  TODO
+	regular and lambda functions  TODO nested functions
+	function calls with keywords and defaults
+
+Language Keywords
+=================
+
+	global, nonlocal
+	while, for, continue, break
+	if, elif, else
+	try, except, raise
+	def, lambda
+	new, class
+	from, import, as
+	pass, assert
+	and, or, is, in, not
+	return, yield
+
+
+
 select
 -------
 Below `A` and `B` are typed as `chan int`.  Data is read from a channel with `<-`.
@@ -161,4 +189,6 @@ list comprehensions
 
 ```
 	a = []int(x for x in range(3))
-```
\ No newline at end of file
+```
+
+

From 717a8a9a75911a8f0d1e03298bced2f796d94782 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Sun, 14 Sep 2014 11:32:13 -0700
Subject: [PATCH 04/58] fixed `type self.x = XXX` in ast_utils.py. self types
 now passed to Go backend.

---
 pythonjs/ast_utils.py          | 23 +++++++++++++++------
 pythonjs/ministdlib.py         |  1 +
 pythonjs/python_to_pythonjs.py | 27 +++++++++++++++++++++++--
 pythonjs/pythonjs_to_go.py     | 37 +++++++++++++++++++++-------------
 pythonjs/typedpython.py        |  3 ++-
 5 files changed, 68 insertions(+), 23 deletions(-)

diff --git a/pythonjs/ast_utils.py b/pythonjs/ast_utils.py
index 85b2308..a41e755 100644
--- a/pythonjs/ast_utils.py
+++ b/pythonjs/ast_utils.py
@@ -33,8 +33,11 @@ def retrieve_vars(body):
 		#		local_vars.add( c.id )
 		if isinstance(n, ast.Assign):
 			user_typedef = None
-			#targets = list(n.targets)
-			#targets.reverse()
+			self_typedef = None
+			if len(n.targets) == 2:
+				if isinstance(n.targets[1], ast.Attribute) and isinstance(n.targets[1].value, ast.Name) and n.targets[1].value.id=='self':
+					continue
+
 			for i,u in enumerate(n.targets):
 				if isinstance(u, ast.Name):
 					if i==0:
@@ -43,6 +46,7 @@ def retrieve_vars(body):
 						else:
 							local_vars.add( u.id )
 					elif user_typedef:
+						#raise SyntaxError(user_typedef + u.id)
 						local_vars.add( '%s=%s' %(user_typedef, u.id) )
 						user_typedef = None
 					else:
@@ -65,12 +69,19 @@ def retrieve_vars(body):
 
 			if user_typedef:  ## `int x`
 				if  isinstance(n.value, ast.Name):
-					local_vars.add( '%s=%s' %(user_typedef, n.value.id))
+					x = '%s=%s' %(user_typedef, n.value.id)
+					#raise SyntaxError(x)
+					#if len(n.targets)==2: raise SyntaxError(n.targets)
+					local_vars.add( x )
 				elif isinstance(n.value, ast.Num):
-					local_vars.add( '%s=%s' %(user_typedef, n.value.n))
+					x = '%s=%s' %(user_typedef, n.value.n)
+					#if len(n.targets)==2: raise SyntaxError(n.targets)
+					local_vars.add( x )
 				else:
-					raise SyntaxError(n.value)
-
+					#raise SyntaxError(n.targets)
+					#raise SyntaxError(n.value.func.value.id)
+					#raise SyntaxError(user_typedef)
+					pass
 
 		elif isinstance(n, ast.Global):
 			global_vars.update( n.names )
diff --git a/pythonjs/ministdlib.py b/pythonjs/ministdlib.py
index 8cc9a46..3bb8a06 100644
--- a/pythonjs/ministdlib.py
+++ b/pythonjs/ministdlib.py
@@ -59,6 +59,7 @@
 
 GO = {
 	'time': {
+		REQUIRES : ['time'],
 		'clock': 'func clock() float64 { return float64(time.Now().Unix()); }'
 	},
 }
\ No newline at end of file
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
index 09c178f..3c831a6 100755
--- a/pythonjs/python_to_pythonjs.py
+++ b/pythonjs/python_to_pythonjs.py
@@ -218,6 +218,7 @@ def __init__(self, source=None, module=None, module_path=None, dart=False, coffe
 		self._gpu_return_types = set() ## 'array' or float32, or array of 'vec4' float32's.
 
 		self._source = source.splitlines()
+		self._class_stack = list()
 		self._classes = dict()    ## class name : [method names]
 		self._class_parents = dict()  ## class name : parents
 		self._instance_attributes = dict()  ## class name : [attribute names]
@@ -857,8 +858,9 @@ def _get_js_class_base_init(self, node ):
 
 	def _visit_dart_classdef(self, node):
 		name = node.name
-		log('Dart-ClassDef: %s'%name)
+		node._struct_vars = dict()
 		self._js_classes[ name ] = node
+		self._class_stack.append( node )
 
 		methods = {}
 		method_list = []  ## getter/setters can have the same name
@@ -933,7 +935,16 @@ def _visit_dart_classdef(self, node):
 		if not init and not method_list:
 			writer.write( 'pass' )
 
+
+		if node._struct_vars:
+			writer.write('{')
+			for k in node._struct_vars:
+				v = node._struct_vars[k]
+				writer.write('  %s : %s,' %(k,v))
+			writer.write('}')
+
 		writer.pull()
+		self._class_stack.pop()
 
 	def is_gpu_method(self, n):
 		for dec in n.decorator_list:
@@ -1825,11 +1836,23 @@ def visit_Assign(self, node):
 					return None
 				else:
 					targets = targets[1:]
+
+			if len(targets)==2 and isinstance(targets[1], ast.Attribute) and isinstance(targets[1].value, ast.Name) and targets[1].value.id == 'self' and len(self._class_stack):
+				self._class_stack[-1]._struct_vars[ 'self.'+targets[1].attr ] = target.id
+				if target.id == 'long' and isinstance(node.value, ast.Num):
+					## requires long library ##
+					writer.write('%s = long.fromString("%s")' %(targets[1].value.id, self.visit(node.value)))
+					return None
+				else:
+					targets = targets[1:]
+
 			elif len(targets)==1 and isinstance(node.value, ast.Name) and target.id in typedpython.types:
 				self._typedef_vars[ node.value.id ] = target.id
 				return None
 			else:
-				raise SyntaxError( self.format_error(targets) )
+				xxx = self.visit(target) + ':' + self.visit(targets[1])
+				#raise SyntaxError( self.format_error(targets) )
+				raise SyntaxError( self.format_error(xxx) )
 
 		elif self._with_rpc_name and isinstance(target, Attribute) and isinstance(target.value, Name) and target.value.id == self._with_rpc_name:
 			writer.write('__rpc_set__(%s, "%s", %s)' %(self._with_rpc, target.attr, self.visit(node.value)))
diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index 2e5db32..8b1c85e 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -64,7 +64,22 @@ def visit_ClassDef(self, node):
 					props.add( kw.arg )
 					sdef[ kw.arg ] = kw.value.id
 
+
+		init = None
+		method_names = set()
+		for b in node.body:
+			if isinstance(b, ast.FunctionDef):
+				method_names.add( b.name )
+				if b.name == '__init__':
+					init = b
+			elif isinstance(b, ast.Expr) and isinstance(b.value, ast.Dict):
+				for i in range( len(b.value.keys) ):
+					k = self.visit( b.value.keys[ i ] )
+					v = self.visit( b.value.values[i] )
+					sdef[k] = v
+
 		node._struct_def.update( sdef )
+
 		out.append( 'type %s struct {' %node.name)
 		if base_classes:
 			for bnode in base_classes:
@@ -76,16 +91,6 @@ def visit_ClassDef(self, node):
 		out.append('}')
 
 
-		init = None
-		method_names = set()
-		for b in node.body:
-			assert isinstance(b, ast.FunctionDef)
-			method_names.add( b.name )
-			#out.append( self.visit(b) )
-			if b.name == '__init__':
-				init = b
-
-
 		parent_init = None
 		if base_classes:
 			for bnode in base_classes:
@@ -105,8 +110,8 @@ def visit_ClassDef(self, node):
 
 
 		for b in node.body:
-			assert isinstance(b, ast.FunctionDef)
-			out.append( self.visit(b) )
+			if isinstance(b, ast.FunctionDef):
+				out.append( self.visit(b) )
 
 		if init or parent_init:
 			if parent_init:
@@ -186,7 +191,6 @@ def visit_Module(self, node):
 		header = [
 			'package main',
 			'import "fmt"',
-			#'import "time"'
 		]
 		lines = []
 
@@ -562,7 +566,12 @@ def main(script, insert_runtime=True):
 		runtime = open( os.path.join(dirname, 'go_builtins.py') ).read()
 		script = runtime + '\n' + script
 
-	tree = ast.parse(script)
+	try:
+		tree = ast.parse(script)
+	except SyntaxError as err:
+		sys.stderr.write(script)
+		raise err
+
 	#return GoGenerator().visit(tree)
 	try:
 		return GoGenerator().visit(tree)
diff --git a/pythonjs/typedpython.py b/pythonjs/typedpython.py
index 468e2bc..0cf8e00 100644
--- a/pythonjs/typedpython.py
+++ b/pythonjs/typedpython.py
@@ -1,4 +1,4 @@
-types = ['str', 'list', 'dict']
+types = ['str', 'list', 'dict', 'bool']
 
 glsl_types = ['struct*', 'int*', 'float*', 'vec2', 'vec3', 'vec4', 'mat2', 'mat3', 'mat4']
 glsl_xtypes = ['mat2x2', 'mat3x3', 'mat4x4']  ## others not supported in WebGLSL
@@ -470,6 +470,7 @@ def __init__(self):
 		[]int		self.y = []int()
 		class:ABS     self.z = A()
 		[]A     self.z = A()
+		bool    self.b = xxx()
 
 '''
 

From 1bb0c6731972cbc18cbaff10268bb61e846b304d Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Wed, 17 Sep 2014 12:05:07 -0700
Subject: [PATCH 05/58] go backend: array.append hack, new type syntax for
 attributes of self `int self.x = 1`, new pointer syntax `*myclass self.y =
 a`. updated richards benchmark with typed syntax.

---
 pythonjs/ast_utils.py           |   8 +-
 pythonjs/python_to_pythonjs.py  |  49 ++++++++--
 pythonjs/pythonjs.py            |  22 -----
 pythonjs/pythonjs_to_go.py      | 102 +++++++++++++++++++--
 pythonjs/runtime/go_builtins.py |  26 ++++++
 pythonjs/typedpython.py         |  24 ++++-
 regtests/bench/richards.py      | 155 +++++++++++++++++---------------
 regtests/go/arrays.py           |   2 +
 8 files changed, 276 insertions(+), 112 deletions(-)

diff --git a/pythonjs/ast_utils.py b/pythonjs/ast_utils.py
index a41e755..8f71b06 100644
--- a/pythonjs/ast_utils.py
+++ b/pythonjs/ast_utils.py
@@ -123,8 +123,12 @@ def inspect_function( node ):
 			c = decorator
 			assert len(c.args) == 0 and len(c.keywords)
 			for kw in c.keywords:
-				assert isinstance( kw.value, ast.Name)
-				typedefs[ kw.arg ] = kw.value.id
+				if isinstance( kw.value, ast.Name):
+					typedefs[ kw.arg ] = kw.value.id
+				elif isinstance( kw.value, ast.Str):
+					typedefs[ kw.arg ] = '"%s"' %kw.value.s
+				else:
+					raise SyntaxError(kw.value)
 
 	info = {
 		'locals':local_vars, 
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
index 3c831a6..ed341f6 100755
--- a/pythonjs/python_to_pythonjs.py
+++ b/pythonjs/python_to_pythonjs.py
@@ -765,7 +765,10 @@ def visit_AugAssign(self, node):
 				attr = node.target.attr
 				target = '%s.%s' %(name, attr)
 
-			if self._with_dart:
+			if self._with_go:
+				a = '%s /= %s' %(target, self.visit(node.value))
+
+			elif self._with_dart:
 				a = '%s = (%s/%s).floor()' %(target, target, self.visit(node.value))
 			else:
 				a = '%s = Math.floor(%s/%s)' %(target, target, self.visit(node.value))
@@ -1318,7 +1321,9 @@ def visit_Name(self, node):
 			elif node.id == 'False':
 				return 'false'
 			elif node.id == 'None':
-				if self._with_dart:
+				if self._with_go:
+					return 'nil'
+				elif self._with_dart:
 					return 'null'
 				else:
 					return 'null'
@@ -1403,6 +1408,7 @@ def visit_BinOp(self, node):
 		if self._with_glsl:
 			return '(%s %s %s)' % (left, op, right)
 		elif self._with_go:
+			if op == '//': op = '/'
 			if is_go_listcomp:
 				return right
 			else:
@@ -1838,7 +1844,7 @@ def visit_Assign(self, node):
 					targets = targets[1:]
 
 			if len(targets)==2 and isinstance(targets[1], ast.Attribute) and isinstance(targets[1].value, ast.Name) and targets[1].value.id == 'self' and len(self._class_stack):
-				self._class_stack[-1]._struct_vars[ 'self.'+targets[1].attr ] = target.id
+				self._class_stack[-1]._struct_vars[ targets[1].attr ] = target.id
 				if target.id == 'long' and isinstance(node.value, ast.Num):
 					## requires long library ##
 					writer.write('%s = long.fromString("%s")' %(targets[1].value.id, self.visit(node.value)))
@@ -1854,6 +1860,33 @@ def visit_Assign(self, node):
 				#raise SyntaxError( self.format_error(targets) )
 				raise SyntaxError( self.format_error(xxx) )
 
+		elif self._with_go and isinstance(target, ast.Subscript) and isinstance(target.value, ast.Name) and target.value.id in ('__go__array__', '__go__class__', '__go__pointer__'):
+			if len(targets)==2 and isinstance(targets[1], ast.Attribute) and isinstance(targets[1].value, ast.Name) and targets[1].value.id == 'self' and len(self._class_stack):
+				if target.value.id == '__go__array__':
+					self._class_stack[-1]._struct_vars[ targets[1].attr ] = '__go__array__(%s<<typedef)' %self.visit(target.slice)
+				elif target.value.id == '__go__class__':
+					self._class_stack[-1]._struct_vars[ targets[1].attr ] = self.visit(target.slice)
+				elif target.value.id == '__go__pointer__':
+					self._class_stack[-1]._struct_vars[ targets[1].attr ] = '"*%s"' %self.visit(target.slice)
+
+			elif target.value.id == '__go__class__':
+				#self._class_stack[-1]._struct_vars[ targets[1].attr ] = self.visit(target.slice)
+				raise SyntaxError(self.visit(target))
+			elif target.value.id == '__go__pointer__':
+				if len(targets)==2:
+					writer.write(
+						'inline("var %s *%s;")' %(self.visit(targets[1]), self.visit(target.slice))
+					)
+				else:
+					writer.write(
+						'inline("var %s *%s;")' %(self.visit(node.value), self.visit(target.slice))
+					)
+			else:
+				raise SyntaxError(self.visit(target))
+
+			targets = targets[1:]
+
+
 		elif self._with_rpc_name and isinstance(target, Attribute) and isinstance(target.value, Name) and target.value.id == self._with_rpc_name:
 			writer.write('__rpc_set__(%s, "%s", %s)' %(self._with_rpc, target.attr, self.visit(node.value)))
 			return None
@@ -2856,8 +2889,14 @@ def visit_FunctionDef(self, node):
 
 				else:
 					assert len(decorator.args) == 1
-					assert isinstance( decorator.args[0], Name)
-					return_type = decorator.args[0].id
+					if isinstance( decorator.args[0], Name):
+						return_type = decorator.args[0].id
+					elif isinstance(decorator.args[0], ast.Str):
+						return_type = '"%s"' %decorator.args[0].s
+					else:
+						raise SyntaxError('invalid @returns argument')
+
+
 					if return_type in typedpython.glsl_types:
 						self._gpu_return_types.add( return_type )
 
diff --git a/pythonjs/pythonjs.py b/pythonjs/pythonjs.py
index 20de63c..a60726d 100755
--- a/pythonjs/pythonjs.py
+++ b/pythonjs/pythonjs.py
@@ -962,28 +962,6 @@ def visit_BinOp(self, node):
 		if op == '>>' and left == '__new__':
 			return ' new %s' %right
 
-		elif op == '<<':
-			if left in ('__go__receive__', '__go__send__'):
-				return '<- %s' %right
-			elif isinstance(node.left, ast.Call) and isinstance(node.left.func, ast.Name) and node.left.func.id in ('__go__array__', '__go__arrayfixed__', '__go__map__'):
-				if node.left.func.id == '__go__map__':
-					key_type = self.visit(node.left.args[0])
-					value_type = self.visit(node.left.args[1])
-					if value_type == 'interface': value_type = 'interface{}'
-					return 'map[%s]%s%s' %(key_type, value_type, right)
-				else:
-					if not right.startswith('{') and not right.endswith('}'):
-						right = '{%s}' %right[1:-1]
-
-					if node.left.func.id == '__go__array__':
-						return '[]%s%s' %(self.visit(node.left.args[0]), right)
-					elif node.left.func.id == '__go__arrayfixed__':
-						asize = self.visit(node.left.args[0])
-						atype = self.visit(node.left.args[1])
-						return '[%s]%s%s' %(asize, atype, right)
-			elif isinstance(node.left, ast.Name) and node.left.id=='__go__array__' and op == '<<':
-				return '[]%s' %self.visit(node.right)
-
 		if left in self._typed_vars and self._typed_vars[left] == 'numpy.float32':
 			left += '[_id_]'
 		if right in self._typed_vars and self._typed_vars[right] == 'numpy.float32':
diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index 8b1c85e..73193a8 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -6,7 +6,7 @@
 import ast
 import pythonjs
 
-
+go_types = 'bool string int float64'.split()
 
 class GoGenerator( pythonjs.JSGenerator ):
 
@@ -23,6 +23,23 @@ def __init__(self, requirejs=False, insert_runtime=False):
 
 		self._imports = []
 
+	def visit_Is(self, node):
+		return '=='
+	def visit_IsNot(self, node):
+		return '!='
+
+
+	def visit_Name(self, node):
+		if node.id == 'None':
+			return 'nil'
+		elif node.id == 'True':
+			return 'true'
+		elif node.id == 'False':
+			return 'false'
+		#elif node.id == 'null':
+		#	return 'nil'
+		return node.id
+
 	def visit_ClassDef(self, node):
 		self._class_stack.append( node )
 		node._parents = set()
@@ -75,7 +92,10 @@ def visit_ClassDef(self, node):
 			elif isinstance(b, ast.Expr) and isinstance(b.value, ast.Dict):
 				for i in range( len(b.value.keys) ):
 					k = self.visit( b.value.keys[ i ] )
-					v = self.visit( b.value.values[i] )
+					if isinstance(b.value.values[i], ast.Str):
+						v = b.value.values[i].s
+					else:
+						v = self.visit( b.value.values[i] )
 					sdef[k] = v
 
 		node._struct_def.update( sdef )
@@ -282,6 +302,11 @@ def visit_For(self, node):
 
 	def _visit_call_helper(self, node, force_name=None):
 		fname = force_name or self.visit(node.func)
+		is_append = False
+		if fname.endswith('.append'):
+			is_append = True
+			fname = fname.split('.append')[0]
+
 		if fname=='__DOLLAR__': fname = '$'
 		elif fname == 'range':
 			assert len(node.args)
@@ -306,7 +331,11 @@ def _visit_call_helper(self, node, force_name=None):
 			if args: args += ','
 			args += '%s...' %self.visit(node.starargs)
 
-		return '%s(%s)' % (fname, args)
+		if is_append:
+			return '%s = append(%s,%s)' % (fname, fname, args)
+
+		else:
+			return '%s(%s)' % (fname, args)
 
 	def _visit_call_helper_go(self, node):
 		name = self.visit(node.func)
@@ -324,13 +353,62 @@ def _visit_call_helper_go(self, node):
 		elif name == '__go__array__':
 			if isinstance(node.args[0], ast.BinOp):# and node.args[0].op == '<<':  ## todo assert right is `typedef`
 				a = self.visit(node.args[0].left)
-				return '[]%s' %a
+				if a in go_types:
+					return '[]%s' %a
+				else:
+					return '[]*%s' %a
+
 			else:
 				a = self.visit(node.args[0])
-				return '[]%s{}' %a
+				if a in go_types:
+					return '[]%s{}' %a
+				else:
+					return '[]*%s{}' %a
 		else:
 			raise SyntaxError(name)
 
+
+	def visit_BinOp(self, node):
+		left = self.visit(node.left)
+		op = self.visit(node.op)
+		right = self.visit(node.right)
+
+		if op == '>>' and left == '__new__':
+			return ' new %s' %right
+
+		elif op == '<<':
+			if left in ('__go__receive__', '__go__send__'):
+				return '<- %s' %right
+			elif isinstance(node.left, ast.Call) and isinstance(node.left.func, ast.Name) and node.left.func.id in ('__go__array__', '__go__arrayfixed__', '__go__map__'):
+				if node.left.func.id == '__go__map__':
+					key_type = self.visit(node.left.args[0])
+					value_type = self.visit(node.left.args[1])
+					if value_type == 'interface': value_type = 'interface{}'
+					return 'map[%s]%s%s' %(key_type, value_type, right)
+				else:
+					if not right.startswith('{') and not right.endswith('}'):
+						right = '{%s}' %right[1:-1]
+
+					if node.left.func.id == '__go__array__':
+						T = self.visit(node.left.args[0])
+						if T in go_types:
+							return '[]%s%s' %(T, right)
+						else:
+							return '[]*%s%s' %(T, right)
+					elif node.left.func.id == '__go__arrayfixed__':
+						asize = self.visit(node.left.args[0])
+						atype = self.visit(node.left.args[1])
+						return '[%s]%s%s' %(asize, atype, right)
+			elif isinstance(node.left, ast.Name) and node.left.id=='__go__array__' and op == '<<':
+				return '[]%s' %self.visit(node.right)
+
+		if left in self._typed_vars and self._typed_vars[left] == 'numpy.float32':
+			left += '[_id_]'
+		if right in self._typed_vars and self._typed_vars[right] == 'numpy.float32':
+			right += '[_id_]'
+
+		return '(%s %s %s)' % (left, op, right)
+
 	def visit_Return(self, node):
 		if isinstance(node.value, ast.Tuple):
 			return 'return %s' % ', '.join(map(self.visit, node.value.elts))
@@ -349,16 +427,23 @@ def _visit_function(self, node):
 		for decor in node.decorator_list:
 			if isinstance(decor, ast.Call) and isinstance(decor.func, ast.Name) and decor.func.id == '__typedef__':
 				for key in decor.keywords:
-					#args_typedefs[ key.arg ] = key.value.id
-					args_typedefs[ key.arg ] = self.visit(key.value)
+					if isinstance( key.value, ast.Str):
+						args_typedefs[ key.arg ] = key.value.s
+					else:
+						args_typedefs[ key.arg ] = self.visit(key.value)
 			elif isinstance(decor, ast.Call) and isinstance(decor.func, ast.Name) and decor.func.id == '__typedef_chan__':
 				for key in decor.keywords:
 					chan_args_typedefs[ key.arg ] = self.visit(key.value)
 			elif isinstance(decor, ast.Call) and isinstance(decor.func, ast.Name) and decor.func.id == 'returns':
 				if decor.keywords:
 					raise SyntaxError('invalid go return type')
-				else:
+				elif isinstance(decor.args[0], ast.Name):
 					return_type = decor.args[0].id
+				else:
+					return_type = decor.args[0].s
+
+				if return_type == 'self':
+					return_type = '*' + self._class_stack[-1].name
 
 
 		node._arg_names = []
@@ -572,6 +657,7 @@ def main(script, insert_runtime=True):
 		sys.stderr.write(script)
 		raise err
 
+	#raise RuntimeError(script)
 	#return GoGenerator().visit(tree)
 	try:
 		return GoGenerator().visit(tree)
diff --git a/pythonjs/runtime/go_builtins.py b/pythonjs/runtime/go_builtins.py
index 0cb2019..986f42f 100644
--- a/pythonjs/runtime/go_builtins.py
+++ b/pythonjs/runtime/go_builtins.py
@@ -6,6 +6,32 @@
 
 inline("""
 
+func myappend(self []int, x int) ([]int){
+	return append(self, x)
+}
+
+func __test_if_true__(v interface{}) bool {
+	switch v.(type) {
+		case nil:
+			return false
+		case int:
+			i,_ := v.(int)
+			return i != 0
+		case float64:
+			i,_ := v.(int)
+			return i != 0.0
+		case bool:
+			b,_ := v.(bool)
+			return b
+		case string:
+			s,_ := v.(string)
+			return s != ""
+		default:
+			return false
+
+	}
+}
+
 func str(v interface{}) string {
 	switch v.(type) {
 		case nil:
diff --git a/pythonjs/typedpython.py b/pythonjs/typedpython.py
index 0cf8e00..59f576a 100644
--- a/pythonjs/typedpython.py
+++ b/pythonjs/typedpython.py
@@ -93,7 +93,8 @@ def transform_source( source, strip=False ):
 				b = ''.join(a)
 				b = b.strip()
 				is_class_type = b.startswith('class:') and len(b.split(':'))==2
-				if (b in types or is_class_type) and nextchar != '=':
+				is_pointer = b.startswith('*')
+				if (b in types or is_class_type or is_pointer) and nextchar != '=':
 					if strip:
 						a = a[ : -len(b) ]
 					elif is_class_type:
@@ -101,6 +102,11 @@ def transform_source( source, strip=False ):
 						a = a[ : -len('class:')-len(cls)]
 						a.append('__go__class__[%s]=\t\t\t\t' %cls)
 
+					elif is_pointer:
+						cls = b.split('*')[-1]
+						a = a[ : -len('*')-len(cls)]
+						a.append('__go__pointer__[%s]=\t\t\t\t' %cls)
+
 					else:
 						if a[-1]=='*':
 							a.pop()
@@ -153,7 +159,7 @@ def transform_source( source, strip=False ):
 				output.append('%sexcept %s: %s=%s' %(indent, exception, s0.split('=')[0], default) )
 				c = ''
 
-		if '=\t\t\t\tdef ' in c:
+		if '=\t\t\t\tdef ' in c:  ## todo deprecate
 			x, c = c.split('=\t\t\t\tdef ')
 			indent = []
 			pre = []
@@ -169,7 +175,10 @@ def transform_source( source, strip=False ):
 		elif c.strip().startswith('def ') and '->' in c:  ## python3 syntax
 			c, rtype = c.split('->')
 			c += ':'
-			rtype = rtype.strip()[:-1]
+			rtype = rtype.strip()[:-1].strip()
+			if rtype.startswith('*'):
+				rtype = '"%s"' %rtype
+
 			indent = []
 			for char in c:
 				if char in __whitespace:
@@ -305,6 +314,9 @@ def transform_source( source, strip=False ):
 					else:
 						arg_name = arg
 
+					if typedef.startswith('*'):
+						typedef = '"%s"' %typedef.strip()
+
 					if chan:
 						output.append('%s@typedef_chan(%s=%s)' %(indent, arg_name, typedef))
 					else:
@@ -464,6 +476,9 @@ def f(*args:int, **kwargs:int) ->int:
 def plot(id:string, latency:[]float64, xlabel:string, title:string ):
 	pass
 
+def f( x:*ABC ) -> *XXX:
+	pass
+
 class A:
 	def __init__(self):
 		int 		self.x = 1
@@ -471,6 +486,9 @@ def __init__(self):
 		class:ABS     self.z = A()
 		[]A     self.z = A()
 		bool    self.b = xxx()
+		*ABS     self.z = A()
+		#[]*A     self.z = A()   ## this is ugly
+
 
 '''
 
diff --git a/regtests/bench/richards.py b/regtests/bench/richards.py
index 4d07a28..9f8152a 100644
--- a/regtests/bench/richards.py
+++ b/regtests/bench/richards.py
@@ -11,7 +11,7 @@
 #  Translation from C++, Mario Wolczko
 #  Outer loop added by Alex Jacoby
 
-from time import time
+from time import clock
 
 # Task IDs
 I_IDLE = 1
@@ -32,14 +32,18 @@
 BUFSIZE_RANGE = range(BUFSIZE)
 
 class Packet(object):
-	def __init__(self,l,i,k):
-		self.link = l
-		self.ident = i
-		self.kind = k
-		self.datum = 0
-		self.data = [0] * BUFSIZE
-
-	def append_to(self,lst):
+
+	def __init__(self,l:*Packet, i:int, k:int):
+		*Packet	self.link = l
+		int		self.ident = i
+		int		self.kind = k
+		int		self.datum = 0
+		#[]int	self.data = [0] * BUFSIZE
+		[]int	self.data = []int()
+		for x in range(BUFSIZE):
+			self.data.append( 0 )
+
+	def append_to(self, lst:*Packet) -> *Packet:
 		self.link = None
 		if lst is None:
 			return self
@@ -59,75 +63,76 @@ class TaskRec(object):
 
 class DeviceTaskRec(TaskRec):
 	def __init__(self):
-		self.pending = None
+		*Packet  self.pending = None
 
 class IdleTaskRec(TaskRec):
 	def __init__(self):
-		self.control = 1
-		self.count = 10000
+		int self.control = 1
+		int self.count = 10000
 
 class HandlerTaskRec(TaskRec):
 	def __init__(self):
-		self.work_in = None
-		self.device_in = None
+		*Packet  self.work_in = None
+		*Packet  self.device_in = None
 
-	def workInAdd(self,p):
+	def workInAdd(self, p:*Packet) ->*Packet:
 		self.work_in = p.append_to(self.work_in)
 		return self.work_in
 
-	def deviceInAdd(self,p):
+	def deviceInAdd(self, p:*Packet) ->*Packet:
 		self.device_in = p.append_to(self.device_in)
 		return self.device_in
 
 class WorkerTaskRec(TaskRec):
 	def __init__(self):
-		self.destination = I_HANDLERA
-		self.count = 0
+		int self.destination = I_HANDLERA
+		int self.count = 0
+
 # Task
 
 class TaskState(object):
 	def __init__(self):
-		self.packet_pending = True
-		self.task_waiting = False
-		self.task_holding = False
+		bool self.packet_pending = True
+		bool self.task_waiting = False
+		bool self.task_holding = False
 
-	def packetPending(self):
+	def packetPending(self) -> self:
 		self.packet_pending = True
 		self.task_waiting = False
 		self.task_holding = False
 		return self
 
-	def waiting(self):
+	def waiting(self) -> self:
 		self.packet_pending = False
 		self.task_waiting = True
 		self.task_holding = False
 		return self
 
-	def running(self):
+	def running(self) -> self:
 		self.packet_pending = False
 		self.task_waiting = False
 		self.task_holding = False
 		return self
 		
-	def waitingWithPacket(self):
+	def waitingWithPacket(self) -> self:
 		self.packet_pending = True
 		self.task_waiting = True
 		self.task_holding = False
 		return self
 		
-	def isPacketPending(self):
+	def isPacketPending(self) -> bool:
 		return self.packet_pending
 
-	def isTaskWaiting(self):
+	def isTaskWaiting(self) -> bool:
 		return self.task_waiting
 
-	def isTaskHolding(self):
+	def isTaskHolding(self) -> bool:
 		return self.task_holding
 
-	def isTaskHoldingOrWaiting(self):
+	def isTaskHoldingOrWaiting(self) -> bool:
 		return self.task_holding or (not self.packet_pending and self.task_waiting)
 
-	def isWaitingWithPacket(self):
+	def isWaitingWithPacket(self) -> bool:
 		return self.packet_pending and self.task_waiting and not self.task_holding
 
 
@@ -137,7 +142,7 @@ def isWaitingWithPacket(self):
 tracing = False
 layout = 0
 
-def trace(a):
+def trace(a:string):
 	global layout
 	layout -= 1
 	if layout <= 0:
@@ -150,38 +155,39 @@ def trace(a):
 
 class TaskWorkArea(object):
 	def __init__(self):
-		self.taskTab = [None] * TASKTABSIZE
-
-		self.taskList = None
+		#[]Task      self.taskTab = [None] * TASKTABSIZE
+		[]Task      self.taskTab  = []Task()
+		*Task  self.taskList = None
 
-		self.holdCount = 0
-		self.qpktCount = 0
+		int self.holdCount = 0
+		int self.qpktCount = 0
 
 taskWorkArea = TaskWorkArea()
 
 class Task(TaskState):
 
+	# note: r:TaskRec is the super class, TODO cast to its subclass.
+	def __init__(self,i:int, p:int, w:*Packet, initialState:*TaskState,r:*TaskRec):
+		*Task    self.link = taskWorkArea.taskList
+		int           self.ident = i
+		int           self.priority = p
+		*Packet  self.input = w
 
-	def __init__(self,i,p,w,initialState,r):
-		self.link = taskWorkArea.taskList
-		self.ident = i
-		self.priority = p
-		self.input = w
+		bool self.packet_pending = initialState.isPacketPending()
+		bool self.task_waiting = initialState.isTaskWaiting()
+		bool self.task_holding = initialState.isTaskHolding()
 
-		self.packet_pending = initialState.isPacketPending()
-		self.task_waiting = initialState.isTaskWaiting()
-		self.task_holding = initialState.isTaskHolding()
-
-		self.handle = r
+		*TaskRec  self.handle = r
 
 		taskWorkArea.taskList = self
 		taskWorkArea.taskTab[i] = self
 
-	def fn(self,pkt,r):
+	def fn(self, pkt:*Packet, r:*TaskRec) -> self:
 		#raise NotImplementedError
 		print('NotImplementedError')
+		return self
 
-	def addPacket(self,p,old):
+	def addPacket(self,p:*Packet, old:*Task) -> self:
 		if self.input is None:
 			self.input = p
 			self.packet_pending = True
@@ -192,7 +198,8 @@ def addPacket(self,p,old):
 		return old
 
 
-	def runTask(self):
+	def runTask(self) -> self:
+		*Packet msg
 		if self.isWaitingWithPacket():
 			msg = self.input
 			self.input = msg.link
@@ -200,24 +207,24 @@ def runTask(self):
 				self.running()
 			else:
 				self.packetPending()
-		else:
-			msg = None
+		#else:
+		#	msg = None
 
 		return self.fn(msg,self.handle)
 
 
-	def waitTask(self):
+	def waitTask(self) -> self:
 		self.task_waiting = True
 		return self
 
 
-	def hold(self):
+	def hold(self) -> *Task:
 		taskWorkArea.holdCount += 1
 		self.task_holding = True
 		return self.link
 
 
-	def release(self,i):
+	def release(self,i:int) -> self:
 		t = self.findtcb(i)
 		t.task_holding = False
 		if t.priority > self.priority:
@@ -226,7 +233,7 @@ def release(self,i):
 			return self
 
 
-	def qpkt(self,pkt):
+	def qpkt(self, pkt:*Packet) -> self:
 		t = self.findtcb(pkt.ident)
 		taskWorkArea.qpktCount += 1
 		pkt.link = None
@@ -234,7 +241,7 @@ def qpkt(self,pkt):
 		return t.addPacket(pkt,self)
 
 
-	def findtcb(self,id):
+	def findtcb(self,id:int) -> *Task:
 		t = taskWorkArea.taskTab[id]
 		if t is None:
 			print('Exception in findtcb')
@@ -245,12 +252,14 @@ def findtcb(self,id):
 
 
 class DeviceTask(Task):
-	def __init__(self,i,p,w,s,r):
+	def __init__(self,i:int, p:int, w:*Packet, s:*TaskState,r:*TaskRec):
 		Task.__init__(self,i,p,w,s,r)
 
-	def fn(self,pkt,r):
+	def fn(self,pkt:Packet, r:TaskRec) -> self:
 		d = r
-		assert isinstance(d, DeviceTaskRec)
+		#assert isinstance(d, DeviceTaskRec)
+		#class:DeviceTaskRec  d = r
+
 		if pkt is None:
 			pkt = d.pending
 			if pkt is None:
@@ -266,12 +275,14 @@ def fn(self,pkt,r):
 
 
 class HandlerTask(Task):
-	def __init__(self,i,p,w,s,r):
+	def __init__(self,i:int, p:int, w:*Packet, s:*TaskState,r:*TaskRec):
 		Task.__init__(self,i,p,w,s,r)
 
-	def fn(self,pkt,r):
+	def fn(self, pkt:*Packet, r:*TaskRec) -> self:
 		h = r
-		assert isinstance(h, HandlerTaskRec)
+		#class:HandlerTaskRec h = r
+		#assert isinstance(h, HandlerTaskRec)  ## old style typedef
+
 		if pkt is not None:
 			if pkt.kind == K_WORK:
 				h.workInAdd(pkt)
@@ -298,12 +309,12 @@ def fn(self,pkt,r):
 
 
 class IdleTask(Task):
-	def __init__(self,i,p,w,s,r):
+	def __init__(self,i:int, p:int, w:*Packet, s:*TaskState,r:*TaskRec):
 		Task.__init__(self,i,0,None,s,r)
 
-	def fn(self,pkt,r):
+	def fn(self,pkt:*Packet,r:*TaskRec) -> self:
 		i = r
-		assert isinstance(i, IdleTaskRec)
+		#assert isinstance(i, IdleTaskRec)
 		i.count -= 1
 		if i.count == 0:
 			return self.hold()
@@ -321,12 +332,12 @@ def fn(self,pkt,r):
 A = ord('A')
 
 class WorkTask(Task):
-	def __init__(self,i,p,w,s,r):
+	def __init__(self,i:int, p:int, w:*Packet, s:*TaskState, r:*TaskRec):
 		Task.__init__(self,i,p,w,s,r)
 
-	def fn(self,pkt,r):
+	def fn(self,pkt:*Packet, r:*TaskRec) -> self:
 		w = r
-		assert isinstance(w, WorkerTaskRec)
+		#assert isinstance(w, WorkerTaskRec)
 		if pkt is None:
 			return self.waitTask()
 
@@ -364,7 +375,7 @@ def schedule():
 
 class Richards(object):
 
-	def run(self, iterations):
+	def run(self, iterations:int) ->bool:
 		for i in range(iterations):
 			taskWorkArea.holdCount = 0
 			taskWorkArea.qpktCount = 0
@@ -398,13 +409,13 @@ def run(self, iterations):
 
 		return True
 
-def entry_point(iterations):
+def entry_point(iterations:int) ->float64:
 	r = Richards()
-	startTime = time()
+	startTime = clock()
 	result = r.run(iterations)
 	if not result:
 		print('#ERROR incorrect results!')
-	return time() - startTime
+	return clock() - startTime
 
 def main():
 	iterations=10
diff --git a/regtests/go/arrays.py b/regtests/go/arrays.py
index 76d84e5..ce4fb5e 100644
--- a/regtests/go/arrays.py
+++ b/regtests/go/arrays.py
@@ -4,6 +4,8 @@ def main():
 	a = []int(1,2,3)
 	TestError( a[0]==1 )
 	TestError( len(a)==3 )
+	a.append( 4 )
+	TestError( len(a)==4 )
 
 	b = [2]int(100,200)
 	TestError( b[0]==100 )

From 80e1805f58ff59f5e99f9657cc9da0a06ecde1a5 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Fri, 19 Sep 2014 15:57:38 -0700
Subject: [PATCH 06/58] allow `[]int` to be used in function argument
 annotations `def f(x:[]int):` ,and ord('a') builtin.

---
 pythonjs/runtime/go_builtins.py     |  5 +++++
 pythonjs/typedpython.py             | 11 ++++++++--
 regtests/bench/add.py               | 11 +++++++---
 regtests/bench/richards.py          |  2 ++
 regtests/lang/builtins.py           | 31 ++++++++++++++++-------------
 regtests/lang/list_passed_as_arg.py | 12 +++++++++++
 6 files changed, 53 insertions(+), 19 deletions(-)
 create mode 100644 regtests/lang/list_passed_as_arg.py

diff --git a/pythonjs/runtime/go_builtins.py b/pythonjs/runtime/go_builtins.py
index 986f42f..bef6fd1 100644
--- a/pythonjs/runtime/go_builtins.py
+++ b/pythonjs/runtime/go_builtins.py
@@ -10,6 +10,11 @@
 	return append(self, x)
 }
 
+func ord(x string) int {
+	r := []rune(x)
+	return int(r[0])
+}
+
 func __test_if_true__(v interface{}) bool {
 	switch v.(type) {
 		case nil:
diff --git a/pythonjs/typedpython.py b/pythonjs/typedpython.py
index 59f576a..75c96d3 100644
--- a/pythonjs/typedpython.py
+++ b/pythonjs/typedpython.py
@@ -36,8 +36,12 @@ def transform_source( source, strip=False ):
 		a = []
 		hit_go_typedef = False
 		gotype = None
+		isindef = False
 
 		for i,char in enumerate(line):
+			if isindef is False and len(a) and ''.join(a).strip().startswith('def '):
+				isindef = True
+
 			nextchar = None
 			j = i+1
 			while j < len(line):
@@ -45,7 +49,8 @@ def transform_source( source, strip=False ):
 				if nextchar.strip(): break
 				j += 1
 
-			if a and char==']' and j==i+1 and nextchar!=None and nextchar in '[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ':
+			## go array and map syntax ##
+			if not isindef and len(a) and char==']' and j==i+1 and nextchar!=None and nextchar in '[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ':
 				assert '[' in a
 				gotype = []
 				b = a.pop()
@@ -314,7 +319,7 @@ def transform_source( source, strip=False ):
 					else:
 						arg_name = arg
 
-					if typedef.startswith('*'):
+					if typedef.startswith('*') or typedef.startswith('[]'):
 						typedef = '"%s"' %typedef.strip()
 
 					if chan:
@@ -489,6 +494,8 @@ def __init__(self):
 		*ABS     self.z = A()
 		#[]*A     self.z = A()   ## this is ugly
 
+def listpass( a:[]int ):
+	pass
 
 '''
 
diff --git a/regtests/bench/add.py b/regtests/bench/add.py
index 98c5378..f0e07f2 100644
--- a/regtests/bench/add.py
+++ b/regtests/bench/add.py
@@ -11,7 +11,12 @@ def main():
 		pass
 
 	start = clock()
-	a = 0
-	for i in range(10000000):
-		a = 1 + 2
+	a = -1000000
+	for i in range(1000000):
+		for j in range(100):
+			a = 1 + 2
 	print(clock()-start)
+
+	# in Go a variable must be used for something, or the compiler will throw an error,
+	# here just print 'a' to pass the benchmark.
+	print('#', a)
diff --git a/regtests/bench/richards.py b/regtests/bench/richards.py
index 9f8152a..9394bca 100644
--- a/regtests/bench/richards.py
+++ b/regtests/bench/richards.py
@@ -157,6 +157,8 @@ class TaskWorkArea(object):
 	def __init__(self):
 		#[]Task      self.taskTab = [None] * TASKTABSIZE
 		[]Task      self.taskTab  = []Task()
+		for i in range(TASKTABSIZE):
+			self.taskTab.append(None)
 		*Task  self.taskList = None
 
 		int self.holdCount = 0
diff --git a/regtests/lang/builtins.py b/regtests/lang/builtins.py
index 61cbd2a..d6abb9a 100644
--- a/regtests/lang/builtins.py
+++ b/regtests/lang/builtins.py
@@ -4,25 +4,28 @@
 
 
 def main():
-	n = float('1.1')
-	TestError( n==1.1 )
+	o = ord('x')
+	TestError( o == 120 )
 
-	n = float('NaN')
-	TestError( isNaN(n)==True )
+	#n = float('1.1')
+	#TestError( n==1.1 )
 
-	r = round( 1.1234, 2)
+	#n = float('NaN')
+	#TestError( isNaN(n)==True )
+
+	#r = round( 1.1234, 2)
 	#print(r)
-	TestError( str(r) == '1.12' )
+	#TestError( str(r) == '1.12' )
 
-	r = round( 100.001, 2)
-	TestError( r == 100 )
+	#r = round( 100.001, 2)
+	#TestError( r == 100 )
 
-	i = int( 100.1 )
-	TestError( i == 100 )
+	#i = int( 100.1 )
+	#TestError( i == 100 )
 
-	r = round( 5.49 )
-	TestError( r == 5 )
+	#r = round( 5.49 )
+	#TestError( r == 5 )
 
-	r = round( 5.49, 1 )
-	TestError( r == 5.5 )
+	#r = round( 5.49, 1 )
+	#TestError( r == 5.5 )
 
diff --git a/regtests/lang/list_passed_as_arg.py b/regtests/lang/list_passed_as_arg.py
new file mode 100644
index 0000000..4f59e57
--- /dev/null
+++ b/regtests/lang/list_passed_as_arg.py
@@ -0,0 +1,12 @@
+'''
+list passed to function
+'''
+
+def f( l:[]int ):
+	l.append(1)
+
+def main():
+	a = []int(1,2,3)
+	TestError( a[0]==1 )
+	f( a )
+	TestError( len(a)==4 )
\ No newline at end of file

From 3f66f024f1b0bc7a76fa61505ea25d29e351e798 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Sat, 20 Sep 2014 15:23:30 -0700
Subject: [PATCH 07/58] always take a pointer to array when creating a new one,
 always take pointer to arrays in arguments that take arrays. changed
 `.append` method to operate on an array pointer. updated `len` builtin to
 operate on a pointer. fixed passing an array to another function that appends
 to it.

---
 pythonjs/pythonjs_to_go.py | 37 +++++++++++++++++++++++++++++--------
 pythonjs/typedpython.py    |  4 +++-
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index 73193a8..833988e 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -168,6 +168,24 @@ def _visit_call_special( self, node ):
 		return self._visit_call_helper(node, force_name=name)
 
 
+	def _visit_subscript_ellipsis(self, node):
+		name = self.visit(node.value)
+		#return '%s["$wrapped"]' %name
+		raise NotImplementedError
+
+
+	def visit_Subscript(self, node):
+		if isinstance(node.slice, ast.Ellipsis):
+			if self._glsl:
+				#return '%s[_id_]' % self.visit(node.value)
+				return '%s[matrix_index()]' % self.visit(node.value)
+			else:
+				return self._visit_subscript_ellipsis( node )
+		else:
+			## deference pointer and then index
+			return '(*%s)[%s]' % (self.visit(node.value), self.visit(node.slice))
+
+
 	def visit_Slice(self, node):
 		lower = upper = step = None
 		if node.lower:
@@ -305,12 +323,14 @@ def _visit_call_helper(self, node, force_name=None):
 		is_append = False
 		if fname.endswith('.append'):
 			is_append = True
-			fname = fname.split('.append')[0]
+			arr = fname.split('.append')[0]
 
 		if fname=='__DOLLAR__': fname = '$'
 		elif fname == 'range':
 			assert len(node.args)
 			fname += str(len(node.args))
+		elif fname == 'len':
+			return 'len(*%s)' %self.visit(node.args[0])
 
 
 		if node.args:
@@ -332,7 +352,8 @@ def _visit_call_helper(self, node, force_name=None):
 			args += '%s...' %self.visit(node.starargs)
 
 		if is_append:
-			return '%s = append(%s,%s)' % (fname, fname, args)
+			## deference pointer as first arg to append, assign to temp variable, then set the pointer to the new array.
+			return '__%s := append(*%s,%s); *%s = __%s;' % (arr, arr, args, arr, arr)
 
 		else:
 			return '%s(%s)' % (fname, args)
@@ -354,9 +375,9 @@ def _visit_call_helper_go(self, node):
 			if isinstance(node.args[0], ast.BinOp):# and node.args[0].op == '<<':  ## todo assert right is `typedef`
 				a = self.visit(node.args[0].left)
 				if a in go_types:
-					return '[]%s' %a
+					return '*[]%s' %a
 				else:
-					return '[]*%s' %a
+					return '*[]*%s' %a
 
 			else:
 				a = self.visit(node.args[0])
@@ -392,15 +413,15 @@ def visit_BinOp(self, node):
 					if node.left.func.id == '__go__array__':
 						T = self.visit(node.left.args[0])
 						if T in go_types:
-							return '[]%s%s' %(T, right)
+							return '&[]%s%s' %(T, right)
 						else:
-							return '[]*%s%s' %(T, right)
+							return '&[]*%s%s' %(T, right)
 					elif node.left.func.id == '__go__arrayfixed__':
 						asize = self.visit(node.left.args[0])
 						atype = self.visit(node.left.args[1])
-						return '[%s]%s%s' %(asize, atype, right)
+						return '&[%s]%s%s' %(asize, atype, right)
 			elif isinstance(node.left, ast.Name) and node.left.id=='__go__array__' and op == '<<':
-				return '[]%s' %self.visit(node.right)
+				return '*[]%s' %self.visit(node.right)
 
 		if left in self._typed_vars and self._typed_vars[left] == 'numpy.float32':
 			left += '[_id_]'
diff --git a/pythonjs/typedpython.py b/pythonjs/typedpython.py
index 75c96d3..c8439a0 100644
--- a/pythonjs/typedpython.py
+++ b/pythonjs/typedpython.py
@@ -319,8 +319,10 @@ def transform_source( source, strip=False ):
 					else:
 						arg_name = arg
 
-					if typedef.startswith('*') or typedef.startswith('[]'):
+					if typedef.startswith('*'):
 						typedef = '"%s"' %typedef.strip()
+					elif typedef.startswith('[]'):
+						typedef = '"*%s"' %typedef.strip()
 
 					if chan:
 						output.append('%s@typedef_chan(%s=%s)' %(indent, arg_name, typedef))

From 105d7d4fbd9c0827394d5d25cfc2f69e2f120d56 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Sun, 21 Sep 2014 01:42:25 -0700
Subject: [PATCH 08/58] always create map and take a pointer to it. always pass
 map pointers to functions (so they can modify its contents inplace).

---
 pythonjs/pythonjs_to_go.py         |  7 +++++--
 pythonjs/typedpython.py            |  5 +++++
 regtests/lang/map_passed_as_arg.py | 17 +++++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 regtests/lang/map_passed_as_arg.py

diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index 833988e..ab32712 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -22,6 +22,7 @@ def __init__(self, requirejs=False, insert_runtime=False):
 		self._kwargs_type_ = dict()
 
 		self._imports = []
+		self._ids = 0
 
 	def visit_Is(self, node):
 		return '=='
@@ -353,7 +354,9 @@ def _visit_call_helper(self, node, force_name=None):
 
 		if is_append:
 			## deference pointer as first arg to append, assign to temp variable, then set the pointer to the new array.
-			return '__%s := append(*%s,%s); *%s = __%s;' % (arr, arr, args, arr, arr)
+			id = self._ids
+			self._ids += 1
+			return '__%s := append(*%s,%s); *%s = __%s;' % (id, arr, args, arr, id)
 
 		else:
 			return '%s(%s)' % (fname, args)
@@ -405,7 +408,7 @@ def visit_BinOp(self, node):
 					key_type = self.visit(node.left.args[0])
 					value_type = self.visit(node.left.args[1])
 					if value_type == 'interface': value_type = 'interface{}'
-					return 'map[%s]%s%s' %(key_type, value_type, right)
+					return '&map[%s]%s%s' %(key_type, value_type, right)
 				else:
 					if not right.startswith('{') and not right.endswith('}'):
 						right = '{%s}' %right[1:-1]
diff --git a/pythonjs/typedpython.py b/pythonjs/typedpython.py
index c8439a0..c7ba584 100644
--- a/pythonjs/typedpython.py
+++ b/pythonjs/typedpython.py
@@ -323,6 +323,8 @@ def transform_source( source, strip=False ):
 						typedef = '"%s"' %typedef.strip()
 					elif typedef.startswith('[]'):
 						typedef = '"*%s"' %typedef.strip()
+					elif typedef.startswith('map['):
+						typedef = '"*%s"' %typedef.strip()
 
 					if chan:
 						output.append('%s@typedef_chan(%s=%s)' %(indent, arg_name, typedef))
@@ -499,6 +501,9 @@ def __init__(self):
 def listpass( a:[]int ):
 	pass
 
+def mappass( a:map[string]int ):
+	pass
+
 '''
 
 if __name__ == '__main__':
diff --git a/regtests/lang/map_passed_as_arg.py b/regtests/lang/map_passed_as_arg.py
new file mode 100644
index 0000000..5c3a8a6
--- /dev/null
+++ b/regtests/lang/map_passed_as_arg.py
@@ -0,0 +1,17 @@
+'''
+list passed to function
+'''
+
+def f( m:map[string]int ):
+	m['x'] = 100
+
+def main():
+	a = map[string]int{
+		'x' : 1,
+		'y' : 2,
+		'z' : 3
+	}
+	TestError( a['x']==1 )
+	f( a )
+	TestError( a['x']==100 )
+	#TestError( len(a)==4 )
\ No newline at end of file

From cbc5828e35da5cf59efa17a9083e7c70df472fa5 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Sun, 21 Sep 2014 14:33:25 -0700
Subject: [PATCH 09/58] adding 'simple' generator functions for Go.

---
 pythonjs/python_to_pythonjs.py | 147 +++++++++++++++++++++++++++++++--
 regtests/loop/yield.py         |  16 ++--
 2 files changed, 152 insertions(+), 11 deletions(-)

diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
index ed341f6..214d129 100755
--- a/pythonjs/python_to_pythonjs.py
+++ b/pythonjs/python_to_pythonjs.py
@@ -1843,7 +1843,7 @@ def visit_Assign(self, node):
 				else:
 					targets = targets[1:]
 
-			if len(targets)==2 and isinstance(targets[1], ast.Attribute) and isinstance(targets[1].value, ast.Name) and targets[1].value.id == 'self' and len(self._class_stack):
+			elif len(targets)==2 and isinstance(targets[1], ast.Attribute) and isinstance(targets[1].value, ast.Name) and targets[1].value.id == 'self' and len(self._class_stack):
 				self._class_stack[-1]._struct_vars[ targets[1].attr ] = target.id
 				if target.id == 'long' and isinstance(node.value, ast.Num):
 					## requires long library ##
@@ -1855,9 +1855,12 @@ def visit_Assign(self, node):
 			elif len(targets)==1 and isinstance(node.value, ast.Name) and target.id in typedpython.types:
 				self._typedef_vars[ node.value.id ] = target.id
 				return None
+			elif isinstance(target, ast.Name) and target.id in typedpython.types:
+				raise SyntaxError( self.format_error(target.id) )
 			else:
-				xxx = self.visit(target) + ':' + self.visit(targets[1])
-				#raise SyntaxError( self.format_error(targets) )
+				#xxx = self.visit(target) + ':' + self.visit(targets[1])
+				xxx = self.visit(target) + ':' + self.visit(node.value)
+				raise SyntaxError( self.format_error(targets) )
 				raise SyntaxError( self.format_error(xxx) )
 
 		elif self._with_go and isinstance(target, ast.Subscript) and isinstance(target.value, ast.Name) and target.value.id in ('__go__array__', '__go__class__', '__go__pointer__'):
@@ -2802,7 +2805,6 @@ def visit_FunctionDef(self, node):
 		global writer
 
 		if node in self._generator_function_nodes:
-			log('generator function: %s'%node.name)
 			self._generator_functions.add( node.name )
 			if '--native-yield' in sys.argv:
 				raise NotImplementedError  ## TODO
@@ -2848,7 +2850,7 @@ def visit_FunctionDef(self, node):
 			if isinstance(decorator, Name) and decorator.id == 'gpu':
 				gpu = True
 
-			elif isinstance(decorator, Call) and decorator.func.id == 'expression':
+			elif isinstance(decorator, Call) and decorator.func.id == 'expression':  ## js function expressions are now the default
 				assert len(decorator.args)==1
 				func_expr = self.visit(decorator.args[0])
 
@@ -3960,9 +3962,142 @@ def visit_Yield(self, node):
 			writer.write('__yield_return__ = %s'%self.visit(node.value))
 
 	def visit_Name(self, node):
-		return 'this.%s' %node.id
+		## this hack should be replaced to support globals
+		if self._with_go:
+			return 'self.%s' %node.id
+		else:
+			return 'this.%s' %node.id
+
 
 	def visit_FunctionDef(self, node):
+		if self._with_go:
+			self._visit_genfunc_go(node)
+		else:
+			self._visit_genfunc_js(node)
+
+
+	def _visit_genfunc_go(self, node):
+		writer.write('class %s:' %node.name)
+		writer.push()  ## push class
+
+
+		typedefs = dict()
+		stypes = dict()  ## go struct
+
+		for decorator in reversed(node.decorator_list):
+
+			if isinstance(decorator, Call) and decorator.func.id in ('typedef', 'typedef_chan'):
+				c = decorator
+				assert len(c.args) == 0 and len(c.keywords)
+				for kw in c.keywords:
+					#assert isinstance( kw.value, Name)
+					kwval = kw.value.id
+					#self._typedef_vars[ kw.arg ] = kwval
+					#self._instances[ kw.arg ] = kwval
+					#self._func_typedefs[ kw.arg ] = kwval
+					#local_typedefs.append( '%s=%s' %(kw.arg, kwval))
+					if decorator.func.id=='typedef_chan':
+						#typedef_chans.append( kw.arg )
+						writer.write('@__typedef_chan__(%s=%s)' %(kw.arg, kwval))
+					else:
+						typedefs[ kw.arg ] = kwval
+						stypes[ kw.arg ] = kwval
+
+		args = [a.id for a in node.args.args]
+
+		for name in typedefs:
+			kwval = typedefs[name]
+			writer.write('@__typedef__(%s=%s)' %(name, kwval))
+
+		writer.write('def __init__(self, %s):' %','.join(args))
+		writer.push()
+		for arg in args:
+			assert arg in typedefs
+			writer.write('self.%s = %s'%(arg,arg))
+
+		self._in_head = True
+		loop_node = None
+		tail_yield = []
+		for b in node.body:
+			if loop_node:
+				tail_yield.append( b )
+
+			elif isinstance(b, ast.For):
+				iter_start = '0'
+				iter = b.iter
+				if isinstance(iter, ast.Call) and isinstance(iter.func, Name) and iter.func.id in ('range','xrange'):
+					if len(iter.args) == 2:
+						iter_start = self.visit(iter.args[0])
+						iter_end = self.visit(iter.args[1])
+					else:
+						iter_end = self.visit(iter.args[0])
+				else:
+					iter_end = self.visit(iter)
+
+				writer.write('self.__iter_start = %s'%iter_start)
+				writer.write('self.__iter_index = %s'%iter_start)
+				writer.write('self.__iter_end = %s'%iter_end)
+				writer.write('self.__done__ = 0')
+				loop_node = b
+				self._in_head = False
+
+			else:
+				if isinstance(b, ast.Assign) and isinstance(b.targets[0], ast.Name) and len(b.targets)==2:  ## typed local
+					stypes[ b.targets[1].id ] = b.targets[0].id
+				self.visit(b)
+
+		writer.pull()  ## end of init
+
+		## write typedef go struct ##
+
+		for intype in '__iter_start __iter_index __iter_end __done__'.split():
+			stypes[ intype ] = 'int'
+
+		writer.write('{')
+		for n in stypes:
+			writer.write( '%s : %s,' %(n, stypes[n]))
+		writer.write('}')
+
+		## iterator function `next`
+		writer.write('def next(self):')
+		writer.push()
+
+		if self._head_yield:
+			writer.write('if self.__head_returned == 0:')
+			writer.push()
+			writer.write('self.__head_returned = 1')
+			writer.write('return self.__head_yield')
+			writer.pull()
+			writer.write('elif self.__iter_index < self.__iter_end:')
+
+		else:
+			writer.write('if self.__iter_index < self.__iter_end:')
+
+		writer.push()
+		for b in loop_node.body:
+			self.visit(b)
+
+		writer.write('self.__iter_index += 1')
+
+		if not tail_yield:
+			writer.write('if self.__iter_index == self.__iter_end: self.__done__ = 1')
+
+		writer.write('return __yield_return__')
+		writer.pull()
+		writer.write('else:')
+		writer.push()
+		writer.write('self.__done__ = 1')
+		if tail_yield:
+			for b in tail_yield:
+				self.visit(b)
+			writer.write('return __yield_return__')
+		writer.pull()
+
+		writer.pull()  ## end of next
+		writer.pull()  ## pull class
+
+
+	def _visit_genfunc_js(self, node):
 		args = [a.id for a in node.args.args]
 		writer.write('def %s(%s):' %(node.name, ','.join(args)))
 		writer.push()
diff --git a/regtests/loop/yield.py b/regtests/loop/yield.py
index fb4a2db..b676c64 100644
--- a/regtests/loop/yield.py
+++ b/regtests/loop/yield.py
@@ -2,15 +2,21 @@
 generator function
 '''
 
-def fib(n):
-	a, b = 0, 1
+def fib(n:int) -> int:
+	int a = 0
+	int b = 1
+	int c = 0
+
 	for x in range(n):
 		yield a
-		a,b = b, a+b
-	yield 'world'
+		c = b
+		b = a+b
+		a = c
+
+	yield -1  ## signals end
 
 def main():
-	arr = []
+	arr = []int()
 	for n in fib(20):
 		arr.append( n )
 

From c77beb292a1d09abcbb5609ffefea95cb7f92d5d Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Sun, 21 Sep 2014 15:42:26 -0700
Subject: [PATCH 10/58] simple generator functions `yield`

---
 README.md                      | 33 +++++++++++++++++++++++++++++++++
 pythonjs/python_to_pythonjs.py | 23 +++++++++++++++++++----
 pythonjs/pythonjs_to_go.py     |  8 ++++++--
 regtests/loop/yield.py         |  2 ++
 4 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 9336e51..6f3674e 100644
--- a/README.md
+++ b/README.md
@@ -77,3 +77,36 @@ Gython supports Go's typed maps.
 	}
 
 ```
+
+Array and maps are always passed as pointers in a function call, this way the called function can modify the array or map inplace.
+In the example below `a` is typed as an array of integers `[]int`, but it is actually retyped when transformed into Go as `*[]int`
+```
+def myfunc( a:[]int ):
+	a.append( 100 )
+
+x = []int()
+myfunc( x )
+
+```
+
+Simple Generator Functions
+==========================
+Gython supports generator functions with a single for loop that yields from its main body.
+The generator function can also yield once before the loop, and once after.
+```
+def fib(n:int) -> int:
+	int a = 0
+	int b = 1
+	int c = 0
+	for x in range(n):
+		yield a
+		c = b
+		b = a+b
+		a = c
+	yield -1
+
+def main():
+	arr = []int()
+	for n in fib(20):
+		arr.append( n )
+```
\ No newline at end of file
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
index 214d129..b8ec227 100755
--- a/pythonjs/python_to_pythonjs.py
+++ b/pythonjs/python_to_pythonjs.py
@@ -3955,8 +3955,12 @@ def __init__(self, node, compiler=None):
 
 	def visit_Yield(self, node):
 		if self._in_head:
-			writer.write('this.__head_yield = %s'%self.visit(node.value))
-			writer.write('this.__head_returned = 0')
+			if self._with_go:
+				writer.write('self.__head_yield = %s'%self.visit(node.value))
+				writer.write('self.__head_returned = 0')
+			else:
+				writer.write('this.__head_yield = %s'%self.visit(node.value))
+				writer.write('this.__head_returned = 0')
 			self._head_yield = True
 		else:
 			writer.write('__yield_return__ = %s'%self.visit(node.value))
@@ -3983,10 +3987,17 @@ def _visit_genfunc_go(self, node):
 
 		typedefs = dict()
 		stypes = dict()  ## go struct
-
+		return_type = None
 		for decorator in reversed(node.decorator_list):
+			if isinstance(decorator, ast.Call) and isinstance(decorator.func, ast.Name) and decorator.func.id == 'returns':
+				if decorator.keywords:
+					raise SyntaxError('invalid go return type')
+				elif isinstance(decorator.args[0], ast.Name):
+					return_type = decorator.args[0].id
+				else:
+					return_type = decorator.args[0].s
 
-			if isinstance(decorator, Call) and decorator.func.id in ('typedef', 'typedef_chan'):
+			elif isinstance(decorator, Call) and decorator.func.id in ('typedef', 'typedef_chan'):
 				c = decorator
 				assert len(c.args) == 0 and len(c.keywords)
 				for kw in c.keywords:
@@ -4003,6 +4014,7 @@ def _visit_genfunc_go(self, node):
 						typedefs[ kw.arg ] = kwval
 						stypes[ kw.arg ] = kwval
 
+		assert return_type
 		args = [a.id for a in node.args.args]
 
 		for name in typedefs:
@@ -4059,9 +4071,12 @@ def _visit_genfunc_go(self, node):
 		writer.write('}')
 
 		## iterator function `next`
+		writer.write('@returns(%s)' %return_type)
 		writer.write('def next(self):')
 		writer.push()
 
+		writer.write('inline("var __yield_return__ %s")' %return_type)
+
 		if self._head_yield:
 			writer.write('if self.__head_returned == 0:')
 			writer.push()
diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index ab32712..963fd30 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -298,8 +298,12 @@ def visit_For(self, node):
 				tar = self.visit(node.target.elts[1])
 				lines.append('for %s,%s := range %s {' %(idx,tar, iter))
 
-			else:
-				raise SyntaxError('invalid for loop - bad iterator')
+			else: ## generator function
+				gfunc = node.iter.func.id
+				gargs = ','.join( [self.visit(e) for e in node.iter.args] )
+				lines.append('__gen%s := __new__%s(%s)' %(gfunc,gfunc, gargs))
+				lines.append('for __gen%s.__done__ != 1 {' %gfunc)
+				lines.append('	%s := __gen%s.next()' %(self.visit(node.target), gfunc))
 
 		elif isinstance(node.target, ast.List) or isinstance(node.target, ast.Tuple):
 			iter = self.visit( node.iter )
diff --git a/regtests/loop/yield.py b/regtests/loop/yield.py
index b676c64..620ee82 100644
--- a/regtests/loop/yield.py
+++ b/regtests/loop/yield.py
@@ -8,6 +8,7 @@ def fib(n:int) -> int:
 	int c = 0
 
 	for x in range(n):
+		#print('looping')
 		yield a
 		c = b
 		b = a+b
@@ -18,6 +19,7 @@ def fib(n:int) -> int:
 def main():
 	arr = []int()
 	for n in fib(20):
+		#print(n)
 		arr.append( n )
 
 	TestError( arr[0]==0 )

From 43b6c44ad626df942d06c851c7573cb551390749 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Mon, 22 Sep 2014 19:15:43 -0700
Subject: [PATCH 11/58] generics for Go, subclasses with a common base class
 can be passed to the same generic function that can call methods on the
 instances and return a value. only the first variable in a generic function
 may be a subclass instance. in the function def the shared base class is
 given by name: `def g( a:MyBaseClass ):`

---
 pythonjs/pythonjs_to_go.py         | 44 +++++++++++++++++++++++++-----
 regtests/go/generics_subclasses.py | 37 +++++++++++++++++++++++++
 2 files changed, 74 insertions(+), 7 deletions(-)
 create mode 100644 regtests/go/generics_subclasses.py

diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index 963fd30..6e28e33 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -14,7 +14,7 @@ def __init__(self, requirejs=False, insert_runtime=False):
 		pythonjs.JSGenerator.__init__(self, requirejs=False, insert_runtime=False)
 
 		self._class_stack = list()
-		self._classes = dict()
+		self._classes = dict()		## name : node
 		self._class_props = dict()
 
 		self._vars = set()
@@ -45,6 +45,7 @@ def visit_ClassDef(self, node):
 		self._class_stack.append( node )
 		node._parents = set()
 		node._struct_def = dict()
+		node._subclasses = set()  ## required for generics generator
 		out = []
 		sdef = dict()
 		props = set()
@@ -73,6 +74,8 @@ def visit_ClassDef(self, node):
 				props.update( self._class_props[p] )
 				base_classes.add( self._classes[p] )
 
+			self._classes[ n ]._subclasses.add( node.name )
+
 
 		for decor in node.decorator_list:  ## class decorators
 			if isinstance(decor, ast.Call):
@@ -452,6 +455,7 @@ def _visit_function(self, node):
 		args_typedefs = {}
 		chan_args_typedefs = {}
 		return_type = None
+		generics = set()
 		for decor in node.decorator_list:
 			if isinstance(decor, ast.Call) and isinstance(decor.func, ast.Name) and decor.func.id == '__typedef__':
 				for key in decor.keywords:
@@ -459,6 +463,14 @@ def _visit_function(self, node):
 						args_typedefs[ key.arg ] = key.value.s
 					else:
 						args_typedefs[ key.arg ] = self.visit(key.value)
+
+					## check for super classes - generics ##
+					if args_typedefs[ key.arg ] in self._classes:
+						classname = args_typedefs[ key.arg ]
+						generics.add( classname ) # switch v.(type) for each
+						generics = generics.union( self._classes[classname]._subclasses )
+						args_typedefs[ key.arg ] = 'interface{}'
+
 			elif isinstance(decor, ast.Call) and isinstance(decor.func, ast.Name) and decor.func.id == '__typedef_chan__':
 				for key in decor.keywords:
 					chan_args_typedefs[ key.arg ] = self.visit(key.value)
@@ -474,7 +486,7 @@ def _visit_function(self, node):
 					return_type = '*' + self._class_stack[-1].name
 
 
-		node._arg_names = []
+		node._arg_names = args_names = []
 		args = []
 		oargs = []
 		offset = len(node.args.args) - len(node.args.defaults)
@@ -496,7 +508,10 @@ def _visit_function(self, node):
 
 			if arg_name in args_typedefs:
 				arg_type = args_typedefs[arg_name]
-				a = '%s %s' %(arg_name, arg_type)
+				if i==0 and generics:
+					a = '__gen__ %s' %arg_type
+				else:
+					a = '%s %s' %(arg_name, arg_type)
 			else:
 				arg_type = chan_args_typedefs[arg_name]
 				a = '%s chan %s' %(arg_name, arg_type)
@@ -552,10 +567,25 @@ def _visit_function(self, node):
 				out.append('}')
 				#out.append('} else { %s := %s }' %(n,v))
 
-		for b in node.body:
-			v = self.visit(b)
-			if v:
-				out.append( self.indent() + v )
+		if generics:
+			out.append(self.indent() + 'switch __gen__.(type) {')
+			self.push()
+			for gt in generics:
+				out.append(self.indent() + 'case *%s:' %gt)
+				self.push()
+				out.append(self.indent() + '%s,_ := __gen__.(%s)' %(args_names[0],gt) )
+				for b in node.body:
+					v = self.visit(b)
+					if v: out.append( self.indent() + v )
+				self.pull()
+			self.pull()
+			out.append('}')
+			out.append('return -1')
+
+		else:
+			for b in node.body:
+				v = self.visit(b)
+				if v: out.append( self.indent() + v )
 
 		self.pull()
 		out.append( self.indent()+'}' )
diff --git a/regtests/go/generics_subclasses.py b/regtests/go/generics_subclasses.py
new file mode 100644
index 0000000..9802f9a
--- /dev/null
+++ b/regtests/go/generics_subclasses.py
@@ -0,0 +1,37 @@
+'''
+generics classes with common base.
+'''
+class A:
+	def __init__(self, x:int):
+		int self.x = x
+
+	def method1(self) -> int:
+		return self.x
+
+class B(A):
+
+	def method1(self) ->int:
+		return self.x * 2
+
+class C(A):
+
+	def method1(self) ->int:
+		return self.x + 100
+
+
+def my_generic( g:A ) ->int:
+	return g.method1()
+
+def main():
+	a = A( 100 )
+	b = B( 100 )
+	c = C( 100 )
+
+	x = my_generic( a )
+	print( x )
+
+	y = my_generic( b )
+	print( y )
+
+	z = my_generic( c )
+	print( z )

From 174123eefed44bb8782ba7bb8c24ae7a06e768a1 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Tue, 23 Sep 2014 01:14:00 -0700
Subject: [PATCH 12/58] fixed Generics

---
 README.md                          | 46 ++++++++++++++++++++++++++++++
 pythonjs/pythonjs_to_go.py         | 13 +++++++--
 regtests/go/generics_subclasses.py |  8 +++---
 3 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 6f3674e..e1178a6 100644
--- a/README.md
+++ b/README.md
@@ -109,4 +109,50 @@ def main():
 	arr = []int()
 	for n in fib(20):
 		arr.append( n )
+```
+
+Generic High Order Functions
+==========================
+Gython supports generic functions, where the first argument can be an instance of different subclasses.
+All the subclasses must share the same common base class.  In the function definition the first argument
+is typed with the name of the common base class.  In the function below `my_generic`, the first argument `g`
+is typed with the common base class: `def my_generic( a:A )`
+
+
+```
+class A:
+	def __init__(self, x:int):
+		int self.x = x
+
+	def method1(self) -> int:
+		return self.x
+
+class B(A):
+
+	def method1(self) ->int:
+		return self.x * 2
+
+class C(A):
+
+	def method1(self) ->int:
+		return self.x + 200
+
+
+def my_generic( g:A ) ->int:
+	return g.method1()
+
+def main():
+	a = A( 100 )
+	b = B( 100 )
+	c = C( 100 )
+
+	x = my_generic( a )
+	a.x == x
+
+	y = my_generic( b )
+	y==200
+
+	z = my_generic( c )
+	z==300
+
 ```
\ No newline at end of file
diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index 6e28e33..de75cdd 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -573,14 +573,23 @@ def _visit_function(self, node):
 			for gt in generics:
 				out.append(self.indent() + 'case *%s:' %gt)
 				self.push()
-				out.append(self.indent() + '%s,_ := __gen__.(%s)' %(args_names[0],gt) )
+				out.append(self.indent() + '%s,_ := __gen__.(*%s)' %(args_names[0],gt) )
 				for b in node.body:
 					v = self.visit(b)
 					if v: out.append( self.indent() + v )
 				self.pull()
 			self.pull()
 			out.append('}')
-			out.append('return -1')
+			if return_type == 'int':
+				out.append('return 0')
+			elif return_type == 'float':
+				out.append('return 0.0')
+			elif return_type == 'string':
+				out.append('return ""')
+			elif return_type == 'bool':
+				out.append('return false')
+			elif return_type:
+				raise NotImplementedError('TODO other generator function return types')
 
 		else:
 			for b in node.body:
diff --git a/regtests/go/generics_subclasses.py b/regtests/go/generics_subclasses.py
index 9802f9a..5dcf934 100644
--- a/regtests/go/generics_subclasses.py
+++ b/regtests/go/generics_subclasses.py
@@ -16,7 +16,7 @@ def method1(self) ->int:
 class C(A):
 
 	def method1(self) ->int:
-		return self.x + 100
+		return self.x + 200
 
 
 def my_generic( g:A ) ->int:
@@ -28,10 +28,10 @@ def main():
 	c = C( 100 )
 
 	x = my_generic( a )
-	print( x )
+	TestError(a.x == x )
 
 	y = my_generic( b )
-	print( y )
+	TestError( y==200 )
 
 	z = my_generic( c )
-	print( z )
+	TestError( z==300 )

From 6b089349117363cb8aaff908abaa0dae461f734f Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Tue, 23 Sep 2014 08:49:13 -0700
Subject: [PATCH 13/58] new option `--no-runtime` for translator.py will not
 insert pythonjs runtime into output.

---
 pythonjs/translator.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pythonjs/translator.py b/pythonjs/translator.py
index 0b772f9..e3f797a 100755
--- a/pythonjs/translator.py
+++ b/pythonjs/translator.py
@@ -10,7 +10,7 @@
 from pythonjs_to_go import main as pythonjs_to_go
 
 cmdhelp = """\
-usage: translator.py [--dart|--coffee|--lua|--go|--visjs|--no-wrapper|--analyze] file.py
+usage: translator.py [--dart|--coffee|--lua|--go|--visjs|--no-wrapper|--no-runtime|--analyze] file.py
 
 example:
        translator.py --no-wrapper myscript.py > myscript.js
@@ -74,7 +74,8 @@ def main(script, module_path=None):
 				## requirejs module is on by default, this wraps the code in a `define` function
 				## and returns `__module__`
 				## if --no-wrapper is used, then the raw javascript is returned.
-				code = pythonjs_to_javascript( a, requirejs='--no-wrapper' not in sys.argv )
+				## by default the pythonjs runtime is inserted, this can be disabled with `--no-runtime`
+				code = pythonjs_to_javascript( a, requirejs='--no-wrapper' not in sys.argv, insert_runtime='--no-runtime' not in sys.argv )
 
 		if '--analyze' in sys.argv:
 			dartanalyzer = os.path.expanduser('~/dart-sdk/bin/dartanalyzer')

From 49498576bc5a1106864564e7475f651d6adf0f3b Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Tue, 23 Sep 2014 13:14:32 -0700
Subject: [PATCH 14/58] starting on support for Go map comprehensions.

---
 pythonjs/python_to_pythonjs.py      | 66 ++++++++++++++++++++++++++++-
 regtests/dict/dict_comprehension.py |  9 ++++
 regtests/go/map_comprehension.py    |  9 ++++
 3 files changed, 82 insertions(+), 2 deletions(-)
 create mode 100644 regtests/dict/dict_comprehension.py
 create mode 100644 regtests/go/map_comprehension.py

diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
index b8ec227..5fad4e7 100755
--- a/pythonjs/python_to_pythonjs.py
+++ b/pythonjs/python_to_pythonjs.py
@@ -587,6 +587,50 @@ def visit_GeneratorExp(self, node):
 		return self.visit_ListComp(node)
 
 	_comp_id = 0
+
+	def visit_DictComp(self, node):
+		'''
+		node.key is key name
+		node.value is value
+		'''
+		#raise SyntaxError(self.visit(node.key))  ## key, value, generators
+
+		node.returns_type = 'dict'
+
+		if len(self._comprehensions) == 0:
+			comps = collect_dict_comprehensions( node )
+			for i,cnode in enumerate(comps):
+				cname = '__comp__%s' % self._comp_id
+				self._comp_id += 1
+				cnode._comp_name = cname
+				self._comprehensions.append( cnode )
+
+
+		cname = node._comp_name
+		writer.write('var(%s)'%cname)
+
+		length = len( node.generators )
+		a = ['idx%s'%i for i in range(length)]
+		writer.write('var( %s )' %','.join(a) )
+		a = ['iter%s'%i for i in range(length)]
+		writer.write('var( %s )' %','.join(a) )
+		a = ['get%s'%i for i in range(length)]
+		writer.write('var( %s )' %','.join(a) )
+
+		if self._with_go:
+			assert node.go_dictcomp_type
+			writer.write('%s = __go__map__(%s)' %(cname, node.go_dictcomp_type))
+		else:
+			writer.write('%s = []'%cname)
+
+		generators = list( node.generators )
+		generators.reverse()
+		self._gen_comp( generators, node )
+
+		self._comprehensions.remove( node )
+		return cname
+
+
 	def visit_ListComp(self, node):
 		node.returns_type = 'list'
 
@@ -626,7 +670,6 @@ def visit_ListComp(self, node):
 
 	def _gen_comp(self, generators, node):
 		gen = generators.pop()
-		#if len(gen.ifs): raise NotImplementedError  ## TODO
 		id = len(generators) + self._comprehensions.index( node )
 		assert isinstance(gen.target, Name)
 		writer.write('idx%s = 0'%id)
@@ -635,7 +678,6 @@ def _gen_comp(self, generators, node):
 		if isinstance(gen.iter, ast.Call) and isinstance(gen.iter.func, ast.Name) and gen.iter.func.id in ('range', 'xrange'):
 			is_range = True
 
-			#writer.write('iter%s = __get__(len, "__call__")([%s], JSObject())' %(id, self.visit(gen.iter.args[0])) )
 			writer.write('iter%s = %s' %(id, self.visit(gen.iter.args[0])) )
 			writer.write('while idx%s < iter%s:' %(id,id) )
 			writer.push()
@@ -4201,6 +4243,26 @@ def collect_calls(node):
 	return calls
 
 
+class CollectDictComprehensions(NodeVisitor):
+	_comps_ = []
+	def visit_GeneratorExp(self,node):
+		self._comps_.append( node )		
+		self.visit( node.elt )
+		for gen in node.generators:
+			self.visit( gen.iter )
+			self.visit( gen.target )
+	def visit_DictComp(self, node):
+		self._comps_.append( node )
+		self.visit( node.key )
+		self.visit( node.value )
+		for gen in node.generators:
+			self.visit( gen.iter )
+			self.visit( gen.target )
+
+def collect_dict_comprehensions(node):
+	CollectDictComprehensions._comps_ = comps = []
+	CollectDictComprehensions().visit( node )
+	return comps
 
 
 class CollectComprehensions(NodeVisitor):
diff --git a/regtests/dict/dict_comprehension.py b/regtests/dict/dict_comprehension.py
new file mode 100644
index 0000000..b62f59a
--- /dev/null
+++ b/regtests/dict/dict_comprehension.py
@@ -0,0 +1,9 @@
+'''
+dict comprehensions
+'''
+
+
+
+def main():
+	m = { a:'xxx' for a in range(10)}
+	print(m)
diff --git a/regtests/go/map_comprehension.py b/regtests/go/map_comprehension.py
new file mode 100644
index 0000000..8f185ec
--- /dev/null
+++ b/regtests/go/map_comprehension.py
@@ -0,0 +1,9 @@
+'''
+map comprehensions
+'''
+
+
+
+def main():
+	m = map[int]string{ a:'xxx' for a in range(10)}
+	print(m)

From d55301cb6d113e257f6f33a89f895550668c5b17 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Wed, 24 Sep 2014 01:39:00 -0700
Subject: [PATCH 15/58] dict comprehensions.

---
 pythonjs/python_to_pythonjs.py | 39 ++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
index 5fad4e7..402f1d5 100755
--- a/pythonjs/python_to_pythonjs.py
+++ b/pythonjs/python_to_pythonjs.py
@@ -621,7 +621,7 @@ def visit_DictComp(self, node):
 			assert node.go_dictcomp_type
 			writer.write('%s = __go__map__(%s)' %(cname, node.go_dictcomp_type))
 		else:
-			writer.write('%s = []'%cname)
+			writer.write('%s = {}'%cname)
 
 		generators = list( node.generators )
 		generators.reverse()
@@ -706,27 +706,13 @@ def _gen_comp(self, generators, node):
 					test.append( self.visit(compare) )
 
 				writer.write('if %s:' %' and '.join(test))
-
 				writer.push()
-				if self._with_dart:
-					writer.write('%s.add( %s )' %(cname,self.visit(node.elt)) )
-				elif self._with_lua:
-					writer.write('table.insert(%s, %s )' %(cname,self.visit(node.elt)) )
-				elif self._with_go:
-					writer.write('%s = append(%s, %s )' %(cname, cname,self.visit(node.elt)) )
-				else:
-					writer.write('%s.push( %s )' %(cname,self.visit(node.elt)) )
+				self._gen_comp_helper(cname, node)
 				writer.pull()
+
 			else:
+				self._gen_comp_helper(cname, node)
 
-				if self._with_dart:
-					writer.write('%s.add( %s )' %(cname,self.visit(node.elt)) )
-				elif self._with_lua:
-					writer.write('table.insert(%s, %s )' %(cname,self.visit(node.elt)) )
-				elif self._with_go:
-					writer.write('%s = append(%s, %s )' %(cname, cname,self.visit(node.elt)) )
-				else:
-					writer.write('%s.push( %s )' %(cname,self.visit(node.elt)) )
 		if self._with_lua:
 			writer.write('idx%s = idx%s + 1' %(id,id) )
 		else:
@@ -736,7 +722,24 @@ def _gen_comp(self, generators, node):
 		if self._with_lua:  ## convert to list
 			writer.write('%s = list.__call__({},{pointer:%s, length:idx%s})' %(cname, cname, id))
 
+	def _gen_comp_helper(self, cname, node):
+		if isinstance(node, ast.DictComp):
+			key = self.visit(node.key)
+			val = self.visit(node.value)
+			if self._with_go:
+				writer.write('%s[ %s ] = %s' %(cname, key, val) )
+			else:
+				writer.write('%s[ %s ] = %s' %(cname, key, val) )
 
+		else:
+			if self._with_dart:
+				writer.write('%s.add( %s )' %(cname,self.visit(node.elt)) )
+			elif self._with_lua:
+				writer.write('table.insert(%s, %s )' %(cname,self.visit(node.elt)) )
+			elif self._with_go:
+				writer.write('%s = append(%s, %s )' %(cname, cname,self.visit(node.elt)) )
+			else:
+				writer.write('%s.push( %s )' %(cname,self.visit(node.elt)) )
 
 	def visit_In(self, node):
 		return ' in '

From 5121485fdbceadcd8f98a533dd022207379979b8 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Wed, 24 Sep 2014 02:07:49 -0700
Subject: [PATCH 16/58] Go map comprehensions.

---
 pythonjs/python_to_pythonjs.py   | 10 +++++++---
 pythonjs/typedpython.py          |  2 ++
 regtests/go/map_comprehension.py |  5 ++---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
index 402f1d5..6e72f74 100755
--- a/pythonjs/python_to_pythonjs.py
+++ b/pythonjs/python_to_pythonjs.py
@@ -619,7 +619,8 @@ def visit_DictComp(self, node):
 
 		if self._with_go:
 			assert node.go_dictcomp_type
-			writer.write('%s = __go__map__(%s)' %(cname, node.go_dictcomp_type))
+			k,v = node.go_dictcomp_type
+			writer.write('%s = __go__map__(%s, %s)<<{}' %(cname, k,v))
 		else:
 			writer.write('%s = {}'%cname)
 
@@ -1442,10 +1443,13 @@ def visit_BinOp(self, node):
 		is_go_listcomp = False
 		if self._with_go:
 			if op == '<<':
-				if isinstance(node.left, ast.Call) and isinstance(node.left.func, ast.Name) and node.left.func.id=='__go__array__':
-					if isinstance(node.right, ast.GeneratorExp):
+				if isinstance(node.left, ast.Call) and isinstance(node.left.func, ast.Name):
+					if node.left.func.id=='__go__array__' and isinstance(node.right, ast.GeneratorExp):
 						is_go_listcomp = True
 						node.right.go_listcomp_type = node.left.args[0].id
+					elif node.left.func.id=='__go__map__':
+						is_go_listcomp = True
+						node.right.go_dictcomp_type =  ( node.left.args[0].id, node.left.args[1].id )
 
 
 		right = self.visit(node.right)
diff --git a/pythonjs/typedpython.py b/pythonjs/typedpython.py
index c7ba584..3d6c9c5 100644
--- a/pythonjs/typedpython.py
+++ b/pythonjs/typedpython.py
@@ -504,6 +504,8 @@ def listpass( a:[]int ):
 def mappass( a:map[string]int ):
 	pass
 
+m = map[int]string{ a:'xxx' for a in range(10)}
+
 '''
 
 if __name__ == '__main__':
diff --git a/regtests/go/map_comprehension.py b/regtests/go/map_comprehension.py
index 8f185ec..648da5a 100644
--- a/regtests/go/map_comprehension.py
+++ b/regtests/go/map_comprehension.py
@@ -2,8 +2,7 @@
 map comprehensions
 '''
 
-
-
 def main():
 	m = map[int]string{ a:'xxx' for a in range(10)}
-	print(m)
+	TestError( m[0]=='xxx' )
+	TestError( m[9]=='xxx' )

From aff2a6d2150643a448324db49188260cfde52450 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Wed, 24 Sep 2014 04:24:49 -0700
Subject: [PATCH 17/58] translator.py new option --fast-javascript that changes
 all settings to output fast and clean javascript (breaks some python rules,
 like using objects as dict keys)

---
 README.md                      | 25 ++++++++++--------
 pythonjs/python_to_pythonjs.py | 25 ++++++++++++------
 pythonjs/pythonjs.py           | 46 +++++++++++++++++++++++-----------
 pythonjs/translator.py         | 15 ++++++++---
 4 files changed, 74 insertions(+), 37 deletions(-)

diff --git a/README.md b/README.md
index e1178a6..1a4d544 100644
--- a/README.md
+++ b/README.md
@@ -52,11 +52,23 @@ Gython supports classes and multiple inheritance, with method overrides and call
 
 ```
 
-Gython supports list comprehensions.
-Below is an array of integers.
+Gython supports Go's typed maps.
+
+```
+	a = map[string]int{
+		'x': 1,
+		'y': 2,
+		'z': 3,
+	}
+
+```
+
+Gython supports array and map comprehensions.
+Below is an array of integers, and a map of strings with integer keys.
 
 ```
 	a = []int(x for x in range(3))
+	b = map[int]string{ i:'xxx' for i in range(10) }
 ```
 
 Gython supports Go's send data to channel syntax
@@ -67,16 +79,7 @@ Gython supports Go's send data to channel syntax
 
 ```
 
-Gython supports Go's typed maps.
-
-```
-	a = map[string]int{
-		'x': 1,
-		'y': 2,
-		'z': 3,
-	}
 
-```
 
 Array and maps are always passed as pointers in a function call, this way the called function can modify the array or map inplace.
 In the example below `a` is typed as an array of integers `[]int`, but it is actually retyped when transformed into Go as `*[]int`
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
index 6e72f74..603885f 100755
--- a/pythonjs/python_to_pythonjs.py
+++ b/pythonjs/python_to_pythonjs.py
@@ -132,13 +132,14 @@ def format_error(self, node):
 			msg += '%s%s line:%s col:%s\n' % (' '*(l+1)*2, n.__class__.__name__, n.lineno, n.col_offset)
                 return msg
 
-	def __init__(self, source=None, module=None, module_path=None, dart=False, coffee=False, lua=False, go=False):
+	def __init__(self, source=None, module=None, module_path=None, dart=False, coffee=False, lua=False, go=False, fast_javascript=False):
 		super(PythonToPythonJS, self).__init__()
 		self._module_path = module_path  ## used for user `from xxx import *` to load .py files in the same directory.
 		self._with_lua = lua
 		self._with_coffee = coffee
 		self._with_dart = dart
 		self._with_go = go
+		self._fast_js = fast_javascript
 
 		self._html_tail = []; script = False
 		if source.strip().startswith('<html'):
@@ -199,7 +200,12 @@ def __init__(self, source=None, module=None, module_path=None, dart=False, coffe
 		self._line_number = 0
 		self._stack = []        ## current path to the root
 
-		self._direct_operators = set()  ## optimize "+" and "*" operator
+		## optimize "+" and "*" operator
+		if fast_javascript:
+			self._direct_operators = set( ['+', '*'] )
+		else:
+			self._direct_operators = set()
+
 		self._with_ll = False   ## lowlevel
 		self._with_js = True
 		self._in_lambda = False
@@ -211,7 +217,7 @@ def __init__(self, source=None, module=None, module_path=None, dart=False, coffe
 		self._with_webworker = False
 		self._with_rpc = None
 		self._with_rpc_name = None
-		self._with_direct_keys = False
+		self._with_direct_keys = fast_javascript
 
 		self._with_glsl = False
 		self._in_gpu_main = False
@@ -503,7 +509,8 @@ def visit_ImportFrom(self, node):
 			data = open(path, 'rb').read()
 			subtrans = PythonToPythonJS(
 				data, 
-				module_path=self._module_path
+				module_path     = self._module_path,
+				fast_javascript = self._fast_js
 			)
 			self._js_classes.update( subtrans._js_classes ) ## TODO - what other typedef info needs to be copied here?
 
@@ -1297,7 +1304,7 @@ def visit_If(self, node):
 		elif isinstance(node.test, ast.List):
 			writer.write('if %s.length:' % self.visit(node.test))
 
-		elif self._with_ll or self._with_glsl:
+		elif self._with_ll or self._with_glsl or self._fast_js:
 			writer.write('if %s:' % self.visit(node.test))
 		elif isinstance(node.test, ast.Compare):
 			writer.write('if %s:' % self.visit(node.test))
@@ -4330,14 +4337,16 @@ def collect_generator_functions(node):
 
 
 
-def main(script, dart=False, coffee=False, lua=False, go=False, module_path=None):
+def main(script, dart=False, coffee=False, lua=False, go=False, module_path=None, fast_javascript=False):
+	assert fast_javascript
 	translator = PythonToPythonJS(
 		source = script, 
-		dart   = dart or '--dart' in sys.argv,
+		dart   = dart,
 		coffee = coffee,
 		lua    = lua,
 		go     = go,
-		module_path = module_path
+		module_path = module_path,
+		fast_javascript = fast_javascript
 	)
 
 	code = writer.getvalue()
diff --git a/pythonjs/pythonjs.py b/pythonjs/pythonjs.py
index a60726d..fd07595 100755
--- a/pythonjs/pythonjs.py
+++ b/pythonjs/pythonjs.py
@@ -25,9 +25,10 @@ def __init__(self, node):
 		RuntimeError.__init__(self)
 
 class JSGenerator(NodeVisitor): #, inline_function.Inliner):
-	def __init__(self, requirejs=True, insert_runtime=True, webworker=False, function_expressions=True):
+	def __init__(self, requirejs=True, insert_runtime=True, webworker=False, function_expressions=True, fast_javascript=False):
 		#writer = code_writer.Writer()
 		#self.setup_inliner( writer )
+		self._fast_js = fast_javascript
 		self._func_expressions = function_expressions
 		self._indent = 0
 		self._global_functions = {}
@@ -96,10 +97,11 @@ def visit_With(self, node):
 		r = []
 		is_switch = False
 		if isinstance( node.context_expr, Name ) and node.context_expr.id == '__default__':
-			r.append('default:')
+			r.append(self.indent()+'default:')
 		elif isinstance( node.context_expr, Name ) and node.context_expr.id == '__select__':
 			r.append('select {')
 			is_switch = True
+			self.push()
 		elif isinstance( node.context_expr, ast.Call ):
 			if not isinstance(node.context_expr.func, ast.Name):
 				raise SyntaxError( self.visit(node.context_expr))
@@ -111,19 +113,21 @@ def visit_With(self, node):
 				a = '%s = %s' %(node.context_expr.keywords[0].arg, self.visit(node.context_expr.keywords[0].value))
 
 			if node.context_expr.func.id == '__case__':
-				r.append('case %s:' %a)
+				r.append(self.indent()+'case %s:' %a)
 			elif node.context_expr.func.id == '__switch__':
 				r.append('switch (%s) {' %self.visit(node.context_expr.args[0]))
 				is_switch = True
 			else:
 				raise SyntaxError( 'invalid use of with')
 
-
+		self.push()
 		for b in node.body:
 			a = self.visit(b)
-			if a: r.append(a)
+			if a: r.append(self.indent()+a)
+		self.pull()
 
 		if is_switch:
+			self.pull()
 			r.append('}')
 
 		return '\n'.join(r)
@@ -537,9 +541,9 @@ def _visit_function(self, node):
 			## infact, var should always be used with function expressions.
 
 			if self._func_expressions or func_expr:
-				buffer = self.indent() + 'var %s = function(%s) {\n' % (node.name, ', '.join(args))
+				buffer = 'var %s = function(%s) {\n' % (node.name, ', '.join(args))
 			else:
-				buffer = self.indent() + 'function %s(%s) {\n' % (node.name, ', '.join(args))
+				buffer = 'function %s(%s) {\n' % (node.name, ', '.join(args))
 
 			if self._requirejs and node.name not in self._exports:
 				self._exports.add( node.name )
@@ -547,9 +551,9 @@ def _visit_function(self, node):
 		else:
 
 			if self._func_expressions or func_expr:
-				buffer = self.indent() + 'var %s = function(%s) {\n' % (node.name, ', '.join(args))
+				buffer = 'var %s = function(%s) {\n' % (node.name, ', '.join(args))
 			else:
-				buffer = self.indent() + 'function %s(%s) {\n' % (node.name, ', '.join(args))
+				buffer = 'function %s(%s) {\n' % (node.name, ', '.join(args))
 
 		self.push()
 		body = list()
@@ -1031,15 +1035,21 @@ def visit_Is(self, node):
 
 	def visit_Compare(self, node):
 		if self._glsl:
-			comp = [self.visit(node.left)]
+			return self.visit(node.left)
 		elif isinstance(node.ops[0], ast.Eq):
 			left = self.visit(node.left)
 			right = self.visit(node.comparators[0])
-			return '(%s instanceof Array ? JSON.stringify(%s)==JSON.stringify(%s) : %s===%s)' %(left, left, right, left, right)
+			if self._fast_js:
+				return '(%s===%s)' %(left, right)
+			else:
+				return '(%s instanceof Array ? JSON.stringify(%s)==JSON.stringify(%s) : %s===%s)' %(left, left, right, left, right)
 		elif isinstance(node.ops[0], ast.NotEq):
 			left = self.visit(node.left)
 			right = self.visit(node.comparators[0])
-			return '(!(%s instanceof Array ? JSON.stringify(%s)==JSON.stringify(%s) : %s===%s))' %(left, left, right, left, right)
+			if self._fast_js:
+				return '(%s!==%s)' %(left, right)
+			else:
+				return '(!(%s instanceof Array ? JSON.stringify(%s)==JSON.stringify(%s) : %s===%s))' %(left, left, right, left, right)
 
 		else:
 			comp = [ '(']
@@ -1059,7 +1069,7 @@ def visit_Compare(self, node):
 				else:
 					comp.append( self.visit(node.comparators[i]) )
 
-		return ' '.join( comp )
+			return ' '.join( comp )
 
 	def visit_Not(self, node):
 		return '!'
@@ -1254,7 +1264,7 @@ def generate_runtime():
 	]
 	return '\n'.join( lines )
 
-def main(source, requirejs=True, insert_runtime=True, webworker=False, function_expressions=True):
+def main(source, requirejs=True, insert_runtime=True, webworker=False, function_expressions=True, fast_javascript=False):
 	head = []
 	tail = []
 	script = False
@@ -1319,7 +1329,13 @@ def main(source, requirejs=True, insert_runtime=True, webworker=False, function_
 
 		sys.exit(1)
 
-	gen = JSGenerator( requirejs=requirejs, insert_runtime=insert_runtime, webworker=webworker, function_expressions=function_expressions )
+	gen = JSGenerator(
+		requirejs=requirejs, 
+		insert_runtime=insert_runtime, 
+		webworker=webworker, 
+		function_expressions=function_expressions,
+		fast_javascript = fast_javascript
+	)
 	output = gen.visit(tree)
 	if head:
 		head.append( output )
diff --git a/pythonjs/translator.py b/pythonjs/translator.py
index e3f797a..369d380 100755
--- a/pythonjs/translator.py
+++ b/pythonjs/translator.py
@@ -10,7 +10,7 @@
 from pythonjs_to_go import main as pythonjs_to_go
 
 cmdhelp = """\
-usage: translator.py [--dart|--coffee|--lua|--go|--visjs|--no-wrapper|--no-runtime|--analyze] file.py
+usage: translator.py [--dart|--coffee|--lua|--go|--visjs|--no-wrapper|--no-runtime|--fast-javascript|--analyze] file.py
 
 example:
        translator.py --no-wrapper myscript.py > myscript.js
@@ -63,7 +63,11 @@ def main(script, module_path=None):
 			a = python_to_pythonjs(script, lua=True, module_path=module_path)
 			code = pythonjs_to_luajs( a )
 		else:
-			a = python_to_pythonjs(script, module_path=module_path)
+			a = python_to_pythonjs(
+				script, 
+				module_path=module_path,
+				fast_javascript = '--fast-javascript' in sys.argv
+			)
 
 			if isinstance(a, dict):
 				res = {}
@@ -75,7 +79,12 @@ def main(script, module_path=None):
 				## and returns `__module__`
 				## if --no-wrapper is used, then the raw javascript is returned.
 				## by default the pythonjs runtime is inserted, this can be disabled with `--no-runtime`
-				code = pythonjs_to_javascript( a, requirejs='--no-wrapper' not in sys.argv, insert_runtime='--no-runtime' not in sys.argv )
+				code = pythonjs_to_javascript(
+					a, 
+					requirejs='--no-wrapper' not in sys.argv, 
+					insert_runtime='--no-runtime' not in sys.argv,
+					fast_javascript = '--fast-javascript' in sys.argv
+				)
 
 		if '--analyze' in sys.argv:
 			dartanalyzer = os.path.expanduser('~/dart-sdk/bin/dartanalyzer')

From 69f3a58a20793e3562d8b8ec3c134ae6bb8b44cd Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Wed, 24 Sep 2014 07:58:31 -0700
Subject: [PATCH 18/58] split runtime into two files, pythonjs-minimal.js
 contains just what is likely needed for programs that do not depend much on
 too many pythonic features.

---
 pythonjs/python_to_pythonjs.py    |   48 +-
 pythonjs/pythonjs-minimal.js      |  530 ++++++++
 pythonjs/pythonjs.js              | 2117 ++++++++++++++---------------
 pythonjs/pythonjs.py              |   28 +-
 pythonjs/runtime/builtins.py      |  694 +---------
 pythonjs/runtime/builtins_core.py |  368 +++++
 pythonjs/runtime/builtins_glsl.py |  313 +++++
 pythonjs/typedpython.py           |   13 +-
 8 files changed, 2322 insertions(+), 1789 deletions(-)
 create mode 100644 pythonjs/pythonjs-minimal.js
 create mode 100644 pythonjs/runtime/builtins_core.py
 create mode 100644 pythonjs/runtime/builtins_glsl.py

diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
index 603885f..7358eef 100755
--- a/pythonjs/python_to_pythonjs.py
+++ b/pythonjs/python_to_pythonjs.py
@@ -476,7 +476,10 @@ def visit_ImportFrom(self, node):
 		else:
 			lib = ministdlib.JS
 
-		path = os.path.join( self._module_path, node.module+'.py')
+		if self._module_path:
+			path = os.path.join( self._module_path, node.module+'.py')
+		else:
+			path = os.path.join( './', node.module+'.py')
 
 		if node.module == 'time' and node.names[0].name == 'sleep':
 			self._use_sleep = True
@@ -515,7 +518,7 @@ def visit_ImportFrom(self, node):
 			self._js_classes.update( subtrans._js_classes ) ## TODO - what other typedef info needs to be copied here?
 
 		else:
-			msg = 'invalid import - file not found: %s/%s.py'%(self._module_path,node.module)
+			msg = 'invalid import - file not found: %s'%path
 			raise SyntaxError( self.format_error(msg) )
 
 	def visit_Assert(self, node):
@@ -1088,17 +1091,21 @@ def _visit_js_classdef(self, node):
 		else:
 			writer.write('pass')
 
+
 		## `self.__class__` pointer ##
-		writer.write('this.__class__ = %s' %name)
+		writer.write('this.__class__ = %s' %name)  ## isinstance runtime builtin requires this
 
-		## instance UID ##
-		writer.write('this.__uid__ = "" + _PythonJS_UID')
-		writer.write('_PythonJS_UID += 1')
+		if not self._fast_js:
+			## instance UID ##
+			writer.write('this.__uid__ = "" + _PythonJS_UID')
+			writer.write('_PythonJS_UID += 1')
 
 		writer.pull()
-		## class UID ##
-		writer.write('%s.__uid__ = "" + _PythonJS_UID' %name)
-		writer.write('_PythonJS_UID += 1')
+
+		if not self._fast_js:
+			## class UID ##
+			writer.write('%s.__uid__ = "" + _PythonJS_UID' %name)
+			writer.write('_PythonJS_UID += 1')
 
 		#keys = methods.keys()
 		#keys.sort()
@@ -1151,8 +1158,8 @@ def _visit_js_classdef(self, node):
 			writer.write('%s.prototype.__struct_name__ = "%s"' %(name,name))
 
 		## TODO support property decorators in javascript-mode ##
-		writer.write('%s.prototype.__properties__ = {}' %name)
-		writer.write('%s.prototype.__unbound_methods__ = {}' %name)
+		#writer.write('%s.prototype.__properties__ = {}' %name)
+		#writer.write('%s.prototype.__unbound_methods__ = {}' %name)
 
 
 		self._in_js_class = False
@@ -2228,11 +2235,17 @@ def _visit_assign_helper(self, node, target):
 			writer.write('%s = %s' % (','.join(elts), self.visit(node.value)))
 
 		else:  # it's a Tuple
-			id = self.identifier
-			self.identifier += 1
-			r = '__r_%s' % id
-			writer.write('var(%s)' % r)
-			writer.write('%s = %s' % (r, self.visit(node.value)))
+
+			if isinstance(node.value, ast.Name):
+				r = node.value.id
+			else:
+				id = self.identifier
+				self.identifier += 1
+				r = '__r_%s' % id
+				writer.write('var(%s)' % r)
+				writer.write('%s = %s' % (r, self.visit(node.value)))
+
+
 			for i, target in enumerate(target.elts):
 				if isinstance(target, Attribute):
 					code = '__set__(%s, "%s", %s[%s])' % (
@@ -2843,7 +2856,7 @@ def visit_Lambda(self, node):
 
 		##'__INLINE_FUNCTION__' from typedpython.py
 
-		if hasattr(node, 'keep_as_lambda') or args and args[0]=='__INLINE_FUNCTION__':
+		if hasattr(node, 'keep_as_lambda') or (args and args[0]=='__INLINE_FUNCTION__'):
 			## TODO lambda keyword args
 			self._in_lambda = True
 			a = '(lambda %s: %s)' %(','.join(args), self.visit(node.body))
@@ -4338,7 +4351,6 @@ def collect_generator_functions(node):
 
 
 def main(script, dart=False, coffee=False, lua=False, go=False, module_path=None, fast_javascript=False):
-	assert fast_javascript
 	translator = PythonToPythonJS(
 		source = script, 
 		dart   = dart,
diff --git a/pythonjs/pythonjs-minimal.js b/pythonjs/pythonjs-minimal.js
new file mode 100644
index 0000000..f828906
--- /dev/null
+++ b/pythonjs/pythonjs-minimal.js
@@ -0,0 +1,530 @@
+IndexError = function(msg) {this.message = msg || "";}; IndexError.prototype = Object.create(Error.prototype); IndexError.prototype.name = "IndexError";
+KeyError   = function(msg) {this.message = msg || "";}; KeyError.prototype = Object.create(Error.prototype); KeyError.prototype.name = "KeyError";
+ValueError = function(msg) {this.message = msg || "";}; ValueError.prototype = Object.create(Error.prototype); ValueError.prototype.name = "ValueError";
+AttributeError = function(msg) {this.message = msg || "";}; AttributeError.prototype = Object.create(Error.prototype);AttributeError.prototype.name = "AttributeError";
+RuntimeError   = function(msg) {this.message = msg || "";}; RuntimeError.prototype = Object.create(Error.prototype);RuntimeError.prototype.name = "RuntimeError";
+var hasattr = function(ob, attr) {
+  
+  return Object.hasOwnProperty.call(ob, attr);
+}
+
+var len = function(ob) {
+  
+  if (ob instanceof Array) {
+    return ob.length;
+  } else {
+    if (__is_typed_array(ob)) {
+      return ob.length;
+    } else {
+      if (ob instanceof ArrayBuffer) {
+        return ob.byteLength;
+      } else {
+        if (ob.__len__) {
+          return ob.__len__();
+        } else {
+          return Object.keys(ob).length;
+        }
+      }
+    }
+  }
+}
+
+var func = function(a) {
+  
+  if (this.indexOf(a)===-1) {
+    return false;
+  } else {
+    return true;
+  }
+}
+
+Object.defineProperty(String.prototype, "__contains__", { enumerable:false,value:func,writeable:true,configurable:true });
+var func = function(start, stop, step) {
+  
+  if (( start ) === undefined && ( stop ) === undefined && (step===-1)) {
+    return this.split("").reverse().join("");
+  } else {
+    if (( stop ) < 0) {
+      stop = (this.length + stop);
+    }
+    return this.substring(start, stop);
+  }
+}
+
+Object.defineProperty(String.prototype, "__getslice__", { enumerable:false,value:func,writeable:true,configurable:true });
+var func = function() {
+  
+  return this.split("\n");
+}
+
+Object.defineProperty(String.prototype, "splitlines", { enumerable:false,value:func,writeable:true,configurable:true });
+var func = function() {
+  
+  return this.trim();
+}
+
+Object.defineProperty(String.prototype, "strip", { enumerable:false,value:func,writeable:true,configurable:true });
+var func = function(a) {
+  
+  if (this.substring(0, a.length)===a) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+Object.defineProperty(String.prototype, "startswith", { enumerable:false,value:func,writeable:true,configurable:true });
+var func = function(a) {
+  
+  if (this.substring((this.length - a.length), this.length)===a) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+Object.defineProperty(String.prototype, "endswith", { enumerable:false,value:func,writeable:true,configurable:true });
+var func = function(a) {
+  var i,arr,out;
+  out = "";
+  if (a instanceof Array) {
+    arr = a;
+  } else {
+    arr = a["$wrapped"];
+  }
+  i = 0;
+    var __iter1 = arr;
+  if (! (__iter1 instanceof Array || typeof __iter1 == "string" || __is_typed_array(__iter1) || __is_some_array(__iter1) )) { __iter1 = __object_keys__(__iter1) }
+  for (var __idx1=0; __idx1 < __iter1.length; __idx1++) {
+    var value = __iter1[ __idx1 ];
+    out += value;
+    i += 1;
+    if (( i ) < arr.length) {
+      out += this;
+    }
+  }
+  return out;
+}
+
+Object.defineProperty(String.prototype, "join", { enumerable:false,value:func,writeable:true,configurable:true });
+var func = function() {
+  
+  return this.toUpperCase();
+}
+
+Object.defineProperty(String.prototype, "upper", { enumerable:false,value:func,writeable:true,configurable:true });
+var func = function() {
+  
+  return this.toLowerCase();
+}
+
+Object.defineProperty(String.prototype, "lower", { enumerable:false,value:func,writeable:true,configurable:true });
+var func = function(a) {
+  var i;
+  i = this.indexOf(a);
+  if (i===-1) {
+    throw new ValueError((a + " - not in string"));
+  }
+  return i;
+}
+
+Object.defineProperty(String.prototype, "index", { enumerable:false,value:func,writeable:true,configurable:true });
+var func = function(a) {
+  
+  if (this.indexOf(a)===-1) {
+    return false;
+  } else {
+    return true;
+  }
+}
+
+Object.defineProperty(Array.prototype, "__contains__", { enumerable:false,value:func,writeable:true,configurable:true });
+var func = function(start, stop, step) {
+  var i,arr,n;
+  arr = [];
+  start = (start | 0);
+  if (( stop ) === undefined) {
+    stop = this.length;
+  }
+  if (( start ) < 0) {
+    start = (this.length + start);
+  }
+  if (( stop ) < 0) {
+    stop = (this.length + stop);
+  }
+  if (typeof(step)==="number") {
+    if (( step ) < 0) {
+      i = start;
+      while (( i ) >= 0) {
+        arr.push(this[i]);
+        i += step;
+      }
+      return arr;
+    } else {
+      i = start;
+      n = stop;
+      while (( i ) < n) {
+        arr.push(this[i]);
+        i += step;
+      }
+      return arr;
+    }
+  } else {
+    i = start;
+    n = stop;
+    while (( i ) < n) {
+      arr.push(this[i]);
+      i += 1;
+    }
+    return arr;
+  }
+}
+
+Object.defineProperty(Array.prototype, "__getslice__", { enumerable:false,value:func,writeable:true,configurable:true });
+var func = function(start, stop, step, items) {
+  var arr;
+  if (( start ) === undefined) {
+    start = 0;
+  }
+  if (( stop ) === undefined) {
+    stop = this.length;
+  }
+  arr = [start, (stop - start)];
+    var __iter2 = items;
+  if (! (__iter2 instanceof Array || typeof __iter2 == "string" || __is_typed_array(__iter2) || __is_some_array(__iter2) )) { __iter2 = __object_keys__(__iter2) }
+  for (var __idx2=0; __idx2 < __iter2.length; __idx2++) {
+    var item = __iter2[ __idx2 ];
+    arr.push(item);
+  }
+  this.splice.apply(this, arr);
+}
+
+Object.defineProperty(Array.prototype, "__setslice__", { enumerable:false,value:func,writeable:true,configurable:true });
+var func = function(item) {
+  
+  this.push(item);
+  return this;
+}
+
+Object.defineProperty(Array.prototype, "append", { enumerable:false,value:func,writeable:true,configurable:true });
+var extend = function(other) {
+  
+    var __iter3 = other;
+  if (! (__iter3 instanceof Array || typeof __iter3 == "string" || __is_typed_array(__iter3) || __is_some_array(__iter3) )) { __iter3 = __object_keys__(__iter3) }
+  for (var __idx3=0; __idx3 < __iter3.length; __idx3++) {
+    var obj = __iter3[ __idx3 ];
+    this.push(obj);
+  }
+  return this;
+}
+
+Object.defineProperty(Array.prototype, "extend", { enumerable:false,value:extend,writeable:true,configurable:true });
+var func = function(item) {
+  var index;
+  index = this.indexOf(item);
+  this.splice(index, 1);
+}
+
+Object.defineProperty(Array.prototype, "remove", { enumerable:false,value:func,writeable:true,configurable:true });
+var insert = function(index, obj) {
+  
+  if (( index ) < 0) {
+    index = (this.length + index);
+  }
+  this.splice(index, 0, obj);
+}
+
+Object.defineProperty(Array.prototype, "insert", { enumerable:false,value:insert,writeable:true,configurable:true });
+var index = function(obj) {
+  
+  return this.indexOf(obj);
+}
+
+Object.defineProperty(Array.prototype, "index", { enumerable:false,value:index,writeable:true,configurable:true });
+var count = function(obj) {
+  var a;
+  a = 0;
+    var __iter4 = this;
+  if (! (__iter4 instanceof Array || typeof __iter4 == "string" || __is_typed_array(__iter4) || __is_some_array(__iter4) )) { __iter4 = __object_keys__(__iter4) }
+  for (var __idx4=0; __idx4 < __iter4.length; __idx4++) {
+    var item = __iter4[ __idx4 ];
+    if (( item ) === obj) {
+      a += 1;
+    }
+  }
+  return a;
+}
+
+Object.defineProperty(Array.prototype, "count", { enumerable:false,value:count,writeable:true,configurable:true });
+var __contains__ = function(ob, a) {
+  var t;
+  t = typeof(ob);
+  if (t==="string") {
+    if (ob.indexOf(a)===-1) {
+      return false;
+    } else {
+      return true;
+    }
+  } else {
+    if (t==="number") {
+      throw new TypeError;
+    } else {
+      if (__is_typed_array(ob)) {
+                var __iter5 = ob;
+        if (! (__iter5 instanceof Array || typeof __iter5 == "string" || __is_typed_array(__iter5) || __is_some_array(__iter5) )) { __iter5 = __object_keys__(__iter5) }
+        for (var __idx5=0; __idx5 < __iter5.length; __idx5++) {
+          var x = __iter5[ __idx5 ];
+          if (x===a) {
+            return true;
+          }
+        }
+        return false;
+      } else {
+        if (ob.__contains__) {
+          return ob.__contains__(a);
+        } else {
+          if (ob instanceof Object && Object.hasOwnProperty.call(ob, a)) {
+            return true;
+          } else {
+            return false;
+          }
+        }
+      }
+    }
+  }
+}
+
+__dom_array_types__ = [];
+if (typeof(NodeList)==="function") {
+  __dom_array_types__ = [NodeList, FileList, DOMStringList, HTMLCollection, SVGNumberList, SVGTransformList];
+  if (typeof(DataTransferItemList)==="function") {
+    __dom_array_types__.push(DataTransferItemList);
+  }
+  if (typeof(HTMLAllCollection)==="function") {
+    __dom_array_types__.push(HTMLAllCollection);
+  }
+  if (typeof(SVGElementInstanceList)==="function") {
+    __dom_array_types__.push(SVGElementInstanceList);
+  }
+  if (typeof(ClientRectList)==="function") {
+    __dom_array_types__.push(ClientRectList);
+  }
+}
+var __is_some_array = function(ob) {
+  
+  if (( __dom_array_types__.length ) > 0) {
+        var __iter6 = __dom_array_types__;
+    if (! (__iter6 instanceof Array || typeof __iter6 == "string" || __is_typed_array(__iter6) || __is_some_array(__iter6) )) { __iter6 = __object_keys__(__iter6) }
+    for (var __idx6=0; __idx6 < __iter6.length; __idx6++) {
+      var t = __iter6[ __idx6 ];
+      if (ob instanceof t) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
+var __is_typed_array = function(ob) {
+  
+  if (ob instanceof Int8Array || ob instanceof Uint8Array) {
+    return true;
+  } else {
+    if (ob instanceof Int16Array || ob instanceof Uint16Array) {
+      return true;
+    } else {
+      if (ob instanceof Int32Array || ob instanceof Uint32Array) {
+        return true;
+      } else {
+        if (ob instanceof Float32Array || ob instanceof Float64Array) {
+          return true;
+        } else {
+          return false;
+        }
+      }
+    }
+  }
+}
+
+var __js_typed_array = function(t, a) {
+  var arr;
+  if (t==="i") {
+    arr =  new Int32Array(a.length);
+  }
+  arr.set(a);
+  return arr;
+}
+
+var __object_keys__ = function(ob) {
+  var arr;
+  "\n		notes:\n			. Object.keys(ob) will not work because we create PythonJS objects using `Object.create(null)`\n			. this is different from Object.keys because it traverses the prototype chain.\n		";
+  arr = [];
+  for (var key in ob) { arr.push(key) };
+  return arr;
+}
+
+var __sprintf = function(fmt, args) {
+  var chunks,item,arr;
+  if (args instanceof Array) {
+    chunks = fmt.split("%s");
+    arr = [];
+    var i;
+    i = 0;
+        var __iter7 = chunks;
+    if (! (__iter7 instanceof Array || typeof __iter7 == "string" || __is_typed_array(__iter7) || __is_some_array(__iter7) )) { __iter7 = __object_keys__(__iter7) }
+    for (var __idx7=0; __idx7 < __iter7.length; __idx7++) {
+      var txt = __iter7[ __idx7 ];
+      arr.append(txt);
+      if (( i ) >= args.length) {
+        break;
+      }
+      item = args[i];
+      if (typeof(item)==="string") {
+        arr.append(item);
+      } else {
+        if (typeof(item)==="number") {
+          arr.append(("" + item));
+        } else {
+          arr.append(Object.prototype.toString.call(item));
+        }
+      }
+      i += 1;
+    }
+    return "".join(arr);
+  } else {
+    return __replace_method(fmt, "%s", args);
+  }
+}
+
+var __jsdict = function(items) {
+  var d,key;
+  d = {};
+    var __iter8 = items;
+  if (! (__iter8 instanceof Array || typeof __iter8 == "string" || __is_typed_array(__iter8) || __is_some_array(__iter8) )) { __iter8 = __object_keys__(__iter8) }
+  for (var __idx8=0; __idx8 < __iter8.length; __idx8++) {
+    var item = __iter8[ __idx8 ];
+    key = item[0];
+    if (key instanceof Array) {
+      key = JSON.stringify(key);
+    } else {
+      if (key.__uid__) {
+        key = key.__uid__;
+      }
+    }
+    d[key] = item[1];
+  }
+  return d;
+}
+
+var __jsdict_get = function(ob, key, default_value) {
+  
+  if (ob instanceof Object) {
+    if (key instanceof Array) {
+      key = JSON.stringify(key);
+    }
+    if (key in ob) {
+      return ob[key];
+    }
+    return default_value;
+  } else {
+    if (( default_value ) !== undefined) {
+      return ob.get(key, default_value);
+    } else {
+      return ob.get(key);
+    }
+  }
+}
+
+var __jsdict_set = function(ob, key, value) {
+  
+  if (ob instanceof Object) {
+    if (key instanceof Array) {
+      key = JSON.stringify(key);
+    }
+    ob[key] = value;
+  } else {
+    ob.set(key,value);
+  }
+}
+
+var __jsdict_keys = function(ob) {
+  
+  if (ob instanceof Object) {
+    return Object.keys( ob );
+  } else {
+    return ob.keys();
+  }
+}
+
+var __jsdict_values = function(ob) {
+  var arr,value;
+  if (ob instanceof Object) {
+    arr = [];
+        var __iter9 = ob;
+    if (! (__iter9 instanceof Array || typeof __iter9 == "string" || __is_typed_array(__iter9) || __is_some_array(__iter9) )) { __iter9 = __object_keys__(__iter9) }
+    for (var __idx9=0; __idx9 < __iter9.length; __idx9++) {
+      var key = __iter9[ __idx9 ];
+      if (ob.hasOwnProperty(key)) {
+        value = ob[key];
+        arr.push(value);
+      }
+    }
+    return arr;
+  } else {
+    return ob.values();
+  }
+}
+
+var __jsdict_items = function(ob) {
+  var arr,value;
+  if (ob instanceof Object || ( ob.items ) === undefined) {
+    arr = [];
+        var __iter10 = ob;
+    if (! (__iter10 instanceof Array || typeof __iter10 == "string" || __is_typed_array(__iter10) || __is_some_array(__iter10) )) { __iter10 = __object_keys__(__iter10) }
+    for (var __idx10=0; __idx10 < __iter10.length; __idx10++) {
+      var key = __iter10[ __idx10 ];
+      if (Object.hasOwnProperty.call(ob, key)) {
+        value = ob[key];
+        arr.push([key, value]);
+      }
+    }
+    return arr;
+  } else {
+    return ob.items();
+  }
+}
+
+var __jsdict_pop = function(ob, key, _kwargs_) {
+  var v;
+  if (!( _kwargs_ instanceof Object )) {;
+  var _kwargs_ = {ob: arguments[0],key: arguments[1],_default: arguments[2]};
+  };
+  if (_kwargs_ === undefined || _kwargs_._default === undefined) {var _default = null} else {var _default=_kwargs_._default};
+  if (ob instanceof Array) {
+    if (ob.length) {
+      if (( key ) === undefined) {
+        return ob.pop();
+      } else {
+        return ob.splice(key, 1)[0];
+      }
+    } else {
+      throw new IndexError(key);
+    }
+  } else {
+    if (ob instanceof Object) {
+      if (key in ob) {
+        v = ob[key];
+        delete ob[key];
+        return v;
+      } else {
+        if (( _default ) === undefined) {
+          throw new KeyError(key);
+        } else {
+          return _default;
+        }
+      }
+    } else {
+      return ob.pop(key, _default);
+    }
+  }
+}
diff --git a/pythonjs/pythonjs.js b/pythonjs/pythonjs.js
index fa6a00b..54a5229 100644
--- a/pythonjs/pythonjs.js
+++ b/pythonjs/pythonjs.js
@@ -2,13 +2,13 @@ __NULL_OBJECT__ = Object.create(null);
 __WEBWORKER__ = false;
 __NODEJS__ = false;
 __BROWSER__ = false;
-if ((!(typeof(process) instanceof Array ? JSON.stringify(typeof(process))==JSON.stringify("undefined") : typeof(process)==="undefined"))) {
+if (typeof(process)!=="undefined") {
   __NODEJS__ = true;
 }
-if ((!(typeof(window) instanceof Array ? JSON.stringify(typeof(window))==JSON.stringify("undefined") : typeof(window)==="undefined"))) {
+if (typeof(window)!=="undefined") {
   __BROWSER__ = true;
 }
-if ((typeof(importScripts) instanceof Array ? JSON.stringify(typeof(importScripts))==JSON.stringify("function") : typeof(importScripts)==="function")) {
+if (typeof(importScripts)==="function") {
   __WEBWORKER__ = true;
 }
 var __create_array__ = function() {
@@ -40,21 +40,21 @@ var __get__ = function(object, attribute, error_message) {
       }
     }
   }
-  if ((attribute instanceof Array ? JSON.stringify(attribute)==JSON.stringify("__call__") : attribute==="__call__")) {
-    if ((object.pythonscript_function || object.is_wrapper)) {
+  if (attribute==="__call__") {
+    if (object.pythonscript_function || object.is_wrapper) {
       return object;
     } else {
       if (object.cached_wrapper) {
         return object.cached_wrapper;
       } else {
         if ({}.toString.call(object) === '[object Function]') {
-                              var wrapper = function(args, kwargs) {
+                    var wrapper = function(args, kwargs) {
             var i,arg,keys;
-            if ((!(args instanceof Array ? JSON.stringify(args)==JSON.stringify(null) : args===null))) {
+            if (args!==null) {
               i = 0;
               while (( i ) < args.length) {
                 arg = args[i];
-                if ((arg && (typeof(arg) instanceof Array ? JSON.stringify(typeof(arg))==JSON.stringify("object") : typeof(arg)==="object"))) {
+                if (arg && (typeof(arg)==="object")) {
                   if (arg.jsify) {
                     args[i] = arg.jsify();
                   }
@@ -62,14 +62,14 @@ var __get__ = function(object, attribute, error_message) {
                 i += 1;
               }
             }
-            if ((!(kwargs instanceof Array ? JSON.stringify(kwargs)==JSON.stringify(null) : kwargs===null))) {
+            if (kwargs!==null) {
               keys = __object_keys__(kwargs);
-              if ((!(keys.length instanceof Array ? JSON.stringify(keys.length)==JSON.stringify(0) : keys.length===0))) {
+              if (keys.length!==0) {
                 args.push(kwargs);
                 i = 0;
                 while (( i ) < keys.length) {
                   arg = kwargs[keys[i]];
-                  if ((arg && (typeof(arg) instanceof Array ? JSON.stringify(typeof(arg))==JSON.stringify("object") : typeof(arg)==="object"))) {
+                  if (arg && (typeof(arg)==="object")) {
                     if (arg.jsify) {
                       kwargs[keys[i]] = arg.jsify();
                     }
@@ -93,10 +93,10 @@ var __get__ = function(object, attribute, error_message) {
   }
   var attr;
   attr = object[attribute];
-  if ((( __NODEJS__ ) === false && ( __WEBWORKER__ ) === false)) {
+  if (( __NODEJS__ ) === false && ( __WEBWORKER__ ) === false) {
     if (object instanceof HTMLDocument) {
       if (typeof(attr) === 'function') {
-                        var wrapper = function(args, kwargs) {
+                var wrapper = function(args, kwargs) {
           return attr.apply(object, args);
         }
 
@@ -108,7 +108,7 @@ var __get__ = function(object, attribute, error_message) {
     } else {
       if (object instanceof HTMLElement) {
         if (typeof(attr) === 'function') {
-                              var wrapper = function(args, kwargs) {
+                    var wrapper = function(args, kwargs) {
             return attr.apply(object, args);
           }
 
@@ -121,18 +121,18 @@ var __get__ = function(object, attribute, error_message) {
     }
   }
   if (( attr ) !== undefined) {
-    if ((typeof(attr) instanceof Array ? JSON.stringify(typeof(attr))==JSON.stringify("function") : typeof(attr)==="function")) {
+    if (typeof(attr)==="function") {
       if (attr.pythonscript_function === undefined && attr.is_wrapper === undefined) {
-        if ((attr.prototype instanceof Object && ( Object.keys(attr.prototype).length ) > 0)) {
+        if (attr.prototype instanceof Object && ( Object.keys(attr.prototype).length ) > 0) {
           return attr;
         }
-                        var wrapper = function(args, kwargs) {
+                var wrapper = function(args, kwargs) {
           var i,arg,keys;
-          if ((!(args instanceof Array ? JSON.stringify(args)==JSON.stringify(null) : args===null))) {
+          if (args!==null) {
             i = 0;
             while (( i ) < args.length) {
               arg = args[i];
-              if ((arg && (typeof(arg) instanceof Array ? JSON.stringify(typeof(arg))==JSON.stringify("object") : typeof(arg)==="object"))) {
+              if (arg && (typeof(arg)==="object")) {
                 if (arg.jsify) {
                   args[i] = arg.jsify();
                 }
@@ -140,14 +140,14 @@ var __get__ = function(object, attribute, error_message) {
               i += 1;
             }
           }
-          if ((!(kwargs instanceof Array ? JSON.stringify(kwargs)==JSON.stringify(null) : kwargs===null))) {
+          if (kwargs!==null) {
             keys = __object_keys__(kwargs);
-            if ((!(keys.length instanceof Array ? JSON.stringify(keys.length)==JSON.stringify(0) : keys.length===0))) {
+            if (keys.length!==0) {
               args.push(kwargs);
               i = 0;
               while (( i ) < keys.length) {
                 arg = kwargs[keys[i]];
-                if ((arg && (typeof(arg) instanceof Array ? JSON.stringify(typeof(arg))==JSON.stringify("object") : typeof(arg)==="object"))) {
+                if (arg && (typeof(arg)==="object")) {
                   if (arg.jsify) {
                     kwargs[keys[i]] = arg.jsify();
                   }
@@ -164,10 +164,10 @@ var __get__ = function(object, attribute, error_message) {
         return wrapper;
       } else {
         if (attr.is_classmethod) {
-                              var method = function() {
+                    var method = function() {
             var args;
             args = Array.prototype.slice.call(arguments);
-            if ((args[0] instanceof Array && {}.toString.call(args[1]) === '[object Object]' && (args.length instanceof Array ? JSON.stringify(args.length)==JSON.stringify(2) : args.length===2))) {
+            if (args[0] instanceof Array && {}.toString.call(args[1]) === '[object Object]' && (args.length===2)) {
               /*pass*/
             } else {
               args = [args, {}];
@@ -200,8 +200,8 @@ var __get__ = function(object, attribute, error_message) {
     if (( attribute )  in  __class__.__unbound_methods__) {
       attr = __class__.__unbound_methods__[attribute];
       if (attr.fastdef) {
-                        var method = function(args, kwargs) {
-          if ((arguments && arguments[0])) {
+                var method = function(args, kwargs) {
+          if (arguments && arguments[0]) {
             arguments[0].splice(0, 0, object);
             return attr.apply(this, arguments);
           } else {
@@ -210,11 +210,11 @@ var __get__ = function(object, attribute, error_message) {
         }
 
       } else {
-                        var method = function(args, kwargs) {
-          if ((arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(0) : arguments.length===0)) {
+                var method = function(args, kwargs) {
+          if (arguments.length===0) {
             return attr([object], __NULL_OBJECT__);
           } else {
-            if ((args instanceof Array && ( typeof(kwargs) ) === "object" && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+            if (args instanceof Array && ( typeof(kwargs) ) === "object" && (arguments.length===2)) {
               args.splice(0, 0, object);
               if (( kwargs ) === undefined) {
                 return attr(args, __NULL_OBJECT__);
@@ -242,8 +242,8 @@ var __get__ = function(object, attribute, error_message) {
           return attr;
         } else {
           if (attr.fastdef) {
-                                    var method = function(args, kwargs) {
-              if ((arguments && arguments[0])) {
+                        var method = function(args, kwargs) {
+              if (arguments && arguments[0]) {
                 arguments[0].splice(0, 0, object);
                 return attr.apply(this, arguments);
               } else {
@@ -252,11 +252,11 @@ var __get__ = function(object, attribute, error_message) {
             }
 
           } else {
-                                    var method = function(args, kwargs) {
-              if ((arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(0) : arguments.length===0)) {
+                        var method = function(args, kwargs) {
+              if (arguments.length===0) {
                 return attr([object], __NULL_OBJECT__);
               } else {
-                if ((args instanceof Array && ( typeof(kwargs) ) === "object" && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+                if (args instanceof Array && ( typeof(kwargs) ) === "object" && (arguments.length===2)) {
                   args.splice(0, 0, object);
                   if (( kwargs ) === undefined) {
                     return attr(args, __NULL_OBJECT__);
@@ -290,8 +290,8 @@ var __get__ = function(object, attribute, error_message) {
       if (( attr ) !== undefined) {
         if ({}.toString.call(attr) === '[object Function]') {
           if (attr.fastdef) {
-                                    var method = function(args, kwargs) {
-              if ((arguments && arguments[0])) {
+                        var method = function(args, kwargs) {
+              if (arguments && arguments[0]) {
                 arguments[0].splice(0, 0, object);
                 return attr.apply(this, arguments);
               } else {
@@ -300,11 +300,11 @@ var __get__ = function(object, attribute, error_message) {
             }
 
           } else {
-                                    var method = function(args, kwargs) {
-              if ((arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(0) : arguments.length===0)) {
+                        var method = function(args, kwargs) {
+              if (arguments.length===0) {
                 return attr([object], __NULL_OBJECT__);
               } else {
-                if ((args instanceof Array && ( typeof(kwargs) ) === "object" && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+                if (args instanceof Array && ( typeof(kwargs) ) === "object" && (arguments.length===2)) {
                   args.splice(0, 0, object);
                   if (( kwargs ) === undefined) {
                     return attr(args, __NULL_OBJECT__);
@@ -353,8 +353,8 @@ var __get__ = function(object, attribute, error_message) {
       }
     }
   }
-  if ((attribute instanceof Array ? JSON.stringify(attribute)==JSON.stringify("__getitem__") : attribute==="__getitem__")) {
-            var wrapper = function(args, kwargs) {
+  if (attribute==="__getitem__") {
+        var wrapper = function(args, kwargs) {
       v = object[args[0]];
       if (( v ) === undefined) {
         throw new KeyError(args[0]);
@@ -364,8 +364,8 @@ var __get__ = function(object, attribute, error_message) {
     wrapper.is_wrapper = true;
     return wrapper;
   } else {
-    if ((attribute instanceof Array ? JSON.stringify(attribute)==JSON.stringify("__setitem__") : attribute==="__setitem__")) {
-                  var wrapper = function(args, kwargs) {
+    if (attribute==="__setitem__") {
+            var wrapper = function(args, kwargs) {
         object[args[0]] = args[1];
       }
 
@@ -373,20 +373,20 @@ var __get__ = function(object, attribute, error_message) {
       return wrapper;
     }
   }
-  if ((typeof(object, "function") && object.is_wrapper)) {
+  if (typeof(object, "function") && object.is_wrapper) {
     return object.wrapped[attribute];
   }
-  if (((attribute instanceof Array ? JSON.stringify(attribute)==JSON.stringify("__iter__") : attribute==="__iter__") && object instanceof Object)) {
-            var wrapper = function(args, kwargs) {
+  if ((attribute==="__iter__") && object instanceof Object) {
+        var wrapper = function(args, kwargs) {
       return  new __ArrayIterator(Object.keys(object), 0);
     }
 
     wrapper.is_wrapper = true;
     return wrapper;
   }
-  if (((attribute instanceof Array ? JSON.stringify(attribute)==JSON.stringify("__contains__") : attribute==="__contains__") && object instanceof Object)) {
-            var wrapper = function(args, kwargs) {
-      return (!(Object.keys(object).indexOf(args[0]) instanceof Array ? JSON.stringify(Object.keys(object).indexOf(args[0]))==JSON.stringify(-1) : Object.keys(object).indexOf(args[0])===-1));
+  if ((attribute==="__contains__") && object instanceof Object) {
+        var wrapper = function(args, kwargs) {
+      return (Object.keys(object).indexOf(args[0])!==-1);
     }
 
     wrapper.is_wrapper = true;
@@ -429,7 +429,7 @@ var _get_upstream_property = function(base, attr) {
 
 var __set__ = function(object, attribute, value) {
   "\n	__setattr__ is always called when an attribute is set,\n	unlike __getattr__ that only triggers when an attribute is not found,\n	this asymmetry is in fact part of the Python spec.\n	note there is no __setattribute__\n\n	In normal Python a property setter is not called before __setattr__,\n	this is bad language design because the user has been more explicit\n	in having the property setter.\n\n	In PythonJS, property setters are called instead of __setattr__.\n	";
-  if ((( "__class__" )  in  object && (!(object.__class__.__setters__.indexOf(attribute) instanceof Array ? JSON.stringify(object.__class__.__setters__.indexOf(attribute))==JSON.stringify(-1) : object.__class__.__setters__.indexOf(attribute)===-1)))) {
+  if (( "__class__" )  in  object && (object.__class__.__setters__.indexOf(attribute)!==-1)) {
     object[attribute] = value;
   } else {
     if (( "__setattr__" )  in  object) {
@@ -484,26 +484,542 @@ var __getargs__ = function(func_name, signature, args, kwargs) {
   return out;
 }
 
-_PythonJS_UID = 0;
 IndexError = function(msg) {this.message = msg || "";}; IndexError.prototype = Object.create(Error.prototype); IndexError.prototype.name = "IndexError";
 KeyError   = function(msg) {this.message = msg || "";}; KeyError.prototype = Object.create(Error.prototype); KeyError.prototype.name = "KeyError";
 ValueError = function(msg) {this.message = msg || "";}; ValueError.prototype = Object.create(Error.prototype); ValueError.prototype.name = "ValueError";
 AttributeError = function(msg) {this.message = msg || "";}; AttributeError.prototype = Object.create(Error.prototype);AttributeError.prototype.name = "AttributeError";
 RuntimeError   = function(msg) {this.message = msg || "";}; RuntimeError.prototype = Object.create(Error.prototype);RuntimeError.prototype.name = "RuntimeError";
-var __getfast__ = function(ob, attr) {
+var hasattr = function(ob, attr) {
+  
+  return Object.hasOwnProperty.call(ob, attr);
+}
+
+var len = function(ob) {
+  
+  if (ob instanceof Array) {
+    return ob.length;
+  } else {
+    if (__is_typed_array(ob)) {
+      return ob.length;
+    } else {
+      if (ob instanceof ArrayBuffer) {
+        return ob.byteLength;
+      } else {
+        if (ob.__len__) {
+          return ob.__len__();
+        } else {
+          return Object.keys(ob).length;
+        }
+      }
+    }
+  }
+}
+
+var func = function(a) {
+  
+  if (this.indexOf(a)===-1) {
+    return false;
+  } else {
+    return true;
+  }
+}
+
+Object.defineProperty(String.prototype, "__contains__", { enumerable:false,value:func,writeable:true,configurable:true });
+var func = function(start, stop, step) {
+  
+  if (( start ) === undefined && ( stop ) === undefined && (step===-1)) {
+    return this.split("").reverse().join("");
+  } else {
+    if (( stop ) < 0) {
+      stop = (this.length + stop);
+    }
+    return this.substring(start, stop);
+  }
+}
+
+Object.defineProperty(String.prototype, "__getslice__", { enumerable:false,value:func,writeable:true,configurable:true });
+var func = function() {
+  
+  return this.split("\n");
+}
+
+Object.defineProperty(String.prototype, "splitlines", { enumerable:false,value:func,writeable:true,configurable:true });
+var func = function() {
+  
+  return this.trim();
+}
+
+Object.defineProperty(String.prototype, "strip", { enumerable:false,value:func,writeable:true,configurable:true });
+var func = function(a) {
+  
+  if (this.substring(0, a.length)===a) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+Object.defineProperty(String.prototype, "startswith", { enumerable:false,value:func,writeable:true,configurable:true });
+var func = function(a) {
+  
+  if (this.substring((this.length - a.length), this.length)===a) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+Object.defineProperty(String.prototype, "endswith", { enumerable:false,value:func,writeable:true,configurable:true });
+var func = function(a) {
+  var i,arr,out;
+  out = "";
+  if (a instanceof Array) {
+    arr = a;
+  } else {
+    arr = a["$wrapped"];
+  }
+  i = 0;
+    var __iter1 = arr;
+  if (! (__iter1 instanceof Array || typeof __iter1 == "string" || __is_typed_array(__iter1) || __is_some_array(__iter1) )) { __iter1 = __object_keys__(__iter1) }
+  for (var __idx1=0; __idx1 < __iter1.length; __idx1++) {
+    var value = __iter1[ __idx1 ];
+    out += value;
+    i += 1;
+    if (( i ) < arr.length) {
+      out += this;
+    }
+  }
+  return out;
+}
+
+Object.defineProperty(String.prototype, "join", { enumerable:false,value:func,writeable:true,configurable:true });
+var func = function() {
+  
+  return this.toUpperCase();
+}
+
+Object.defineProperty(String.prototype, "upper", { enumerable:false,value:func,writeable:true,configurable:true });
+var func = function() {
+  
+  return this.toLowerCase();
+}
+
+Object.defineProperty(String.prototype, "lower", { enumerable:false,value:func,writeable:true,configurable:true });
+var func = function(a) {
+  var i;
+  i = this.indexOf(a);
+  if (i===-1) {
+    throw new ValueError((a + " - not in string"));
+  }
+  return i;
+}
+
+Object.defineProperty(String.prototype, "index", { enumerable:false,value:func,writeable:true,configurable:true });
+var func = function(a) {
+  
+  if (this.indexOf(a)===-1) {
+    return false;
+  } else {
+    return true;
+  }
+}
+
+Object.defineProperty(Array.prototype, "__contains__", { enumerable:false,value:func,writeable:true,configurable:true });
+var func = function(start, stop, step) {
+  var i,arr,n;
+  arr = [];
+  start = (start | 0);
+  if (( stop ) === undefined) {
+    stop = this.length;
+  }
+  if (( start ) < 0) {
+    start = (this.length + start);
+  }
+  if (( stop ) < 0) {
+    stop = (this.length + stop);
+  }
+  if (typeof(step)==="number") {
+    if (( step ) < 0) {
+      i = start;
+      while (( i ) >= 0) {
+        arr.push(this[i]);
+        i += step;
+      }
+      return arr;
+    } else {
+      i = start;
+      n = stop;
+      while (( i ) < n) {
+        arr.push(this[i]);
+        i += step;
+      }
+      return arr;
+    }
+  } else {
+    i = start;
+    n = stop;
+    while (( i ) < n) {
+      arr.push(this[i]);
+      i += 1;
+    }
+    return arr;
+  }
+}
+
+Object.defineProperty(Array.prototype, "__getslice__", { enumerable:false,value:func,writeable:true,configurable:true });
+var func = function(start, stop, step, items) {
+  var arr;
+  if (( start ) === undefined) {
+    start = 0;
+  }
+  if (( stop ) === undefined) {
+    stop = this.length;
+  }
+  arr = [start, (stop - start)];
+    var __iter2 = items;
+  if (! (__iter2 instanceof Array || typeof __iter2 == "string" || __is_typed_array(__iter2) || __is_some_array(__iter2) )) { __iter2 = __object_keys__(__iter2) }
+  for (var __idx2=0; __idx2 < __iter2.length; __idx2++) {
+    var item = __iter2[ __idx2 ];
+    arr.push(item);
+  }
+  this.splice.apply(this, arr);
+}
+
+Object.defineProperty(Array.prototype, "__setslice__", { enumerable:false,value:func,writeable:true,configurable:true });
+var func = function(item) {
+  
+  this.push(item);
+  return this;
+}
+
+Object.defineProperty(Array.prototype, "append", { enumerable:false,value:func,writeable:true,configurable:true });
+var extend = function(other) {
+  
+    var __iter3 = other;
+  if (! (__iter3 instanceof Array || typeof __iter3 == "string" || __is_typed_array(__iter3) || __is_some_array(__iter3) )) { __iter3 = __object_keys__(__iter3) }
+  for (var __idx3=0; __idx3 < __iter3.length; __idx3++) {
+    var obj = __iter3[ __idx3 ];
+    this.push(obj);
+  }
+  return this;
+}
+
+Object.defineProperty(Array.prototype, "extend", { enumerable:false,value:extend,writeable:true,configurable:true });
+var func = function(item) {
+  var index;
+  index = this.indexOf(item);
+  this.splice(index, 1);
+}
+
+Object.defineProperty(Array.prototype, "remove", { enumerable:false,value:func,writeable:true,configurable:true });
+var insert = function(index, obj) {
+  
+  if (( index ) < 0) {
+    index = (this.length + index);
+  }
+  this.splice(index, 0, obj);
+}
+
+Object.defineProperty(Array.prototype, "insert", { enumerable:false,value:insert,writeable:true,configurable:true });
+var index = function(obj) {
+  
+  return this.indexOf(obj);
+}
+
+Object.defineProperty(Array.prototype, "index", { enumerable:false,value:index,writeable:true,configurable:true });
+var count = function(obj) {
+  var a;
+  a = 0;
+    var __iter4 = this;
+  if (! (__iter4 instanceof Array || typeof __iter4 == "string" || __is_typed_array(__iter4) || __is_some_array(__iter4) )) { __iter4 = __object_keys__(__iter4) }
+  for (var __idx4=0; __idx4 < __iter4.length; __idx4++) {
+    var item = __iter4[ __idx4 ];
+    if (( item ) === obj) {
+      a += 1;
+    }
+  }
+  return a;
+}
+
+Object.defineProperty(Array.prototype, "count", { enumerable:false,value:count,writeable:true,configurable:true });
+var __contains__ = function(ob, a) {
+  var t;
+  t = typeof(ob);
+  if (t==="string") {
+    if (ob.indexOf(a)===-1) {
+      return false;
+    } else {
+      return true;
+    }
+  } else {
+    if (t==="number") {
+      throw new TypeError;
+    } else {
+      if (__is_typed_array(ob)) {
+                var __iter5 = ob;
+        if (! (__iter5 instanceof Array || typeof __iter5 == "string" || __is_typed_array(__iter5) || __is_some_array(__iter5) )) { __iter5 = __object_keys__(__iter5) }
+        for (var __idx5=0; __idx5 < __iter5.length; __idx5++) {
+          var x = __iter5[ __idx5 ];
+          if (x===a) {
+            return true;
+          }
+        }
+        return false;
+      } else {
+        if (ob.__contains__) {
+          return ob.__contains__(a);
+        } else {
+          if (ob instanceof Object && Object.hasOwnProperty.call(ob, a)) {
+            return true;
+          } else {
+            return false;
+          }
+        }
+      }
+    }
+  }
+}
+
+__dom_array_types__ = [];
+if (typeof(NodeList)==="function") {
+  __dom_array_types__ = [NodeList, FileList, DOMStringList, HTMLCollection, SVGNumberList, SVGTransformList];
+  if (typeof(DataTransferItemList)==="function") {
+    __dom_array_types__.push(DataTransferItemList);
+  }
+  if (typeof(HTMLAllCollection)==="function") {
+    __dom_array_types__.push(HTMLAllCollection);
+  }
+  if (typeof(SVGElementInstanceList)==="function") {
+    __dom_array_types__.push(SVGElementInstanceList);
+  }
+  if (typeof(ClientRectList)==="function") {
+    __dom_array_types__.push(ClientRectList);
+  }
+}
+var __is_some_array = function(ob) {
+  
+  if (( __dom_array_types__.length ) > 0) {
+        var __iter6 = __dom_array_types__;
+    if (! (__iter6 instanceof Array || typeof __iter6 == "string" || __is_typed_array(__iter6) || __is_some_array(__iter6) )) { __iter6 = __object_keys__(__iter6) }
+    for (var __idx6=0; __idx6 < __iter6.length; __idx6++) {
+      var t = __iter6[ __idx6 ];
+      if (ob instanceof t) {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
+var __is_typed_array = function(ob) {
+  
+  if (ob instanceof Int8Array || ob instanceof Uint8Array) {
+    return true;
+  } else {
+    if (ob instanceof Int16Array || ob instanceof Uint16Array) {
+      return true;
+    } else {
+      if (ob instanceof Int32Array || ob instanceof Uint32Array) {
+        return true;
+      } else {
+        if (ob instanceof Float32Array || ob instanceof Float64Array) {
+          return true;
+        } else {
+          return false;
+        }
+      }
+    }
+  }
+}
+
+var __js_typed_array = function(t, a) {
+  var arr;
+  if (t==="i") {
+    arr =  new Int32Array(a.length);
+  }
+  arr.set(a);
+  return arr;
+}
+
+var __object_keys__ = function(ob) {
+  var arr;
+  "\n		notes:\n			. Object.keys(ob) will not work because we create PythonJS objects using `Object.create(null)`\n			. this is different from Object.keys because it traverses the prototype chain.\n		";
+  arr = [];
+  for (var key in ob) { arr.push(key) };
+  return arr;
+}
+
+var __sprintf = function(fmt, args) {
+  var chunks,item,arr;
+  if (args instanceof Array) {
+    chunks = fmt.split("%s");
+    arr = [];
+    var i;
+    i = 0;
+        var __iter7 = chunks;
+    if (! (__iter7 instanceof Array || typeof __iter7 == "string" || __is_typed_array(__iter7) || __is_some_array(__iter7) )) { __iter7 = __object_keys__(__iter7) }
+    for (var __idx7=0; __idx7 < __iter7.length; __idx7++) {
+      var txt = __iter7[ __idx7 ];
+      arr.append(txt);
+      if (( i ) >= args.length) {
+        break;
+      }
+      item = args[i];
+      if (typeof(item)==="string") {
+        arr.append(item);
+      } else {
+        if (typeof(item)==="number") {
+          arr.append(("" + item));
+        } else {
+          arr.append(Object.prototype.toString.call(item));
+        }
+      }
+      i += 1;
+    }
+    return "".join(arr);
+  } else {
+    return __replace_method(fmt, "%s", args);
+  }
+}
+
+var __jsdict = function(items) {
+  var d,key;
+  d = {};
+    var __iter8 = items;
+  if (! (__iter8 instanceof Array || typeof __iter8 == "string" || __is_typed_array(__iter8) || __is_some_array(__iter8) )) { __iter8 = __object_keys__(__iter8) }
+  for (var __idx8=0; __idx8 < __iter8.length; __idx8++) {
+    var item = __iter8[ __idx8 ];
+    key = item[0];
+    if (key instanceof Array) {
+      key = JSON.stringify(key);
+    } else {
+      if (key.__uid__) {
+        key = key.__uid__;
+      }
+    }
+    d[key] = item[1];
+  }
+  return d;
+}
+
+var __jsdict_get = function(ob, key, default_value) {
+  
+  if (ob instanceof Object) {
+    if (key instanceof Array) {
+      key = JSON.stringify(key);
+    }
+    if (key in ob) {
+      return ob[key];
+    }
+    return default_value;
+  } else {
+    if (( default_value ) !== undefined) {
+      return ob.get(key, default_value);
+    } else {
+      return ob.get(key);
+    }
+  }
+}
+
+var __jsdict_set = function(ob, key, value) {
+  
+  if (ob instanceof Object) {
+    if (key instanceof Array) {
+      key = JSON.stringify(key);
+    }
+    ob[key] = value;
+  } else {
+    ob.set(key,value);
+  }
+}
+
+var __jsdict_keys = function(ob) {
+  
+  if (ob instanceof Object) {
+    return Object.keys( ob );
+  } else {
+    return ob.keys();
+  }
+}
+
+var __jsdict_values = function(ob) {
+  var arr,value;
+  if (ob instanceof Object) {
+    arr = [];
+        var __iter9 = ob;
+    if (! (__iter9 instanceof Array || typeof __iter9 == "string" || __is_typed_array(__iter9) || __is_some_array(__iter9) )) { __iter9 = __object_keys__(__iter9) }
+    for (var __idx9=0; __idx9 < __iter9.length; __idx9++) {
+      var key = __iter9[ __idx9 ];
+      if (ob.hasOwnProperty(key)) {
+        value = ob[key];
+        arr.push(value);
+      }
+    }
+    return arr;
+  } else {
+    return ob.values();
+  }
+}
+
+var __jsdict_items = function(ob) {
+  var arr,value;
+  if (ob instanceof Object || ( ob.items ) === undefined) {
+    arr = [];
+        var __iter10 = ob;
+    if (! (__iter10 instanceof Array || typeof __iter10 == "string" || __is_typed_array(__iter10) || __is_some_array(__iter10) )) { __iter10 = __object_keys__(__iter10) }
+    for (var __idx10=0; __idx10 < __iter10.length; __idx10++) {
+      var key = __iter10[ __idx10 ];
+      if (Object.hasOwnProperty.call(ob, key)) {
+        value = ob[key];
+        arr.push([key, value]);
+      }
+    }
+    return arr;
+  } else {
+    return ob.items();
+  }
+}
+
+var __jsdict_pop = function(ob, key, _kwargs_) {
   var v;
-  v = ob[attr];
-  if (( v ) === undefined) {
-    throw new AttributeError(attr);
+  if (!( _kwargs_ instanceof Object )) {;
+  var _kwargs_ = {ob: arguments[0],key: arguments[1],_default: arguments[2]};
+  };
+  if (_kwargs_ === undefined || _kwargs_._default === undefined) {var _default = null} else {var _default=_kwargs_._default};
+  if (ob instanceof Array) {
+    if (ob.length) {
+      if (( key ) === undefined) {
+        return ob.pop();
+      } else {
+        return ob.splice(key, 1)[0];
+      }
+    } else {
+      throw new IndexError(key);
+    }
   } else {
-    return v;
+    if (ob instanceof Object) {
+      if (key in ob) {
+        v = ob[key];
+        delete ob[key];
+        return v;
+      } else {
+        if (( _default ) === undefined) {
+          throw new KeyError(key);
+        } else {
+          return _default;
+        }
+      }
+    } else {
+      return ob.pop(key, _default);
+    }
   }
 }
 
-var __wrap_function__ = function(f) {
-  
-  f.is_wrapper = true;
-  return f;
+var int16 = function(a) {
+  var arr;
+  arr =  new Int16Array(1);
+  arr[0] = a;
+  return arr;
 }
 
 var __gpu_object = function(cls, struct_name, data_name) {
@@ -521,12 +1037,8 @@ var glsljit_runtime = function(header) {
 var GLSLJITRuntime = function(header) {
   GLSLJITRuntime.__init__(this, header);
   this.__class__ = GLSLJITRuntime;
-  this.__uid__ = ("" + _PythonJS_UID);
-  _PythonJS_UID += 1;
 }
 
-GLSLJITRuntime.__uid__ = ("" + _PythonJS_UID);
-_PythonJS_UID += 1;
 GLSLJITRuntime.prototype.__init__ = function(header) {
   
   this.header = header;
@@ -541,10 +1053,10 @@ GLSLJITRuntime.__init__ = function () { return GLSLJITRuntime.prototype.__init__
 GLSLJITRuntime.prototype.compile_header = function() {
   var a,b;
   a = [];
-    var __iter1 = this.struct_types;
-  if (! (__iter1 instanceof Array || typeof __iter1 == "string" || __is_typed_array(__iter1) || __is_some_array(__iter1) )) { __iter1 = __object_keys__(__iter1) }
-  for (var __idx1=0; __idx1 < __iter1.length; __idx1++) {
-    var sname = __iter1[ __idx1 ];
+    var __iter11 = this.struct_types;
+  if (! (__iter11 instanceof Array || typeof __iter11 == "string" || __is_typed_array(__iter11) || __is_some_array(__iter11) )) { __iter11 = __object_keys__(__iter11) }
+  for (var __idx11=0; __idx11 < __iter11.length; __idx11++) {
+    var sname = __iter11[ __idx11 ];
     if (__contains__(this.glsltypes, sname)) {
       /*pass*/
     } else {
@@ -574,7 +1086,7 @@ GLSLJITRuntime.push = function () { return GLSLJITRuntime.prototype.push.apply(a
 GLSLJITRuntime.prototype.define_structure = function(ob) {
   var integers,arr,code,struct_name,struct_type,member_list,subtype,t,members,arrays,structs,floats;
   struct_name = null;
-  if (__test_if_true__(ob.__struct_name__)) {
+  if (ob.__struct_name__) {
     struct_name = ob.__struct_name__;
     if (__contains__(this.struct_types, struct_name)) {
       return struct_name;
@@ -585,34 +1097,34 @@ GLSLJITRuntime.prototype.define_structure = function(ob) {
   integers = [];
   structs = [];
   struct_type = [];
-  if (__test_if_true__((struct_name && __contains__(this.glsltypes, struct_name)))) {
+  if (struct_name && __contains__(this.glsltypes, struct_name)) {
     return struct_name;
   }
-    var __iter2 = dir(ob);
-  if (! (__iter2 instanceof Array || typeof __iter2 == "string" || __is_typed_array(__iter2) || __is_some_array(__iter2) )) { __iter2 = __object_keys__(__iter2) }
-  for (var __idx2=0; __idx2 < __iter2.length; __idx2++) {
-    var key = __iter2[ __idx2 ];
-    if (__test_if_true__(((key.length instanceof Array ? JSON.stringify(key.length)==JSON.stringify(1) : key.length===1) && __contains__("0123456789", key)))) {
+    var __iter12 = dir(ob);
+  if (! (__iter12 instanceof Array || typeof __iter12 == "string" || __is_typed_array(__iter12) || __is_some_array(__iter12) )) { __iter12 = __object_keys__(__iter12) }
+  for (var __idx12=0; __idx12 < __iter12.length; __idx12++) {
+    var key = __iter12[ __idx12 ];
+    if ((key.length===1) && __contains__("0123456789", key)) {
       throw new RuntimeError(key);
     }
     t = typeof(ob[key]);
-    if (__test_if_true__(((t instanceof Array ? JSON.stringify(t)==JSON.stringify("object") : t==="object") && ob[key] instanceof Array && ob[key].length && (typeof(ob[key][0]) instanceof Array ? JSON.stringify(typeof(ob[key][0]))==JSON.stringify("number") : typeof(ob[key][0])==="number")))) {
+    if ((t==="object") && ob[key] instanceof Array && ob[key].length && (typeof(ob[key][0])==="number")) {
       struct_type.push(("ARY_" + key));
       arrays.push(key);
     } else {
-      if ((t instanceof Array ? JSON.stringify(t)==JSON.stringify("number") : t==="number")) {
+      if (t==="number") {
         struct_type.push(("NUM_" + key));
         floats.push(key);
       } else {
-        if (__test_if_true__(ob[key] instanceof Int16Array)) {
+        if (ob[key] instanceof Int16Array) {
           struct_type.push(("INT_" + key));
-          if ((ob[key].length instanceof Array ? JSON.stringify(ob[key].length)==JSON.stringify(1) : ob[key].length===1)) {
+          if (ob[key].length===1) {
             integers.push(key);
           } else {
             /*pass*/
           }
         } else {
-          if (__test_if_true__(((t instanceof Array ? JSON.stringify(t)==JSON.stringify("object") : t==="object") && ob[key].__struct_name__))) {
+          if ((t==="object") && ob[key].__struct_name__) {
             struct_type.push(("S_" + key));
             structs.push(key);
             if (! (__contains__(this.struct_types, ob[key].__struct_name__))) {
@@ -633,33 +1145,33 @@ GLSLJITRuntime.prototype.define_structure = function(ob) {
   }
   if (! (__contains__(this.struct_types, struct_name))) {
     member_list = [];
-        var __iter3 = integers;
-    if (! (__iter3 instanceof Array || typeof __iter3 == "string" || __is_typed_array(__iter3) || __is_some_array(__iter3) )) { __iter3 = __object_keys__(__iter3) }
-    for (var __idx3=0; __idx3 < __iter3.length; __idx3++) {
-      var key = __iter3[ __idx3 ];
+        var __iter13 = integers;
+    if (! (__iter13 instanceof Array || typeof __iter13 == "string" || __is_typed_array(__iter13) || __is_some_array(__iter13) )) { __iter13 = __object_keys__(__iter13) }
+    for (var __idx13=0; __idx13 < __iter13.length; __idx13++) {
+      var key = __iter13[ __idx13 ];
       member_list.append((("int " + key) + ";"));
     }
-        var __iter4 = floats;
-    if (! (__iter4 instanceof Array || typeof __iter4 == "string" || __is_typed_array(__iter4) || __is_some_array(__iter4) )) { __iter4 = __object_keys__(__iter4) }
-    for (var __idx4=0; __idx4 < __iter4.length; __idx4++) {
-      var key = __iter4[ __idx4 ];
+        var __iter14 = floats;
+    if (! (__iter14 instanceof Array || typeof __iter14 == "string" || __is_typed_array(__iter14) || __is_some_array(__iter14) )) { __iter14 = __object_keys__(__iter14) }
+    for (var __idx14=0; __idx14 < __iter14.length; __idx14++) {
+      var key = __iter14[ __idx14 ];
       member_list.append((("float " + key) + ";"));
     }
-        var __iter5 = arrays;
-    if (! (__iter5 instanceof Array || typeof __iter5 == "string" || __is_typed_array(__iter5) || __is_some_array(__iter5) )) { __iter5 = __object_keys__(__iter5) }
-    for (var __idx5=0; __idx5 < __iter5.length; __idx5++) {
-      var key = __iter5[ __idx5 ];
+        var __iter15 = arrays;
+    if (! (__iter15 instanceof Array || typeof __iter15 == "string" || __is_typed_array(__iter15) || __is_some_array(__iter15) )) { __iter15 = __object_keys__(__iter15) }
+    for (var __idx15=0; __idx15 < __iter15.length; __idx15++) {
+      var key = __iter15[ __idx15 ];
       arr = ob[key];
       member_list.append((((("float " + key) + "[") + arr.length) + "];"));
     }
-        var __iter6 = structs;
-    if (! (__iter6 instanceof Array || typeof __iter6 == "string" || __is_typed_array(__iter6) || __is_some_array(__iter6) )) { __iter6 = __object_keys__(__iter6) }
-    for (var __idx6=0; __idx6 < __iter6.length; __idx6++) {
-      var key = __iter6[ __idx6 ];
+        var __iter16 = structs;
+    if (! (__iter16 instanceof Array || typeof __iter16 == "string" || __is_typed_array(__iter16) || __is_some_array(__iter16) )) { __iter16 = __object_keys__(__iter16) }
+    for (var __idx16=0; __idx16 < __iter16.length; __idx16++) {
+      var key = __iter16[ __idx16 ];
       subtype = ob[key].__struct_name__;
       member_list.append((((subtype + " ") + key) + ";"));
     }
-    if ((len(member_list) instanceof Array ? JSON.stringify(len(member_list))==JSON.stringify(0) : len(member_list)===0)) {
+    if (len(member_list)===0) {
       throw new RuntimeError(struct_name);
     }
     members = "".join(member_list);
@@ -673,7 +1185,7 @@ GLSLJITRuntime.define_structure = function () { return GLSLJITRuntime.prototype.
 GLSLJITRuntime.prototype.structure = function(ob, name) {
   var sname,stype,args,value,has_arrays,o,aname,wrapper;
   wrapper = null;
-  if (__test_if_true__(ob instanceof Object)) {
+  if (ob instanceof Object) {
     /*pass*/
   } else {
     if (( ob.__class__ ) === dict) {
@@ -682,15 +1194,15 @@ GLSLJITRuntime.prototype.structure = function(ob, name) {
     }
   }
   sname = this.define_structure(ob);
-  if (__test_if_true__(wrapper)) {
+  if (wrapper) {
     wrapper.__struct_name__ = sname;
   }
   args = [];
   stype = this.struct_types[sname];
   if (! (__contains__(this.struct_types, sname))) {
     if (__contains__(this.glsltypes, sname)) {
-      if ((sname instanceof Array ? JSON.stringify(sname)==JSON.stringify("mat4") : sname==="mat4")) {
-        if (__test_if_true__(ob.__struct_data__)) {
+      if (sname==="mat4") {
+        if (ob.__struct_data__) {
           o = ob[ob.__struct_data__];
         } else {
           o = ob;
@@ -712,45 +1224,45 @@ GLSLJITRuntime.prototype.structure = function(ob, name) {
     }
   }
   has_arrays = false;
-  if (__test_if_true__(stype)) {
+  if (stype) {
     if (( stype["arrays"].length ) > 0) {
       has_arrays = true;
     }
-        var __iter7 = stype["integers"];
-    if (! (__iter7 instanceof Array || typeof __iter7 == "string" || __is_typed_array(__iter7) || __is_some_array(__iter7) )) { __iter7 = __object_keys__(__iter7) }
-    for (var __idx7=0; __idx7 < __iter7.length; __idx7++) {
-      var key = __iter7[ __idx7 ];
+        var __iter17 = stype["integers"];
+    if (! (__iter17 instanceof Array || typeof __iter17 == "string" || __is_typed_array(__iter17) || __is_some_array(__iter17) )) { __iter17 = __object_keys__(__iter17) }
+    for (var __idx17=0; __idx17 < __iter17.length; __idx17++) {
+      var key = __iter17[ __idx17 ];
       args.push((ob[key][0] + ""));
     }
-        var __iter8 = stype["floats"];
-    if (! (__iter8 instanceof Array || typeof __iter8 == "string" || __is_typed_array(__iter8) || __is_some_array(__iter8) )) { __iter8 = __object_keys__(__iter8) }
-    for (var __idx8=0; __idx8 < __iter8.length; __idx8++) {
-      var key = __iter8[ __idx8 ];
+        var __iter18 = stype["floats"];
+    if (! (__iter18 instanceof Array || typeof __iter18 == "string" || __is_typed_array(__iter18) || __is_some_array(__iter18) )) { __iter18 = __object_keys__(__iter18) }
+    for (var __idx18=0; __idx18 < __iter18.length; __idx18++) {
+      var key = __iter18[ __idx18 ];
       value = (ob[key] + "");
       if (! (__contains__(value, "."))) {
         value += ".0";
       }
       args.push(value);
     }
-        var __iter9 = stype["arrays"];
-    if (! (__iter9 instanceof Array || typeof __iter9 == "string" || __is_typed_array(__iter9) || __is_some_array(__iter9) )) { __iter9 = __object_keys__(__iter9) }
-    for (var __idx9=0; __idx9 < __iter9.length; __idx9++) {
-      var key = __iter9[ __idx9 ];
+        var __iter19 = stype["arrays"];
+    if (! (__iter19 instanceof Array || typeof __iter19 == "string" || __is_typed_array(__iter19) || __is_some_array(__iter19) )) { __iter19 = __object_keys__(__iter19) }
+    for (var __idx19=0; __idx19 < __iter19.length; __idx19++) {
+      var key = __iter19[ __idx19 ];
       aname = (("_" + key) + name);
       this.array(ob[key], aname);
       args.push(aname);
     }
-        var __iter10 = stype["structs"];
-    if (! (__iter10 instanceof Array || typeof __iter10 == "string" || __is_typed_array(__iter10) || __is_some_array(__iter10) )) { __iter10 = __object_keys__(__iter10) }
-    for (var __idx10=0; __idx10 < __iter10.length; __idx10++) {
-      var key = __iter10[ __idx10 ];
+        var __iter20 = stype["structs"];
+    if (! (__iter20 instanceof Array || typeof __iter20 == "string" || __is_typed_array(__iter20) || __is_some_array(__iter20) )) { __iter20 = __object_keys__(__iter20) }
+    for (var __idx20=0; __idx20 < __iter20.length; __idx20++) {
+      var key = __iter20[ __idx20 ];
       aname = (("_" + key) + name);
       this.structure(ob[key], aname);
       args.push(aname);
     }
   }
   args = ",".join(args);
-  if (__test_if_true__(has_arrays)) {
+  if (has_arrays) {
     this.shader.push((((((((sname + " ") + name) + "=") + sname) + "(") + args) + ");"));
   } else {
     this.header.push((((((((("const " + sname) + " ") + name) + "=") + sname) + "(") + args) + ");"));
@@ -773,13 +1285,13 @@ GLSLJITRuntime.prototype.int16array = function(ob, name) {
 GLSLJITRuntime.int16array = function () { return GLSLJITRuntime.prototype.int16array.apply(arguments[0], Array.prototype.slice.call(arguments,1)) };
 GLSLJITRuntime.prototype.array = function(ob, name) {
   var a,i,j,subname,subarr,v;
-  if (__test_if_true__(ob[0] instanceof Array)) {
+  if (ob[0] instanceof Array) {
     a = [];
     i = 0;
     while (( i ) < ob.length) {
       subarr = ob[i];
       subname = __sprintf("%s_%s", [name, i]);
-      if ((a.length instanceof Array ? JSON.stringify(a.length)==JSON.stringify(0) : a.length===0)) {
+      if (a.length===0) {
         a.append((((("float " + subname) + "[") + subarr.length) + "]"));
       } else {
         a.append(((((";float " + subname) + "[") + subarr.length) + "]"));
@@ -797,7 +1309,7 @@ GLSLJITRuntime.prototype.array = function(ob, name) {
     }
     this.shader.push("".join(a));
   } else {
-    if (__test_if_true__((ob[0] instanceof Object || ( ob[0].__class__ ) === dict))) {
+    if (ob[0] instanceof Object || ( ob[0].__class__ ) === dict) {
       i = 0;
       while (( i ) < ob.length) {
         this.structure(ob[i], ((name + "_") + i));
@@ -818,15 +1330,13 @@ GLSLJITRuntime.prototype.array = function(ob, name) {
 GLSLJITRuntime.array = function () { return GLSLJITRuntime.prototype.array.apply(arguments[0], Array.prototype.slice.call(arguments,1)) };
 GLSLJITRuntime.prototype.object = function(ob, name) {
   var func,cls;
-    var __iter11 = this.object_packagers;
-  if (! (__iter11 instanceof Array || typeof __iter11 == "string" || __is_typed_array(__iter11) || __is_some_array(__iter11) )) { __iter11 = __object_keys__(__iter11) }
-  for (var __idx11=0; __idx11 < __iter11.length; __idx11++) {
-    var p = __iter11[ __idx11 ];
-    var __r_0;
-    __r_0 = p;
-    cls = __r_0[0];
-    func = __r_0[1];
-    if (__test_if_true__(ob instanceof cls)) {
+    var __iter21 = this.object_packagers;
+  if (! (__iter21 instanceof Array || typeof __iter21 == "string" || __is_typed_array(__iter21) || __is_some_array(__iter21) )) { __iter21 = __object_keys__(__iter21) }
+  for (var __idx21=0; __idx21 < __iter21.length; __idx21++) {
+    var p = __iter21[ __idx21 ];
+    cls = p[0];
+    func = p[1];
+    if (ob instanceof cls) {
       return func(ob);
     }
   }
@@ -835,19 +1345,17 @@ GLSLJITRuntime.prototype.object = function(ob, name) {
 GLSLJITRuntime.object = function () { return GLSLJITRuntime.prototype.object.apply(arguments[0], Array.prototype.slice.call(arguments,1)) };
 GLSLJITRuntime.prototype.unpack_array2d = function(arr, dims) {
   var h,rows,w,row;
-  if ((typeof(dims) instanceof Array ? JSON.stringify(typeof(dims))==JSON.stringify("number") : typeof(dims)==="number")) {
+  if (typeof(dims)==="number") {
     return arr;
   }
-  var __r_1;
-  __r_1 = dims;
-  w = __r_1[0];
-  h = __r_1[1];
+  w = dims[0];
+  h = dims[1];
   row = [];
   rows = [row];
-    var __iter12 = arr;
-  if (! (__iter12 instanceof Array || typeof __iter12 == "string" || __is_typed_array(__iter12) || __is_some_array(__iter12) )) { __iter12 = __object_keys__(__iter12) }
-  for (var __idx12=0; __idx12 < __iter12.length; __idx12++) {
-    var value = __iter12[ __idx12 ];
+    var __iter22 = arr;
+  if (! (__iter22 instanceof Array || typeof __iter22 == "string" || __is_typed_array(__iter22) || __is_some_array(__iter22) )) { __iter22 = __object_keys__(__iter22) }
+  for (var __idx22=0; __idx22 < __iter22.length; __idx22++) {
+    var value = __iter22[ __idx22 ];
     row.append(value);
     if (( row.length ) >= w) {
       row = [];
@@ -855,7 +1363,7 @@ GLSLJITRuntime.prototype.unpack_array2d = function(arr, dims) {
     }
   }
   __jsdict_pop(rows);
-  if ((!(rows.length instanceof Array ? JSON.stringify(rows.length)==JSON.stringify(h) : rows.length===h))) {
+  if (rows.length!==h) {
     console.log("ERROR: __unpack_array2d, invalid height.");
   }
   return rows;
@@ -864,14 +1372,12 @@ GLSLJITRuntime.prototype.unpack_array2d = function(arr, dims) {
 GLSLJITRuntime.unpack_array2d = function () { return GLSLJITRuntime.prototype.unpack_array2d.apply(arguments[0], Array.prototype.slice.call(arguments,1)) };
 GLSLJITRuntime.prototype.unpack_vec4 = function(arr, dims) {
   var rows,i,h,vec,w,row;
-  if ((typeof(dims) instanceof Array ? JSON.stringify(typeof(dims))==JSON.stringify("number") : typeof(dims)==="number")) {
+  if (typeof(dims)==="number") {
     w = dims;
     h = 1;
   } else {
-    var __r_2;
-    __r_2 = dims;
-    w = __r_2[0];
-    h = __r_2[1];
+    w = dims[0];
+    h = dims[1];
   }
   rows = [];
   i = 0;
@@ -899,7 +1405,7 @@ GLSLJITRuntime.prototype.unpack_vec4 = function(arr, dims) {
     }
     y += 1;
   }
-  if ((!(rows.length instanceof Array ? JSON.stringify(rows.length)==JSON.stringify(h) : rows.length===h))) {
+  if (rows.length!==h) {
     console.log("ERROR: __unpack_vec4, invalid height.");
   }
   return rows;
@@ -909,10 +1415,10 @@ GLSLJITRuntime.unpack_vec4 = function () { return GLSLJITRuntime.prototype.unpac
 GLSLJITRuntime.prototype.unpack_mat4 = function(arr) {
   var i;
   i = 0;
-    var __iter13 = this.matrices;
-  if (! (__iter13 instanceof Array || typeof __iter13 == "string" || __is_typed_array(__iter13) || __is_some_array(__iter13) )) { __iter13 = __object_keys__(__iter13) }
-  for (var __idx13=0; __idx13 < __iter13.length; __idx13++) {
-    var mat = __iter13[ __idx13 ];
+    var __iter23 = this.matrices;
+  if (! (__iter23 instanceof Array || typeof __iter23 == "string" || __is_typed_array(__iter23) || __is_some_array(__iter23) )) { __iter23 = __object_keys__(__iter23) }
+  for (var __idx23=0; __idx23 < __iter23.length; __idx23++) {
+    var mat = __iter23[ __idx23 ];
     var j,j__end__;
     j = 0;
     j__end__ = 16;
@@ -926,8 +1432,23 @@ GLSLJITRuntime.prototype.unpack_mat4 = function(arr) {
 }
 
 GLSLJITRuntime.unpack_mat4 = function () { return GLSLJITRuntime.prototype.unpack_mat4.apply(arguments[0], Array.prototype.slice.call(arguments,1)) };
-GLSLJITRuntime.prototype.__properties__ = {  };
-GLSLJITRuntime.prototype.__unbound_methods__ = {  };
+_PythonJS_UID = 0;
+var __getfast__ = function(ob, attr) {
+  var v;
+  v = ob[attr];
+  if (( v ) === undefined) {
+    throw new AttributeError(attr);
+  } else {
+    return v;
+  }
+}
+
+var __wrap_function__ = function(f) {
+  
+  f.is_wrapper = true;
+  return f;
+}
+
 var __getattr__ = function(ob, a) {
   
   if (ob.__getattr__) {
@@ -942,23 +1463,23 @@ var __test_if_true__ = function(ob) {
     if (( ob ) === false) {
       return false;
     } else {
-      if ((typeof(ob) instanceof Array ? JSON.stringify(typeof(ob))==JSON.stringify("string") : typeof(ob)==="string")) {
-        return (!(ob.length instanceof Array ? JSON.stringify(ob.length)==JSON.stringify(0) : ob.length===0));
+      if (typeof(ob)==="string") {
+        return (ob.length!==0);
       } else {
         if (! (ob)) {
           return false;
         } else {
           if (ob instanceof Array) {
-            return (!(ob.length instanceof Array ? JSON.stringify(ob.length)==JSON.stringify(0) : ob.length===0));
+            return (ob.length!==0);
           } else {
-            if ((typeof(ob) instanceof Array ? JSON.stringify(typeof(ob))==JSON.stringify("function") : typeof(ob)==="function")) {
+            if (typeof(ob)==="function") {
               return true;
             } else {
-              if ((ob.__class__ && ( ob.__class__ ) === dict)) {
-                return (!(Object.keys(ob["$wrapped"]).length instanceof Array ? JSON.stringify(Object.keys(ob["$wrapped"]).length)==JSON.stringify(0) : Object.keys(ob["$wrapped"]).length===0));
+              if (ob.__class__ && ( ob.__class__ ) === dict) {
+                return (Object.keys(ob["$wrapped"]).length!==0);
               } else {
                 if (ob instanceof Object) {
-                  return (!(Object.keys(ob).length instanceof Array ? JSON.stringify(Object.keys(ob).length)==JSON.stringify(0) : Object.keys(ob).length===0));
+                  return (Object.keys(ob).length!==0);
                 } else {
                   return true;
                 }
@@ -972,7 +1493,7 @@ var __test_if_true__ = function(ob) {
 };__test_if_true__.is_wrapper = true;
 var __replace_method = function(ob, a, b) {
   
-  if ((typeof(ob) instanceof Array ? JSON.stringify(typeof(ob))==JSON.stringify("string") : typeof(ob)==="string")) {
+  if (typeof(ob)==="string") {
     return ob.split(a).join(b);
   } else {
     return ob.replace(a, b);
@@ -980,7 +1501,7 @@ var __replace_method = function(ob, a, b) {
 };__replace_method.is_wrapper = true;
 var __split_method = function(ob, delim) {
   
-  if ((typeof(ob) instanceof Array ? JSON.stringify(typeof(ob))==JSON.stringify("string") : typeof(ob)==="string")) {
+  if (typeof(ob)==="string") {
     if (( delim ) === undefined) {
       return ob.split(" ");
     } else {
@@ -994,341 +1515,101 @@ var __split_method = function(ob, delim) {
     }
   }
 };__split_method.is_wrapper = true;
-__dom_array_types__ = [];
-if ((typeof(NodeList) instanceof Array ? JSON.stringify(typeof(NodeList))==JSON.stringify("function") : typeof(NodeList)==="function")) {
-  __dom_array_types__ = [NodeList, FileList, DOMStringList, HTMLCollection, SVGNumberList, SVGTransformList];
-  if ((typeof(DataTransferItemList) instanceof Array ? JSON.stringify(typeof(DataTransferItemList))==JSON.stringify("function") : typeof(DataTransferItemList)==="function")) {
-    __dom_array_types__.push(DataTransferItemList);
-  }
-  if ((typeof(HTMLAllCollection) instanceof Array ? JSON.stringify(typeof(HTMLAllCollection))==JSON.stringify("function") : typeof(HTMLAllCollection)==="function")) {
-    __dom_array_types__.push(HTMLAllCollection);
-  }
-  if ((typeof(SVGElementInstanceList) instanceof Array ? JSON.stringify(typeof(SVGElementInstanceList))==JSON.stringify("function") : typeof(SVGElementInstanceList)==="function")) {
-    __dom_array_types__.push(SVGElementInstanceList);
-  }
-  if ((typeof(ClientRectList) instanceof Array ? JSON.stringify(typeof(ClientRectList))==JSON.stringify("function") : typeof(ClientRectList)==="function")) {
-    __dom_array_types__.push(ClientRectList);
-  }
-}
-var __is_some_array = function(ob) {
-  
-  if (( __dom_array_types__.length ) > 0) {
-        var __iter14 = __dom_array_types__;
-    if (! (__iter14 instanceof Array || typeof __iter14 == "string" || __is_typed_array(__iter14) || __is_some_array(__iter14) )) { __iter14 = __object_keys__(__iter14) }
-    for (var __idx14=0; __idx14 < __iter14.length; __idx14++) {
-      var t = __iter14[ __idx14 ];
-      if (__test_if_true__(ob instanceof t)) {
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
-var __is_typed_array = function(ob) {
-  
-  if (__test_if_true__((ob instanceof Int8Array || ob instanceof Uint8Array))) {
-    return true;
-  } else {
-    if (__test_if_true__((ob instanceof Int16Array || ob instanceof Uint16Array))) {
-      return true;
-    } else {
-      if (__test_if_true__((ob instanceof Int32Array || ob instanceof Uint32Array))) {
-        return true;
-      } else {
-        if (__test_if_true__((ob instanceof Float32Array || ob instanceof Float64Array))) {
-          return true;
-        } else {
-          return false;
-        }
-      }
-    }
-  }
-}
-
-var __js_typed_array = function(t, a) {
-  var arr;
-  if ((t instanceof Array ? JSON.stringify(t)==JSON.stringify("i") : t==="i")) {
-    arr =  new Int32Array(a.length);
-  }
-  arr.set(a);
-  return arr;
-}
-
-var __contains__ = function(ob, a) {
-  var t;
-  t = typeof(ob);
-  if ((t instanceof Array ? JSON.stringify(t)==JSON.stringify("string") : t==="string")) {
-    if ((ob.indexOf(a) instanceof Array ? JSON.stringify(ob.indexOf(a))==JSON.stringify(-1) : ob.indexOf(a)===-1)) {
-      return false;
-    } else {
-      return true;
-    }
-  } else {
-    if ((t instanceof Array ? JSON.stringify(t)==JSON.stringify("number") : t==="number")) {
-      throw new TypeError;
-    } else {
-      if (__test_if_true__(__is_typed_array(ob))) {
-                var __iter15 = ob;
-        if (! (__iter15 instanceof Array || typeof __iter15 == "string" || __is_typed_array(__iter15) || __is_some_array(__iter15) )) { __iter15 = __object_keys__(__iter15) }
-        for (var __idx15=0; __idx15 < __iter15.length; __idx15++) {
-          var x = __iter15[ __idx15 ];
-          if ((x instanceof Array ? JSON.stringify(x)==JSON.stringify(a) : x===a)) {
-            return true;
-          }
-        }
-        return false;
-      } else {
-        if (__test_if_true__(ob.__contains__)) {
-          return ob.__contains__(a);
-        } else {
-          if (__test_if_true__((ob instanceof Object && Object.hasOwnProperty.call(ob, a)))) {
-            return true;
-          } else {
-            return false;
-          }
-        }
-      }
-    }
-  }
-}
-
 var __add_op = function(a, b) {
   var c,t;
   t = typeof(a);
-  if (__test_if_true__(((t instanceof Array ? JSON.stringify(t)==JSON.stringify("string") : t==="string") || (t instanceof Array ? JSON.stringify(t)==JSON.stringify("number") : t==="number")))) {
+  if ((t==="string") || (t==="number")) {
     return a+b;
   } else {
-    if (__test_if_true__(a instanceof Array)) {
+    if (a instanceof Array) {
       c = [];
       c.extend(a);
       c.extend(b);
       return c;
     } else {
-      if (__test_if_true__(a.__add__)) {
+      if (a.__add__) {
         return a.__add__(b);
-      } else {
-        throw new TypeError("invalid objects for addition");
-      }
-    }
-  }
-}
-
-var __mul_op = function(a, b) {
-  var c,arr,t;
-  t = typeof(a);
-  if ((t instanceof Array ? JSON.stringify(t)==JSON.stringify("number") : t==="number")) {
-    return a * b;
-  } else {
-    if ((t instanceof Array ? JSON.stringify(t)==JSON.stringify("string") : t==="string")) {
-      arr = [];
-      var i,i__end__;
-      i = 0;
-      i__end__ = b;
-      while (( i ) < i__end__) {
-        arr.append(a);
-        i += 1;
-      }
-      return "".join(arr);
-    } else {
-      if (__test_if_true__(a instanceof Array)) {
-        c = [];
-        
-        i = 0;
-        i__end__ = b;
-        while (( i ) < i__end__) {
-          c.extend(a);
-          i += 1;
-        }
-        return c;
-      } else {
-        if (__test_if_true__(a.__mul__)) {
-          return a.__mul__(b);
-        } else {
-          throw new TypeError("invalid objects for multiplication");
-        }
-      }
-    }
-  }
-}
-
-var __jsdict = function(items) {
-  var d,key;
-  d = {};
-    var __iter16 = items;
-  if (! (__iter16 instanceof Array || typeof __iter16 == "string" || __is_typed_array(__iter16) || __is_some_array(__iter16) )) { __iter16 = __object_keys__(__iter16) }
-  for (var __idx16=0; __idx16 < __iter16.length; __idx16++) {
-    var item = __iter16[ __idx16 ];
-    key = item[0];
-    if (__test_if_true__(key instanceof Array)) {
-      key = JSON.stringify(key);
-    } else {
-      if (__test_if_true__(key.__uid__)) {
-        key = key.__uid__;
-      }
-    }
-    d[key] = item[1];
-  }
-  return d;
-}
-
-var __jsdict_get = function(ob, key, default_value) {
-  
-  if (__test_if_true__(ob instanceof Object)) {
-    if (__test_if_true__(key instanceof Array)) {
-      key = JSON.stringify(key);
-    }
-    if (__test_if_true__(key in ob)) {
-      return ob[key];
-    }
-    return default_value;
-  } else {
-    if (( default_value ) !== undefined) {
-      return ob.get(key, default_value);
-    } else {
-      return ob.get(key);
-    }
-  }
-}
-
-var __jsdict_set = function(ob, key, value) {
-  
-  if (__test_if_true__(ob instanceof Object)) {
-    if (__test_if_true__(key instanceof Array)) {
-      key = JSON.stringify(key);
-    }
-    ob[key] = value;
-  } else {
-    ob.set(key,value);
-  }
-}
-
-var __jsdict_keys = function(ob) {
-  
-  if (__test_if_true__(ob instanceof Object)) {
-    return Object.keys( ob );
-  } else {
-    return ob.keys();
-  }
-}
-
-var __jsdict_values = function(ob) {
-  var arr,value;
-  if (__test_if_true__(ob instanceof Object)) {
-    arr = [];
-        var __iter17 = ob;
-    if (! (__iter17 instanceof Array || typeof __iter17 == "string" || __is_typed_array(__iter17) || __is_some_array(__iter17) )) { __iter17 = __object_keys__(__iter17) }
-    for (var __idx17=0; __idx17 < __iter17.length; __idx17++) {
-      var key = __iter17[ __idx17 ];
-      if (__test_if_true__(ob.hasOwnProperty(key))) {
-        value = ob[key];
-        arr.push(value);
-      }
-    }
-    return arr;
-  } else {
-    return ob.values();
-  }
-}
-
-var __jsdict_items = function(ob) {
-  var arr,value;
-  if (__test_if_true__((ob instanceof Object || ( ob.items ) === undefined))) {
-    arr = [];
-        var __iter18 = ob;
-    if (! (__iter18 instanceof Array || typeof __iter18 == "string" || __is_typed_array(__iter18) || __is_some_array(__iter18) )) { __iter18 = __object_keys__(__iter18) }
-    for (var __idx18=0; __idx18 < __iter18.length; __idx18++) {
-      var key = __iter18[ __idx18 ];
-      if (__test_if_true__(Object.hasOwnProperty.call(ob, key))) {
-        value = ob[key];
-        arr.push([key, value]);
+      } else {
+        throw new TypeError("invalid objects for addition");
       }
     }
-    return arr;
-  } else {
-    return ob.items();
   }
 }
 
-var __jsdict_pop = function(ob, key, _kwargs_) {
-  var v;
-  if (!( _kwargs_ instanceof Object )) {;
-  var _kwargs_ = {ob: arguments[0],key: arguments[1],_default: arguments[2]};
-  };
-  if (_kwargs_ === undefined || _kwargs_._default === undefined) {var _default = null} else {var _default=_kwargs_._default};
-  if (__test_if_true__(ob instanceof Array)) {
-    if (__test_if_true__(ob.length)) {
-      if (( key ) === undefined) {
-        return ob.pop();
-      } else {
-        return ob.splice(key, 1)[0];
+var __mul_op = function(a, b) {
+  var c,arr,t;
+  t = typeof(a);
+  if (t==="number") {
+    return a * b;
+  } else {
+    if (t==="string") {
+      arr = [];
+      var i,i__end__;
+      i = 0;
+      i__end__ = b;
+      while (( i ) < i__end__) {
+        arr.append(a);
+        i += 1;
       }
+      return "".join(arr);
     } else {
-      throw new IndexError(key);
-    }
-  } else {
-    if (__test_if_true__(ob instanceof Object)) {
-      if (__test_if_true__(key in ob)) {
-        v = ob[key];
-        delete ob[key];
-        return v;
+      if (a instanceof Array) {
+        c = [];
+        
+        i = 0;
+        i__end__ = b;
+        while (( i ) < i__end__) {
+          c.extend(a);
+          i += 1;
+        }
+        return c;
       } else {
-        if (( _default ) === undefined) {
-          throw new KeyError(key);
+        if (a.__mul__) {
+          return a.__mul__(b);
         } else {
-          return _default;
+          throw new TypeError("invalid objects for multiplication");
         }
       }
-    } else {
-      return ob.pop(key, _default);
     }
   }
 }
 
 var dir = function(ob) {
   
-  if (__test_if_true__(ob instanceof Object)) {
+  if (ob instanceof Object) {
     return Object.keys( ob );
   } else {
     return __object_keys__(ob);
   }
 }
 
-var __object_keys__ = function(ob) {
-  var arr;
-  "\n		notes:\n			. Object.keys(ob) will not work because we create PythonJS objects using `Object.create(null)`\n			. this is different from Object.keys because it traverses the prototype chain.\n		";
-  arr = [];
-  for (var key in ob) { arr.push(key) };
-  return arr;
-}
-
 var __bind_property_descriptors__ = function(o, klass) {
   var prop,desc;
-    var __iter19 = klass.__properties__;
-  if (! (__iter19 instanceof Array || typeof __iter19 == "string" || __is_typed_array(__iter19) || __is_some_array(__iter19) )) { __iter19 = __object_keys__(__iter19) }
-  for (var __idx19=0; __idx19 < __iter19.length; __idx19++) {
-    var name = __iter19[ __idx19 ];
+    var __iter24 = klass.__properties__;
+  if (! (__iter24 instanceof Array || typeof __iter24 == "string" || __is_typed_array(__iter24) || __is_some_array(__iter24) )) { __iter24 = __object_keys__(__iter24) }
+  for (var __idx24=0; __idx24 < __iter24.length; __idx24++) {
+    var name = __iter24[ __idx24 ];
     desc = __jsdict([["enumerable", true]]);
     prop = klass.__properties__[name];
-    if (__test_if_true__(prop["get"])) {
+    if (prop["get"]) {
       desc["get"] = __generate_getter__(klass, o, name);
     }
-    if (__test_if_true__(prop["set"])) {
+    if (prop["set"]) {
       desc["set"] = __generate_setter__(klass, o, name);
     }
     Object.defineProperty(o, name, desc);
   }
-    var __iter20 = klass.__bases__;
-  if (! (__iter20 instanceof Array || typeof __iter20 == "string" || __is_typed_array(__iter20) || __is_some_array(__iter20) )) { __iter20 = __object_keys__(__iter20) }
-  for (var __idx20=0; __idx20 < __iter20.length; __idx20++) {
-    var base = __iter20[ __idx20 ];
+    var __iter25 = klass.__bases__;
+  if (! (__iter25 instanceof Array || typeof __iter25 == "string" || __is_typed_array(__iter25) || __is_some_array(__iter25) )) { __iter25 = __object_keys__(__iter25) }
+  for (var __idx25=0; __idx25 < __iter25.length; __idx25++) {
+    var base = __iter25[ __idx25 ];
     __bind_property_descriptors__(o, base);
   }
 }
 
 var __generate_getter__ = function(klass, o, n) {
   
-      var __lambda__ = function() {
+    var __lambda__ = function() {
     
     return klass.__properties__[n]["get"]([o], __jsdict([]));
   }
@@ -1338,7 +1619,7 @@ var __generate_getter__ = function(klass, o, n) {
 
 var __generate_setter__ = function(klass, o, n) {
   
-      var __lambda__ = function(v) {
+    var __lambda__ = function(v) {
     
     return klass.__properties__[n]["set"]([o, v], __jsdict([]));
   }
@@ -1346,39 +1627,6 @@ var __generate_setter__ = function(klass, o, n) {
   return __lambda__;
 }
 
-var __sprintf = function(fmt, args) {
-  var chunks,item,arr;
-  if (__test_if_true__(args instanceof Array)) {
-    chunks = fmt.split("%s");
-    arr = [];
-    var i;
-    i = 0;
-        var __iter21 = chunks;
-    if (! (__iter21 instanceof Array || typeof __iter21 == "string" || __is_typed_array(__iter21) || __is_some_array(__iter21) )) { __iter21 = __object_keys__(__iter21) }
-    for (var __idx21=0; __idx21 < __iter21.length; __idx21++) {
-      var txt = __iter21[ __idx21 ];
-      arr.append(txt);
-      if (( i ) >= args.length) {
-        break;
-      }
-      item = args[i];
-      if ((typeof(item) instanceof Array ? JSON.stringify(typeof(item))==JSON.stringify("string") : typeof(item)==="string")) {
-        arr.append(item);
-      } else {
-        if ((typeof(item) instanceof Array ? JSON.stringify(typeof(item))==JSON.stringify("number") : typeof(item)==="number")) {
-          arr.append(("" + item));
-        } else {
-          arr.append(Object.prototype.toString.call(item));
-        }
-      }
-      i += 1;
-    }
-    return "".join(arr);
-  } else {
-    return __replace_method(fmt, "%s", args);
-  }
-}
-
 var __create_class__ = function(class_name, parents, attrs, props) {
   var f,klass,prop;
   "Create a PythonScript class";
@@ -1389,49 +1637,49 @@ var __create_class__ = function(class_name, parents, attrs, props) {
   klass.__all_method_names__ = [];
   klass.__properties__ = props;
   klass.__attributes__ = attrs;
-    var __iter22 = attrs;
-  if (! (__iter22 instanceof Array || typeof __iter22 == "string" || __is_typed_array(__iter22) || __is_some_array(__iter22) )) { __iter22 = __object_keys__(__iter22) }
-  for (var __idx22=0; __idx22 < __iter22.length; __idx22++) {
-    var key = __iter22[ __idx22 ];
-    if ((typeof(attrs[key]) instanceof Array ? JSON.stringify(typeof(attrs[key]))==JSON.stringify("function") : typeof(attrs[key])==="function")) {
+    var __iter26 = attrs;
+  if (! (__iter26 instanceof Array || typeof __iter26 == "string" || __is_typed_array(__iter26) || __is_some_array(__iter26) )) { __iter26 = __object_keys__(__iter26) }
+  for (var __idx26=0; __idx26 < __iter26.length; __idx26++) {
+    var key = __iter26[ __idx26 ];
+    if (typeof(attrs[key])==="function") {
       klass.__all_method_names__.push(key);
       f = attrs[key];
-      if (__test_if_true__((hasattr(f, "is_classmethod") && f.is_classmethod))) {
+      if (hasattr(f, "is_classmethod") && f.is_classmethod) {
         /*pass*/
       } else {
-        if (__test_if_true__((hasattr(f, "is_staticmethod") && f.is_staticmethod))) {
+        if (hasattr(f, "is_staticmethod") && f.is_staticmethod) {
           /*pass*/
         } else {
           klass.__unbound_methods__[key] = attrs[key];
         }
       }
     }
-    if ((key instanceof Array ? JSON.stringify(key)==JSON.stringify("__getattribute__") : key==="__getattribute__")) {
+    if (key==="__getattribute__") {
       continue
     }
     klass[key] = attrs[key];
   }
   klass.__setters__ = [];
   klass.__getters__ = [];
-    var __iter23 = klass.__properties__;
-  if (! (__iter23 instanceof Array || typeof __iter23 == "string" || __is_typed_array(__iter23) || __is_some_array(__iter23) )) { __iter23 = __object_keys__(__iter23) }
-  for (var __idx23=0; __idx23 < __iter23.length; __idx23++) {
-    var name = __iter23[ __idx23 ];
+    var __iter27 = klass.__properties__;
+  if (! (__iter27 instanceof Array || typeof __iter27 == "string" || __is_typed_array(__iter27) || __is_some_array(__iter27) )) { __iter27 = __object_keys__(__iter27) }
+  for (var __idx27=0; __idx27 < __iter27.length; __idx27++) {
+    var name = __iter27[ __idx27 ];
     prop = klass.__properties__[name];
     klass.__getters__.push(name);
-    if (__test_if_true__(prop["set"])) {
+    if (prop["set"]) {
       klass.__setters__.push(name);
     }
   }
-    var __iter24 = klass.__bases__;
-  if (! (__iter24 instanceof Array || typeof __iter24 == "string" || __is_typed_array(__iter24) || __is_some_array(__iter24) )) { __iter24 = __object_keys__(__iter24) }
-  for (var __idx24=0; __idx24 < __iter24.length; __idx24++) {
-    var base = __iter24[ __idx24 ];
+    var __iter28 = klass.__bases__;
+  if (! (__iter28 instanceof Array || typeof __iter28 == "string" || __is_typed_array(__iter28) || __is_some_array(__iter28) )) { __iter28 = __object_keys__(__iter28) }
+  for (var __idx28=0; __idx28 < __iter28.length; __idx28++) {
+    var base = __iter28[ __idx28 ];
     Array.prototype.push.apply(klass.__getters__, base.__getters__);
     Array.prototype.push.apply(klass.__setters__, base.__setters__);
     Array.prototype.push.apply(klass.__all_method_names__, base.__all_method_names__);
   }
-      var __call__ = function() {
+    var __call__ = function() {
     var has_getattr,wrapper,object,has_getattribute;
     "Create a PythonJS object";
     object = Object.create(null);
@@ -1439,31 +1687,31 @@ var __create_class__ = function(class_name, parents, attrs, props) {
     object.__dict__ = object;
     has_getattribute = false;
     has_getattr = false;
-        var __iter25 = klass.__all_method_names__;
-    if (! (__iter25 instanceof Array || typeof __iter25 == "string" || __is_typed_array(__iter25) || __is_some_array(__iter25) )) { __iter25 = __object_keys__(__iter25) }
-    for (var __idx25=0; __idx25 < __iter25.length; __idx25++) {
-      var name = __iter25[ __idx25 ];
-      if ((name instanceof Array ? JSON.stringify(name)==JSON.stringify("__getattribute__") : name==="__getattribute__")) {
+        var __iter29 = klass.__all_method_names__;
+    if (! (__iter29 instanceof Array || typeof __iter29 == "string" || __is_typed_array(__iter29) || __is_some_array(__iter29) )) { __iter29 = __object_keys__(__iter29) }
+    for (var __idx29=0; __idx29 < __iter29.length; __idx29++) {
+      var name = __iter29[ __idx29 ];
+      if (name==="__getattribute__") {
         has_getattribute = true;
       } else {
-        if ((name instanceof Array ? JSON.stringify(name)==JSON.stringify("__getattr__") : name==="__getattr__")) {
+        if (name==="__getattr__") {
           has_getattr = true;
         } else {
           wrapper = __get__(object, name);
-          if (__test_if_true__(! (wrapper.is_wrapper))) {
+          if (! (wrapper.is_wrapper)) {
             console.log(["RUNTIME ERROR: failed to get wrapper for:", name]);
           }
         }
       }
     }
-    if (__test_if_true__(has_getattr)) {
+    if (has_getattr) {
       __get__(object, "__getattr__");
     }
-    if (__test_if_true__(has_getattribute)) {
+    if (has_getattribute) {
       __get__(object, "__getattribute__");
     }
     __bind_property_descriptors__(object, klass);
-    if (__test_if_true__(object.__init__)) {
+    if (object.__init__) {
       object.__init__.apply(this, arguments);
     }
     return object;
@@ -1478,7 +1726,7 @@ var type = function(args, kwargs) {
   
   var __sig__,__args__;
   __sig__ = { kwargs:{"bases": null, "class_dict": null},args:["ob_or_class_name", "bases", "class_dict"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -1489,32 +1737,17 @@ var type = function(args, kwargs) {
   var bases = __args__['bases'];
   var class_dict = __args__['class_dict'];
   "\n	type(object) -> the object's type\n	type(name, bases, dict) -> a __new__>>type  ## broken? - TODO test\n	";
-  if (__test_if_true__((( bases ) === null && ( class_dict ) === null))) {
+  if (( bases ) === null && ( class_dict ) === null) {
     return ob_or_class_name.__class__;
   } else {
     return create_class(ob_or_class_name, bases, class_dict);
   }
 };type.is_wrapper = true;
-var hasattr = function(args, kwargs) {
-  
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["ob", "attr"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("hasattr", __sig__, args, kwargs);
-  var ob = __args__['ob'];
-  var attr = __args__['attr'];
-  return Object.hasOwnProperty.call(ob, attr);
-};hasattr.is_wrapper = true;
 var getattr = function(args, kwargs) {
   var prop;
   var __sig__,__args__;
   __sig__ = { kwargs:{"property": false},args:["ob", "attr", "property"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -1524,9 +1757,9 @@ var getattr = function(args, kwargs) {
   var ob = __args__['ob'];
   var attr = __args__['attr'];
   var property = __args__['property'];
-  if (__test_if_true__(property)) {
+  if (property) {
     prop = _get_upstream_property(ob.__class__, attr);
-    if (__test_if_true__((prop && prop["get"]))) {
+    if (prop && prop["get"]) {
       return prop["get"]([ob], __jsdict([]));
     } else {
       console.log(["ERROR: getattr property error", prop]);
@@ -1539,7 +1772,7 @@ var setattr = function(args, kwargs) {
   var prop;
   var __sig__,__args__;
   __sig__ = { kwargs:{"property": false},args:["ob", "attr", "value", "property"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -1550,9 +1783,9 @@ var setattr = function(args, kwargs) {
   var attr = __args__['attr'];
   var value = __args__['value'];
   var property = __args__['property'];
-  if (__test_if_true__(property)) {
+  if (property) {
     prop = _get_upstream_property(ob.__class__, attr);
-    if (__test_if_true__((prop && prop["set"]))) {
+    if (prop && prop["set"]) {
       prop["set"]([ob, value], __jsdict([]));
     } else {
       console.log(["ERROR: setattr property error", prop]);
@@ -1565,7 +1798,7 @@ var issubclass = function(args, kwargs) {
   var i,bases;
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["C", "B"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -1579,8 +1812,8 @@ var issubclass = function(args, kwargs) {
   }
   bases = C.__bases__;
   i = 0;
-  while (( i ) < __get__(bases, "length", "missing attribute `length` - line 655: while i < bases.length:")) {
-    if (__test_if_true__(issubclass([((bases instanceof Array) ? bases[i] : __get__(bases, "__getitem__", "line 656: if issubclass( bases[i], B ):")([i], __NULL_OBJECT__)), B], __NULL_OBJECT__))) {
+  while (( i ) < __get__(bases, "length", "missing attribute `length` - line 228: while i < bases.length:")) {
+    if (issubclass([((bases instanceof Array) ? bases[i] : __get__(bases, "__getitem__", "line 229: if issubclass( bases[i], B ):")([i], __NULL_OBJECT__)), B], __NULL_OBJECT__)) {
       return true;
     }
     i += 1;
@@ -1591,7 +1824,7 @@ var isinstance = function(args, kwargs) {
   var ob_class;
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["ob", "klass"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -1600,13 +1833,13 @@ var isinstance = function(args, kwargs) {
   __args__ = __getargs__("isinstance", __sig__, args, kwargs);
   var ob = __args__['ob'];
   var klass = __args__['klass'];
-  if (__test_if_true__((( ob ) === undefined || ( ob ) === null))) {
+  if (( ob ) === undefined || ( ob ) === null) {
     return false;
   } else {
-    if (__test_if_true__((ob instanceof Array && ( klass ) === list))) {
+    if (ob instanceof Array && ( klass ) === list) {
       return true;
     } else {
-      if (__test_if_true__(! (Object.hasOwnProperty.call(ob, "__class__")))) {
+      if (! (Object.hasOwnProperty.call(ob, "__class__"))) {
         return false;
       }
     }
@@ -1622,7 +1855,7 @@ var int = function(args, kwargs) {
   
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["a"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -1631,23 +1864,16 @@ var int = function(args, kwargs) {
   __args__ = __getargs__("int", __sig__, args, kwargs);
   var a = __args__['a'];
   a = Math.round(a);
-  if (__test_if_true__(isNaN(a))) {
+  if (isNaN(a)) {
     throw new ValueError("not a number");
   }
   return a;
 };int.is_wrapper = true;
-var int16 = function(a) {
-  var arr;
-  arr =  new Int16Array(1);
-  arr[0] = a;
-  return arr;
-}
-
 var float = function(args, kwargs) {
   var b;
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["a"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -1655,17 +1881,17 @@ var float = function(args, kwargs) {
   }
   __args__ = __getargs__("float", __sig__, args, kwargs);
   var a = __args__['a'];
-  if ((typeof(a) instanceof Array ? JSON.stringify(typeof(a))==JSON.stringify("string") : typeof(a)==="string")) {
-    if ((a.lower() instanceof Array ? JSON.stringify(a.lower())==JSON.stringify("nan") : a.lower()==="nan")) {
+  if (typeof(a)==="string") {
+    if (a.lower()==="nan") {
       return NaN;
     } else {
-      if ((a.lower() instanceof Array ? JSON.stringify(a.lower())==JSON.stringify("inf") : a.lower()==="inf")) {
+      if (a.lower()==="inf") {
         return Infinity;
       }
     }
   }
   b = Number(a);
-  if (__test_if_true__(isNaN(b))) {
+  if (isNaN(b)) {
     throw new ValueError(("can not convert to float: " + a));
   }
   return b;
@@ -1674,7 +1900,7 @@ var round = function(args, kwargs) {
   var p,b;
   var __sig__,__args__;
   __sig__ = { kwargs:{"places": 0},args:["a", "places"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -1684,7 +1910,7 @@ var round = function(args, kwargs) {
   var a = __args__['a'];
   var places = __args__['places'];
   b = ("" + a);
-  if ((b.indexOf(".") instanceof Array ? JSON.stringify(b.indexOf("."))==JSON.stringify(-1) : b.indexOf(".")===-1)) {
+  if (b.indexOf(".")===-1) {
     return a;
   } else {
     p = Math.pow(10, places);
@@ -1695,7 +1921,7 @@ var str = function(args, kwargs) {
   
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["s"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -1708,17 +1934,7 @@ var str = function(args, kwargs) {
 var _setup_str_prototype = function() {
   
   "\n	Extend JavaScript String.prototype with methods that implement the Python str API.\n	The decorator @String.prototype.[name] assigns the function to the prototype,\n	and ensures that the special 'this' variable will work.\n	";
-      var func = function(a) {
-    
-    if ((this.indexOf(a) instanceof Array ? JSON.stringify(this.indexOf(a))==JSON.stringify(-1) : this.indexOf(a)===-1)) {
-      return false;
-    } else {
-      return true;
-    }
-  }
-
-  Object.defineProperty(String.prototype, "__contains__", { enumerable:false,value:func,writeable:true,configurable:true });
-      var func = function(index) {
+    var func = function(index) {
     
     if (( index ) < 0) {
       return this[(this.length + index)];
@@ -1728,13 +1944,13 @@ var _setup_str_prototype = function() {
   }
 
   Object.defineProperty(String.prototype, "get", { enumerable:false,value:func,writeable:true,configurable:true });
-      var func = function(self) {
+    var func = function(self) {
     
     return __get__(Iterator, "__call__")([this, 0], __NULL_OBJECT__);
   }
 
   Object.defineProperty(String.prototype, "__iter__", { enumerable:false,value:func,writeable:true,configurable:true });
-      var func = function(idx) {
+    var func = function(idx) {
     
     if (( idx ) < 0) {
       return this[(this.length + idx)];
@@ -1744,115 +1960,25 @@ var _setup_str_prototype = function() {
   }
 
   Object.defineProperty(String.prototype, "__getitem__", { enumerable:false,value:func,writeable:true,configurable:true });
-      var func = function() {
+    var func = function() {
     
     return this.length;
   }
 
   Object.defineProperty(String.prototype, "__len__", { enumerable:false,value:func,writeable:true,configurable:true });
-      var func = function(start, stop, step) {
-    
-    if (__test_if_true__((( start ) === undefined && ( stop ) === undefined && (step instanceof Array ? JSON.stringify(step)==JSON.stringify(-1) : step===-1)))) {
-      return this.split("").reverse().join("");
-    } else {
-      if (( stop ) < 0) {
-        stop = (this.length + stop);
-      }
-      return this.substring(start, stop);
-    }
-  }
-
-  Object.defineProperty(String.prototype, "__getslice__", { enumerable:false,value:func,writeable:true,configurable:true });
-      var func = function() {
-    
-    return this.split("\n");
-  }
-
-  Object.defineProperty(String.prototype, "splitlines", { enumerable:false,value:func,writeable:true,configurable:true });
-      var func = function() {
-    
-    return this.trim();
-  }
-
-  Object.defineProperty(String.prototype, "strip", { enumerable:false,value:func,writeable:true,configurable:true });
-      var func = function(a) {
-    
-    if ((this.substring(0, a.length) instanceof Array ? JSON.stringify(this.substring(0, a.length))==JSON.stringify(a) : this.substring(0, a.length)===a)) {
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  Object.defineProperty(String.prototype, "startswith", { enumerable:false,value:func,writeable:true,configurable:true });
-      var func = function(a) {
-    
-    if ((this.substring((this.length - a.length), this.length) instanceof Array ? JSON.stringify(this.substring((this.length - a.length), this.length))==JSON.stringify(a) : this.substring((this.length - a.length), this.length)===a)) {
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  Object.defineProperty(String.prototype, "endswith", { enumerable:false,value:func,writeable:true,configurable:true });
-      var func = function(a) {
-    var i,arr,out;
-    out = "";
-    if (__test_if_true__(a instanceof Array)) {
-      arr = a;
-    } else {
-      arr = a["$wrapped"];
-    }
-    i = 0;
-        var __iter26 = arr;
-    if (! (__iter26 instanceof Array || typeof __iter26 == "string" || __is_typed_array(__iter26) || __is_some_array(__iter26) )) { __iter26 = __object_keys__(__iter26) }
-    for (var __idx26=0; __idx26 < __iter26.length; __idx26++) {
-      var value = __iter26[ __idx26 ];
-      out += value;
-      i += 1;
-      if (( i ) < arr.length) {
-        out += this;
-      }
-    }
-    return out;
-  }
-
-  Object.defineProperty(String.prototype, "join", { enumerable:false,value:func,writeable:true,configurable:true });
-      var func = function() {
-    
-    return this.toUpperCase();
-  }
-
-  Object.defineProperty(String.prototype, "upper", { enumerable:false,value:func,writeable:true,configurable:true });
-      var func = function() {
-    
-    return this.toLowerCase();
-  }
-
-  Object.defineProperty(String.prototype, "lower", { enumerable:false,value:func,writeable:true,configurable:true });
-      var func = function(a) {
-    var i;
-    i = this.indexOf(a);
-    if ((i instanceof Array ? JSON.stringify(i)==JSON.stringify(-1) : i===-1)) {
-      throw new ValueError((a + " - not in string"));
-    }
-    return i;
-  }
-
-  Object.defineProperty(String.prototype, "index", { enumerable:false,value:func,writeable:true,configurable:true });
-      var func = function(a) {
+    var func = function(a) {
     
     return this.indexOf(a);
   }
 
   Object.defineProperty(String.prototype, "find", { enumerable:false,value:func,writeable:true,configurable:true });
-      var func = function() {
+    var func = function() {
     var digits;
     digits = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"];
-        var __iter27 = this;
-    if (! (__iter27 instanceof Array || typeof __iter27 == "string" || __is_typed_array(__iter27) || __is_some_array(__iter27) )) { __iter27 = __object_keys__(__iter27) }
-    for (var __idx27=0; __idx27 < __iter27.length; __idx27++) {
-      var char = __iter27[ __idx27 ];
+        var __iter30 = this;
+    if (! (__iter30 instanceof Array || typeof __iter30 == "string" || __is_typed_array(__iter30) || __is_some_array(__iter30) )) { __iter30 = __object_keys__(__iter30) }
+    for (var __idx30=0; __idx30 < __iter30.length; __idx30++) {
+      var char = __iter30[ __idx30 ];
       if (__contains__(digits, char)) {
         /*pass*/
       } else {
@@ -1863,13 +1989,13 @@ var _setup_str_prototype = function() {
   }
 
   Object.defineProperty(String.prototype, "isdigit", { enumerable:false,value:func,writeable:true,configurable:true });
-      var func = function() {
+    var func = function() {
     var digits;
     digits = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "."];
-        var __iter28 = this;
-    if (! (__iter28 instanceof Array || typeof __iter28 == "string" || __is_typed_array(__iter28) || __is_some_array(__iter28) )) { __iter28 = __object_keys__(__iter28) }
-    for (var __idx28=0; __idx28 < __iter28.length; __idx28++) {
-      var char = __iter28[ __idx28 ];
+        var __iter31 = this;
+    if (! (__iter31 instanceof Array || typeof __iter31 == "string" || __is_typed_array(__iter31) || __is_some_array(__iter31) )) { __iter31 = __object_keys__(__iter31) }
+    for (var __idx31=0; __idx31 < __iter31.length; __idx31++) {
+      var char = __iter31[ __idx31 ];
       if (__contains__(digits, char)) {
         /*pass*/
       } else {
@@ -1880,26 +2006,26 @@ var _setup_str_prototype = function() {
   }
 
   Object.defineProperty(String.prototype, "isnumber", { enumerable:false,value:func,writeable:true,configurable:true });
-      var func = function(encoding) {
+    var func = function(encoding) {
     
     return this;
   }
 
   Object.defineProperty(String.prototype, "decode", { enumerable:false,value:func,writeable:true,configurable:true });
-      var func = function(encoding) {
+    var func = function(encoding) {
     
     return this;
   }
 
   Object.defineProperty(String.prototype, "encode", { enumerable:false,value:func,writeable:true,configurable:true });
-      var func = function(fmt) {
+    var func = function(fmt) {
     var keys,r;
     r = this;
     keys = Object.keys(fmt);
-        var __iter29 = keys;
-    if (! (__iter29 instanceof Array || typeof __iter29 == "string" || __is_typed_array(__iter29) || __is_some_array(__iter29) )) { __iter29 = __object_keys__(__iter29) }
-    for (var __idx29=0; __idx29 < __iter29.length; __idx29++) {
-      var key = __iter29[ __idx29 ];
+        var __iter32 = keys;
+    if (! (__iter32 instanceof Array || typeof __iter32 == "string" || __is_typed_array(__iter32) || __is_some_array(__iter32) )) { __iter32 = __object_keys__(__iter32) }
+    for (var __idx32=0; __idx32 < __iter32.length; __idx32++) {
+      var key = __iter32[ __idx32 ];
       r = r.split(key).join(fmt[key]);
     }
     r = r.split("{").join("").split("}").join("");
@@ -1911,8 +2037,8 @@ var _setup_str_prototype = function() {
 _setup_str_prototype();
 var __sort_method = function(ob) {
   
-  if (__test_if_true__(ob instanceof Array)) {
-            var f = function(a, b) {
+  if (ob instanceof Array) {
+        var f = function(a, b) {
       
       if (( a ) < b) {
         return -1;
@@ -1933,13 +2059,13 @@ var __sort_method = function(ob) {
 
 var _setup_array_prototype = function() {
   
-      var func = function() {
+    var func = function() {
     var i,item;
     i = 0;
     while (( i ) < this.length) {
       item = this[i];
-      if ((typeof(item) instanceof Array ? JSON.stringify(typeof(item))==JSON.stringify("object") : typeof(item)==="object")) {
-        if (__test_if_true__(item.jsify)) {
+      if (typeof(item)==="object") {
+        if (item.jsify) {
           this[i] = item.jsify();
         }
       }
@@ -1949,29 +2075,19 @@ var _setup_array_prototype = function() {
   }
 
   Object.defineProperty(Array.prototype, "jsify", { enumerable:false,value:func,writeable:true,configurable:true });
-      var func = function(a) {
-    
-    if ((this.indexOf(a) instanceof Array ? JSON.stringify(this.indexOf(a))==JSON.stringify(-1) : this.indexOf(a)===-1)) {
-      return false;
-    } else {
-      return true;
-    }
-  }
-
-  Object.defineProperty(Array.prototype, "__contains__", { enumerable:false,value:func,writeable:true,configurable:true });
-      var func = function() {
+    var func = function() {
     
     return this.length;
   }
 
   Object.defineProperty(Array.prototype, "__len__", { enumerable:false,value:func,writeable:true,configurable:true });
-      var func = function(index) {
+    var func = function(index) {
     
     return this[index];
   }
 
   Object.defineProperty(Array.prototype, "get", { enumerable:false,value:func,writeable:true,configurable:true });
-      var __getitem__ = function(index) {
+    var __getitem__ = function(index) {
     
     if (( index ) < 0) {
       index = (this.length + index);
@@ -1980,7 +2096,7 @@ var _setup_array_prototype = function() {
   }
 
   Object.defineProperty(Array.prototype, "__getitem__", { enumerable:false,value:__getitem__,writeable:true,configurable:true });
-      var __setitem__ = function(index, value) {
+    var __setitem__ = function(index, value) {
     
     if (( index ) < 0) {
       index = (this.length + index);
@@ -1989,130 +2105,13 @@ var _setup_array_prototype = function() {
   }
 
   Object.defineProperty(Array.prototype, "__setitem__", { enumerable:false,value:__setitem__,writeable:true,configurable:true });
-      var func = function() {
+    var func = function() {
     
     return __get__(Iterator, "__call__")([this, 0], __NULL_OBJECT__);
   }
 
   Object.defineProperty(Array.prototype, "__iter__", { enumerable:false,value:func,writeable:true,configurable:true });
-      var func = function(start, stop, step) {
-    var i,arr,n;
-    arr = [];
-    start = (start | 0);
-    if (( stop ) === undefined) {
-      stop = this.length;
-    }
-    if (( start ) < 0) {
-      start = (this.length + start);
-    }
-    if (( stop ) < 0) {
-      stop = (this.length + stop);
-    }
-    if ((typeof(step) instanceof Array ? JSON.stringify(typeof(step))==JSON.stringify("number") : typeof(step)==="number")) {
-      if (( step ) < 0) {
-        i = start;
-        while (( i ) >= 0) {
-          arr.push(this[i]);
-          i += step;
-        }
-        return arr;
-      } else {
-        i = start;
-        n = stop;
-        while (( i ) < n) {
-          arr.push(this[i]);
-          i += step;
-        }
-        return arr;
-      }
-    } else {
-      i = start;
-      n = stop;
-      while (( i ) < n) {
-        arr.push(this[i]);
-        i += 1;
-      }
-      return arr;
-    }
-  }
-
-  Object.defineProperty(Array.prototype, "__getslice__", { enumerable:false,value:func,writeable:true,configurable:true });
-      var func = function(start, stop, step, items) {
-    var arr;
-    if (( start ) === undefined) {
-      start = 0;
-    }
-    if (( stop ) === undefined) {
-      stop = this.length;
-    }
-    arr = [start, (stop - start)];
-        var __iter30 = items;
-    if (! (__iter30 instanceof Array || typeof __iter30 == "string" || __is_typed_array(__iter30) || __is_some_array(__iter30) )) { __iter30 = __object_keys__(__iter30) }
-    for (var __idx30=0; __idx30 < __iter30.length; __idx30++) {
-      var item = __iter30[ __idx30 ];
-      arr.push(item);
-    }
-    this.splice.apply(this, arr);
-  }
-
-  Object.defineProperty(Array.prototype, "__setslice__", { enumerable:false,value:func,writeable:true,configurable:true });
-      var func = function(item) {
-    
-    this.push(item);
-    return this;
-  }
-
-  Object.defineProperty(Array.prototype, "append", { enumerable:false,value:func,writeable:true,configurable:true });
-      var extend = function(other) {
-    
-        var __iter31 = other;
-    if (! (__iter31 instanceof Array || typeof __iter31 == "string" || __is_typed_array(__iter31) || __is_some_array(__iter31) )) { __iter31 = __object_keys__(__iter31) }
-    for (var __idx31=0; __idx31 < __iter31.length; __idx31++) {
-      var obj = __iter31[ __idx31 ];
-      this.push(obj);
-    }
-    return this;
-  }
-
-  Object.defineProperty(Array.prototype, "extend", { enumerable:false,value:extend,writeable:true,configurable:true });
-      var func = function(item) {
-    var index;
-    index = this.indexOf(item);
-    this.splice(index, 1);
-  }
-
-  Object.defineProperty(Array.prototype, "remove", { enumerable:false,value:func,writeable:true,configurable:true });
-      var insert = function(index, obj) {
-    
-    if (( index ) < 0) {
-      index = (this.length + index);
-    }
-    this.splice(index, 0, obj);
-  }
-
-  Object.defineProperty(Array.prototype, "insert", { enumerable:false,value:insert,writeable:true,configurable:true });
-      var index = function(obj) {
-    
-    return this.indexOf(obj);
-  }
-
-  Object.defineProperty(Array.prototype, "index", { enumerable:false,value:index,writeable:true,configurable:true });
-      var count = function(obj) {
-    var a;
-    a = 0;
-        var __iter32 = this;
-    if (! (__iter32 instanceof Array || typeof __iter32 == "string" || __is_typed_array(__iter32) || __is_some_array(__iter32) )) { __iter32 = __object_keys__(__iter32) }
-    for (var __idx32=0; __idx32 < __iter32.length; __idx32++) {
-      var item = __iter32[ __idx32 ];
-      if (( item ) === obj) {
-        a += 1;
-      }
-    }
-    return a;
-  }
-
-  Object.defineProperty(Array.prototype, "count", { enumerable:false,value:count,writeable:true,configurable:true });
-      var func = function(x, low, high) {
+    var func = function(x, low, high) {
     var a,mid;
     if (( low ) === undefined) {
       low = 0;
@@ -2133,11 +2132,11 @@ var _setup_array_prototype = function() {
   }
 
   Object.defineProperty(Array.prototype, "bisect", { enumerable:false,value:func,writeable:true,configurable:true });
-      var func = function(other) {
+    var func = function(other) {
     var f;
-            var __lambda__ = function(i) {
+        var __lambda__ = function(i) {
       
-      return (other.indexOf(i) instanceof Array ? JSON.stringify(other.indexOf(i))==JSON.stringify(-1) : other.indexOf(i)===-1);
+      return (other.indexOf(i)===-1);
     }
 
     f = __lambda__;
@@ -2145,11 +2144,11 @@ var _setup_array_prototype = function() {
   }
 
   Object.defineProperty(Array.prototype, "difference", { enumerable:false,value:func,writeable:true,configurable:true });
-      var func = function(other) {
+    var func = function(other) {
     var f;
-            var __lambda__ = function(i) {
+        var __lambda__ = function(i) {
       
-      return (!(other.indexOf(i) instanceof Array ? JSON.stringify(other.indexOf(i))==JSON.stringify(-1) : other.indexOf(i)===-1));
+      return (other.indexOf(i)!==-1);
     }
 
     f = __lambda__;
@@ -2157,13 +2156,13 @@ var _setup_array_prototype = function() {
   }
 
   Object.defineProperty(Array.prototype, "intersection", { enumerable:false,value:func,writeable:true,configurable:true });
-      var func = function(other) {
+    var func = function(other) {
     
         var __iter33 = this;
     if (! (__iter33 instanceof Array || typeof __iter33 == "string" || __is_typed_array(__iter33) || __is_some_array(__iter33) )) { __iter33 = __object_keys__(__iter33) }
     for (var __idx33=0; __idx33 < __iter33.length; __idx33++) {
       var item = __iter33[ __idx33 ];
-      if ((other.indexOf(item) instanceof Array ? JSON.stringify(other.indexOf(item))==JSON.stringify(-1) : other.indexOf(item)===-1)) {
+      if (other.indexOf(item)===-1) {
         return false;
       }
     }
@@ -2171,7 +2170,7 @@ var _setup_array_prototype = function() {
   }
 
   Object.defineProperty(Array.prototype, "issubset", { enumerable:false,value:func,writeable:true,configurable:true });
-      var func = function() {
+    var func = function() {
     var i,arr;
     arr = [];
     i = 0;
@@ -2187,9 +2186,9 @@ var _setup_array_prototype = function() {
 _setup_array_prototype();
 var _setup_nodelist_prototype = function() {
   
-      var func = function(a) {
+    var func = function(a) {
     
-    if ((this.indexOf(a) instanceof Array ? JSON.stringify(this.indexOf(a))==JSON.stringify(-1) : this.indexOf(a)===-1)) {
+    if (this.indexOf(a)===-1) {
       return false;
     } else {
       return true;
@@ -2197,19 +2196,19 @@ var _setup_nodelist_prototype = function() {
   }
 
   Object.defineProperty(NodeList.prototype, "__contains__", { enumerable:false,value:func,writeable:true,configurable:true });
-      var func = function() {
+    var func = function() {
     
     return this.length;
   }
 
   Object.defineProperty(NodeList.prototype, "__len__", { enumerable:false,value:func,writeable:true,configurable:true });
-      var func = function(index) {
+    var func = function(index) {
     
     return this[index];
   }
 
   Object.defineProperty(NodeList.prototype, "get", { enumerable:false,value:func,writeable:true,configurable:true });
-      var __getitem__ = function(index) {
+    var __getitem__ = function(index) {
     
     if (( index ) < 0) {
       index = (this.length + index);
@@ -2218,7 +2217,7 @@ var _setup_nodelist_prototype = function() {
   }
 
   Object.defineProperty(NodeList.prototype, "__getitem__", { enumerable:false,value:__getitem__,writeable:true,configurable:true });
-      var __setitem__ = function(index, value) {
+    var __setitem__ = function(index, value) {
     
     if (( index ) < 0) {
       index = (this.length + index);
@@ -2227,27 +2226,27 @@ var _setup_nodelist_prototype = function() {
   }
 
   Object.defineProperty(NodeList.prototype, "__setitem__", { enumerable:false,value:__setitem__,writeable:true,configurable:true });
-      var func = function() {
+    var func = function() {
     
     return __get__(Iterator, "__call__")([this, 0], __NULL_OBJECT__);
   }
 
   Object.defineProperty(NodeList.prototype, "__iter__", { enumerable:false,value:func,writeable:true,configurable:true });
-      var index = function(obj) {
+    var index = function(obj) {
     
     return this.indexOf(obj);
   }
 
   Object.defineProperty(NodeList.prototype, "index", { enumerable:false,value:index,writeable:true,configurable:true });
 };_setup_nodelist_prototype.is_wrapper = true;
-if (__test_if_true__(((__NODEJS__ instanceof Array ? JSON.stringify(__NODEJS__)==JSON.stringify(false) : __NODEJS__===false) && (__WEBWORKER__ instanceof Array ? JSON.stringify(__WEBWORKER__)==JSON.stringify(false) : __WEBWORKER__===false)))) {
+if ((__NODEJS__===false) && (__WEBWORKER__===false)) {
   _setup_nodelist_prototype();
 }
 var bisect = function(args, kwargs) {
   
   var __sig__,__args__;
   __sig__ = { kwargs:{"low": null, "high": null},args:["a", "x", "low", "high"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -2264,7 +2263,7 @@ var range = function(args, kwargs) {
   var i,arr;
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["num", "stop", "step"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -2295,7 +2294,7 @@ var xrange = function(args, kwargs) {
   
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["num", "stop", "step"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -2311,7 +2310,7 @@ var sum = function(args, kwargs) {
   var a;
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["arr"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -2320,12 +2319,12 @@ var sum = function(args, kwargs) {
   __args__ = __getargs__("sum", __sig__, args, kwargs);
   var arr = __args__['arr'];
   a = 0;
-  var b,__iterator__40;
-  __iterator__40 = __get__(__get__(arr, "__iter__", "no iterator - line 1065: for b in arr:"), "__call__")([], __NULL_OBJECT__);
-  var __next__40;
-  __next__40 = __get__(__iterator__40, "next");
-  while (( __iterator__40.index ) < __iterator__40.length) {
-    b = __next__40();
+  var b,__iterator__12;
+  __iterator__12 = __get__(__get__(arr, "__iter__", "no iterator - line 478: for b in arr:"), "__call__")([], __NULL_OBJECT__);
+  var __next__12;
+  __next__12 = __get__(__iterator__12, "next");
+  while (( __iterator__12.index ) < __iterator__12.length) {
+    b = __next__12();
     a += b;
   }
   return a;
@@ -2335,41 +2334,11 @@ __StopIteration_attrs = {};
 __StopIteration_parents = [];
 __StopIteration_properties = {};
 StopIteration = __create_class__("StopIteration", __StopIteration_parents, __StopIteration_attrs, __StopIteration_properties);
-var len = function(args, kwargs) {
-  
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["ob"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("len", __sig__, args, kwargs);
-  var ob = __args__['ob'];
-  if (__test_if_true__(ob instanceof Array)) {
-    return ob.length;
-  } else {
-    if (__test_if_true__(__is_typed_array(ob))) {
-      return ob.length;
-    } else {
-      if (__test_if_true__(ob instanceof ArrayBuffer)) {
-        return ob.byteLength;
-      } else {
-        if (__test_if_true__(ob.__len__)) {
-          return ob.__len__();
-        } else {
-          return Object.keys(ob).length;
-        }
-      }
-    }
-  }
-};len.is_wrapper = true;
 var next = function(args, kwargs) {
   
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["obj"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -2377,13 +2346,13 @@ var next = function(args, kwargs) {
   }
   __args__ = __getargs__("next", __sig__, args, kwargs);
   var obj = __args__['obj'];
-  return __get__(__get__(obj, "next", "missing attribute `next` - line 1083: return obj.next()"), "__call__")();
+  return __get__(__get__(obj, "next", "missing attribute `next` - line 484: return obj.next()"), "__call__")();
 };next.is_wrapper = true;
 var map = function(args, kwargs) {
   var arr,v;
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["func", "objs"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -2393,12 +2362,12 @@ var map = function(args, kwargs) {
   var func = __args__['func'];
   var objs = __args__['objs'];
   arr = [];
-  var ob,__iterator__41;
-  __iterator__41 = __get__(__get__(objs, "__iter__", "no iterator - line 1086: for ob in objs:"), "__call__")([], __NULL_OBJECT__);
-  var __next__41;
-  __next__41 = __get__(__iterator__41, "next");
-  while (( __iterator__41.index ) < __iterator__41.length) {
-    ob = __next__41();
+  var ob,__iterator__13;
+  __iterator__13 = __get__(__get__(objs, "__iter__", "no iterator - line 487: for ob in objs:"), "__call__")([], __NULL_OBJECT__);
+  var __next__13;
+  __next__13 = __get__(__iterator__13, "next");
+  while (( __iterator__13.index ) < __iterator__13.length) {
+    ob = __next__13();
     v = __get__(func, "__call__")([ob], __NULL_OBJECT__);
     arr.push(v);
   }
@@ -2408,7 +2377,7 @@ var filter = function(args, kwargs) {
   var arr;
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["func", "objs"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -2418,13 +2387,13 @@ var filter = function(args, kwargs) {
   var func = __args__['func'];
   var objs = __args__['objs'];
   arr = [];
-  var ob,__iterator__42;
-  __iterator__42 = __get__(__get__(objs, "__iter__", "no iterator - line 1093: for ob in objs:"), "__call__")([], __NULL_OBJECT__);
-  var __next__42;
-  __next__42 = __get__(__iterator__42, "next");
-  while (( __iterator__42.index ) < __iterator__42.length) {
-    ob = __next__42();
-    if (__test_if_true__(__get__(func, "__call__")([ob], __NULL_OBJECT__))) {
+  var ob,__iterator__14;
+  __iterator__14 = __get__(__get__(objs, "__iter__", "no iterator - line 494: for ob in objs:"), "__call__")([], __NULL_OBJECT__);
+  var __next__14;
+  __next__14 = __get__(__iterator__14, "next");
+  while (( __iterator__14.index ) < __iterator__14.length) {
+    ob = __next__14();
+    if (__get__(func, "__call__")([ob], __NULL_OBJECT__)) {
       arr.push(ob);
     }
   }
@@ -2434,7 +2403,7 @@ var min = function(args, kwargs) {
   var a;
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["lst"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -2443,12 +2412,12 @@ var min = function(args, kwargs) {
   __args__ = __getargs__("min", __sig__, args, kwargs);
   var lst = __args__['lst'];
   a = null;
-  var value,__iterator__43;
-  __iterator__43 = __get__(__get__(lst, "__iter__", "no iterator - line 1100: for value in lst:"), "__call__")([], __NULL_OBJECT__);
-  var __next__43;
-  __next__43 = __get__(__iterator__43, "next");
-  while (( __iterator__43.index ) < __iterator__43.length) {
-    value = __next__43();
+  var value,__iterator__15;
+  __iterator__15 = __get__(__get__(lst, "__iter__", "no iterator - line 501: for value in lst:"), "__call__")([], __NULL_OBJECT__);
+  var __next__15;
+  __next__15 = __get__(__iterator__15, "next");
+  while (( __iterator__15.index ) < __iterator__15.length) {
+    value = __next__15();
     if (( a ) === null) {
       a = value;
     } else {
@@ -2463,7 +2432,7 @@ var max = function(args, kwargs) {
   var a;
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["lst"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -2472,12 +2441,12 @@ var max = function(args, kwargs) {
   __args__ = __getargs__("max", __sig__, args, kwargs);
   var lst = __args__['lst'];
   a = null;
-  var value,__iterator__44;
-  __iterator__44 = __get__(__get__(lst, "__iter__", "no iterator - line 1106: for value in lst:"), "__call__")([], __NULL_OBJECT__);
-  var __next__44;
-  __next__44 = __get__(__iterator__44, "next");
-  while (( __iterator__44.index ) < __iterator__44.length) {
-    value = __next__44();
+  var value,__iterator__16;
+  __iterator__16 = __get__(__get__(lst, "__iter__", "no iterator - line 507: for value in lst:"), "__call__")([], __NULL_OBJECT__);
+  var __next__16;
+  __next__16 = __get__(__iterator__16, "next");
+  while (( __iterator__16.index ) < __iterator__16.length) {
+    value = __next__16();
     if (( a ) === null) {
       a = value;
     } else {
@@ -2492,7 +2461,7 @@ var abs = function(args, kwargs) {
   
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["num"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -2506,7 +2475,7 @@ var ord = function(args, kwargs) {
   
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["char"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -2520,7 +2489,7 @@ var chr = function(args, kwargs) {
   
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["num"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -2533,12 +2502,8 @@ var chr = function(args, kwargs) {
 var __ArrayIterator = function(arr, index) {
   __ArrayIterator.__init__(this, arr, index);
   this.__class__ = __ArrayIterator;
-  this.__uid__ = ("" + _PythonJS_UID);
-  _PythonJS_UID += 1;
 }
 
-__ArrayIterator.__uid__ = ("" + _PythonJS_UID);
-_PythonJS_UID += 1;
 __ArrayIterator.prototype.__init__ = function(arr, index) {
   
   this.arr = arr;
@@ -2556,8 +2521,6 @@ __ArrayIterator.prototype.next = function() {
 }
 
 __ArrayIterator.next = function () { return __ArrayIterator.prototype.next.apply(arguments[0], Array.prototype.slice.call(arguments,1)) };
-__ArrayIterator.prototype.__properties__ = {  };
-__ArrayIterator.prototype.__unbound_methods__ = {  };
 var Iterator,__Iterator_attrs,__Iterator_parents;
 __Iterator_attrs = {};
 __Iterator_parents = [];
@@ -2566,7 +2529,7 @@ var __Iterator___init__ = function(args, kwargs) {
   
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["self", "obj", "index"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -2578,15 +2541,15 @@ var __Iterator___init__ = function(args, kwargs) {
   var index = __args__['index'];
   self.obj = obj;
   self.index = index;
-  self.length = len([obj], __NULL_OBJECT__);
-  self.obj_get = __get__(obj, "get", "missing attribute `get` - line 1134: self.obj_get = obj.get  ## cache this for speed");
+  self.length = __get__(len, "__call__")([obj], __NULL_OBJECT__);
+  self.obj_get = __get__(obj, "get", "missing attribute `get` - line 535: self.obj_get = obj.get  ## cache this for speed");
 };__Iterator___init__.is_wrapper = true;
 __Iterator_attrs.__init__ = __Iterator___init__;
 var __Iterator_next = function(args, kwargs) {
   var index;
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["self"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -2604,7 +2567,7 @@ var tuple = function(args, kwargs) {
   
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["a"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -2612,13 +2575,13 @@ var tuple = function(args, kwargs) {
   }
   __args__ = __getargs__("tuple", __sig__, args, kwargs);
   var a = __args__['a'];
-  if ((Object.keys(arguments).length instanceof Array ? JSON.stringify(Object.keys(arguments).length)==JSON.stringify(0) : Object.keys(arguments).length===0)) {
+  if (Object.keys(arguments).length===0) {
     return [];
   } else {
-    if (__test_if_true__(a instanceof Array)) {
+    if (a instanceof Array) {
       return a.slice();
     } else {
-      if ((typeof(a) instanceof Array ? JSON.stringify(typeof(a))==JSON.stringify("string") : typeof(a)==="string")) {
+      if (typeof(a)==="string") {
         return a.split("");
       } else {
         console.log(a);
@@ -2632,7 +2595,7 @@ var list = function(args, kwargs) {
   
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["a"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -2640,13 +2603,13 @@ var list = function(args, kwargs) {
   }
   __args__ = __getargs__("list", __sig__, args, kwargs);
   var a = __args__['a'];
-  if ((Object.keys(arguments).length instanceof Array ? JSON.stringify(Object.keys(arguments).length)==JSON.stringify(0) : Object.keys(arguments).length===0)) {
+  if (Object.keys(arguments).length===0) {
     return [];
   } else {
-    if (__test_if_true__(a instanceof Array)) {
+    if (a instanceof Array) {
       return a.slice();
     } else {
-      if ((typeof(a) instanceof Array ? JSON.stringify(typeof(a))==JSON.stringify("string") : typeof(a)==="string")) {
+      if (typeof(a)==="string") {
         return a.split("");
       } else {
         console.log(a);
@@ -2663,13 +2626,13 @@ var __tuple_key__ = function(arr) {
   while (( i ) < arr.length) {
     item = arr[i];
     t = typeof(item);
-    if ((t instanceof Array ? JSON.stringify(t)==JSON.stringify("string") : t==="string")) {
+    if (t==="string") {
       r.append((("'" + item) + "'"));
     } else {
-      if (__test_if_true__(item instanceof Array)) {
+      if (item instanceof Array) {
         r.append(__tuple_key__(item));
       } else {
-        if ((t instanceof Array ? JSON.stringify(t)==JSON.stringify("object") : t==="object")) {
+        if (t==="object") {
           if (( item.__uid__ ) === undefined) {
             throw new KeyError(item);
           }
@@ -2692,7 +2655,7 @@ var __dict___init__ = function(args, kwargs) {
   var k,ob,value,v;
   var __sig__,__args__;
   __sig__ = { kwargs:{"js_object": null, "pointer": null},args:["self", "js_object", "pointer"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -2706,15 +2669,15 @@ var __dict___init__ = function(args, kwargs) {
   if (( pointer ) !== null) {
     self["$wrapped"] = pointer;
   } else {
-    if (__test_if_true__(js_object)) {
+    if (js_object) {
       ob = js_object;
-      if (__test_if_true__(ob instanceof Array)) {
-        var o,__iterator__45;
-        __iterator__45 = __get__(__get__(ob, "__iter__", "no iterator - line 1196: for o in ob:"), "__call__")([], __NULL_OBJECT__);
-        var __next__45;
-        __next__45 = __get__(__iterator__45, "next");
-        while (( __iterator__45.index ) < __iterator__45.length) {
-          o = __next__45();
+      if (ob instanceof Array) {
+        var o,__iterator__17;
+        __iterator__17 = __get__(__get__(ob, "__iter__", "no iterator - line 597: for o in ob:"), "__call__")([], __NULL_OBJECT__);
+        var __next__17;
+        __next__17 = __get__(__iterator__17, "next");
+        while (( __iterator__17.index ) < __iterator__17.length) {
+          o = __next__17();
           if (o instanceof Array) {
             k = o[0];
             v = o[1];
@@ -2723,7 +2686,7 @@ var __dict___init__ = function(args, kwargs) {
             v = o["value"];
           }
                     try {
-__get__(__get__(self, "__setitem__", "missing attribute `__setitem__` - line 1203: self.__setitem__( k,v )"), "__call__")([k, v], __NULL_OBJECT__);
+__get__(__get__(self, "__setitem__", "missing attribute `__setitem__` - line 604: self.__setitem__( k,v )"), "__call__")([k, v], __NULL_OBJECT__);
           } catch(__exception__) {
 if (__exception__ == KeyError || __exception__ instanceof KeyError) {
 throw new KeyError("error in dict init, bad key");
@@ -2732,15 +2695,15 @@ throw new KeyError("error in dict init, bad key");
 }
         }
       } else {
-        if (__test_if_true__(isinstance([ob, dict], __NULL_OBJECT__))) {
-          var key,__iterator__46;
-          __iterator__46 = __get__(__get__(__jsdict_keys(ob), "__iter__", "no iterator - line 1207: for key in ob.keys():"), "__call__")([], __NULL_OBJECT__);
-          var __next__46;
-          __next__46 = __get__(__iterator__46, "next");
-          while (( __iterator__46.index ) < __iterator__46.length) {
-            key = __next__46();
-            value = ((ob instanceof Array) ? ob[key] : __get__(ob, "__getitem__", "line 1208: value = ob[ key ]")([key], __NULL_OBJECT__));
-            __get__(__get__(self, "__setitem__", "missing attribute `__setitem__` - line 1209: self.__setitem__( key, value )"), "__call__")([key, value], __NULL_OBJECT__);
+        if (isinstance([ob, dict], __NULL_OBJECT__)) {
+          var key,__iterator__18;
+          __iterator__18 = __get__(__get__(__jsdict_keys(ob), "__iter__", "no iterator - line 608: for key in ob.keys():"), "__call__")([], __NULL_OBJECT__);
+          var __next__18;
+          __next__18 = __get__(__iterator__18, "next");
+          while (( __iterator__18.index ) < __iterator__18.length) {
+            key = __next__18();
+            value = ((ob instanceof Array) ? ob[key] : __get__(ob, "__getitem__", "line 609: value = ob[ key ]")([key], __NULL_OBJECT__));
+            __get__(__get__(self, "__setitem__", "missing attribute `__setitem__` - line 610: self.__setitem__( key, value )"), "__call__")([key, value], __NULL_OBJECT__);
           }
         } else {
           console.log(["ERROR init dict from:", js_object]);
@@ -2755,7 +2718,7 @@ var __dict_jsify = function(args, kwargs) {
   var keys,value;
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["self"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -2763,20 +2726,20 @@ var __dict_jsify = function(args, kwargs) {
   }
   __args__ = __getargs__("__dict_jsify", __sig__, args, kwargs);
   var self = __args__['self'];
-  keys = __object_keys__([self["$wrapped"]], __NULL_OBJECT__);
-  var key,__iterator__47;
-  __iterator__47 = __get__(__get__(keys, "__iter__", "no iterator - line 1216: for key in keys:"), "__call__")([], __NULL_OBJECT__);
-  var __next__47;
-  __next__47 = __get__(__iterator__47, "next");
-  while (( __iterator__47.index ) < __iterator__47.length) {
-    key = __next__47();
-    value = __get__(self["$wrapped"], "__getitem__", "line 1217: value = self[...][key]")([key], __NULL_OBJECT__);
-    if ((typeof(value) instanceof Array ? JSON.stringify(typeof(value))==JSON.stringify("object") : typeof(value)==="object")) {
-      if (__test_if_true__(hasattr([value, "jsify"], __NULL_OBJECT__))) {
-        __get__(__get__(self["$wrapped"], "__setitem__"), "__call__")([key, __get__(__get__(value, "jsify", "missing attribute `jsify` - line 1220: self[...][key] = value.jsify()"), "__call__")()], {});
+  keys = __get__(__object_keys__, "__call__")([self["$wrapped"]], __NULL_OBJECT__);
+  var key,__iterator__19;
+  __iterator__19 = __get__(__get__(keys, "__iter__", "no iterator - line 617: for key in keys:"), "__call__")([], __NULL_OBJECT__);
+  var __next__19;
+  __next__19 = __get__(__iterator__19, "next");
+  while (( __iterator__19.index ) < __iterator__19.length) {
+    key = __next__19();
+    value = __get__(self["$wrapped"], "__getitem__", "line 618: value = self[...][key]")([key], __NULL_OBJECT__);
+    if (typeof(value)==="object") {
+      if (__get__(hasattr, "__call__")([value, "jsify"], __NULL_OBJECT__)) {
+        __get__(__get__(self["$wrapped"], "__setitem__"), "__call__")([key, __get__(__get__(value, "jsify", "missing attribute `jsify` - line 621: self[...][key] = value.jsify()"), "__call__")()], {});
       }
     } else {
-      if ((typeof(value) instanceof Array ? JSON.stringify(typeof(value))==JSON.stringify("function") : typeof(value)==="function")) {
+      if (typeof(value)==="function") {
         throw new RuntimeError("can not jsify function");
       }
     }
@@ -2788,7 +2751,7 @@ var __dict_copy = function(args, kwargs) {
   
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["self"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -2803,7 +2766,7 @@ var __dict_clear = function(args, kwargs) {
   
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["self"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -2818,7 +2781,7 @@ var __dict_has_key = function(args, kwargs) {
   var __dict;
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["self", "key"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -2828,10 +2791,10 @@ var __dict_has_key = function(args, kwargs) {
   var self = __args__['self'];
   var key = __args__['key'];
   __dict = self["$wrapped"];
-  if (__test_if_true__(typeof(key) === 'object' || typeof(key) === 'function')) {
-    key = __get__(key, "__uid__", "missing attribute `__uid__` - line 1233: key = key.__uid__");
+  if (typeof(key) === 'object' || typeof(key) === 'function') {
+    key = __get__(key, "__uid__", "missing attribute `__uid__` - line 634: key = key.__uid__");
   }
-  if (__test_if_true__(key in __dict)) {
+  if (key in __dict) {
     return true;
   } else {
     return false;
@@ -2842,7 +2805,7 @@ var __dict_update = function(args, kwargs) {
   
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["self", "other"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -2851,13 +2814,13 @@ var __dict_update = function(args, kwargs) {
   __args__ = __getargs__("__dict_update", __sig__, args, kwargs);
   var self = __args__['self'];
   var other = __args__['other'];
-  var key,__iterator__48;
-  __iterator__48 = __get__(__get__(other, "__iter__", "no iterator - line 1239: for key in other:"), "__call__")([], __NULL_OBJECT__);
-  var __next__48;
-  __next__48 = __get__(__iterator__48, "next");
-  while (( __iterator__48.index ) < __iterator__48.length) {
-    key = __next__48();
-    __get__(__get__(self, "__setitem__", "missing attribute `__setitem__` - line 1240: self.__setitem__( key, other[key] )"), "__call__")([key, ((other instanceof Array) ? other[key] : __get__(other, "__getitem__", "line 1240: self.__setitem__( key, other[key] )")([key], __NULL_OBJECT__))], __NULL_OBJECT__);
+  var key,__iterator__20;
+  __iterator__20 = __get__(__get__(other, "__iter__", "no iterator - line 640: for key in other:"), "__call__")([], __NULL_OBJECT__);
+  var __next__20;
+  __next__20 = __get__(__iterator__20, "next");
+  while (( __iterator__20.index ) < __iterator__20.length) {
+    key = __next__20();
+    __get__(__get__(self, "__setitem__", "missing attribute `__setitem__` - line 641: self.__setitem__( key, other[key] )"), "__call__")([key, ((other instanceof Array) ? other[key] : __get__(other, "__getitem__", "line 641: self.__setitem__( key, other[key] )")([key], __NULL_OBJECT__))], __NULL_OBJECT__);
   }
 };__dict_update.is_wrapper = true;
 __dict_attrs.update = __dict_update;
@@ -2865,7 +2828,7 @@ var __dict_items = function(args, kwargs) {
   var arr;
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["self"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -2874,13 +2837,13 @@ var __dict_items = function(args, kwargs) {
   __args__ = __getargs__("__dict_items", __sig__, args, kwargs);
   var self = __args__['self'];
   arr = [];
-  var key,__iterator__49;
-  __iterator__49 = __get__(__get__(__jsdict_keys(self), "__iter__", "no iterator - line 1243: for key in self.keys():"), "__call__")([], __NULL_OBJECT__);
-  var __next__49;
-  __next__49 = __get__(__iterator__49, "next");
-  while (( __iterator__49.index ) < __iterator__49.length) {
-    key = __next__49();
-    __get__(__get__(arr, "append", "missing attribute `append` - line 1244: arr.append( [key, self[key]] )"), "__call__")([[key, __get__(self, "__getitem__")([key], __NULL_OBJECT__)]], __NULL_OBJECT__);
+  var key,__iterator__21;
+  __iterator__21 = __get__(__get__(__jsdict_keys(self), "__iter__", "no iterator - line 644: for key in self.keys():"), "__call__")([], __NULL_OBJECT__);
+  var __next__21;
+  __next__21 = __get__(__iterator__21, "next");
+  while (( __iterator__21.index ) < __iterator__21.length) {
+    key = __next__21();
+    __get__(__get__(arr, "append", "missing attribute `append` - line 645: arr.append( [key, self[key]] )"), "__call__")([[key, __get__(self, "__getitem__")([key], __NULL_OBJECT__)]], __NULL_OBJECT__);
   }
   return arr;
 };__dict_items.is_wrapper = true;
@@ -2889,7 +2852,7 @@ var __dict_get = function(args, kwargs) {
   
   var __sig__,__args__;
   __sig__ = { kwargs:{"_default": null},args:["self", "key", "_default"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -2911,7 +2874,7 @@ var __dict_set = function(args, kwargs) {
   
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["self", "key", "value"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -2921,14 +2884,14 @@ var __dict_set = function(args, kwargs) {
   var self = __args__['self'];
   var key = __args__['key'];
   var value = __args__['value'];
-  __get__(__get__(self, "__setitem__", "missing attribute `__setitem__` - line 1252: self.__setitem__(key, value)"), "__call__")([key, value], __NULL_OBJECT__);
+  __get__(__get__(self, "__setitem__", "missing attribute `__setitem__` - line 653: self.__setitem__(key, value)"), "__call__")([key, value], __NULL_OBJECT__);
 };__dict_set.is_wrapper = true;
 __dict_attrs.set = __dict_set;
 var __dict___len__ = function(args, kwargs) {
   var __dict;
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["self"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -2944,7 +2907,7 @@ var __dict___getitem__ = function(args, kwargs) {
   var __dict,msg,err;
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["self", "key"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -2956,23 +2919,23 @@ var __dict___getitem__ = function(args, kwargs) {
   "\n		note: `\"4\"` and `4` are the same key in javascript, is there a sane way to workaround this,\n		that can remain compatible with external javascript?\n		";
   __dict = self["$wrapped"];
   err = false;
-  if (__test_if_true__(key instanceof Array)) {
+  if (key instanceof Array) {
     key = __tuple_key__(key);
   } else {
-    if (__test_if_true__(typeof(key) === 'object' || typeof(key) === 'function')) {
-      if (__test_if_true__(key.__uid__ && key.__uid__ in __dict)) {
+    if (typeof(key) === 'object' || typeof(key) === 'function') {
+      if (key.__uid__ && key.__uid__ in __dict) {
         return __dict[key.__uid__];
       } else {
         err = true;
       }
     }
   }
-  if (__test_if_true__((__dict && key in __dict))) {
+  if (__dict && key in __dict) {
     return __dict[key];
   } else {
     err = true;
   }
-  if (__test_if_true__(err)) {
+  if (err) {
     msg = __sprintf("missing key: %s -\n", key);
     throw new KeyError(__jsdict_keys(__dict));
   }
@@ -2982,7 +2945,7 @@ var __dict___setitem__ = function(args, kwargs) {
   var __dict;
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["self", "key", "value"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -2999,15 +2962,15 @@ var __dict___setitem__ = function(args, kwargs) {
     throw new KeyError("null is invalid key type");
   }
   __dict = self["$wrapped"];
-  if (__test_if_true__(key instanceof Array)) {
+  if (key instanceof Array) {
     key = __tuple_key__(key);
     if (( key ) === undefined) {
       throw new KeyError("undefined is invalid key type (tuple)");
     }
     __dict[key] = value;
   } else {
-    if (__test_if_true__(typeof(key) === 'object' || typeof(key) === 'function')) {
-      if (__test_if_true__(key.__uid__ === undefined)) {
+    if (typeof(key) === 'object' || typeof(key) === 'function') {
+      if (key.__uid__ === undefined) {
         key.__uid__ = '' + _PythonJS_UID++;
       }
       __dict[key.__uid__] = value;
@@ -3021,7 +2984,7 @@ var __dict_keys = function(args, kwargs) {
   
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["self"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -3036,7 +2999,7 @@ var __dict_pop = function(args, kwargs) {
   var js_object,v;
   var __sig__,__args__;
   __sig__ = { kwargs:{"d": null},args:["self", "key", "d"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -3060,7 +3023,7 @@ var __dict_values = function(args, kwargs) {
   var keys,out;
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["self"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -3083,7 +3046,7 @@ var __dict___contains__ = function(args, kwargs) {
   
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["self", "value"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -3105,7 +3068,7 @@ var __dict___iter__ = function(args, kwargs) {
   
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["self"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -3121,7 +3084,7 @@ var set = function(args, kwargs) {
   var keys,mask,s,hashtable,key,fallback;
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["a"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -3153,12 +3116,12 @@ var set = function(args, kwargs) {
     }
   }
   fallback = false;
-  if (__test_if_true__(hashtable)) {
+  if (hashtable) {
         var __iter35 = a;
     if (! (__iter35 instanceof Array || typeof __iter35 == "string" || __is_typed_array(__iter35) || __is_some_array(__iter35) )) { __iter35 = __object_keys__(__iter35) }
     for (var __idx35=0; __idx35 < __iter35.length; __idx35++) {
       var b = __iter35[ __idx35 ];
-      if (__test_if_true__(((typeof(b) instanceof Array ? JSON.stringify(typeof(b))==JSON.stringify("number") : typeof(b)==="number") && ( b ) === ( (b | 0) )))) {
+      if ((typeof(b)==="number") && ( b ) === ( (b | 0) )) {
         key = (b & mask);
         hashtable[key] = b;
         keys.push(key);
@@ -3171,12 +3134,12 @@ var set = function(args, kwargs) {
     fallback = true;
   }
   s = [];
-  if (__test_if_true__(fallback)) {
+  if (fallback) {
         var __iter36 = a;
     if (! (__iter36 instanceof Array || typeof __iter36 == "string" || __is_typed_array(__iter36) || __is_some_array(__iter36) )) { __iter36 = __object_keys__(__iter36) }
     for (var __idx36=0; __idx36 < __iter36.length; __idx36++) {
       var item = __iter36[ __idx36 ];
-      if ((s.indexOf(item) instanceof Array ? JSON.stringify(s.indexOf(item))==JSON.stringify(-1) : s.indexOf(item)===-1)) {
+      if (s.indexOf(item)===-1) {
         s.push(item);
       }
     }
@@ -3195,7 +3158,7 @@ var frozenset = function(args, kwargs) {
   
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["a"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -3217,7 +3180,7 @@ var __array___init__ = function(args, kwargs) {
   var size,buff;
   var __sig__,__args__;
   __sig__ = { kwargs:{"initializer": null, "little_endian": false},args:["self", "typecode", "initializer", "little_endian"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -3229,17 +3192,17 @@ var __array___init__ = function(args, kwargs) {
   var initializer = __args__['initializer'];
   var little_endian = __args__['little_endian'];
   self.typecode = typecode;
-  self.itemsize = __get__(__get__(self, "typecodes", "missing attribute `typecodes` - line 1436: self.itemsize = self.typecodes[ typecode ]"), "__getitem__", "line 1436: self.itemsize = self.typecodes[ typecode ]")([typecode], __NULL_OBJECT__);
+  self.itemsize = __get__(__get__(self, "typecodes", "missing attribute `typecodes` - line 837: self.itemsize = self.typecodes[ typecode ]"), "__getitem__", "line 837: self.itemsize = self.typecodes[ typecode ]")([typecode], __NULL_OBJECT__);
   self.little_endian = little_endian;
-  if (__test_if_true__(initializer)) {
-    self.length = len([initializer], __NULL_OBJECT__);
+  if (initializer) {
+    self.length = __get__(len, "__call__")([initializer], __NULL_OBJECT__);
     self.bytes = (self.length * self.itemsize);
-    if ((self.typecode instanceof Array ? JSON.stringify(self.typecode)==JSON.stringify("float8") : self.typecode==="float8")) {
+    if (self.typecode==="float8") {
       self._scale = max([[abs([min([initializer], __NULL_OBJECT__)], __NULL_OBJECT__), max([initializer], __NULL_OBJECT__)]], __NULL_OBJECT__);
       self._norm_get = (self._scale / 127);
       self._norm_set = (1.0 / self._norm_get);
     } else {
-      if ((self.typecode instanceof Array ? JSON.stringify(self.typecode)==JSON.stringify("float16") : self.typecode==="float16")) {
+      if (self.typecode==="float16") {
         self._scale = max([[abs([min([initializer], __NULL_OBJECT__)], __NULL_OBJECT__), max([initializer], __NULL_OBJECT__)]], __NULL_OBJECT__);
         self._norm_get = (self._scale / 32767);
         self._norm_set = (1.0 / self._norm_get);
@@ -3253,14 +3216,14 @@ var __array___init__ = function(args, kwargs) {
   buff = new ArrayBuffer(size);
   self.dataview = new DataView(buff);
   self.buffer = buff;
-  __get__(__get__(self, "fromlist", "missing attribute `fromlist` - line 1457: self.fromlist( initializer )"), "__call__")([initializer], __NULL_OBJECT__);
+  __get__(__get__(self, "fromlist", "missing attribute `fromlist` - line 858: self.fromlist( initializer )"), "__call__")([initializer], __NULL_OBJECT__);
 };__array___init__.is_wrapper = true;
 __array_attrs.__init__ = __array___init__;
 var __array___len__ = function(args, kwargs) {
   
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["self"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -3275,7 +3238,7 @@ var __array___contains__ = function(args, kwargs) {
   var arr;
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["self", "value"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -3284,8 +3247,8 @@ var __array___contains__ = function(args, kwargs) {
   __args__ = __getargs__("__array___contains__", __sig__, args, kwargs);
   var self = __args__['self'];
   var value = __args__['value'];
-  arr = __get__(__get__(self, "to_array", "missing attribute `to_array` - line 1463: arr = self.to_array()"), "__call__")();
-  if ((arr.indexOf(value) instanceof Array ? JSON.stringify(arr.indexOf(value))==JSON.stringify(-1) : arr.indexOf(value)===-1)) {
+  arr = __get__(__get__(self, "to_array", "missing attribute `to_array` - line 864: arr = self.to_array()"), "__call__")();
+  if (arr.indexOf(value)===-1) {
     return false;
   } else {
     return true;
@@ -3296,7 +3259,7 @@ var __array___getitem__ = function(args, kwargs) {
   var func_name,dataview,value,step,func,offset;
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["self", "index"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -3308,14 +3271,14 @@ var __array___getitem__ = function(args, kwargs) {
   step = self.itemsize;
   offset = (step * index);
   dataview = self.dataview;
-  func_name = ("get" + __get__(__get__(self, "typecode_names", "missing attribute `typecode_names` - line 1471: func_name = 'get'+self.typecode_names[ self.typecode ]"), "__getitem__", "line 1471: func_name = 'get'+self.typecode_names[ self.typecode ]")([self.typecode], __NULL_OBJECT__));
+  func_name = ("get" + __get__(__get__(self, "typecode_names", "missing attribute `typecode_names` - line 872: func_name = 'get'+self.typecode_names[ self.typecode ]"), "__getitem__", "line 872: func_name = 'get'+self.typecode_names[ self.typecode ]")([self.typecode], __NULL_OBJECT__));
   func = dataview[func_name].bind(dataview);
   if (( offset ) < self.bytes) {
     value = func(offset);
-    if ((self.typecode instanceof Array ? JSON.stringify(self.typecode)==JSON.stringify("float8") : self.typecode==="float8")) {
+    if (self.typecode==="float8") {
       value = (value * self._norm_get);
     } else {
-      if ((self.typecode instanceof Array ? JSON.stringify(self.typecode)==JSON.stringify("float16") : self.typecode==="float16")) {
+      if (self.typecode==="float16") {
         value = (value * self._norm_get);
       }
     }
@@ -3329,7 +3292,7 @@ var __array___setitem__ = function(args, kwargs) {
   var func_name,dataview,step,func,offset;
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["self", "index", "value"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -3345,13 +3308,13 @@ var __array___setitem__ = function(args, kwargs) {
   }
   offset = (step * index);
   dataview = self.dataview;
-  func_name = ("set" + __get__(__get__(self, "typecode_names", "missing attribute `typecode_names` - line 1487: func_name = 'set'+self.typecode_names[ self.typecode ]"), "__getitem__", "line 1487: func_name = 'set'+self.typecode_names[ self.typecode ]")([self.typecode], __NULL_OBJECT__));
+  func_name = ("set" + __get__(__get__(self, "typecode_names", "missing attribute `typecode_names` - line 888: func_name = 'set'+self.typecode_names[ self.typecode ]"), "__getitem__", "line 888: func_name = 'set'+self.typecode_names[ self.typecode ]")([self.typecode], __NULL_OBJECT__));
   func = dataview[func_name].bind(dataview);
   if (( offset ) < self.bytes) {
-    if ((self.typecode instanceof Array ? JSON.stringify(self.typecode)==JSON.stringify("float8") : self.typecode==="float8")) {
+    if (self.typecode==="float8") {
       value = (value * self._norm_set);
     } else {
-      if ((self.typecode instanceof Array ? JSON.stringify(self.typecode)==JSON.stringify("float16") : self.typecode==="float16")) {
+      if (self.typecode==="float16") {
         value = (value * self._norm_set);
       }
     }
@@ -3365,7 +3328,7 @@ var __array___iter__ = function(args, kwargs) {
   
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["self"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -3380,7 +3343,7 @@ var __array_get = function(args, kwargs) {
   
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["self", "index"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -3396,7 +3359,7 @@ var __array_fromlist = function(args, kwargs) {
   var typecode,i,func_name,dataview,length,item,step,func,offset,size;
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["self", "lst"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -3405,22 +3368,22 @@ var __array_fromlist = function(args, kwargs) {
   __args__ = __getargs__("__array_fromlist", __sig__, args, kwargs);
   var self = __args__['self'];
   var lst = __args__['lst'];
-  length = len([lst], __NULL_OBJECT__);
+  length = __get__(len, "__call__")([lst], __NULL_OBJECT__);
   step = self.itemsize;
   typecode = self.typecode;
   size = (length * step);
   dataview = self.dataview;
-  func_name = ("set" + __get__(__get__(self, "typecode_names", "missing attribute `typecode_names` - line 1507: func_name = 'set'+self.typecode_names[ typecode ]"), "__getitem__", "line 1507: func_name = 'set'+self.typecode_names[ typecode ]")([typecode], __NULL_OBJECT__));
+  func_name = ("set" + __get__(__get__(self, "typecode_names", "missing attribute `typecode_names` - line 908: func_name = 'set'+self.typecode_names[ typecode ]"), "__getitem__", "line 908: func_name = 'set'+self.typecode_names[ typecode ]")([typecode], __NULL_OBJECT__));
   func = dataview[func_name].bind(dataview);
   if (( size ) <= self.bytes) {
     i = 0;
     offset = 0;
     while (( i ) < length) {
-      item = ((lst instanceof Array) ? lst[i] : __get__(lst, "__getitem__", "line 1512: item = lst[i]")([i], __NULL_OBJECT__));
-      if ((typecode instanceof Array ? JSON.stringify(typecode)==JSON.stringify("float8") : typecode==="float8")) {
+      item = ((lst instanceof Array) ? lst[i] : __get__(lst, "__getitem__", "line 913: item = lst[i]")([i], __NULL_OBJECT__));
+      if (typecode==="float8") {
         item *= self._norm_set;
       } else {
-        if ((typecode instanceof Array ? JSON.stringify(typecode)==JSON.stringify("float16") : typecode==="float16")) {
+        if (typecode==="float16") {
           item *= self._norm_set;
         }
       }
@@ -3437,7 +3400,7 @@ var __array_resize = function(args, kwargs) {
   var source,new_buff,target,new_size,buff;
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["self", "length"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -3462,7 +3425,7 @@ var __array_append = function(args, kwargs) {
   var length;
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["self", "value"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -3472,7 +3435,7 @@ var __array_append = function(args, kwargs) {
   var self = __args__['self'];
   var value = __args__['value'];
   length = self.length;
-  __get__(__get__(self, "resize", "missing attribute `resize` - line 1535: self.resize( self.length + 1 )"), "__call__")([(self.length + 1)], __NULL_OBJECT__);
+  __get__(__get__(self, "resize", "missing attribute `resize` - line 936: self.resize( self.length + 1 )"), "__call__")([(self.length + 1)], __NULL_OBJECT__);
   __get__(__get__(self, "__setitem__"), "__call__")([length, value], {});
 };__array_append.is_wrapper = true;
 __array_attrs.append = __array_append;
@@ -3480,7 +3443,7 @@ var __array_extend = function(args, kwargs) {
   
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["self", "lst"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -3489,13 +3452,13 @@ var __array_extend = function(args, kwargs) {
   __args__ = __getargs__("__array_extend", __sig__, args, kwargs);
   var self = __args__['self'];
   var lst = __args__['lst'];
-  var value,__iterator__54;
-  __iterator__54 = __get__(__get__(lst, "__iter__", "no iterator - line 1538: for value in lst:"), "__call__")([], __NULL_OBJECT__);
-  var __next__54;
-  __next__54 = __get__(__iterator__54, "next");
-  while (( __iterator__54.index ) < __iterator__54.length) {
-    value = __next__54();
-    __get__(__get__(self, "append", "missing attribute `append` - line 1539: self.append( value )"), "__call__")([value], __NULL_OBJECT__);
+  var value,__iterator__26;
+  __iterator__26 = __get__(__get__(lst, "__iter__", "no iterator - line 939: for value in lst:"), "__call__")([], __NULL_OBJECT__);
+  var __next__26;
+  __next__26 = __get__(__iterator__26, "next");
+  while (( __iterator__26.index ) < __iterator__26.length) {
+    value = __next__26();
+    __get__(__get__(self, "append", "missing attribute `append` - line 940: self.append( value )"), "__call__")([value], __NULL_OBJECT__);
   }
 };__array_extend.is_wrapper = true;
 __array_attrs.extend = __array_extend;
@@ -3503,7 +3466,7 @@ var __array_to_array = function(args, kwargs) {
   var i,item,arr;
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["self"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -3525,7 +3488,7 @@ var __array_to_list = function(args, kwargs) {
   
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["self"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -3533,14 +3496,14 @@ var __array_to_list = function(args, kwargs) {
   }
   __args__ = __getargs__("__array_to_list", __sig__, args, kwargs);
   var self = __args__['self'];
-  return __get__(__get__(self, "to_array", "missing attribute `to_array` - line 1549: return self.to_array()"), "__call__")();
+  return __get__(__get__(self, "to_array", "missing attribute `to_array` - line 950: return self.to_array()"), "__call__")();
 };__array_to_list.is_wrapper = true;
 __array_attrs.to_list = __array_to_list;
 var __array_to_ascii = function(args, kwargs) {
   var i,length,arr,string;
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["self"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -3549,9 +3512,9 @@ var __array_to_ascii = function(args, kwargs) {
   __args__ = __getargs__("__array_to_ascii", __sig__, args, kwargs);
   var self = __args__['self'];
   string = "";
-  arr = __get__(__get__(self, "to_array", "missing attribute `to_array` - line 1552: arr = self.to_array()"), "__call__")();
+  arr = __get__(__get__(self, "to_array", "missing attribute `to_array` - line 953: arr = self.to_array()"), "__call__")();
   i = 0;
-  length = __get__(arr, "length", "missing attribute `length` - line 1553: i = 0; length = arr.length");
+  length = __get__(arr, "length", "missing attribute `length` - line 954: i = 0; length = arr.length");
   while (( i ) < length) {
     var num = arr[i];
     var char = String.fromCharCode(num);
@@ -3570,7 +3533,7 @@ var __file___init__ = function(args, kwargs) {
   
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["self", "path", "flags"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -3581,11 +3544,11 @@ var __file___init__ = function(args, kwargs) {
   var path = __args__['path'];
   var flags = __args__['flags'];
   self.path = path;
-  if ((flags instanceof Array ? JSON.stringify(flags)==JSON.stringify("rb") : flags==="rb")) {
+  if (flags==="rb") {
     self.flags = "r";
     self.binary = true;
   } else {
-    if ((flags instanceof Array ? JSON.stringify(flags)==JSON.stringify("wb") : flags==="wb")) {
+    if (flags==="wb") {
       self.flags = "w";
       self.binary = true;
     } else {
@@ -3600,7 +3563,7 @@ var __file_read = function(args, kwargs) {
   var _fs,path;
   var __sig__,__args__;
   __sig__ = { kwargs:{"binary": false},args:["self", "binary"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -3611,7 +3574,7 @@ var __file_read = function(args, kwargs) {
   var binary = __args__['binary'];
   _fs = __get__(require, "__call__")(["fs"], __NULL_OBJECT__);
   path = self.path;
-  if (__test_if_true__((binary || self.binary))) {
+  if (binary || self.binary) {
     return _fs.readFileSync(path, { encoding:null });
   } else {
     return _fs.readFileSync(path, __jsdict([["encoding", "utf8"]]));
@@ -3622,7 +3585,7 @@ var __file_write = function(args, kwargs) {
   var path,buff,_fs;
   var __sig__,__args__;
   __sig__ = { kwargs:{"binary": false},args:["self", "data", "binary"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -3634,9 +3597,9 @@ var __file_write = function(args, kwargs) {
   var binary = __args__['binary'];
   _fs = __get__(require, "__call__")(["fs"], __NULL_OBJECT__);
   path = self.path;
-  if (__test_if_true__((binary || self.binary))) {
+  if (binary || self.binary) {
     binary = (binary || self.binary);
-    if ((binary instanceof Array ? JSON.stringify(binary)==JSON.stringify("base64") : binary==="base64")) {
+    if (binary==="base64") {
       buff =  new Buffer(data, "base64");
       _fs.writeFileSync(path, buff, __jsdict([["encoding", null]]));
     } else {
@@ -3651,7 +3614,7 @@ var __file_close = function(args, kwargs) {
   
   var __sig__,__args__;
   __sig__ = { kwargs:{},args:["self"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -3667,7 +3630,7 @@ var __open__ = function(args, kwargs) {
   
   var __sig__,__args__;
   __sig__ = { kwargs:{"mode": null},args:["path", "mode"] };
-  if ((args instanceof Array && (Object.prototype.toString.call(kwargs) instanceof Array ? JSON.stringify(Object.prototype.toString.call(kwargs))==JSON.stringify("[object Object]") : Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length instanceof Array ? JSON.stringify(arguments.length)==JSON.stringify(2) : arguments.length===2))) {
+  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
     /*pass*/
   } else {
     args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
@@ -3710,18 +3673,18 @@ var __start_new_thread = function(f, args) {
   worker =  new Worker(f);
   worker.__uid__ = len(threading.workers);
   threading.workers.append(__jsdict([["worker", worker], ["args", args]]));
-      var func = function(event) {
+    var func = function(event) {
     var a,res,value;
-    if ((event.data.type instanceof Array ? JSON.stringify(event.data.type)==JSON.stringify("terminate") : event.data.type==="terminate")) {
+    if (event.data.type==="terminate") {
       worker.terminate();
     } else {
-      if ((event.data.type instanceof Array ? JSON.stringify(event.data.type)==JSON.stringify("call") : event.data.type==="call")) {
+      if (event.data.type==="call") {
         res = __module__[event.data.function].apply(null, event.data.args);
-        if (__test_if_true__((( res ) !== null && ( res ) !== undefined))) {
+        if (( res ) !== null && ( res ) !== undefined) {
           worker.postMessage(__jsdict([["type", "return_to_blocking_callback"], ["result", res]]));
         }
       } else {
-        if ((event.data.type instanceof Array ? JSON.stringify(event.data.type)==JSON.stringify("append") : event.data.type==="append")) {
+        if (event.data.type==="append") {
           a = args[event.data.argindex];
           a.push(event.data.value);
                     var __iter40 = __get_other_workers_with_shared_arg(worker, a);
@@ -3731,10 +3694,10 @@ var __start_new_thread = function(f, args) {
             other.postMessage(__jsdict([["type", "append"], ["argindex", event.data.argindex], ["value", event.data.value]]));
           }
         } else {
-          if ((event.data.type instanceof Array ? JSON.stringify(event.data.type)==JSON.stringify("__setitem__") : event.data.type==="__setitem__")) {
+          if (event.data.type==="__setitem__") {
             a = args[event.data.argindex];
             value = event.data.value;
-            if (__test_if_true__(a.__setitem__)) {
+            if (a.__setitem__) {
               a.__setitem__(event.data.index, value);
             } else {
               a[event.data.index] = value;
@@ -3761,12 +3724,12 @@ var __start_new_thread = function(f, args) {
   if (! (__iter42 instanceof Array || typeof __iter42 == "string" || __is_typed_array(__iter42) || __is_some_array(__iter42) )) { __iter42 = __object_keys__(__iter42) }
   for (var __idx42=0; __idx42 < __iter42.length; __idx42++) {
     var arg = __iter42[ __idx42 ];
-    if (__test_if_true__(arg.jsify)) {
+    if (arg.jsify) {
       jsargs.append(arg.jsify());
     } else {
       jsargs.append(arg);
     }
-    if (__test_if_true__(arg instanceof Array)) {
+    if (arg instanceof Array) {
       __gen_worker_append(worker, arg, i);
     }
     i += 1;
@@ -3777,7 +3740,7 @@ var __start_new_thread = function(f, args) {
 
 var __gen_worker_append = function(worker, ob, index) {
   
-      var append = function(item) {
+    var append = function(item) {
     
     worker.postMessage(__jsdict([["type", "append"], ["argindex", index], ["value", item]]));
     ob.push(item);
@@ -3788,15 +3751,15 @@ var __gen_worker_append = function(worker, ob, index) {
 
 var __webworker_wrap = function(ob, argindex) {
   
-  if (__test_if_true__(ob instanceof Array)) {
-            var func = function(index, item) {
+  if (ob instanceof Array) {
+        var func = function(index, item) {
       
       postMessage(__jsdict([["type", "__setitem__"], ["index", index], ["value", item], ["argindex", argindex]]));
       Array.prototype.__setitem__.call(ob, index, item);
     }
 
     Object.defineProperty(ob, "__setitem__", __jsdict([["enumerable", false], ["value", func], ["writeable", true], ["configurable", true]]));
-            var func = function(item) {
+        var func = function(item) {
       
       postMessage(__jsdict([["type", "append"], ["value", item], ["argindex", argindex]]));
       Array.prototype.push.call(ob, item);
@@ -3804,8 +3767,8 @@ var __webworker_wrap = function(ob, argindex) {
 
     Object.defineProperty(ob, "append", __jsdict([["enumerable", false], ["value", func], ["writeable", true], ["configurable", true]]));
   } else {
-    if ((typeof(ob) instanceof Array ? JSON.stringify(typeof(ob))==JSON.stringify("object") : typeof(ob)==="object")) {
-                  var func = function(key, item) {
+    if (typeof(ob)==="object") {
+            var func = function(key, item) {
         
         postMessage(__jsdict([["type", "__setitem__"], ["index", key], ["value", item], ["argindex", argindex]]));
         ob[key] = item;
diff --git a/pythonjs/pythonjs.py b/pythonjs/pythonjs.py
index fd07595..85f423a 100755
--- a/pythonjs/pythonjs.py
+++ b/pythonjs/pythonjs.py
@@ -1096,7 +1096,12 @@ def visit_BoolOp(self, node):
 
 	def visit_If(self, node):
 		out = []
-		out.append( 'if (%s) {' %self.visit(node.test) )
+		test = self.visit(node.test)
+		if test.startswith('(') and test.endswith(')'):
+			out.append( 'if %s {' %test )
+		else:
+			out.append( 'if (%s) {' %test )
+
 		self.push()
 
 		for line in list(map(self.visit, node.body)):
@@ -1255,12 +1260,25 @@ def visit_Break(self, node):
 		return 'break;'
 
 
+def generate_minimal_runtime():
+	from python_to_pythonjs import main as py2pyjs
+	a = py2pyjs(
+		open('runtime/builtins_core.py', 'rb').read(),
+		module_path = 'runtime',
+		fast_javascript = True
+	)
+	return main( a, requirejs=False, insert_runtime=False, function_expressions=True, fast_javascript=True )
 
 def generate_runtime():
 	from python_to_pythonjs import main as py2pyjs
+	builtins = py2pyjs(
+		open('runtime/builtins.py', 'rb').read(),
+		module_path = 'runtime',
+		fast_javascript = True
+	)
 	lines = [
-		main( open('runtime/pythonpythonjs.py', 'rb').read(), requirejs=False, insert_runtime=False, function_expressions=True ), ## lowlevel pythonjs
-		main( py2pyjs(open('runtime/builtins.py', 'rb').read()), requirejs=False, insert_runtime=False, function_expressions=True )
+		main( open('runtime/pythonpythonjs.py', 'rb').read(), requirejs=False, insert_runtime=False, function_expressions=True, fast_javascript=True ), ## lowlevel pythonjs
+		main( builtins, requirejs=False, insert_runtime=False, function_expressions=True, fast_javascript=True )
 	]
 	return '\n'.join( lines )
 
@@ -1368,5 +1386,9 @@ def command():
 	if '--runtime' in sys.argv:
 		print('creating new runtime: pythonjs.js')
 		open('pythonjs.js', 'wb').write( generate_runtime() )
+	elif '--miniruntime' in sys.argv:
+		print('creating new runtime: pythonjs-minimal.js')
+		open('pythonjs-minimal.js', 'wb').write( generate_minimal_runtime() )
+
 	else:
 		command()
diff --git a/pythonjs/runtime/builtins.py b/pythonjs/runtime/builtins.py
index 7047472..d77d2e4 100644
--- a/pythonjs/runtime/builtins.py
+++ b/pythonjs/runtime/builtins.py
@@ -7,13 +7,11 @@
 pythonjs.configure( direct_operator='*' )
 pythonjs.configure( direct_keys=True )
 
+from builtins_core import *
+from builtins_glsl import *
+
 _PythonJS_UID = 0
 
-inline('IndexError = function(msg) {this.message = msg || "";}; IndexError.prototype = Object.create(Error.prototype); IndexError.prototype.name = "IndexError";')
-inline('KeyError   = function(msg) {this.message = msg || "";}; KeyError.prototype = Object.create(Error.prototype); KeyError.prototype.name = "KeyError";')
-inline('ValueError = function(msg) {this.message = msg || "";}; ValueError.prototype = Object.create(Error.prototype); ValueError.prototype.name = "ValueError";')
-inline('AttributeError = function(msg) {this.message = msg || "";}; AttributeError.prototype = Object.create(Error.prototype);AttributeError.prototype.name = "AttributeError";')
-inline('RuntimeError   = function(msg) {this.message = msg || "";}; RuntimeError.prototype = Object.create(Error.prototype);RuntimeError.prototype.name = "RuntimeError";')
 
 with lowlevel:
 	def __getfast__(ob, attr):
@@ -30,307 +28,7 @@ def __wrap_function__(f):
 		return f
 
 
-	def __gpu_object(cls, struct_name, data_name):
-		cls.prototype.__struct_name__ = struct_name
-		cls.prototype.__struct_data__ = data_name
-	with lowlevel:
-		gpu = {
-			'object' : __gpu_object
-		}
 
-	def glsljit_runtime(header):
-		return new( GLSLJITRuntime(header) )
-
-	class GLSLJITRuntime:
-		def __init__(self, header):
-			self.header = header
-			self.shader = []
-			self.object_packagers = []
-			self.struct_types = {}
-			self.glsltypes = ['vec2', 'vec3', 'vec4', 'mat4']
-			self.matrices = []
-
-		def compile_header(self):
-			a = []  ## insert structs at top of header
-			for sname in self.struct_types:
-				if sname in self.glsltypes:
-					pass
-				else:
-					a.push( self.struct_types[sname]['code'] )
-
-			## calls get_global_id, see WebCLGL API docs. ##
-			a.push('int matrix_index() { return int(get_global_id().y*%s.0); }' %self.matrices.length)
-			a.push('int matrix_row() { return int(get_global_id().x*4.0); }')  ## returns: 0, 1, 2, 3
-
-			## first class array error, can not return an array, even when the size is known ##
-			#a.push('float[3] floatN( float a, float b, float c) { float f[3]; f[0]=a; f[1]=b; f[2]=b; return f; }')
-
-			## these could be generated for each array size to reduce the mess in main,
-			## TODO it would be better to upload them as uniforms.
-			#a.push('void floatN( float f[3], float a, float b, float c) { f[0]=a; f[1]=b; f[2]=b; }')
-
-			## the array can be declared in the header, but not filled with data here.
-			#a.push('float XXX[3];')
-			#a.push('floatN( XXX, 1.1, 2.2, 3.3 );')
-			#a.push('XXX[0]=1.1;')
-
-
-			a = '\n'.join(a)
-			## code in header could be methods that reference the struct types above.
-			b = "\n".join(self.header)
-			return '\n'.join([a,b])
-
-		def compile_main(self):
-			return '\n'.join(self.shader)
-
-		def push(self, s):
-			self.shader.push(s)
-
-
-		def define_structure(self, ob):
-			struct_name = None
-			#if Object.hasOwnProperty.call(ob,'__struct_name__'):
-			if ob.__struct_name__:
-				struct_name = ob.__struct_name__
-				if struct_name in self.struct_types:
-					return struct_name
-
-			arrays = []
-			floats = []
-			integers = []
-			structs = []
-			struct_type = []  ## fallback for javascript objects
-
-			if struct_name and struct_name in self.glsltypes:
-				return struct_name
-
-			#for key in ob.keys():
-			for key in dir( ob ):
-				if key.length==1 and key in '0123456789':
-					raise RuntimeError(key)
-				t = typeof( ob[key] )
-				if t=='object' and instanceof(ob[key], Array) and ob[key].length and typeof(ob[key][0])=='number':
-					struct_type.push( 'ARY_'+key )
-					arrays.push(key)
-				elif t=='number':
-					struct_type.push( 'NUM_'+key)
-					floats.push(key)
-				elif instanceof(ob[key], Int16Array):
-					struct_type.push( 'INT_'+key)
-					if ob[key].length == 1:
-						integers.push(key)
-					else:
-						pass  ## TODO int16array
-				elif t=='object' and ob[key].__struct_name__:
-					struct_type.push( 'S_'+key)
-					structs.push( key )
-					if ob[key].__struct_name__ not in self.struct_types:
-						if ob[key].__struct_name__ in self.glsltypes:
-							pass
-						else:
-							self.define_structure( ob[key] )
-
-			if struct_name is None:
-				#print('DEGUG: new struct name', ob.__struct_name__)
-				#print(ob)
-				struct_name = ''.join( struct_type )
-				ob.__struct_name__ = struct_name
-
-			if struct_name not in self.struct_types:
-				member_list = []
-				for key in integers:
-					member_list.append('int '+key+';')
-				for key in floats:
-					member_list.append('float '+key+';')
-				for key in arrays:
-					arr = ob[key]
-					member_list.append('float '+key+'['+arr.length+'];')
-				for key in structs:
-					subtype = ob[key].__struct_name__
-					member_list.append( subtype+' '+key+';')
-
-				if len(member_list)==0:
-					raise RuntimeError(struct_name)
-
-				members = ''.join(member_list)
-				code = 'struct ' +struct_name+ ' {' +members+ '};'
-				#print('-------struct glsl code-------')
-				#print(code)
-				#print('------------------------------')
-				self.struct_types[ struct_name ] = {
-					'arrays' : arrays,
-					'floats' : floats,
-					'integers': integers,
-					'structs' : structs,
-					'code'   : code
-				}
-			return struct_name
-
-		def structure(self, ob, name):
-			wrapper = None
-			if instanceof(ob, Object):
-				pass
-			elif ob.__class__ is dict:
-				wrapper = ob
-				ob = ob[...]
-
-			sname = self.define_structure(ob)
-			if wrapper:
-				wrapper.__struct_name__ = sname
-
-			args = []
-			stype = self.struct_types[ sname ]
-
-			# if stype is None:  ## TODO fix me
-			if sname not in self.struct_types:
-				if sname in self.glsltypes:
-					if sname == 'mat4':
-						if ob.__struct_data__:
-							o = ob[ ob.__struct_data__ ]
-						else:
-							o = ob
-
-						for i in range(o.length):
-							value = o[i] +''
-							if '.' not in value: value += '.0'
-							args.push( value )
-
-				else:
-					raise RuntimeError('no method to pack structure: ' +sname)
-
-			has_arrays = False
-			if stype:
-				if stype['arrays'].length > 0:
-					has_arrays = True
-
-				for key in stype['integers']:
-					args.push( ob[key][0]+'' )
-
-				for key in stype['floats']:
-					value = ob[key] + ''
-					if '.' not in value:
-						value += '.0'
-					args.push( value )
-
-				for key in stype['arrays']:
-					#args.push( '{'+ob[key].toString()+ '}')  ## this will not work
-					## arrays need to be assigned to a local variable before passing
-					## it to the struct constructor.
-					aname = '_'+key+name
-					self.array(ob[key], aname)
-					args.push( aname )
-
-				for key in stype['structs']:
-					aname = '_'+key+name
-					self.structure(ob[key], aname)
-					args.push( aname )
-
-			args = ','.join(args)
-			if has_arrays:
-				self.shader.push( sname + ' ' +name+ '=' +sname+ '(' +args+ ');' )
-			else:
-				self.header.push( 'const ' + sname + ' ' +name+ '=' +sname+ '(' +args+ ');' )
-			return stype
-
-		def int16array(self, ob, name):
-			a = ['int ' + name + '[' + ob.length + ']']
-			i = 0
-			while i < ob.length:
-				a.push(';'+name+'['+i+']='+ob[i])
-				i += 1
-
-			self.shader.push( ''.join(a) )
-
-		def array(self, ob, name):
-			if instanceof(ob[0], Array):
-				a = [] #'float ' + name + '[' + ob.length + ']']
-				i = 0
-				while i < ob.length:
-					subarr = ob[i]
-					subname = '%s_%s'%(name,i)
-					if a.length==0:
-						a.append('float ' + subname + '[' + subarr.length + ']')
-					else:
-						a.append(';float ' + subname + '[' + subarr.length + ']')
-					j = 0
-					while j < subarr.length:
-						v = subarr[j] + ''
-						if '.' not in v:
-							v += '.0'
-						a.push(';'+subname+'['+j+']='+v)
-						j += 1
-
-					i += 1
-
-				self.shader.push( ''.join(a) )
-
-			elif instanceof(ob[0], Object) or ob[0].__class__ is dict:
-				i = 0
-				while i < ob.length:
-					self.structure( ob[i], name+'_'+i)
-					i += 1
-
-			else:
-				a = ['float ' + name + '[' + ob.length + '];']
-				i = 0
-				while i < ob.length:
-					a.push(name+'['+i+']='+ob[i] + ';')
-					i += 1
-
-				self.shader.push( ''.join(a) )
-
-		def object(self, ob, name):
-			for p in self.object_packagers:
-				cls, func = p
-				if instanceof(ob, cls):
-					return func(ob)
-
-		def unpack_array2d(self, arr, dims):
-			if typeof(dims)=='number':
-				return arr
-
-			w,h = dims
-			row = []
-			rows = [row]
-			for value in arr:
-				row.append(value)
-				if row.length >= w:
-					row = []
-					rows.append(row)
-			rows.pop()
-			if rows.length != h:
-				print('ERROR: __unpack_array2d, invalid height.')
-			return rows
-
-		def unpack_vec4(self, arr, dims):
-			if typeof(dims)=='number':
-				w = dims
-				h = 1
-			else:
-				w,h = dims
-			rows = []
-			i=0
-			for y in range(h):
-				row = []
-				rows.append( row )
-				for x in range(w):
-					vec = []
-					for j in range(4):
-						vec.append( arr[i])
-						i += 1
-					row.append( vec )
-
-			if rows.length != h:
-				print('ERROR: __unpack_vec4, invalid height.')
-			return rows
-
-		def unpack_mat4(self, arr):
-			i = 0
-			for mat in self.matrices:
-				for j in range(16):
-					mat[j] = arr[i]
-					i += 1
-			return self.matrices
 
 with lowlevel:
 
@@ -381,68 +79,7 @@ def __split_method( ob, delim ):
 			else:
 				return ob.split( delim )
 
-
 with javascript:
-	__dom_array_types__ = []
-	if typeof(NodeList) == 'function':  ## NodeList is only available in browsers
-		## minimal dom array types common to allow browsers ##
-		__dom_array_types__ = [ NodeList, FileList, DOMStringList, HTMLCollection, SVGNumberList, SVGTransformList]
-
-		## extra dom array types ##
-		if typeof(DataTransferItemList) == 'function':  ## missing in NodeWebkit
-			__dom_array_types__.push( DataTransferItemList )
-		if typeof(HTMLAllCollection) == 'function':     ## missing in Firefox
-			__dom_array_types__.push( HTMLAllCollection )
-		if typeof(SVGElementInstanceList) == 'function':## missing in Firefox
-			__dom_array_types__.push( SVGElementInstanceList )
-		if typeof(ClientRectList) == 'function':        ## missing in Firefox-trunk
-			__dom_array_types__.push( ClientRectList )
-
-	def __is_some_array( ob ):
-		if __dom_array_types__.length > 0:
-			for t in __dom_array_types__:
-				if instanceof(ob, t):
-					return True
-		return False
-
-	def __is_typed_array( ob ):
-		if instanceof( ob, Int8Array ) or instanceof( ob, Uint8Array ):
-			return True
-		elif instanceof( ob, Int16Array ) or instanceof( ob, Uint16Array ):
-			return True
-		elif instanceof( ob, Int32Array ) or instanceof( ob, Uint32Array ):
-			return True
-		elif instanceof( ob, Float32Array ) or instanceof( ob, Float64Array ):
-			return True
-		else:
-			return False
-
-
-	def __js_typed_array( t, a ):
-		if t == 'i':
-			arr = new( Int32Array(a.length) )
-
-		arr.set( a )
-		return arr
-
-	def __contains__( ob, a ):
-		t = typeof(ob)
-		if t == 'string':
-			if ob.indexOf(a) == -1: return False
-			else: return True
-		elif t == 'number':
-			raise TypeError
-		elif __is_typed_array(ob):
-			for x in ob:
-				if x == a:
-					return True
-			return False
-		elif ob.__contains__:
-			return ob.__contains__(a)
-		elif instanceof(ob, Object) and Object.hasOwnProperty.call(ob, a):
-			return True
-		else:
-			return False
 
 	def __add_op(a, b):
 		## 'number' is already checked before this gets called (ternary op)
@@ -480,96 +117,6 @@ def __mul_op(a, b):
 			raise TypeError('invalid objects for multiplication')
 
 
-	def __jsdict( items ):
-		d = JS("{}")
-		for item in items:
-			key = item[0]
-			if instanceof(key, Array):
-				key = JSON.stringify(key)
-			elif key.__uid__:
-				key = key.__uid__
-			d[ key ] = item[1]
-		return d
-
-	def __jsdict_get(ob, key, default_value):
-		if instanceof(ob, Object):
-			if instanceof(key, Array):
-				key = JSON.stringify(key)
-			if JS("key in ob"): return ob[key]
-			return default_value
-		else:  ## PythonJS object instance ##
-			## this works because instances from PythonJS are created using Object.create(null) ##
-			if default_value is not undefined:
-				return JS("ob.get(key, default_value)")
-			else:
-				return JS("ob.get(key)")
-
-	def __jsdict_set(ob, key, value):
-		if instanceof(ob, Object):
-			if instanceof(key, Array):
-				key = JSON.stringify(key)
-			ob[ key ] = value
-		else:  ## PythonJS object instance ##
-			## this works because instances from PythonJS are created using Object.create(null) ##
-			JS("ob.set(key,value)")
-
-	def __jsdict_keys(ob):
-		if instanceof(ob, Object):
-			## in the case of tuple keys this would return stringified JSON instead of the original arrays,
-			## TODO, should this loop over the keys and convert the json strings back to objects?
-			## but then how would we know if a given string was json... special prefix character?
-			return JS("Object.keys( ob )")
-		else:  ## PythonJS object instance ##
-			## this works because instances from PythonJS are created using Object.create(null) ##
-			return JS("ob.keys()")
-
-	def __jsdict_values(ob):
-		if instanceof(ob, Object):
-			arr = []
-			for key in ob:
-				if ob.hasOwnProperty(key):
-					value = ob[key]
-					arr.push( value )
-			return arr
-		else:  ## PythonJS object instance ##
-			## this works because instances from PythonJS are created using Object.create(null) ##
-			return JS("ob.values()")
-
-	def __jsdict_items(ob):
-		## `ob.items is None` is for: "self.__dict__.items()" because self.__dict__ is not actually a dict
-		if instanceof(ob, Object) or ob.items is undefined:  ## in javascript-mode missing attributes do not raise AttributeError
-			arr = []
-			for key in ob:
-				if Object.hasOwnProperty.call(ob, key):
-					value = ob[key]
-					arr.push( [key,value] )
-			return arr
-		else:  ## PythonJS object instance ##
-			return JS("ob.items()")
-
-	def __jsdict_pop(ob, key, _default=None):
-		if instanceof(ob, Array):
-			if ob.length:
-				## note: javascript array.pop only pops the end of an array
-				if key is undefined:
-					return inline("ob.pop()")
-				else:
-					return ob.splice( key, 1 )[0]
-			else:
-				raise IndexError(key)
-
-		elif instanceof(ob, Object):
-			if JS("key in ob"):
-				v = ob[key]
-				JS("delete ob[key]")
-				return v
-			elif _default is undefined:
-				raise KeyError(key)
-			else:
-				return _default
-		else:  ## PythonJS object instance ##
-			## this works because instances from PythonJS are created using Object.create(null) ##
-			return JS("ob.pop(key, _default)")
 
 
 	def dir(ob):
@@ -578,15 +125,7 @@ def dir(ob):
 		else:
 			return __object_keys__(ob)
 
-	def __object_keys__(ob):
-		'''
-		notes:
-			. Object.keys(ob) will not work because we create PythonJS objects using `Object.create(null)`
-			. this is different from Object.keys because it traverses the prototype chain.
-		'''
-		arr = []
-		JS('for (var key in ob) { arr.push(key) }')
-		return arr
+
 
 	def __bind_property_descriptors__(o, klass):
 		for name in klass.__properties__:
@@ -609,26 +148,7 @@ def __generate_setter__(klass, o, n):
 		return lambda v: klass.__properties__[ n ]['set']([o,v],{})
 
 
-	def __sprintf(fmt, args):
-		## note: '%sXXX%s'.split().length != args.length
-		## because `%s` at the start or end will split to empty chunks ##
-		if instanceof(args, Array):
-			chunks = fmt.split('%s')
-			arr = []
-			for i,txt in enumerate(chunks):
-				arr.append( txt )
-				if i >= args.length:
-					break
-				item = args[i]
-				if typeof(item) == 'string':
-					arr.append( item )
-				elif typeof(item) == 'number':
-					arr.append( ''+item )
-				else:
-					arr.append( Object.prototype.toString.call(item) )
-			return ''.join(arr)
-		else:
-			return fmt.replace('%s', args)
+
 
 	def __create_class__(class_name, parents, attrs, props):
 		"""Create a PythonScript class"""
@@ -729,10 +249,6 @@ def type(ob_or_class_name, bases=None, class_dict=None):
 		else:
 			return create_class(ob_or_class_name, bases, class_dict)  ## TODO rename create_class to _pyjs_create_class
 
-def hasattr(ob, attr):
-	## TODO check parent classes for attr
-	with javascript:
-		return Object.hasOwnProperty.call(ob, attr)
 
 def getattr(ob, attr, property=False):
 	with javascript:
@@ -798,11 +314,7 @@ def int(a):
 			raise ValueError('not a number')
 		return a
 
-with javascript:
-	def int16(a):  ## used by glsljit when packing structs.
-		arr = new(Int16Array(1))
-		arr[0]=a
-		return arr
+
 
 def float(a):
 	with javascript:
@@ -840,10 +352,6 @@ def _setup_str_prototype():
 	'''
 	with javascript:
 
-		@String.prototype.__contains__
-		def func(a):
-			if this.indexOf(a) == -1: return False
-			else: return True
 
 		@String.prototype.get
 		def func(index):
@@ -868,66 +376,6 @@ def func(idx):
 		def func():
 			return this.length
 
-		@String.prototype.__getslice__
-		def func(start, stop, step):
-			if start is undefined and stop is undefined and step == -1:
-				return this.split('').reverse().join('')
-			else:
-				if stop < 0:
-					stop = this.length + stop
-				return this.substring(start, stop)
-
-		@String.prototype.splitlines
-		def func():
-			return this.split('\n')
-
-		@String.prototype.strip
-		def func():
-			return this.trim()  ## missing in IE8
-
-		@String.prototype.startswith
-		def func(a):
-			if this.substring(0, a.length) == a:
-				return True
-			else:
-				return False
-
-		@String.prototype.endswith
-		def func(a):
-			if this.substring(this.length-a.length, this.length) == a:
-				return True
-			else:
-				return False
-
-		@String.prototype.join
-		def func(a):
-			out = ''
-			if instanceof(a, Array):
-				arr = a
-			else:
-				arr = a[...]
-			i = 0
-			for value in arr:
-				out += value
-				i += 1
-				if i < arr.length:
-					out += this
-			return out
-
-		@String.prototype.upper
-		def func():
-			return this.toUpperCase()
-
-		@String.prototype.lower
-		def func():
-			return this.toLowerCase()
-
-		@String.prototype.index
-		def func(a):
-			i = this.indexOf(a)
-			if i == -1:
-				raise ValueError(a + ' - not in string')
-			return i
 
 		@String.prototype.find
 		def func(a):
@@ -1000,10 +448,6 @@ def func():
 				i += 1
 			return this
 
-		@Array.prototype.__contains__
-		def func(a):
-			if this.indexOf(a) == -1: return False
-			else: return True
 
 		@Array.prototype.__len__
 		def func():
@@ -1028,118 +472,6 @@ def func():
 			with python:
 				return Iterator(this, 0)
 
-		@Array.prototype.__getslice__
-		def func(start, stop, step):
-			arr = []
-
-			start = start | 0
-			if stop is undefined:
-				stop = this.length
-
-			if start < 0:
-				start = this.length + start
-			if stop < 0:
-				stop = this.length + stop
-
-			#reverse = step < 0  ## in javascript `null<0` and `undefined<0` are false
-			#reverse = False
-
-			if typeof(step)=='number':
-				#reverse = step < 0
-				#if reverse:
-				if step < 0:
-					#step = Math.abs(step)
-					i = start
-					while i >= 0:
-						arr.push( this[i] )
-						i += step
-					return arr
-
-				else:
-					i = start
-					n = stop
-					while i < n:
-						arr.push( this[i] )
-						i += step
-					return arr
-
-			else:
-				i = start
-				n = stop
-				while i < n:
-					#arr[ i ] = this[i]  ## slower in chrome
-					arr.push( this[i] )
-					i += 1  ## this gets optimized to i++
-				return arr
-
-			#if reverse:
-			#	arr.reverse()
-
-			#if step == 1:
-			#	arr = new(Array(this.length))
-			#	i = 0
-			#	while i < this.length:
-			#		arr[ i ] = this[i]
-			#		i += 1  ## this gets optimized to i++
-			#else:
-			#	arr = []
-			#	i = 0
-			#	while i < this.length:
-			#		arr.push( this[i] )
-			#		i += step
-
-			#if start is undefined and stop is undefined:
-			#	if reverse: arr.reverse()
-			#elif reverse:
-			#	arr = arr.slice(stop, start+1)
-			#	arr.reverse()
-			#else:
-			#	#if stop < 0:  ## mozilla spec says negative indices are supported
-			#	#	stop = arr.length + stop
-			#	arr = arr.slice(start, stop)
-
-			#return arr
-
-		@Array.prototype.__setslice__
-		def func(start, stop, step, items):
-			if start is undefined: start = 0
-			if stop is undefined: stop = this.length
-			arr = [start, stop-start]
-			for item in items: arr.push( item )
-			this.splice.apply(this, arr )
-
-		@Array.prototype.append
-		def func(item):
-			this.push( item )
-			return this
-
-		@Array.prototype.extend
-		def extend(other):
-			for obj in other:
-				this.push(obj)
-			return this
-
-		@Array.prototype.remove
-		def func(item):
-			index = this.indexOf( item )
-			this.splice(index, 1)
-
-		@Array.prototype.insert
-		def insert(index, obj):
-			if index < 0: index = this.length + index
-			this.splice(index, 0, obj)
-
-		@Array.prototype.index
-		def index(obj):
-			return this.indexOf(obj)
-
-		@Array.prototype.count
-		def count(obj):
-			a = 0
-			for item in this:
-				if item is obj:  ## note that `==` will not work here, `===` is required for objects
-					a += 1
-			return a
 
 
 		## set-like features ##
@@ -1266,20 +598,6 @@ class StopIteration:  ## DEPRECATED
 	pass
 
 
-def len(ob):
-	with javascript:
-		if instanceof(ob, Array):
-			return ob.length
-		elif __is_typed_array(ob):
-			return ob.length
-		elif instanceof(ob, ArrayBuffer):
-			return ob.byteLength
-		elif ob.__len__:
-			return ob.__len__()
-		else: #elif instanceof(ob, Object):
-			return Object.keys(ob).length
-
-
 def next(obj):
 	return obj.next()
 
diff --git a/pythonjs/runtime/builtins_core.py b/pythonjs/runtime/builtins_core.py
new file mode 100644
index 0000000..8d25516
--- /dev/null
+++ b/pythonjs/runtime/builtins_core.py
@@ -0,0 +1,368 @@
+pythonjs.configure( runtime_exceptions=False )
+pythonjs.configure( direct_operator='+' )
+pythonjs.configure( direct_operator='*' )
+pythonjs.configure( direct_keys=True )
+
+
+inline('IndexError = function(msg) {this.message = msg || "";}; IndexError.prototype = Object.create(Error.prototype); IndexError.prototype.name = "IndexError";')
+inline('KeyError   = function(msg) {this.message = msg || "";}; KeyError.prototype = Object.create(Error.prototype); KeyError.prototype.name = "KeyError";')
+inline('ValueError = function(msg) {this.message = msg || "";}; ValueError.prototype = Object.create(Error.prototype); ValueError.prototype.name = "ValueError";')
+inline('AttributeError = function(msg) {this.message = msg || "";}; AttributeError.prototype = Object.create(Error.prototype);AttributeError.prototype.name = "AttributeError";')
+inline('RuntimeError   = function(msg) {this.message = msg || "";}; RuntimeError.prototype = Object.create(Error.prototype);RuntimeError.prototype.name = "RuntimeError";')
+
+
+with javascript:
+
+	def hasattr(ob, attr):
+		## TODO check parent classes for attr, this fails on for methods because those are are on the .prototype ?
+		return Object.hasOwnProperty.call(ob, attr)
+
+	def len(ob):
+		if instanceof(ob, Array):
+			return ob.length
+		elif __is_typed_array(ob):
+			return ob.length
+		elif instanceof(ob, ArrayBuffer):
+			return ob.byteLength
+		elif ob.__len__:
+			return ob.__len__()
+		else: #elif instanceof(ob, Object):
+			return Object.keys(ob).length
+
+	@String.prototype.__contains__
+	def func(a):
+		if this.indexOf(a) == -1: return False
+		else: return True
+
+	@String.prototype.__getslice__
+	def func(start, stop, step):
+		if start is undefined and stop is undefined and step == -1:
+			return this.split('').reverse().join('')
+		else:
+			if stop < 0:
+				stop = this.length + stop
+			return this.substring(start, stop)
+
+	@String.prototype.splitlines
+	def func():
+		return this.split('\n')
+
+	@String.prototype.strip
+	def func():
+		return this.trim()  ## missing in IE8
+
+	@String.prototype.startswith
+	def func(a):
+		if this.substring(0, a.length) == a:
+			return True
+		else:
+			return False
+
+	@String.prototype.endswith
+	def func(a):
+		if this.substring(this.length-a.length, this.length) == a:
+			return True
+		else:
+			return False
+
+	@String.prototype.join
+	def func(a):
+		out = ''
+		if instanceof(a, Array):
+			arr = a
+		else:
+			arr = a[...]
+		i = 0
+		for value in arr:
+			out += value
+			i += 1
+			if i < arr.length:
+				out += this
+		return out
+
+	@String.prototype.upper
+	def func():
+		return this.toUpperCase()
+
+	@String.prototype.lower
+	def func():
+		return this.toLowerCase()
+
+	@String.prototype.index
+	def func(a):
+		i = this.indexOf(a)
+		if i == -1:
+			raise ValueError(a + ' - not in string')
+		return i
+
+	@Array.prototype.__contains__
+	def func(a):
+		if this.indexOf(a) == -1: return False
+		else: return True
+
+
+	@Array.prototype.__getslice__
+	def func(start, stop, step):
+		arr = []
+
+		start = start | 0
+		if stop is undefined:
+			stop = this.length
+
+		if start < 0:
+			start = this.length + start
+		if stop < 0:
+			stop = this.length + stop
+
+		if typeof(step)=='number':
+			if step < 0:
+				#step = Math.abs(step)
+				i = start
+				while i >= 0:
+					arr.push( this[i] )
+					i += step
+				return arr
+
+			else:
+				i = start
+				n = stop
+				while i < n:
+					arr.push( this[i] )
+					i += step
+				return arr
+
+		else:
+			i = start
+			n = stop
+			while i < n:
+				#arr[ i ] = this[i]  ## slower in chrome
+				arr.push( this[i] )
+				i += 1  ## this gets optimized to i++
+			return arr
+
+
+	@Array.prototype.__setslice__
+	def func(start, stop, step, items):
+		if start is undefined: start = 0
+		if stop is undefined: stop = this.length
+		arr = [start, stop-start]
+		for item in items: arr.push( item )
+		this.splice.apply(this, arr )
+
+	@Array.prototype.append
+	def func(item):
+		this.push( item )
+		return this
+
+	@Array.prototype.extend
+	def extend(other):
+		for obj in other:
+			this.push(obj)
+		return this
+
+	@Array.prototype.remove
+	def func(item):
+		index = this.indexOf( item )
+		this.splice(index, 1)
+
+	@Array.prototype.insert
+	def insert(index, obj):
+		if index < 0: index = this.length + index
+		this.splice(index, 0, obj)
+
+	@Array.prototype.index
+	def index(obj):
+		return this.indexOf(obj)
+
+	@Array.prototype.count
+	def count(obj):
+		a = 0
+		for item in this:
+			if item is obj:  ## note that `==` will not work here, `===` is required for objects
+				a += 1
+		return a
+
+	def __contains__( ob, a ):
+		t = typeof(ob)
+		if t == 'string':
+			if ob.indexOf(a) == -1: return False
+			else: return True
+		elif t == 'number':
+			raise TypeError
+		elif __is_typed_array(ob):
+			for x in ob:
+				if x == a:
+					return True
+			return False
+		elif ob.__contains__:
+			return ob.__contains__(a)
+		elif instanceof(ob, Object) and Object.hasOwnProperty.call(ob, a):
+			return True
+		else:
+			return False
+
+	__dom_array_types__ = []
+	if typeof(NodeList) == 'function':  ## NodeList is only available in browsers
+		## minimal dom array types common to allow browsers ##
+		__dom_array_types__ = [ NodeList, FileList, DOMStringList, HTMLCollection, SVGNumberList, SVGTransformList]
+
+		## extra dom array types ##
+		if typeof(DataTransferItemList) == 'function':  ## missing in NodeWebkit
+			__dom_array_types__.push( DataTransferItemList )
+		if typeof(HTMLAllCollection) == 'function':     ## missing in Firefox
+			__dom_array_types__.push( HTMLAllCollection )
+		if typeof(SVGElementInstanceList) == 'function':## missing in Firefox
+			__dom_array_types__.push( SVGElementInstanceList )
+		if typeof(ClientRectList) == 'function':        ## missing in Firefox-trunk
+			__dom_array_types__.push( ClientRectList )
+
+	def __is_some_array( ob ):
+		if __dom_array_types__.length > 0:
+			for t in __dom_array_types__:
+				if instanceof(ob, t):
+					return True
+		return False
+
+	def __is_typed_array( ob ):
+		if instanceof( ob, Int8Array ) or instanceof( ob, Uint8Array ):
+			return True
+		elif instanceof( ob, Int16Array ) or instanceof( ob, Uint16Array ):
+			return True
+		elif instanceof( ob, Int32Array ) or instanceof( ob, Uint32Array ):
+			return True
+		elif instanceof( ob, Float32Array ) or instanceof( ob, Float64Array ):
+			return True
+		else:
+			return False
+
+
+	def __js_typed_array( t, a ):
+		if t == 'i':
+			arr = new( Int32Array(a.length) )
+
+		arr.set( a )
+		return arr
+
+	def __object_keys__(ob):
+		'''
+		notes:
+			. Object.keys(ob) will not work because we create PythonJS objects using `Object.create(null)`
+			. this is different from Object.keys because it traverses the prototype chain.
+		'''
+		arr = []
+		JS('for (var key in ob) { arr.push(key) }')
+		return arr
+
+	def __sprintf(fmt, args):
+		## note: '%sXXX%s'.split().length != args.length
+		## because `%s` at the start or end will split to empty chunks ##
+		if instanceof(args, Array):
+			chunks = fmt.split('%s')
+			arr = []
+			for i,txt in enumerate(chunks):
+				arr.append( txt )
+				if i >= args.length:
+					break
+				item = args[i]
+				if typeof(item) == 'string':
+					arr.append( item )
+				elif typeof(item) == 'number':
+					arr.append( ''+item )
+				else:
+					arr.append( Object.prototype.toString.call(item) )
+			return ''.join(arr)
+		else:
+			return fmt.replace('%s', args)
+
+
+
+	def __jsdict( items ):
+		d = JS("{}")
+		for item in items:
+			key = item[0]
+			if instanceof(key, Array):
+				key = JSON.stringify(key)
+			elif key.__uid__:
+				key = key.__uid__
+			d[ key ] = item[1]
+		return d
+
+	def __jsdict_get(ob, key, default_value):
+		if instanceof(ob, Object):
+			if instanceof(key, Array):
+				key = JSON.stringify(key)
+			if JS("key in ob"): return ob[key]
+			return default_value
+		else:  ## PythonJS object instance ##
+			## this works because instances from PythonJS are created using Object.create(null) ##
+			if default_value is not undefined:
+				return JS("ob.get(key, default_value)")
+			else:
+				return JS("ob.get(key)")
+
+	def __jsdict_set(ob, key, value):
+		if instanceof(ob, Object):
+			if instanceof(key, Array):
+				key = JSON.stringify(key)
+			ob[ key ] = value
+		else:  ## PythonJS object instance ##
+			## this works because instances from PythonJS are created using Object.create(null) ##
+			JS("ob.set(key,value)")
+
+	def __jsdict_keys(ob):
+		if instanceof(ob, Object):
+			## in the case of tuple keys this would return stringified JSON instead of the original arrays,
+			## TODO, should this loop over the keys and convert the json strings back to objects?
+			## but then how would we know if a given string was json... special prefix character?
+			return JS("Object.keys( ob )")
+		else:  ## PythonJS object instance ##
+			## this works because instances from PythonJS are created using Object.create(null) ##
+			return JS("ob.keys()")
+
+	def __jsdict_values(ob):
+		if instanceof(ob, Object):
+			arr = []
+			for key in ob:
+				if ob.hasOwnProperty(key):
+					value = ob[key]
+					arr.push( value )
+			return arr
+		else:  ## PythonJS object instance ##
+			## this works because instances from PythonJS are created using Object.create(null) ##
+			return JS("ob.values()")
+
+	def __jsdict_items(ob):
+		## `ob.items is None` is for: "self.__dict__.items()" because self.__dict__ is not actually a dict
+		if instanceof(ob, Object) or ob.items is undefined:  ## in javascript-mode missing attributes do not raise AttributeError
+			arr = []
+			for key in ob:
+				if Object.hasOwnProperty.call(ob, key):
+					value = ob[key]
+					arr.push( [key,value] )
+			return arr
+		else:  ## PythonJS object instance ##
+			return JS("ob.items()")
+
+	def __jsdict_pop(ob, key, _default=None):
+		if instanceof(ob, Array):
+			if ob.length:
+				## note: javascript array.pop only pops the end of an array
+				if key is undefined:
+					return inline("ob.pop()")
+				else:
+					return ob.splice( key, 1 )[0]
+			else:
+				raise IndexError(key)
+
+		elif instanceof(ob, Object):
+			if JS("key in ob"):
+				v = ob[key]
+				JS("delete ob[key]")
+				return v
+			elif _default is undefined:
+				raise KeyError(key)
+			else:
+				return _default
+		else:  ## PythonJS object instance ##
+			## this works because instances from PythonJS are created using Object.create(null) ##
+			return JS("ob.pop(key, _default)")
diff --git a/pythonjs/runtime/builtins_glsl.py b/pythonjs/runtime/builtins_glsl.py
new file mode 100644
index 0000000..cf721e3
--- /dev/null
+++ b/pythonjs/runtime/builtins_glsl.py
@@ -0,0 +1,313 @@
+pythonjs.configure( runtime_exceptions=False )
+pythonjs.configure( direct_operator='+' )
+pythonjs.configure( direct_operator='*' )
+pythonjs.configure( direct_keys=True )
+
+
+with javascript:
+	def int16(a):  ## used by glsljit when packing structs.
+		arr = new(Int16Array(1))
+		arr[0]=a
+		return arr
+
+	def __gpu_object(cls, struct_name, data_name):
+		cls.prototype.__struct_name__ = struct_name
+		cls.prototype.__struct_data__ = data_name
+	with lowlevel:
+		gpu = {
+			'object' : __gpu_object
+		}
+
+	def glsljit_runtime(header):
+		return new( GLSLJITRuntime(header) )
+
+	class GLSLJITRuntime:
+		def __init__(self, header):
+			self.header = header
+			self.shader = []
+			self.object_packagers = []
+			self.struct_types = {}
+			self.glsltypes = ['vec2', 'vec3', 'vec4', 'mat4']
+			self.matrices = []
+
+		def compile_header(self):
+			a = []  ## insert structs at top of header
+			for sname in self.struct_types:
+				if sname in self.glsltypes:
+					pass
+				else:
+					a.push( self.struct_types[sname]['code'] )
+
+			## calls get_global_id, see WebCLGL API docs. ##
+			a.push('int matrix_index() { return int(get_global_id().y*%s.0); }' %self.matrices.length)
+			a.push('int matrix_row() { return int(get_global_id().x*4.0); }')  ## returns: 0, 1, 2, 3
+
+			## first class array error, can not return an array, even when the size is known ##
+			#a.push('float[3] floatN( float a, float b, float c) { float f[3]; f[0]=a; f[1]=b; f[2]=b; return f; }')
+
+			## these could be generated for each array size to reduce the mess in main,
+			## TODO it would be better to upload them as uniforms.
+			#a.push('void floatN( float f[3], float a, float b, float c) { f[0]=a; f[1]=b; f[2]=b; }')
+
+			## the array can be declared in the header, but not filled with data here.
+			#a.push('float XXX[3];')
+			#a.push('floatN( XXX, 1.1, 2.2, 3.3 );')
+			#a.push('XXX[0]=1.1;')
+
+
+			a = '\n'.join(a)
+			## code in header could be methods that reference the struct types above.
+			b = "\n".join(self.header)
+			return '\n'.join([a,b])
+
+		def compile_main(self):
+			return '\n'.join(self.shader)
+
+		def push(self, s):
+			self.shader.push(s)
+
+
+		def define_structure(self, ob):
+			struct_name = None
+			#if Object.hasOwnProperty.call(ob,'__struct_name__'):
+			if ob.__struct_name__:
+				struct_name = ob.__struct_name__
+				if struct_name in self.struct_types:
+					return struct_name
+
+			arrays = []
+			floats = []
+			integers = []
+			structs = []
+			struct_type = []  ## fallback for javascript objects
+
+			if struct_name and struct_name in self.glsltypes:
+				return struct_name
+
+			#for key in ob.keys():
+			for key in dir( ob ):
+				if key.length==1 and key in '0123456789':
+					raise RuntimeError(key)
+				t = typeof( ob[key] )
+				if t=='object' and instanceof(ob[key], Array) and ob[key].length and typeof(ob[key][0])=='number':
+					struct_type.push( 'ARY_'+key )
+					arrays.push(key)
+				elif t=='number':
+					struct_type.push( 'NUM_'+key)
+					floats.push(key)
+				elif instanceof(ob[key], Int16Array):
+					struct_type.push( 'INT_'+key)
+					if ob[key].length == 1:
+						integers.push(key)
+					else:
+						pass  ## TODO int16array
+				elif t=='object' and ob[key].__struct_name__:
+					struct_type.push( 'S_'+key)
+					structs.push( key )
+					if ob[key].__struct_name__ not in self.struct_types:
+						if ob[key].__struct_name__ in self.glsltypes:
+							pass
+						else:
+							self.define_structure( ob[key] )
+
+			if struct_name is None:
+				#print('DEGUG: new struct name', ob.__struct_name__)
+				#print(ob)
+				struct_name = ''.join( struct_type )
+				ob.__struct_name__ = struct_name
+
+			if struct_name not in self.struct_types:
+				member_list = []
+				for key in integers:
+					member_list.append('int '+key+';')
+				for key in floats:
+					member_list.append('float '+key+';')
+				for key in arrays:
+					arr = ob[key]
+					member_list.append('float '+key+'['+arr.length+'];')
+				for key in structs:
+					subtype = ob[key].__struct_name__
+					member_list.append( subtype+' '+key+';')
+
+				if len(member_list)==0:
+					raise RuntimeError(struct_name)
+
+				members = ''.join(member_list)
+				code = 'struct ' +struct_name+ ' {' +members+ '};'
+				#print('-------struct glsl code-------')
+				#print(code)
+				#print('------------------------------')
+				self.struct_types[ struct_name ] = {
+					'arrays' : arrays,
+					'floats' : floats,
+					'integers': integers,
+					'structs' : structs,
+					'code'   : code
+				}
+			return struct_name
+
+		def structure(self, ob, name):
+			wrapper = None
+			if instanceof(ob, Object):
+				pass
+			elif ob.__class__ is dict:
+				wrapper = ob
+				ob = ob[...]
+
+			sname = self.define_structure(ob)
+			if wrapper:
+				wrapper.__struct_name__ = sname
+
+			args = []
+			stype = self.struct_types[ sname ]
+
+			# if stype is None:  ## TODO fix me
+			if sname not in self.struct_types:
+				if sname in self.glsltypes:
+					if sname == 'mat4':
+						if ob.__struct_data__:
+							o = ob[ ob.__struct_data__ ]
+						else:
+							o = ob
+
+						for i in range(o.length):
+							value = o[i] +''
+							if '.' not in value: value += '.0'
+							args.push( value )
+
+				else:
+					raise RuntimeError('no method to pack structure: ' +sname)
+
+			has_arrays = False
+			if stype:
+				if stype['arrays'].length > 0:
+					has_arrays = True
+
+				for key in stype['integers']:
+					args.push( ob[key][0]+'' )
+
+				for key in stype['floats']:
+					value = ob[key] + ''
+					if '.' not in value:
+						value += '.0'
+					args.push( value )
+
+				for key in stype['arrays']:
+					#args.push( '{'+ob[key].toString()+ '}')  ## this will not work
+					## arrays need to be assigned to a local variable before passing
+					## it to the struct constructor.
+					aname = '_'+key+name
+					self.array(ob[key], aname)
+					args.push( aname )
+
+				for key in stype['structs']:
+					aname = '_'+key+name
+					self.structure(ob[key], aname)
+					args.push( aname )
+
+			args = ','.join(args)
+			if has_arrays:
+				self.shader.push( sname + ' ' +name+ '=' +sname+ '(' +args+ ');' )
+			else:
+				self.header.push( 'const ' + sname + ' ' +name+ '=' +sname+ '(' +args+ ');' )
+			return stype
+
+		def int16array(self, ob, name):
+			a = ['int ' + name + '[' + ob.length + ']']
+			i = 0
+			while i < ob.length:
+				a.push(';'+name+'['+i+']='+ob[i])
+				i += 1
+
+			self.shader.push( ''.join(a) )
+
+		def array(self, ob, name):
+			if instanceof(ob[0], Array):
+				a = [] #'float ' + name + '[' + ob.length + ']']
+				i = 0
+				while i < ob.length:
+					subarr = ob[i]
+					subname = '%s_%s'%(name,i)
+					if a.length==0:
+						a.append('float ' + subname + '[' + subarr.length + ']')
+					else:
+						a.append(';float ' + subname + '[' + subarr.length + ']')
+					j = 0
+					while j < subarr.length:
+						v = subarr[j] + ''
+						if '.' not in v:
+							v += '.0'
+						a.push(';'+subname+'['+j+']='+v)
+						j += 1
+
+					i += 1
+
+				self.shader.push( ''.join(a) )
+
+			elif instanceof(ob[0], Object) or ob[0].__class__ is dict:
+				i = 0
+				while i < ob.length:
+					self.structure( ob[i], name+'_'+i)
+					i += 1
+
+			else:
+				a = ['float ' + name + '[' + ob.length + '];']
+				i = 0
+				while i < ob.length:
+					a.push(name+'['+i+']='+ob[i] + ';')
+					i += 1
+
+				self.shader.push( ''.join(a) )
+
+		def object(self, ob, name):
+			for p in self.object_packagers:
+				cls, func = p
+				if instanceof(ob, cls):
+					return func(ob)
+
+		def unpack_array2d(self, arr, dims):
+			if typeof(dims)=='number':
+				return arr
+
+			w,h = dims
+			row = []
+			rows = [row]
+			for value in arr:
+				row.append(value)
+				if row.length >= w:
+					row = []
+					rows.append(row)
+			rows.pop()
+			if rows.length != h:
+				print('ERROR: __unpack_array2d, invalid height.')
+			return rows
+
+		def unpack_vec4(self, arr, dims):
+			if typeof(dims)=='number':
+				w = dims
+				h = 1
+			else:
+				w,h = dims
+			rows = []
+			i=0
+			for y in range(h):
+				row = []
+				rows.append( row )
+				for x in range(w):
+					vec = []
+					for j in range(4):
+						vec.append( arr[i])
+						i += 1
+					row.append( vec )
+
+			if rows.length != h:
+				print('ERROR: __unpack_vec4, invalid height.')
+			return rows
+
+		def unpack_mat4(self, arr):
+			i = 0
+			for mat in self.matrices:
+				for j in range(16):
+					mat[j] = arr[i]
+					i += 1
+			return self.matrices
\ No newline at end of file
diff --git a/pythonjs/typedpython.py b/pythonjs/typedpython.py
index 3d6c9c5..1b58d7a 100644
--- a/pythonjs/typedpython.py
+++ b/pythonjs/typedpython.py
@@ -52,7 +52,10 @@ def transform_source( source, strip=False ):
 			## go array and map syntax ##
 			if not isindef and len(a) and char==']' and j==i+1 and nextchar!=None and nextchar in '[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ':
 				assert '[' in a
+				hit_go_typedef = True
+
 				gotype = []
+				restore = list(a)
 				b = a.pop()
 				while b != '[':
 					gotype.append(b)
@@ -66,11 +69,13 @@ def transform_source( source, strip=False ):
 						a.append('__go__array__(')
 				elif gotype.isdigit():
 					a.append('__go__arrayfixed__(%s,' %gotype)
-				else:
-					assert ''.join(a[-3:])=='map'
+				elif ''.join(a[-3:])=='map':
 					a.pop(); a.pop(); a.pop()
 					a.append('__go__map__(%s,' %gotype)
-				hit_go_typedef = True
+				else:
+					hit_go_typedef = False
+					restore.append(char)
+					a = restore
 
 			elif hit_go_typedef and char=='(':
 				a.append(')<<(')
@@ -506,6 +511,8 @@ def mappass( a:map[string]int ):
 
 m = map[int]string{ a:'xxx' for a in range(10)}
 
+a = xxx[x][y]
+
 '''
 
 if __name__ == '__main__':

From 4aec0f4790d08eb53f60fe1e539ef941a1df1b24 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Thu, 25 Sep 2014 03:07:49 -0700
Subject: [PATCH 19/58] translator.py new option --modules will output split
 the output into multiple files based on classes.

---
 pythonjs/python_to_pythonjs.py | 58 +++++++++++++++++++++++-----------
 pythonjs/pythonjs.py           | 46 ++++++++++++++++++++-------
 pythonjs/translator.py         | 17 ++++++++--
 pythonjs/typedpython.py        | 29 +++++++++++++++--
 4 files changed, 115 insertions(+), 35 deletions(-)

diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
index 7358eef..44bc32a 100755
--- a/pythonjs/python_to_pythonjs.py
+++ b/pythonjs/python_to_pythonjs.py
@@ -132,13 +132,15 @@ def format_error(self, node):
 			msg += '%s%s line:%s col:%s\n' % (' '*(l+1)*2, n.__class__.__name__, n.lineno, n.col_offset)
                 return msg
 
-	def __init__(self, source=None, module=None, module_path=None, dart=False, coffee=False, lua=False, go=False, fast_javascript=False):
-		super(PythonToPythonJS, self).__init__()
+	def __init__(self, source=None, modules=False, module_path=None, dart=False, coffee=False, lua=False, go=False, fast_javascript=False, ):
+		#super(PythonToPythonJS, self).__init__()
+		self._modules = modules          ## split into mutiple files by class
 		self._module_path = module_path  ## used for user `from xxx import *` to load .py files in the same directory.
 		self._with_lua = lua
 		self._with_coffee = coffee
 		self._with_dart = dart
 		self._with_go = go
+		self._with_gojs = False
 		self._fast_js = fast_javascript
 
 		self._html_tail = []; script = False
@@ -242,7 +244,6 @@ def __init__(self, source=None, module=None, module_path=None, dart=False, coffe
 		self._return_type = None
 
 
-		self._module = module    ## DEPRECATED
 		self._typedefs = dict()  ## class name : typedef  (deprecated - part of the old static type finder)
 
 		self._globals = dict()
@@ -327,7 +328,7 @@ def __init__(self, source=None, module=None, module_path=None, dart=False, coffe
 			for line in self._html_tail:
 				writer.write(line)
 
-        def visit(self, node):
+	def visit(self, node):
 		"""Visit a node."""
 		## modified code of visit() method from Python 2.7 stdlib
 		self._stack.append(node)
@@ -513,7 +514,8 @@ def visit_ImportFrom(self, node):
 			subtrans = PythonToPythonJS(
 				data, 
 				module_path     = self._module_path,
-				fast_javascript = self._fast_js
+				fast_javascript = self._fast_js,
+				modules         = self._modules,
 			)
 			self._js_classes.update( subtrans._js_classes ) ## TODO - what other typedef info needs to be copied here?
 
@@ -537,7 +539,7 @@ def visit_Dict(self, node):
 			if isinstance(v, ast.Lambda):
 				v.keep_as_lambda = True
 			v = self.visit( v )
-			if self._with_dart or self._with_ll or self._with_go:
+			if self._with_dart or self._with_ll or self._with_go or self._fast_js:
 				a.append( '%s:%s'%(k,v) )
 				#if isinstance(node.keys[i], ast.Str):
 				#	a.append( '%s:%s'%(k,v) )
@@ -548,7 +550,8 @@ def visit_Dict(self, node):
 			else:
 				a.append( 'JSObject(key=%s, value=%s)'%(k,v) )  ## this allows non-string keys
 
-		if self._with_dart or self._with_ll or self._with_go:
+
+		if self._with_dart or self._with_ll or self._with_go or self._fast_js:
 			b = ','.join( a )
 			return '{%s}' %b
 		elif self._with_js:
@@ -676,7 +679,11 @@ def visit_ListComp(self, node):
 
 		self._comprehensions.remove( node )
 		#return '__get__(list, "__call__")([], {pointer:%s})' %cname
-		return cname
+
+		if self._with_go:
+			return 'go.addr(%s)' %cname
+		else:
+			return cname
 
 
 	def _gen_comp(self, generators, node):
@@ -1165,6 +1172,9 @@ def _visit_js_classdef(self, node):
 		self._in_js_class = False
 
 	def visit_ClassDef(self, node):
+		#raise SyntaxError( self._modules )
+		if self._modules:
+			writer.write('__new_module__(%s)' %node.name)
 		if self._with_dart or self._with_go:
 			self._visit_dart_classdef(node)
 			return
@@ -1739,7 +1749,10 @@ def visit_Attribute(self, node):
 			#else:
 			return '%s.%s' %(node_value, node.attr)
 		elif self._with_dart or self._with_ll or self._with_go:
-			return '%s.%s' %(node_value, node.attr)
+			if self._with_gojs:
+				return '%s.Get("%s")' %(node_value, node.attr)
+			else:
+				return '%s.%s' %(node_value, node.attr)
 
 		elif self._with_js:
 			if self._in_catch_exception == 'AttributeError':
@@ -2085,7 +2098,10 @@ def _visit_assign_helper(self, node, target):
 			#####################################
 
 			if self._with_js or self._with_dart or self._with_go:
-				writer.write( '%s.%s=%s' %(target_value, target.attr, self.visit(node.value)) )
+				if self._with_gojs:
+					writer.write( '%s.Set("%s", %s)' %(target_value, target.attr, self.visit(node.value)) )
+				else:
+					writer.write( '%s.%s=%s' %(target_value, target.attr, self.visit(node.value)) )
 			elif typedef and target.attr in typedef.properties and 'set' in typedef.properties[ target.attr ]:
 				setter = typedef.properties[ target.attr ]['set']
 				writer.write( '%s( [%s, %s], JSObject() )' %(setter, target_value, self.visit(node.value)) )
@@ -2500,7 +2516,10 @@ def visit_Call(self, node):
 			if isinstance(node.func, Name) and node.func.id in self._js_classes:
 				return '__new__%s(%s)' %( self.visit(node.func), ','.join(args) )
 			else:
-				return '%s(%s)' %( self.visit(node.func), ','.join(args) )
+				if self._with_gojs:
+					return '.Call(%s,%s)' %( self.visit(node.func), ','.join(args) )
+				else:
+					return '%s(%s)' %( self.visit(node.func), ','.join(args) )
 
 		elif self._with_js or self._with_dart:
 			args = list( map(self.visit, node.args) )
@@ -3995,11 +4014,19 @@ def visit_With(self, node):
 				if a: writer.write(a)
 			writer.pull()
 
+		elif isinstance( node.context_expr, ast.Name ) and node.context_expr.id == 'gojs':
+			self._with_gojs = True
+			for b in node.body:
+				a = self.visit(b)
+				if a: writer.write(a)
+			self._with_gojs = False
+
 		else:
 			raise SyntaxError('invalid use of "with" statement')
 
 EXTRA_WITH_TYPES = ('__switch__', '__default__', '__case__', '__select__')
 
+
 class GeneratorFunctionTransformer( PythonToPythonJS ):
 	'''
 	Translates a simple generator function into a class with state-machine that can be iterated over by
@@ -4350,15 +4377,10 @@ def collect_generator_functions(node):
 
 
 
-def main(script, dart=False, coffee=False, lua=False, go=False, module_path=None, fast_javascript=False):
+def main(script, **kwargs):
 	translator = PythonToPythonJS(
 		source = script, 
-		dart   = dart,
-		coffee = coffee,
-		lua    = lua,
-		go     = go,
-		module_path = module_path,
-		fast_javascript = fast_javascript
+		**kwargs
 	)
 
 	code = writer.getvalue()
diff --git a/pythonjs/pythonjs.py b/pythonjs/pythonjs.py
index 85f423a..09c54b7 100755
--- a/pythonjs/pythonjs.py
+++ b/pythonjs/pythonjs.py
@@ -132,16 +132,28 @@ def visit_With(self, node):
 
 		return '\n'.join(r)
 
-	def visit_Module(self, node):
+	def _new_module(self, name='main.js'):
 		header = []
-		lines = []
-
 		if self._requirejs and not self._webworker:
 			header.extend([
 				'define( function(){',
 				'__module__ = {}'
 			])
 
+		return {
+			'name'   : name,
+			'header' : header,
+			'lines'  : []
+		}
+
+	def visit_Module(self, node):
+		modules = []
+
+		mod = self._new_module()
+		modules.append( mod )
+		lines = mod['lines']
+		header = mod['header']
+
 
 		if self._insert_runtime:
 			dirname = os.path.dirname(os.path.abspath(__file__))
@@ -149,11 +161,15 @@ def visit_Module(self, node):
 			lines.append( runtime )  #.replace('\n', ';') )
 
 		for b in node.body:
-			line = self.visit(b)
-			if line: lines.append( line )
+			if isinstance(b, ast.Expr) and isinstance(b.value, ast.Call) and isinstance(b.value.func, ast.Name) and b.value.func.id == '__new_module__':
+				mod = self._new_module( '%s.js' %b.value.args[0].id )
+				modules.append( mod )
+				lines = mod['lines']
+				header = mod['header']
+
 			else:
-				#raise b
-				pass
+				line = self.visit(b)
+				if line: lines.append( line )
 
 		if self._requirejs and not self._webworker:
 			for name in self._exports:
@@ -166,9 +182,16 @@ def visit_Module(self, node):
 		if self._has_glsl:
 			header.append( 'var __shader_header__ = ["%s"]'%self.glsl_runtime )
 
-		lines = header + lines
-		## fixed by Foxboron
-		return '\n'.join(l if isinstance(l,str) else l.encode("utf-8") for l in lines)
+		if len(modules) == 1:
+			lines = header + lines
+			## fixed by Foxboron
+			return '\n'.join(l if isinstance(l,str) else l.encode("utf-8") for l in lines)
+		else:
+			d = {}
+			for mod in modules:
+				lines = mod['header'] + mod['lines']
+				d[ mod['name'] ] = '\n'.join(l if isinstance(l,str) else l.encode("utf-8") for l in lines)
+			return d
 
 	def visit_Expr(self, node):
 		# XXX: this is UGLY
@@ -1355,7 +1378,8 @@ def main(source, requirejs=True, insert_runtime=True, webworker=False, function_
 		fast_javascript = fast_javascript
 	)
 	output = gen.visit(tree)
-	if head:
+
+	if head and not isinstance(output, dict):
 		head.append( output )
 		head.extend( tail )
 		output = '\n'.join( head )
diff --git a/pythonjs/translator.py b/pythonjs/translator.py
index 369d380..420c322 100755
--- a/pythonjs/translator.py
+++ b/pythonjs/translator.py
@@ -10,7 +10,7 @@
 from pythonjs_to_go import main as pythonjs_to_go
 
 cmdhelp = """\
-usage: translator.py [--dart|--coffee|--lua|--go|--visjs|--no-wrapper|--no-runtime|--fast-javascript|--analyze] file.py
+usage: translator.py [--dart|--coffee|--lua|--go|--visjs|--no-wrapper|--no-runtime|--fast-javascript|--modules|--analyze] file.py
 
 example:
        translator.py --no-wrapper myscript.py > myscript.js
@@ -66,7 +66,8 @@ def main(script, module_path=None):
 			a = python_to_pythonjs(
 				script, 
 				module_path=module_path,
-				fast_javascript = '--fast-javascript' in sys.argv
+				fast_javascript = '--fast-javascript' in sys.argv,
+				modules  = '--modules' in sys.argv,
 			)
 
 			if isinstance(a, dict):
@@ -83,8 +84,18 @@ def main(script, module_path=None):
 					a, 
 					requirejs='--no-wrapper' not in sys.argv, 
 					insert_runtime='--no-runtime' not in sys.argv,
-					fast_javascript = '--fast-javascript' in sys.argv
+					fast_javascript = '--fast-javascript' in sys.argv,
 				)
+				if isinstance(code, dict):
+					assert '--modules' in sys.argv
+					path = 'build'
+					if os.path.isdir(path):
+						for name in code:
+							open( os.path.join(path,name), 'wb' ).write( code[name] )
+						return 'modules written to: ' + path
+					else:
+						raise RuntimeError('the option --modules requires a folder named "build" in your current directory')
+
 
 		if '--analyze' in sys.argv:
 			dartanalyzer = os.path.expanduser('~/dart-sdk/bin/dartanalyzer')
diff --git a/pythonjs/typedpython.py b/pythonjs/typedpython.py
index 1b58d7a..2a92033 100644
--- a/pythonjs/typedpython.py
+++ b/pythonjs/typedpython.py
@@ -1,3 +1,6 @@
+# _*_ coding: utf-8 _*_
+
+
 types = ['str', 'list', 'dict', 'bool']
 
 glsl_types = ['struct*', 'int*', 'float*', 'vec2', 'vec3', 'vec4', 'mat2', 'mat3', 'mat4']
@@ -25,9 +28,23 @@
 	'go'         : '__go__',
 	'go.channel' : '__go_make_chan__',
 	'go.array'   : '__go__array__',
-	'go.make'    : '__go_make__'
+	'go.make'    : '__go_make__',
+	'go.addr'    : '__go__addr__'
+}
+
+OPERATORS = {
+	'left' : {
+		u'⟦' : '__getitem__',
+		u'⟪' : '__getpeer__',
+		u'⟅' : '__getserver__',
+		u'⎨' : '__getclient__'
+	},
+	'right' : [u'⟧', u'⟫', u'⟆', u'⎬'],
 }
 
+
+
+
 def transform_source( source, strip=False ):
 	output = []
 	output_post = None
@@ -49,8 +66,12 @@ def transform_source( source, strip=False ):
 				if nextchar.strip(): break
 				j += 1
 
+			if not isindef and len(a) and char in OPERATORS['left'] and j==i+1:
+				a.append( '<<__op_left__(u"%s")<<' %char)
+			elif not isindef and len(a) and char in OPERATORS['right']:
+				a.append('<<__op_right__(u"%s")' % char )
 			## go array and map syntax ##
-			if not isindef and len(a) and char==']' and j==i+1 and nextchar!=None and nextchar in '[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ':
+			elif not isindef and len(a) and char==']' and j==i+1 and nextchar!=None and nextchar in '[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ':
 				assert '[' in a
 				hit_go_typedef = True
 
@@ -392,7 +413,7 @@ def transform_source( source, strip=False ):
 	return r
 
 
-test = '''
+test = u'''
 int a = 1
 float b = 1.1
 str c = "hi"
@@ -512,6 +533,8 @@ def mappass( a:map[string]int ):
 m = map[int]string{ a:'xxx' for a in range(10)}
 
 a = xxx[x][y]
+a = xxx⎨Z⎬
+a = xxx ⎨Z⎬⎨zzzz⎬
 
 '''
 

From 29fa0508cc78a177f1a24104c1ce28273adc29be Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Thu, 25 Sep 2014 05:09:45 -0700
Subject: [PATCH 20/58] translator.py new option --fast-loops removes loop
 hacks that make for loops act like python loops, this is safe to use if you
 only loop over arrays.

---
 pythonjs/python_to_pythonjs.py |  42 ++++---
 pythonjs/pythonjs.py           | 207 ++++++++++++++++++---------------
 pythonjs/translator.py         |   3 +-
 3 files changed, 142 insertions(+), 110 deletions(-)

diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
index 44bc32a..96a330b 100755
--- a/pythonjs/python_to_pythonjs.py
+++ b/pythonjs/python_to_pythonjs.py
@@ -1099,10 +1099,11 @@ def _visit_js_classdef(self, node):
 			writer.write('pass')
 
 
-		## `self.__class__` pointer ##
-		writer.write('this.__class__ = %s' %name)  ## isinstance runtime builtin requires this
 
 		if not self._fast_js:
+			## `self.__class__` pointer ##
+			writer.write('this.__class__ = %s' %name)  ## isinstance runtime builtin requires this
+
 			## instance UID ##
 			writer.write('this.__uid__ = "" + _PythonJS_UID')
 			writer.write('_PythonJS_UID += 1')
@@ -1137,8 +1138,12 @@ def _visit_js_classdef(self, node):
 				line = self.visit(method)
 				if line: writer.write( line )
 				#writer.write('%s.prototype.%s = %s'%(name,mname,mname))
-				f = 'function () { return %s.prototype.%s.apply(arguments[0], Array.prototype.slice.call(arguments,1)) }' %(name, mname)
-				writer.write('%s.%s = JS("%s")'%(name,mname,f))
+
+				if not self._fast_js:
+					## allows subclass method to extend the parent's method by calling the parent by class name,
+					## `MyParentClass.some_method(self)`
+					f = 'function () { return %s.prototype.%s.apply(arguments[0], Array.prototype.slice.call(arguments,1)) }' %(name, mname)
+					writer.write('%s.%s = JS("%s")'%(name,mname,f))
 
 		for base in node.bases:
 			base = self.visit(base)
@@ -1174,7 +1179,8 @@ def _visit_js_classdef(self, node):
 	def visit_ClassDef(self, node):
 		#raise SyntaxError( self._modules )
 		if self._modules:
-			writer.write('__new_module__(%s)' %node.name)
+			writer.write('__new_module__(%s)' %node.name) ## triggers a new file in final stage of translation.
+
 		if self._with_dart or self._with_go:
 			self._visit_dart_classdef(node)
 			return
@@ -3247,21 +3253,27 @@ def visit_FunctionDef(self, node):
 
 		elif self._with_js or javascript or self._with_ll:
 			if node.args.defaults:
-				kwargs_name = node.args.kwarg or '_kwargs_'
-				lines = [ 'if (!( %s instanceof Object )) {' %kwargs_name ]
-				a = ','.join( ['%s: arguments[%s]' %(arg.id, i) for i,arg in enumerate(node.args.args)] )
-				lines.append( 'var %s = {%s}' %(kwargs_name, a))
-				lines.append( '}')
-				for a in lines:
-					writer.write("JS('''%s''')" %a)
+				if not self._fast_js:
+					## this trys to recover when called in a bad way,
+					## however, this could be dangerous because the program
+					## should fail if a function is called this badly.
+					kwargs_name = node.args.kwarg or '_kwargs_'
+					lines = [ 'if (!( %s instanceof Object )) {' %kwargs_name ]
+					a = ','.join( ['%s: arguments[%s]' %(arg.id, i) for i,arg in enumerate(node.args.args)] )
+					lines.append( 'var %s = {%s}' %(kwargs_name, a))
+					lines.append( '}')
+					for a in lines:
+						writer.write("JS('''%s''')" %a)
 
 				offset = len(node.args.args) - len(node.args.defaults)
 				for i, arg in enumerate(node.args.args):
 					dindex = i - offset
 					if dindex >= 0:
 						default_value = self.visit( node.args.defaults[dindex] )
-						a = (kwargs_name, kwargs_name, arg.id, arg.id, default_value, arg.id, kwargs_name, arg.id)
-						b = "if (%s === undefined || %s.%s === undefined) {var %s = %s} else {var %s=%s.%s}" %a
+						#a = (kwargs_name, kwargs_name, arg.id, arg.id, default_value, arg.id, kwargs_name, arg.id)
+						#b = "if (%s === undefined || %s.%s === undefined) {var %s = %s} else {var %s=%s.%s}" %a
+						a = (arg.id, kwargs_name, kwargs_name,arg.id, default_value, kwargs_name, arg.id)
+						b = "var %s	= (%s === undefined || %s.%s === undefined) ? %s : %s.%s" %a
 						c = "JS('''%s''')" %b
 						writer.write( c )
 
@@ -3639,8 +3651,6 @@ def visit_For(self, node):
 			for n in node.body:
 				calls = collect_calls(n)
 				for c in calls:
-					log('--call: %s' %c)
-					log('------: %s' %c.func)
 					if isinstance(c.func, ast.Name):  ## these are constant for sure
 						i = self._call_ids
 						writer.write( '''JS('var __call__%s = __get__(%s,"__call__")')''' %(i,self.visit(c.func)) )
diff --git a/pythonjs/pythonjs.py b/pythonjs/pythonjs.py
index 09c54b7..29e10f0 100755
--- a/pythonjs/pythonjs.py
+++ b/pythonjs/pythonjs.py
@@ -25,10 +25,11 @@ def __init__(self, node):
 		RuntimeError.__init__(self)
 
 class JSGenerator(NodeVisitor): #, inline_function.Inliner):
-	def __init__(self, requirejs=True, insert_runtime=True, webworker=False, function_expressions=True, fast_javascript=False):
+	def __init__(self, requirejs=True, insert_runtime=True, webworker=False, function_expressions=True, fast_javascript=False, fast_loops=False):
 		#writer = code_writer.Writer()
 		#self.setup_inliner( writer )
 		self._fast_js = fast_javascript
+		self._fast_loops = fast_loops
 		self._func_expressions = function_expressions
 		self._indent = 0
 		self._global_functions = {}
@@ -50,7 +51,7 @@ def __init__(self, requirejs=True, insert_runtime=True, webworker=False, functio
 		#self.glsl_runtime = 'vec4 _mat4_to_vec4( mat4 a, int col) { return vec4(a[col][0], a[col][1], a[col][2],a[col][3]); }'
 		self.glsl_runtime = 'int _imod(int a, int b) { return int(mod(float(a),float(b))); }'
 
-	def indent(self): return '  ' * self._indent
+	def indent(self): return '\t' * self._indent
 	def push(self): self._indent += 1
 	def pull(self):
 		if self._indent > 0: self._indent -= 1
@@ -302,6 +303,9 @@ def _visit_call_helper_var_glsl(self, node):
 
 
 	def _visit_function(self, node):
+		comments = []
+		body = []
+
 		is_main = node.name == 'main'
 		is_annon = node.name == ''
 		is_pyfunc = False
@@ -553,7 +557,7 @@ def _visit_function(self, node):
 
 		elif len(node.decorator_list)==1 and not (isinstance(node.decorator_list[0], ast.Call) and node.decorator_list[0].func.id in self.special_decorators ) and not (isinstance(node.decorator_list[0], ast.Name) and node.decorator_list[0].id in self.special_decorators):
 			dec = self.visit(node.decorator_list[0])
-			buffer = self.indent() + '%s.%s = function(%s) {\n' % (dec,node.name, ', '.join(args))
+			fdef = '%s.%s = function(%s)' % (dec,node.name, ', '.join(args))
 
 		elif len(self._function_stack) == 1:
 			## this style will not make function global to the eval context in NodeJS ##
@@ -564,9 +568,10 @@ def _visit_function(self, node):
 			## infact, var should always be used with function expressions.
 
 			if self._func_expressions or func_expr:
-				buffer = 'var %s = function(%s) {\n' % (node.name, ', '.join(args))
+				fdef = 'var %s = function(%s)' % (node.name, ', '.join(args))
 			else:
-				buffer = 'function %s(%s) {\n' % (node.name, ', '.join(args))
+				fdef = 'function %s(%s)' % (node.name, ', '.join(args))
+
 
 			if self._requirejs and node.name not in self._exports:
 				self._exports.add( node.name )
@@ -574,16 +579,21 @@ def _visit_function(self, node):
 		else:
 
 			if self._func_expressions or func_expr:
-				buffer = 'var %s = function(%s) {\n' % (node.name, ', '.join(args))
+				fdef = 'var %s = function(%s)' % (node.name, ', '.join(args))
 			else:
-				buffer = 'function %s(%s) {\n' % (node.name, ', '.join(args))
+				fdef = 'function %s(%s)' % (node.name, ', '.join(args))
+
+		body.append( fdef )
 
+		body.append( self.indent() + '{' )
 		self.push()
-		body = list()
 		next = None
 		for i,child in enumerate(node.body):
 			if isinstance(child, Str) or hasattr(child, 'SKIP'):
 				continue
+			elif isinstance(child, ast.Expr) and isinstance(child.value, ast.Str):
+				comments.append('/* %s */' %child.value.s.strip() )
+				continue
 
 			#try:
 			#	v = self.visit(child)
@@ -606,9 +616,14 @@ def _visit_function(self, node):
 			else:
 				body.append( self.indent()+v)
 
-		buffer += '\n'.join(body)
+		#buffer += '\n'.join(body)
 		self.pull()
-		buffer += '\n%s}' %self.indent()
+		#buffer += '\n%s}' %self.indent()
+
+		body.append( self.indent() + '}' )
+
+		buffer = '\n'.join( comments + body )
+
 		#if self._inline_lambda:
 		#	self._inline_lambda = False
 		if is_annon:
@@ -967,7 +982,7 @@ def _inline_code_helper(self, s):
 		return s
 
 	def visit_While(self, node):
-		body = [ 'while (%s) {' %self.visit(node.test)]
+		body = [ 'while (%s)' %self.visit(node.test), self.indent()+'{']
 		self.push()
 		for line in list( map(self.visit, node.body) ):
 			body.append( self.indent()+line )
@@ -1121,9 +1136,10 @@ def visit_If(self, node):
 		out = []
 		test = self.visit(node.test)
 		if test.startswith('(') and test.endswith(')'):
-			out.append( 'if %s {' %test )
+			out.append( 'if %s' %test )
 		else:
-			out.append( 'if (%s) {' %test )
+			out.append( 'if (%s)' %test )
+		out.append( self.indent() + '{' )
 
 		self.push()
 
@@ -1159,9 +1175,72 @@ def _visit_for_prep_iter_helper(self, node, out, iter_name):
 		## support "for key in JSObject" ##
 		#out.append( self.indent() + 'if (! (iter instanceof Array) ) { iter = Object.keys(iter) }' )
 		## new style - Object.keys only works for normal JS-objects, not ones created with `Object.create(null)`
-		out.append(
-			self.indent() + 'if (! (%s instanceof Array || typeof %s == "string" || __is_typed_array(%s) || __is_some_array(%s) )) { %s = __object_keys__(%s) }' %(iter_name, iter_name, iter_name, iter_name, iter_name, iter_name)
-		)
+		if not self._fast_loops:
+			out.append(
+				self.indent() + 'if (! (%s instanceof Array || typeof %s == "string" || __is_typed_array(%s) || __is_some_array(%s) )) { %s = __object_keys__(%s) }' %(iter_name, iter_name, iter_name, iter_name, iter_name, iter_name)
+			)
+
+	def _visit_for_glsl(self, node):
+		target = self.visit(node.target)
+
+		if isinstance(node.iter, ast.Call) and isinstance(node.iter.func, ast.Name) and node.iter.func.id=='iter':  ## `for i in iter(n):`
+			assert isinstance(node.iter.args[0], ast.Name)
+			iter = node.iter.args[0].id
+			self._typed_vars[target] = 'struct*'  ## this fixes attributes on structs
+
+			lines = [
+				'`@var __length__ = %s.length;`' %iter,
+				#'`@console.log("DEBUG iter: "+%s);`' %iter,
+				#'`@console.log("DEBUG first item: "+%s[0]);`' %iter,
+				'`@var __struct_name__ = %s[0].__struct_name__;`' %iter,
+				##same as above - slower ##'`@var __struct_name__ = glsljit.define_structure(%s[0]);`' %iter,
+				#'`@console.log("DEBUG sname: "+__struct_name__);`',
+				'`@var %s = %s[0];`' %(target, iter)  ## capture first item with target name so that for loops can get the length of member arrays
+			]
+
+			##TODO## lines.append('$')  ## optimizes webclgl parser
+
+			lines.append('for (int _iter=0; _iter < `__length__`; _iter++) {' )
+
+			## declare struct variable ##
+			lines.append( '`__struct_name__` %s;' %target)
+
+			## at runtime loop over subarray, for each index inline into the shader's for-loop an if test,
+			lines.append( '`@for (var __j=0; __j<__length__; __j++) {`')
+			lines.append(     '`@glsljit.push("if (_iter==" +__j+ ") { %s=%s_" +__j+ ";}");`' %(target, iter))
+			lines.append( '`@}`')
+
+			##TODO## lines.append('$')  ## optimizes webclgl parser
+
+
+		elif isinstance(node.iter, ast.Call):  ## `for i in range(n):`
+			iter = self.visit(node.iter.args[0])
+			lines = ['for (int %s=0; %s < %s; %s++) {' %(target, target, iter, target)]
+		elif isinstance(node.iter, ast.Name):  ## `for subarray in arrayofarrays:`
+			## capture the length of the subarray into the current javascript scope
+			## this is required to inline the lengths as constants into the GLSL for loops
+			lines = ['`@var __length__ = %s[0].length;`' %node.iter.id]
+			## start the GLSL for loop - `__length__` is set above ##
+			lines.append('for (int _iter=0; _iter < `__length__`; _iter++) {' )
+
+			## declare subarray with size ##
+			lines.append( 'float %s[`__length__`];' %target)
+
+			## at runtime loop over subarray, for each index inline into the shader's for-loop an if test,
+			lines.append( '`@for (var __j=0; __j<__length__; __j++) {`')
+			## below checks if the top-level iterator is the same index, and if so copy its contents into the local subarray,
+			lines.append(     '`@glsljit.push("if (_iter==" +__j+ ") { for (int _J=0; _J<" +__length__+ "; _J++) {%s[_J] = %s_" +__j+ "[_J];} }");`' %(target, node.iter.id))
+			lines.append( '`@}`')
+			## this works because the function glsljit.array will unpack an array of arrays using the variable name with postfix "_n"
+			## note the extra for loop `_J` is required because the local subarray can not be assigned to `A_n`
+
+		else:
+			raise SyntaxError(node.iter)
+
+		for b in node.body:
+			lines.append( self.visit(b) )
+		lines.append( '}' )  ## end of for loop
+		return '\n'.join(lines)
 
 
 	_iter_id = 0
@@ -1180,96 +1259,37 @@ def visit_For(self, node):
 
 		'''
 		if self._glsl:
-			target = self.visit(node.target)
-
-			if isinstance(node.iter, ast.Call) and isinstance(node.iter.func, ast.Name) and node.iter.func.id=='iter':  ## `for i in iter(n):`
-				assert isinstance(node.iter.args[0], ast.Name)
-				iter = node.iter.args[0].id
-				self._typed_vars[target] = 'struct*'  ## this fixes attributes on structs
-
-				lines = [
-					'`@var __length__ = %s.length;`' %iter,
-					#'`@console.log("DEBUG iter: "+%s);`' %iter,
-					#'`@console.log("DEBUG first item: "+%s[0]);`' %iter,
-					'`@var __struct_name__ = %s[0].__struct_name__;`' %iter,
-					##same as above - slower ##'`@var __struct_name__ = glsljit.define_structure(%s[0]);`' %iter,
-					#'`@console.log("DEBUG sname: "+__struct_name__);`',
-					'`@var %s = %s[0];`' %(target, iter)  ## capture first item with target name so that for loops can get the length of member arrays
-				]
-
-				##TODO## lines.append('$')  ## optimizes webclgl parser
-
-				lines.append('for (int _iter=0; _iter < `__length__`; _iter++) {' )
-
-				## declare struct variable ##
-				lines.append( '`__struct_name__` %s;' %target)
-
-				## at runtime loop over subarray, for each index inline into the shader's for-loop an if test,
-				lines.append( '`@for (var __j=0; __j<__length__; __j++) {`')
-				lines.append(     '`@glsljit.push("if (_iter==" +__j+ ") { %s=%s_" +__j+ ";}");`' %(target, iter))
-				lines.append( '`@}`')
-
-				##TODO## lines.append('$')  ## optimizes webclgl parser
-
-
-			elif isinstance(node.iter, ast.Call):  ## `for i in range(n):`
-				iter = self.visit(node.iter.args[0])
-				lines = ['for (int %s=0; %s < %s; %s++) {' %(target, target, iter, target)]
-			elif isinstance(node.iter, ast.Name):  ## `for subarray in arrayofarrays:`
-				## capture the length of the subarray into the current javascript scope
-				## this is required to inline the lengths as constants into the GLSL for loops
-				lines = ['`@var __length__ = %s[0].length;`' %node.iter.id]
-				## start the GLSL for loop - `__length__` is set above ##
-				lines.append('for (int _iter=0; _iter < `__length__`; _iter++) {' )
-
-				## declare subarray with size ##
-				lines.append( 'float %s[`__length__`];' %target)
-
-				## at runtime loop over subarray, for each index inline into the shader's for-loop an if test,
-				lines.append( '`@for (var __j=0; __j<__length__; __j++) {`')
-				## below checks if the top-level iterator is the same index, and if so copy its contents into the local subarray,
-				lines.append(     '`@glsljit.push("if (_iter==" +__j+ ") { for (int _J=0; _J<" +__length__+ "; _J++) {%s[_J] = %s_" +__j+ "[_J];} }");`' %(target, node.iter.id))
-				lines.append( '`@}`')
-				## this works because the function glsljit.array will unpack an array of arrays using the variable name with postfix "_n"
-				## note the extra for loop `_J` is required because the local subarray can not be assigned to `A_n`
-
-			else:
-				raise SyntaxError(node.iter)
-
-			for b in node.body:
-				lines.append( self.visit(b) )
-			lines.append( '}' )  ## end of for loop
-			return '\n'.join(lines)
-
-
-		self._iter_id += 1
-		iname = '__iter%s' %self._iter_id
-		index = '__idx%s' %self._iter_id
+			return self._visit_for_glsl( node )
 
 		target = node.target.id
 		iter = self.visit(node.iter) # iter is the python iterator
 
 		out = []
-		out.append( self.indent() + 'var %s = %s;' % (iname, iter) )
-		#out.append( self.indent() + 'var %s = 0;' % index )
+		body = []
+
+		self._iter_id += 1
+		index = '__i%s' %self._iter_id
+		if not self._fast_loops:
+			iname = '__iter%s' %self._iter_id
+			out.append( self.indent() + 'var %s = %s;' % (iname, iter) )
+		else:
+			iname = iter
 
 		self._visit_for_prep_iter_helper(node, out, iname)
 
-		out.append( self.indent() + 'for (var %s=0; %s < %s.length; %s++) {' % (index, index, iname, index) )
+		if self._fast_loops:
+			out.append( 'for (var %s=0; %s < %s.length; %s++)' % (index, index, iname, index) )
+			out.append( self.indent() + '{' )
+
+		else:
+			out.append( self.indent() + 'for (var %s=0; %s < %s.length; %s++) {' % (index, index, iname, index) )
 		self.push()
 
-		body = []
-		# backup iterator and affect value of the next element to the target
-		#pre = 'var backup = %s; %s = iter[%s];' % (target, target, target)
 		body.append( self.indent() + 'var %s = %s[ %s ];' %(target, iname, index) )
 
 		for line in list(map(self.visit, node.body)):
 			body.append( self.indent() + line )
 
-		# replace the replace target with the javascript iterator
-		#post = '%s = backup;' % target
-		#body.append( self.indent() + post )
-
 		self.pull()
 		out.extend( body )
 		out.append( self.indent() + '}' )
@@ -1305,7 +1325,7 @@ def generate_runtime():
 	]
 	return '\n'.join( lines )
 
-def main(source, requirejs=True, insert_runtime=True, webworker=False, function_expressions=True, fast_javascript=False):
+def main(source, requirejs=True, insert_runtime=True, webworker=False, function_expressions=True, fast_javascript=False, fast_loops=False):
 	head = []
 	tail = []
 	script = False
@@ -1375,7 +1395,8 @@ def main(source, requirejs=True, insert_runtime=True, webworker=False, function_
 		insert_runtime=insert_runtime, 
 		webworker=webworker, 
 		function_expressions=function_expressions,
-		fast_javascript = fast_javascript
+		fast_javascript = fast_javascript,
+		fast_loops      = fast_loops
 	)
 	output = gen.visit(tree)
 
diff --git a/pythonjs/translator.py b/pythonjs/translator.py
index 420c322..2650891 100755
--- a/pythonjs/translator.py
+++ b/pythonjs/translator.py
@@ -10,7 +10,7 @@
 from pythonjs_to_go import main as pythonjs_to_go
 
 cmdhelp = """\
-usage: translator.py [--dart|--coffee|--lua|--go|--visjs|--no-wrapper|--no-runtime|--fast-javascript|--modules|--analyze] file.py
+usage: translator.py [--dart|--coffee|--lua|--go|--visjs|--no-wrapper|--no-runtime|--fast-javascript|--fast-loops|--modules|--analyze] file.py
 
 example:
        translator.py --no-wrapper myscript.py > myscript.js
@@ -85,6 +85,7 @@ def main(script, module_path=None):
 					requirejs='--no-wrapper' not in sys.argv, 
 					insert_runtime='--no-runtime' not in sys.argv,
 					fast_javascript = '--fast-javascript' in sys.argv,
+					fast_loops      = '--fast-loops' in sys.argv
 				)
 				if isinstance(code, dict):
 					assert '--modules' in sys.argv

From b6fc560eb4739b43b1e4bf7504b91b2bb8037fc2 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Thu, 25 Sep 2014 08:43:07 -0700
Subject: [PATCH 21/58] cleaner javascript output, and new option
 --pure-javascript that will avoid using the pythonjs runtime.

---
 pythonjs/python_to_pythonjs.py | 47 +++++++++++++++++++++++++++++++---
 pythonjs/pythonjs.py           |  7 +++--
 pythonjs/translator.py         |  3 ++-
 3 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
index 96a330b..862c3f9 100755
--- a/pythonjs/python_to_pythonjs.py
+++ b/pythonjs/python_to_pythonjs.py
@@ -132,7 +132,7 @@ def format_error(self, node):
 			msg += '%s%s line:%s col:%s\n' % (' '*(l+1)*2, n.__class__.__name__, n.lineno, n.col_offset)
                 return msg
 
-	def __init__(self, source=None, modules=False, module_path=None, dart=False, coffee=False, lua=False, go=False, fast_javascript=False, ):
+	def __init__(self, source=None, modules=False, module_path=None, dart=False, coffee=False, lua=False, go=False, fast_javascript=False, pure_javascript=False):
 		#super(PythonToPythonJS, self).__init__()
 		self._modules = modules          ## split into mutiple files by class
 		self._module_path = module_path  ## used for user `from xxx import *` to load .py files in the same directory.
@@ -142,6 +142,7 @@ def __init__(self, source=None, modules=False, module_path=None, dart=False, cof
 		self._with_go = go
 		self._with_gojs = False
 		self._fast_js = fast_javascript
+		self._strict_mode = pure_javascript
 
 		self._html_tail = []; script = False
 		if source.strip().startswith('<html'):
@@ -516,6 +517,7 @@ def visit_ImportFrom(self, node):
 				module_path     = self._module_path,
 				fast_javascript = self._fast_js,
 				modules         = self._modules,
+				pure_javascript = self._strict_mode,
 			)
 			self._js_classes.update( subtrans._js_classes ) ## TODO - what other typedef info needs to be copied here?
 
@@ -2569,27 +2571,47 @@ def visit_Call(self, node):
 					return '__jsdict_set(%s, %s)' %(self.visit(anode.value), ','.join(args))
 
 				elif anode.attr == 'keys' and not args:
+					if self._strict_mode:
+						raise SyntaxError( self.format_error('method `keys` is not allowed without arguments') )
+
 					return '__jsdict_keys(%s)' %self.visit(anode.value)
 
 				elif anode.attr == 'values' and not args:
+					if self._strict_mode:
+						raise SyntaxError( self.format_error('method `values` is not allowed without arguments') )
 					return '__jsdict_values(%s)' %self.visit(anode.value)
 
 				elif anode.attr == 'items' and not args:
+					if self._strict_mode:
+						raise SyntaxError( self.format_error('method `items` is not allowed without arguments') )
+
 					return '__jsdict_items(%s)' %self.visit(anode.value)
 
 				elif anode.attr == 'pop':
 					if args:
 						return '__jsdict_pop(%s, %s)' %(self.visit(anode.value), ','.join(args) )
 					else:
-						return '__jsdict_pop(%s)' %self.visit(anode.value)
+						if self._strict_mode:
+							return '%s.pop()' %self.visit(anode.value)
+						else:
+							return '__jsdict_pop(%s)' %self.visit(anode.value)
 
 				elif anode.attr == 'split' and not args:
+					if self._strict_mode:
+						raise SyntaxError( self.format_error('method `split` is not allowed without arguments') )
+
 					return '__split_method(%s)' %self.visit(anode.value)
 
 				elif anode.attr == 'sort' and not args:
+					if self._strict_mode:
+						raise SyntaxError( self.format_error('method `sort` is not allowed without arguments') )
+
 					return '__sort_method(%s)' %self.visit(anode.value)
 
 				elif anode.attr == 'replace' and len(node.args)==2:
+					if self._strict_mode:
+						raise SyntaxError( self.format_error('method `replace` is not allowed...') )
+
 					return '__replace_method(%s, %s)' %(self.visit(anode.value), ','.join(args) )
 
 				else:
@@ -3266,14 +3288,31 @@ def visit_FunctionDef(self, node):
 						writer.write("JS('''%s''')" %a)
 
 				offset = len(node.args.args) - len(node.args.defaults)
+
+				maxlen = 0
+				maxlen2 = 0
+				for i, arg in enumerate(node.args.args):
+					dindex = i - offset
+					if dindex >= 0:
+						dval = self.visit( node.args.defaults[dindex] )
+
+						if len(arg.id) > maxlen:
+							maxlen = len(arg.id)
+
+						if len(dval) > maxlen2:
+							maxlen2 = len(dval)
+
+
 				for i, arg in enumerate(node.args.args):
 					dindex = i - offset
 					if dindex >= 0:
 						default_value = self.visit( node.args.defaults[dindex] )
 						#a = (kwargs_name, kwargs_name, arg.id, arg.id, default_value, arg.id, kwargs_name, arg.id)
 						#b = "if (%s === undefined || %s.%s === undefined) {var %s = %s} else {var %s=%s.%s}" %a
-						a = (arg.id, kwargs_name, kwargs_name,arg.id, default_value, kwargs_name, arg.id)
-						b = "var %s	= (%s === undefined || %s.%s === undefined) ? %s : %s.%s" %a
+						spaces = ' ' * (maxlen - len(arg.id))
+						spaces2 = ' ' * (maxlen2 - len(default_value))
+						a = (arg.id, spaces, kwargs_name, kwargs_name,arg.id, spaces, default_value, spaces2, kwargs_name, arg.id)
+						b = "var %s %s= (%s === undefined || %s.%s === undefined)%s?\t%s %s: %s.%s" %a
 						c = "JS('''%s''')" %b
 						writer.write( c )
 
diff --git a/pythonjs/pythonjs.py b/pythonjs/pythonjs.py
index 29e10f0..bdac3c9 100755
--- a/pythonjs/pythonjs.py
+++ b/pythonjs/pythonjs.py
@@ -1154,8 +1154,11 @@ def visit_If(self, node):
 		self.pull()
 
 		if orelse:
-			out.append( self.indent() + '} else {')
+			out.append( self.indent() + '}')
+			out.append( self.indent() + 'else')
+			out.append( self.indent() + '{')
 			out.extend( orelse )
+
 		out.append( self.indent() + '}' )
 
 		return '\n'.join( out )
@@ -1167,7 +1170,7 @@ def visit_Dict(self, node):
 			k = self.visit( node.keys[ i ] )
 			v = self.visit( node.values[i] )
 			a.append( '%s:%s'%(k,v) )
-		b = ','.join( a )
+		b = ', '.join( a )
 		return '{ %s }' %b
 
 
diff --git a/pythonjs/translator.py b/pythonjs/translator.py
index 2650891..b7b247b 100755
--- a/pythonjs/translator.py
+++ b/pythonjs/translator.py
@@ -10,7 +10,7 @@
 from pythonjs_to_go import main as pythonjs_to_go
 
 cmdhelp = """\
-usage: translator.py [--dart|--coffee|--lua|--go|--visjs|--no-wrapper|--no-runtime|--fast-javascript|--fast-loops|--modules|--analyze] file.py
+usage: translator.py [--dart|--coffee|--lua|--go|--visjs|--no-wrapper|--no-runtime|--fast-javascript|--fast-loops|--pure-javascript|--modules|--analyze] file.py
 
 example:
        translator.py --no-wrapper myscript.py > myscript.js
@@ -68,6 +68,7 @@ def main(script, module_path=None):
 				module_path=module_path,
 				fast_javascript = '--fast-javascript' in sys.argv,
 				modules  = '--modules' in sys.argv,
+				pure_javascript = '--pure-javascript' in sys.argv
 			)
 
 			if isinstance(a, dict):

From a60275ef31c9eb5b63d5f5d6893e6ac712cc7f5f Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Sun, 28 Sep 2014 05:04:11 -0700
Subject: [PATCH 22/58] fixed bug in typedpython.py, bad inference of a go
 fixed array, reported by ChrisBarker.

---
 pythonjs/python_to_pythonjs.py |  95 +++++++++++++++++------------
 pythonjs/pythonjs_to_go.py     | 107 +++++++++++++++++++++++++++++----
 pythonjs/typedpython.py        |  14 ++++-
 3 files changed, 163 insertions(+), 53 deletions(-)

diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
index 862c3f9..f409678 100755
--- a/pythonjs/python_to_pythonjs.py
+++ b/pythonjs/python_to_pythonjs.py
@@ -112,10 +112,21 @@ def check_for_parent_with(self, method=None, property=None, operator=None, class
 				if res:
 					return res
 
-class PythonToPythonJS(NodeVisitor, inline_function.Inliner):
+class NodeVisitorBase( ast.NodeVisitor ):
+	def __init__(self):
+		self._line = None
+		self._line_number = 0
+		self._stack = []        ## current path to the root
 
-	identifier = 0
-	_func_typedefs = ()
+	def visit(self, node):
+		"""Visit a node."""
+		## modified code of visit() method from Python 2.7 stdlib
+		self._stack.append(node)
+		method = 'visit_' + node.__class__.__name__
+		visitor = getattr(self, method, self.generic_visit)
+		res = visitor(node)
+		self._stack.pop()
+		return res
 
 	def format_error(self, node):
 		lines = []
@@ -132,8 +143,17 @@ def format_error(self, node):
 			msg += '%s%s line:%s col:%s\n' % (' '*(l+1)*2, n.__class__.__name__, n.lineno, n.col_offset)
                 return msg
 
+
+class PythonToPythonJS(NodeVisitorBase, inline_function.Inliner):
+
+	identifier = 0
+	_func_typedefs = ()
+
+
+
 	def __init__(self, source=None, modules=False, module_path=None, dart=False, coffee=False, lua=False, go=False, fast_javascript=False, pure_javascript=False):
 		#super(PythonToPythonJS, self).__init__()
+		NodeVisitorBase.__init__(self)
 		self._modules = modules          ## split into mutiple files by class
 		self._module_path = module_path  ## used for user `from xxx import *` to load .py files in the same directory.
 		self._with_lua = lua
@@ -199,9 +219,7 @@ def __init__(self, source=None, modules=False, module_path=None, dart=False, cof
 
 		self._in_catch_exception = False
 
-		self._line = None
-		self._line_number = 0
-		self._stack = []        ## current path to the root
+
 
 		## optimize "+" and "*" operator
 		if fast_javascript:
@@ -329,15 +347,7 @@ def __init__(self, source=None, modules=False, module_path=None, dart=False, cof
 			for line in self._html_tail:
 				writer.write(line)
 
-	def visit(self, node):
-		"""Visit a node."""
-		## modified code of visit() method from Python 2.7 stdlib
-		self._stack.append(node)
-		method = 'visit_' + node.__class__.__name__
-		visitor = getattr(self, method, self.generic_visit)
-		res = visitor(node)
-		self._stack.pop()
-		return res
+
 
 	def has_webworkers(self):
 		return len(self._webworker_functions.keys())
@@ -650,16 +660,19 @@ def visit_DictComp(self, node):
 	def visit_ListComp(self, node):
 		node.returns_type = 'list'
 
-		if len(self._comprehensions) == 0:
+		if len(self._comprehensions) == 0 and False:
 			comps = collect_comprehensions( node )
+			assert comps
 			for i,cnode in enumerate(comps):
 				cname = '__comp__%s' % self._comp_id
 				self._comp_id += 1
 				cnode._comp_name = cname
 				self._comprehensions.append( cnode )
 
-		cname = node._comp_name
-		writer.write('var(%s)'%cname)
+		#cname = node._comp_name
+		#writer.write('var(%s)'%cname)
+
+		writer.write('var(__comp__%s)'%self._comp_id)
 
 		length = len( node.generators )
 		a = ['idx%s'%i for i in range(length)]
@@ -671,7 +684,7 @@ def visit_ListComp(self, node):
 
 		if self._with_go:
 			assert node.go_listcomp_type
-			writer.write('%s = __go__array__(%s)' %(cname, node.go_listcomp_type))
+			writer.write('__comp__%s = __go__array__(%s)' %(self._comp_id, node.go_listcomp_type))
 		else:
 			writer.write('%s = JSArray()'%cname)
 
@@ -679,18 +692,22 @@ def visit_ListComp(self, node):
 		generators.reverse()
 		self._gen_comp( generators, node )
 
-		self._comprehensions.remove( node )
+		if node in self._comprehensions:
+			self._comprehensions.remove( node )
 		#return '__get__(list, "__call__")([], {pointer:%s})' %cname
 
 		if self._with_go:
-			return 'go.addr(%s)' %cname
+			return '__go__addr__(__comp__%s)' %self._comp_id
 		else:
-			return cname
+			return '__comp__%s' %self._comp_id
 
 
 	def _gen_comp(self, generators, node):
+		self._comp_id += 1
+		id = self._comp_id
+
 		gen = generators.pop()
-		id = len(generators) + self._comprehensions.index( node )
+		#id = len(generators) + self._comprehensions.index( node )
 		assert isinstance(gen.target, Name)
 		writer.write('idx%s = 0'%id)
 
@@ -719,7 +736,9 @@ def _gen_comp(self, generators, node):
 		if generators:
 			self._gen_comp( generators, node )
 		else:
-			cname = node._comp_name #self._comprehensions[-1]
+			#cname = node._comp_name #self._comprehensions[-1]
+			cname = '__comp__%s' % self._comp_id
+
 			if len(gen.ifs):
 				test = []
 				for compare in gen.ifs:
@@ -1089,10 +1108,12 @@ def _visit_js_classdef(self, node):
 			if hasattr(init, '_code'):  ## cached ##
 				code = init._code
 			elif args:
-				code = '%s.__init__(this, %s); %s'%(name, ','.join(args), tail)
+				#code = '%s.__init__(this, %s); %s'%(name, ','.join(args), tail)
+				code = 'this.__init__(%s); %s'%(', '.join(args), tail)
 				init._code = code
 			else:
-				code = '%s.__init__(this);     %s'%(name, tail)
+				#code = '%s.__init__(this);     %s'%(name, tail)
+				code = 'this.__init__();     %s' % tail
 				init._code = code
 
 			writer.write(code)
@@ -1757,10 +1778,7 @@ def visit_Attribute(self, node):
 			#else:
 			return '%s.%s' %(node_value, node.attr)
 		elif self._with_dart or self._with_ll or self._with_go:
-			if self._with_gojs:
-				return '%s.Get("%s")' %(node_value, node.attr)
-			else:
-				return '%s.%s' %(node_value, node.attr)
+			return '%s.%s' %(node_value, node.attr)
 
 		elif self._with_js:
 			if self._in_catch_exception == 'AttributeError':
@@ -2106,10 +2124,8 @@ def _visit_assign_helper(self, node, target):
 			#####################################
 
 			if self._with_js or self._with_dart or self._with_go:
-				if self._with_gojs:
-					writer.write( '%s.Set("%s", %s)' %(target_value, target.attr, self.visit(node.value)) )
-				else:
-					writer.write( '%s.%s=%s' %(target_value, target.attr, self.visit(node.value)) )
+				writer.write( '%s.%s=%s' %(target_value, target.attr, self.visit(node.value)) )
+
 			elif typedef and target.attr in typedef.properties and 'set' in typedef.properties[ target.attr ]:
 				setter = typedef.properties[ target.attr ]['set']
 				writer.write( '%s( [%s, %s], JSObject() )' %(setter, target_value, self.visit(node.value)) )
@@ -2524,10 +2540,7 @@ def visit_Call(self, node):
 			if isinstance(node.func, Name) and node.func.id in self._js_classes:
 				return '__new__%s(%s)' %( self.visit(node.func), ','.join(args) )
 			else:
-				if self._with_gojs:
-					return '.Call(%s,%s)' %( self.visit(node.func), ','.join(args) )
-				else:
-					return '%s(%s)' %( self.visit(node.func), ','.join(args) )
+				return '%s(%s)' %( self.visit(node.func), ','.join(args) )
 
 		elif self._with_js or self._with_dart:
 			args = list( map(self.visit, node.args) )
@@ -4064,6 +4077,9 @@ def visit_With(self, node):
 			writer.pull()
 
 		elif isinstance( node.context_expr, ast.Name ) and node.context_expr.id == 'gojs':
+			raise SyntaxError('deprecated')
+			transform_gopherjs( node )
+
 			self._with_gojs = True
 			for b in node.body:
 				a = self.visit(b)
@@ -4073,7 +4089,8 @@ def visit_With(self, node):
 		else:
 			raise SyntaxError('invalid use of "with" statement')
 
-EXTRA_WITH_TYPES = ('__switch__', '__default__', '__case__', '__select__')
+EXTRA_WITH_TYPES = ('__switch__', '__default__', '__case__', '__select__', 'gojs')
+
 
 
 class GeneratorFunctionTransformer( PythonToPythonJS ):
diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index de75cdd..a90cfb0 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -8,11 +8,47 @@
 
 go_types = 'bool string int float64'.split()
 
+def transform_gopherjs( node ):
+	gt = GopherjsTransformer()
+	gt.visit( node )
+	return node
+
+class GopherjsTransformer( ast.NodeVisitor ):
+	#def visit_Assign(self, node):
+	#	writer.write( '%s.Set("%s", %s)' %(target_value, target.attr, self.visit(node.value)) )
+
+
+	def visit_Attribute(self, node):
+		#return '%s.Get("%s")' %(self.visit(node.value), node.attr)
+		args = [ ast.Str(node.attr) ]
+		f = ast.Call( ast.Name('Get', None), args, [], None, None )
+		node.__dict__ = f.__dict__
+
+	def visit_Call(self, node):
+		#if isinstance(self._stack[-2], ast.Expr):
+		#	pass
+		#else:
+		#	raise SyntaxError( self._stack )
+		if isinstance(node.func, ast.Attribute):
+			args = [ ast.Str(node.func.attr) ]
+			args.extend( node.args )
+			#f = ast.Call( ast.Name('Call', None), args, node.keywords, node.starargs, node.kwargs )
+			#raise SyntaxError(node)
+
+			f = ast.Call( ast.Name('__js_global_get_'+node.func.value.id, None), args, node.keywords, node.starargs, node.kwargs )
+
+			#x = ast.Attribute( ast.Name('js',None), 'Global', None )
+			#a = ast.Call( ast.Name('__js_global_get_',None), [ast.Str(node.func.value.id)], [], None, None )
+
+			node.__dict__ = f.__dict__
+
+
 class GoGenerator( pythonjs.JSGenerator ):
 
 	def __init__(self, requirejs=False, insert_runtime=False):
 		pythonjs.JSGenerator.__init__(self, requirejs=False, insert_runtime=False)
 
+		self._with_gojs = False
 		self._class_stack = list()
 		self._classes = dict()		## name : node
 		self._class_props = dict()
@@ -29,6 +65,33 @@ def visit_Is(self, node):
 	def visit_IsNot(self, node):
 		return '!='
 
+	def visit_If(self, node):
+		out = []
+		test = self.visit(node.test)
+		if test.startswith('(') and test.endswith(')'):
+			out.append( 'if %s {' %test )
+		else:
+			out.append( 'if (%s) {' %test )
+
+		self.push()
+
+		for line in list(map(self.visit, node.body)):
+			if line is None: continue
+			out.append( self.indent() + line )
+
+		orelse = []
+		for line in list(map(self.visit, node.orelse)):
+			orelse.append( self.indent() + line )
+
+		self.pull()
+
+		if orelse:
+			out.append( self.indent() + '} else {')
+			out.extend( orelse )
+
+		out.append( self.indent() + '}' )
+
+		return '\n'.join( out )
 
 	def visit_Name(self, node):
 		if node.id == 'None':
@@ -339,6 +402,9 @@ def _visit_call_helper(self, node, force_name=None):
 			fname += str(len(node.args))
 		elif fname == 'len':
 			return 'len(*%s)' %self.visit(node.args[0])
+		#elif fname.startswith('__js_global_get_'):
+		#	gname = fname.split('_')[-1]
+		#	fname = 'js.Global.Get("%s").Call' %gname
 
 
 		if node.args:
@@ -365,6 +431,15 @@ def _visit_call_helper(self, node, force_name=None):
 			self._ids += 1
 			return '__%s := append(*%s,%s); *%s = __%s;' % (id, arr, args, arr, id)
 
+		elif self._with_gojs:
+			if isinstance(node.func, ast.Attribute):
+				fname = node.func.attr
+				obname = self.visit(node.func.value)
+				return 'Get("%s").Call("%s",%s)' % (obname, fname, args)
+
+			else:
+				return 'Call("%s",%s)' % (fname, args)
+
 		else:
 			return '%s(%s)' % (fname, args)
 
@@ -395,6 +470,8 @@ def _visit_call_helper_go(self, node):
 					return '[]%s{}' %a
 				else:
 					return '[]*%s{}' %a
+		elif name == '__go__addr__':
+			return '&%s' %self.visit(node.args[0])
 		else:
 			raise SyntaxError(name)
 
@@ -622,7 +699,16 @@ def _visit_call_helper_var(self, node):
 	def visit_With(self, node):
 		r = []
 		is_switch = False
-		if isinstance( node.context_expr, ast.Name ) and node.context_expr.id == '__default__':
+		if isinstance( node.context_expr, ast.Name ) and node.context_expr.id == 'gojs':
+			#transform_gopherjs( node )
+			self._with_gojs = True
+			for b in node.body:
+				a = self.visit(b)
+				if a: r.append(a)
+			self._with_gojs = False
+			return '\n'.join(r)
+
+		elif isinstance( node.context_expr, ast.Name ) and node.context_expr.id == '__default__':
 			r.append('default:')
 		elif isinstance( node.context_expr, ast.Name ) and node.context_expr.id == '__select__':
 			r.append('select {')
@@ -649,6 +735,8 @@ def visit_With(self, node):
 				is_switch = True
 			else:
 				raise SyntaxError( 'invalid use of with')
+		else:
+			raise SyntaxError( 'invalid use of with')
 
 
 		for b in node.body:
@@ -661,34 +749,29 @@ def visit_With(self, node):
 		return '\n'.join(r)
 
 	def visit_Assign(self, node):
-		target = node.targets[0]
-		if isinstance(target, ast.Tuple):
+		if isinstance(node.targets[0], ast.Tuple):
 			raise NotImplementedError('TODO')
 
-		elif isinstance(node.value, ast.BinOp) and self.visit(node.value.op)=='<<' and isinstance(node.value.left, ast.Name) and node.value.left.id=='__go__send__':
-			target = self.visit(target)
+		target = self.visit( node.targets[0] )
+
+		if isinstance(node.value, ast.BinOp) and self.visit(node.value.op)=='<<' and isinstance(node.value.left, ast.Name) and node.value.left.id=='__go__send__':
 			value = self.visit(node.value.right)
 			return '%s <- %s;' % (target, value)
 
 		elif not self._function_stack:
-			target = self.visit(target)
 			value = self.visit(node.value)
 			return 'var %s = %s;' % (target, value)
 
-		elif isinstance(node.targets[0], ast.Name) and target.id in self._vars:
-			target = self.visit(target)
+		elif isinstance(node.targets[0], ast.Name) and node.targets[0].id in self._vars:
 			value = self.visit(node.value)
 			self._vars.remove( target )
 			self._known_vars.add( target )
 			return '%s := %s;' % (target, value)
 
 		else:
-			target = self.visit(target)
 			value = self.visit(node.value)
-
 			#if '<-' in value:
 			#	raise RuntimeError(target+value)
-
 			return '%s = %s;' % (target, value)
 
 	def visit_While(self, node):
@@ -725,7 +808,7 @@ def main(script, insert_runtime=True):
 		raise err
 
 	#raise RuntimeError(script)
-	#return GoGenerator().visit(tree)
+	return GoGenerator().visit(tree)
 	try:
 		return GoGenerator().visit(tree)
 	except SyntaxError as err:
diff --git a/pythonjs/typedpython.py b/pythonjs/typedpython.py
index 2a92033..c7fcc00 100644
--- a/pythonjs/typedpython.py
+++ b/pythonjs/typedpython.py
@@ -50,6 +50,9 @@ def transform_source( source, strip=False ):
 	output_post = None
 
 	for line in source.splitlines():
+		if line.strip().startswith('#'):
+			continue
+
 		a = []
 		hit_go_typedef = False
 		gotype = None
@@ -89,7 +92,14 @@ def transform_source( source, strip=False ):
 					else:
 						a.append('__go__array__(')
 				elif gotype.isdigit():
-					a.append('__go__arrayfixed__(%s,' %gotype)
+					p = ''.join(a).split()[-1].strip()
+					if p.startswith('[') or p.startswith('='):
+						a.append('__go__arrayfixed__(%s,' %gotype)
+					else:
+						hit_go_typedef = False
+						restore.append(char)
+						a = restore
+
 				elif ''.join(a[-3:])=='map':
 					a.pop(); a.pop(); a.pop()
 					a.append('__go__map__(%s,' %gotype)
@@ -528,7 +538,7 @@ def listpass( a:[]int ):
 	pass
 
 def mappass( a:map[string]int ):
-	pass
+	return ConvertDataUnits[unit_type][unit][1][0]
 
 m = map[int]string{ a:'xxx' for a in range(10)}
 

From 9f9cbae40e6efe2818aef2b6cc284bd2f2d31b27 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Sun, 28 Sep 2014 05:36:16 -0700
Subject: [PATCH 23/58] fixed array comprehensions, tests array of class
 instances.

---
 pythonjs/python_to_pythonjs.py      | 39 +++++++++++++++--------------
 regtests/go/list_comprehension.py   | 19 ++++++++++++--
 regtests/lang/list_passed_as_arg.py |  6 ++++-
 3 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
index f409678..f79a593 100755
--- a/pythonjs/python_to_pythonjs.py
+++ b/pythonjs/python_to_pythonjs.py
@@ -626,9 +626,9 @@ def visit_DictComp(self, node):
 			comps = collect_dict_comprehensions( node )
 			for i,cnode in enumerate(comps):
 				cname = '__comp__%s' % self._comp_id
-				self._comp_id += 1
 				cnode._comp_name = cname
 				self._comprehensions.append( cnode )
+				self._comp_id += 1
 
 
 		cname = node._comp_name
@@ -660,21 +660,20 @@ def visit_DictComp(self, node):
 	def visit_ListComp(self, node):
 		node.returns_type = 'list'
 
-		if len(self._comprehensions) == 0 and False:
+		if len(self._comprehensions) == 0 or True:
 			comps = collect_comprehensions( node )
 			assert comps
 			for i,cnode in enumerate(comps):
 				cname = '__comp__%s' % self._comp_id
-				self._comp_id += 1
 				cnode._comp_name = cname
 				self._comprehensions.append( cnode )
+				self._comp_id += 1
 
-		#cname = node._comp_name
-		#writer.write('var(%s)'%cname)
-
-		writer.write('var(__comp__%s)'%self._comp_id)
+		cname = node._comp_name
+		writer.write('var(%s)'%cname)
+		#writer.write('var(__comp__%s)'%self._comp_id)
 
-		length = len( node.generators )
+		length = len( node.generators ) + (len(self._comprehensions)-1)
 		a = ['idx%s'%i for i in range(length)]
 		writer.write('var( %s )' %','.join(a) )
 		a = ['iter%s'%i for i in range(length)]
@@ -684,7 +683,8 @@ def visit_ListComp(self, node):
 
 		if self._with_go:
 			assert node.go_listcomp_type
-			writer.write('__comp__%s = __go__array__(%s)' %(self._comp_id, node.go_listcomp_type))
+			#writer.write('__comp__%s = __go__array__(%s)' %(self._comp_id, node.go_listcomp_type))
+			writer.write('%s = __go__array__(%s)' %(cname, node.go_listcomp_type))
 		else:
 			writer.write('%s = JSArray()'%cname)
 
@@ -692,22 +692,23 @@ def visit_ListComp(self, node):
 		generators.reverse()
 		self._gen_comp( generators, node )
 
-		if node in self._comprehensions:
-			self._comprehensions.remove( node )
-		#return '__get__(list, "__call__")([], {pointer:%s})' %cname
+		#if node in self._comprehensions:
+		#	self._comprehensions.remove( node )
 
 		if self._with_go:
-			return '__go__addr__(__comp__%s)' %self._comp_id
+			#return '__go__addr__(__comp__%s)' %self._comp_id
+			return '__go__addr__(%s)' %cname
 		else:
-			return '__comp__%s' %self._comp_id
+			#return '__comp__%s' %self._comp_id
+			cname
 
 
 	def _gen_comp(self, generators, node):
-		self._comp_id += 1
-		id = self._comp_id
+		#self._comp_id += 1
+		#id = self._comp_id
 
 		gen = generators.pop()
-		#id = len(generators) + self._comprehensions.index( node )
+		id = len(generators) + self._comprehensions.index( node )
 		assert isinstance(gen.target, Name)
 		writer.write('idx%s = 0'%id)
 
@@ -736,8 +737,8 @@ def _gen_comp(self, generators, node):
 		if generators:
 			self._gen_comp( generators, node )
 		else:
-			#cname = node._comp_name #self._comprehensions[-1]
-			cname = '__comp__%s' % self._comp_id
+			cname = node._comp_name #self._comprehensions[-1]
+			#cname = '__comp__%s' % self._comp_id
 
 			if len(gen.ifs):
 				test = []
diff --git a/regtests/go/list_comprehension.py b/regtests/go/list_comprehension.py
index 75c7f7a..44b6318 100644
--- a/regtests/go/list_comprehension.py
+++ b/regtests/go/list_comprehension.py
@@ -2,10 +2,25 @@
 go list comprehensions
 '''
 
+class A:
+	def __init__(self, x:int,y:[]int):
+		int self.x = x
+		[]int self.arr = y
+	def get(self) ->int:
+		return self.arr[3] + self.x
+
+
+def F( arr:[]int ):
+	arr.append( 3 )
+
 def main():
 	a = []int(x for x in range(3))
-
-	TestError( len(a)==3 )
+	F( a )
+	TestError( len(a)==4 )
 	TestError( a[0]==0 )
 	TestError( a[1]==1 )
 	TestError( a[2]==2 )
+	TestError( a[3]==3 )
+
+	b = []A( A(i,a) for i in range(2) )
+	TestError( b[1].get()==4 )
\ No newline at end of file
diff --git a/regtests/lang/list_passed_as_arg.py b/regtests/lang/list_passed_as_arg.py
index 4f59e57..15a1927 100644
--- a/regtests/lang/list_passed_as_arg.py
+++ b/regtests/lang/list_passed_as_arg.py
@@ -9,4 +9,8 @@ def main():
 	a = []int(1,2,3)
 	TestError( a[0]==1 )
 	f( a )
-	TestError( len(a)==4 )
\ No newline at end of file
+	TestError( len(a)==4 )
+
+	b = []int( x for x in range(9) )
+	f( b )
+	TestError( len(b)==10 )

From 4331da48305e17280ff2956fcf7693f3c886ca6b Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Sun, 28 Sep 2014 09:49:42 -0700
Subject: [PATCH 24/58] support Go map of functions
 `map[string]func(int)(int){}`

---
 pythonjs/typedpython.py | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pythonjs/typedpython.py b/pythonjs/typedpython.py
index c7fcc00..ccc2056 100644
--- a/pythonjs/typedpython.py
+++ b/pythonjs/typedpython.py
@@ -55,6 +55,7 @@ def transform_source( source, strip=False ):
 
 		a = []
 		hit_go_typedef = False
+		hit_go_funcdef = False
 		gotype = None
 		isindef = False
 
@@ -100,7 +101,7 @@ def transform_source( source, strip=False ):
 						restore.append(char)
 						a = restore
 
-				elif ''.join(a[-3:])=='map':
+				elif ''.join(a[-3:])=='map' and gotype != 'func':
 					a.pop(); a.pop(); a.pop()
 					a.append('__go__map__(%s,' %gotype)
 				else:
@@ -108,8 +109,16 @@ def transform_source( source, strip=False ):
 					restore.append(char)
 					a = restore
 
+			elif hit_go_funcdef and char==')' and ')' in ''.join(a).split('func(')[-1]:
+				hit_go_funcdef = False
+				a.append('))<<')
+
 			elif hit_go_typedef and char=='(':
-				a.append(')<<(')
+				if ''.join(a).endswith('func'):
+					hit_go_funcdef = True
+					a.append( '(' )
+				else:
+					a.append(')<<(')
 				hit_go_typedef = False
 			elif hit_go_typedef and char=='{':
 				a.append(')<<{')
@@ -546,6 +555,9 @@ def mappass( a:map[string]int ):
 a = xxx⎨Z⎬
 a = xxx ⎨Z⎬⎨zzzz⎬
 
+functions = map[string]func(int)(int){}
+
+
 '''
 
 if __name__ == '__main__':

From 6d22df9ef5b1dd953ec8b33993bc153476c0e52e Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Sun, 28 Sep 2014 23:36:07 -0700
Subject: [PATCH 25/58] nested functions.

---
 pythonjs/python_to_pythonjs.py | 11 ++++++++++-
 pythonjs/pythonjs_to_go.py     | 16 +++++++++++++---
 pythonjs/typedpython.py        |  2 +-
 regtests/go/nested_func.py     | 10 ++++++++++
 4 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 regtests/go/nested_func.py

diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
index f79a593..708217d 100755
--- a/pythonjs/python_to_pythonjs.py
+++ b/pythonjs/python_to_pythonjs.py
@@ -1503,7 +1503,10 @@ def visit_BinOp(self, node):
 						node.right.go_listcomp_type = node.left.args[0].id
 					elif node.left.func.id=='__go__map__':
 						is_go_listcomp = True
-						node.right.go_dictcomp_type =  ( node.left.args[0].id, node.left.args[1].id )
+						if isinstance(node.left.args[1], ast.Call):
+							node.right.go_dictcomp_type =  ( node.left.args[0].id, self.visit(node.left.args[1]) )
+						else:
+							node.right.go_dictcomp_type =  ( node.left.args[0].id, node.left.args[1].id )
 
 
 		right = self.visit(node.right)
@@ -1987,6 +1990,12 @@ def visit_Assign(self, node):
 					writer.write(
 						'inline("var %s *%s;")' %(self.visit(node.value), self.visit(target.slice))
 					)
+
+			elif target.value.id == '__go__array__':
+				if isinstance(node.value, ast.Call) and len(node.value.args) and isinstance(node.value.args[0], ast.GeneratorExp ):
+					node.value.args[0].go_listcomp_type = self.visit(target.slice)
+				else:
+					raise SyntaxError( 'only a variable created by a generator expressions needs an array typedef')
 			else:
 				raise SyntaxError(self.visit(target))
 
diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index a90cfb0..d1b46b0 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -525,9 +525,13 @@ def visit_Return(self, node):
 		return 'return'
 
 	def _visit_function(self, node):
+		is_closure = False
 		if self._function_stack[0] is node:
 			self._vars = set()
 			self._known_vars = set()
+		elif len(self._function_stack) > 1:
+			## do not clear self._vars and _known_vars inside of closure
+			is_closure = True
 
 		args_typedefs = {}
 		chan_args_typedefs = {}
@@ -630,10 +634,16 @@ def _visit_function(self, node):
 		else:
 			method = ''
 		out = []
-		if return_type:
-			out.append( self.indent() + 'func %s%s(%s) %s {\n' % (method, node.name, ', '.join(args), return_type) )
+		if is_closure:
+			if return_type:
+				out.append( self.indent() + '%s := func (%s) %s {\n' % (node.name, ', '.join(args), return_type) )
+			else:
+				out.append( self.indent() + '%s := func (%s) {\n' % (node.name, ', '.join(args)) )
 		else:
-			out.append( self.indent() + 'func %s%s(%s) {\n' % (method, node.name, ', '.join(args)) )
+			if return_type:
+				out.append( self.indent() + 'func %s%s(%s) %s {\n' % (method, node.name, ', '.join(args), return_type) )
+			else:
+				out.append( self.indent() + 'func %s%s(%s) {\n' % (method, node.name, ', '.join(args)) )
 		self.push()
 
 		if oargs:
diff --git a/pythonjs/typedpython.py b/pythonjs/typedpython.py
index ccc2056..83d2fed 100644
--- a/pythonjs/typedpython.py
+++ b/pythonjs/typedpython.py
@@ -556,7 +556,7 @@ def mappass( a:map[string]int ):
 a = xxx ⎨Z⎬⎨zzzz⎬
 
 functions = map[string]func(int)(int){}
-
+[]int a = go( f() for f in funtions )
 
 '''
 
diff --git a/regtests/go/nested_func.py b/regtests/go/nested_func.py
new file mode 100644
index 0000000..afdded2
--- /dev/null
+++ b/regtests/go/nested_func.py
@@ -0,0 +1,10 @@
+'''
+lambda func
+'''
+
+def main():
+	def F(x:int) ->int:
+		return x*2
+
+	a = F(10)
+	TestError(a==20)

From a9fcae120f863388114a33d1aea9ca84f8c998a5 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Mon, 29 Sep 2014 04:56:53 -0700
Subject: [PATCH 26/58] fixed list comprehension in javascript mode.

---
 pythonjs/python_to_pythonjs.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
index 708217d..f7f0e1f 100755
--- a/pythonjs/python_to_pythonjs.py
+++ b/pythonjs/python_to_pythonjs.py
@@ -700,7 +700,7 @@ def visit_ListComp(self, node):
 			return '__go__addr__(%s)' %cname
 		else:
 			#return '__comp__%s' %self._comp_id
-			cname
+			return cname
 
 
 	def _gen_comp(self, generators, node):
@@ -723,6 +723,13 @@ def _gen_comp(self, generators, node):
 			writer.write('var(%s)'%gen.target.id)
 			writer.write('%s=idx%s' %(gen.target.id, id) )
 
+		elif self._with_js:  ## only works with arrays in javascript mode
+			writer.write('iter%s = %s' %(id, self.visit(gen.iter)) )
+			writer.write('while idx%s < iter%s.length:' %(id,id) )
+			writer.push()
+			writer.write('var(%s)'%gen.target.id)
+			writer.write('%s=iter%s[idx%s]' %(gen.target.id, id,id) )
+
 		else:
 			writer.write('iter%s = %s' %(id, self.visit(gen.iter)) )
 			writer.write('get%s = __get__(iter%s, "__getitem__")'%(id,id) )

From d949a30b623b22df4c23dea8ed8d437d1ad14752 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Wed, 1 Oct 2014 08:34:02 -0700
Subject: [PATCH 27/58] fixed `new new` bug caused when calling `new MyClass`
 where MyClass is known to the translator.

---
 pythonjs/pythonjs.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pythonjs/pythonjs.py b/pythonjs/pythonjs.py
index bdac3c9..027388a 100755
--- a/pythonjs/pythonjs.py
+++ b/pythonjs/pythonjs.py
@@ -1002,6 +1002,15 @@ def visit_BinOp(self, node):
 		right = self.visit(node.right)
 
 		if op == '>>' and left == '__new__':
+
+			## this can happen because python_to_pythonjs.py will catch when a new class instance is created
+			## (when it knows that class name) and replace it with `new(MyClass())`; but this can cause a problem
+			## if later the user changes that part of their code into a module, and loads it as a javascript module,
+			## they may update their code to call `new MyClass`, and then later go back to the python library.
+			## the following hack prevents `new new`
+			if isinstance(node.right, ast.Call) and isinstance(node.right.func, ast.Name) and node.right.func.id=='new':
+				right = self.visit(node.right.args[0])
+
 			return ' new %s' %right
 
 		if left in self._typed_vars and self._typed_vars[left] == 'numpy.float32':

From 932aa1895c651ed6d27e5bb095ce34bb35d3265d Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Thu, 2 Oct 2014 05:39:21 -0700
Subject: [PATCH 28/58] callback as attribute in class.

---
 pythonjs/python_to_pythonjs.py   |  5 ++++-
 pythonjs/pythonjs_to_go.py       |  6 ++++--
 pythonjs/typedpython.py          | 15 ++++++++++++---
 regtests/go/callback_in_class.py | 29 +++++++++++++++++++++++++++++
 4 files changed, 49 insertions(+), 6 deletions(-)
 create mode 100644 regtests/go/callback_in_class.py

diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
index f7f0e1f..4cdbb71 100755
--- a/pythonjs/python_to_pythonjs.py
+++ b/pythonjs/python_to_pythonjs.py
@@ -1976,7 +1976,7 @@ def visit_Assign(self, node):
 				raise SyntaxError( self.format_error(targets) )
 				raise SyntaxError( self.format_error(xxx) )
 
-		elif self._with_go and isinstance(target, ast.Subscript) and isinstance(target.value, ast.Name) and target.value.id in ('__go__array__', '__go__class__', '__go__pointer__'):
+		elif self._with_go and isinstance(target, ast.Subscript) and isinstance(target.value, ast.Name) and target.value.id in ('__go__array__', '__go__class__', '__go__pointer__', '__go__func__'):
 			if len(targets)==2 and isinstance(targets[1], ast.Attribute) and isinstance(targets[1].value, ast.Name) and targets[1].value.id == 'self' and len(self._class_stack):
 				if target.value.id == '__go__array__':
 					self._class_stack[-1]._struct_vars[ targets[1].attr ] = '__go__array__(%s<<typedef)' %self.visit(target.slice)
@@ -1984,6 +1984,9 @@ def visit_Assign(self, node):
 					self._class_stack[-1]._struct_vars[ targets[1].attr ] = self.visit(target.slice)
 				elif target.value.id == '__go__pointer__':
 					self._class_stack[-1]._struct_vars[ targets[1].attr ] = '"*%s"' %self.visit(target.slice)
+				elif target.value.id == '__go__func__':
+					self._class_stack[-1]._struct_vars[ targets[1].attr ] = self.visit(target.slice)
+
 
 			elif target.value.id == '__go__class__':
 				#self._class_stack[-1]._struct_vars[ targets[1].attr ] = self.visit(target.slice)
diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index d1b46b0..c26bb01 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -487,8 +487,10 @@ def visit_BinOp(self, node):
 		elif op == '<<':
 			if left in ('__go__receive__', '__go__send__'):
 				return '<- %s' %right
-			elif isinstance(node.left, ast.Call) and isinstance(node.left.func, ast.Name) and node.left.func.id in ('__go__array__', '__go__arrayfixed__', '__go__map__'):
-				if node.left.func.id == '__go__map__':
+			elif isinstance(node.left, ast.Call) and isinstance(node.left.func, ast.Name) and node.left.func.id in ('__go__array__', '__go__arrayfixed__', '__go__map__', '__go__func__'):
+				if node.left.func.id == '__go__func__':
+					raise SyntaxError('TODO - go.func')
+				elif node.left.func.id == '__go__map__':
 					key_type = self.visit(node.left.args[0])
 					value_type = self.visit(node.left.args[1])
 					if value_type == 'interface': value_type = 'interface{}'
diff --git a/pythonjs/typedpython.py b/pythonjs/typedpython.py
index 83d2fed..36c1127 100644
--- a/pythonjs/typedpython.py
+++ b/pythonjs/typedpython.py
@@ -29,7 +29,8 @@
 	'go.channel' : '__go_make_chan__',
 	'go.array'   : '__go__array__',
 	'go.make'    : '__go_make__',
-	'go.addr'    : '__go__addr__'
+	'go.addr'    : '__go__addr__',
+	'go.func'    : '__go__func__',
 }
 
 OPERATORS = {
@@ -144,7 +145,8 @@ def transform_source( source, strip=False ):
 				b = b.strip()
 				is_class_type = b.startswith('class:') and len(b.split(':'))==2
 				is_pointer = b.startswith('*')
-				if (b in types or is_class_type or is_pointer) and nextchar != '=':
+				is_func = b.startswith('func(')
+				if (b in types or is_class_type or is_pointer or is_func) and nextchar != '=':
 					if strip:
 						a = a[ : -len(b) ]
 					elif is_class_type:
@@ -156,13 +158,18 @@ def transform_source( source, strip=False ):
 						cls = b.split('*')[-1]
 						a = a[ : -len('*')-len(cls)]
 						a.append('__go__pointer__[%s]=\t\t\t\t' %cls)
-
+					elif is_func:
+						u = ''.join(a)
+						u = u.replace('func(', '__go__func__["func(')
+						u += '"]=\t\t\t\t'
+						a = [w for w in u]
 					else:
 						if a[-1]=='*':
 							a.pop()
 							a.append('POINTER')
 						a.append('=\t\t\t\t')
 						#a.append( char )
+
 				else:
 					a.append( char )
 			else:
@@ -370,6 +377,8 @@ def transform_source( source, strip=False ):
 						typedef = '"*%s"' %typedef.strip()
 					elif typedef.startswith('map['):
 						typedef = '"*%s"' %typedef.strip()
+					elif typedef.startswith('func('):
+						typedef = '"%s"' %typedef.strip()
 
 					if chan:
 						output.append('%s@typedef_chan(%s=%s)' %(indent, arg_name, typedef))
diff --git a/regtests/go/callback_in_class.py b/regtests/go/callback_in_class.py
new file mode 100644
index 0000000..54a0534
--- /dev/null
+++ b/regtests/go/callback_in_class.py
@@ -0,0 +1,29 @@
+'''
+callback in class
+'''
+class A:
+	def __init__(self, cb:func(int)(int), x:int, y:int, z:int=1):
+		int self.x = x
+		int self.y = y
+		int self.z = z
+		func(int)(int) self.callback = cb
+
+	def call(self, a:int ) -> int:
+		return self.callback( a + self.x + self.y + self.z )
+
+def mycb( x:int ) ->int:
+	return x + 1000
+
+def main():
+	a = A(
+		mycb, 
+		100, 
+		200, 
+		z=300
+	)
+	#print( a.x )
+	#print( a.y )
+	#print( a.z )
+
+	TestError( a.call(-600)==1000 )
+

From 73aeb1277e4b955f425ea9c2c269f1878d7396d0 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Fri, 3 Oct 2014 17:36:34 -0700
Subject: [PATCH 29/58] support make array of pointers to objects `a=[n]A`.
 using hack `_tmp := make([]A,n); TARGET=&_tmp` because go compiler complains
 about taking the address of make.

---
 pythonjs/pythonjs_to_go.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index c26bb01..3d4450b 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -508,7 +508,11 @@ def visit_BinOp(self, node):
 					elif node.left.func.id == '__go__arrayfixed__':
 						asize = self.visit(node.left.args[0])
 						atype = self.visit(node.left.args[1])
-						return '&[%s]%s%s' %(asize, atype, right)
+						if atype not in go_types:
+							if right != '{}': raise SyntaxError('todo init array of objects with args')
+							return '&make([]*%s, %s)' %(atype, asize)
+						else:
+							return '&[%s]%s%s' %(asize, atype, right)
 			elif isinstance(node.left, ast.Name) and node.left.id=='__go__array__' and op == '<<':
 				return '*[]%s' %self.visit(node.right)
 
@@ -678,7 +682,8 @@ def _visit_function(self, node):
 			elif return_type == 'bool':
 				out.append('return false')
 			elif return_type:
-				raise NotImplementedError('TODO other generator function return types')
+				#raise NotImplementedError('TODO other generic function return types', return_type)
+				out.append('return %s' %(return_type.replace('*','&')+'{}'))
 
 		else:
 			for b in node.body:
@@ -784,7 +789,12 @@ def visit_Assign(self, node):
 			value = self.visit(node.value)
 			#if '<-' in value:
 			#	raise RuntimeError(target+value)
-			return '%s = %s;' % (target, value)
+			if value.startswith('&make('):
+				#raise SyntaxError(value)
+				v = value[1:]
+				return '_tmp := %s; %s = &_tmp;' %(v, target)
+			else:
+				return '%s = %s;' % (target, value)
 
 	def visit_While(self, node):
 		cond = self.visit(node.test)

From 7d7b0e37d0070098645bf38b61adcb9477d6a2d4 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Sun, 5 Oct 2014 04:53:51 -0700
Subject: [PATCH 30/58] allow a Generic to be passed to the __init__ function
 of a class.  A Generic in __init__ will become `interface{}` which can then
 be used by methods that use the attribute as an argument and retype it as a
 Generic.

---
 pythonjs/python_to_pythonjs.py  |  6 +++++
 pythonjs/pythonjs_to_go.py      | 45 ++++++++++++++++++++-------------
 regtests/go/generics_methods.py | 33 ++++++++++++++++++++++++
 3 files changed, 67 insertions(+), 17 deletions(-)
 create mode 100644 regtests/go/generics_methods.py

diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
index 4cdbb71..8968a84 100755
--- a/pythonjs/python_to_pythonjs.py
+++ b/pythonjs/python_to_pythonjs.py
@@ -1016,6 +1016,12 @@ def _visit_dart_classdef(self, node):
 			if not self._with_go:
 				init.name = node.name
 			self.visit(init)
+			for item in init.body:
+				if isinstance(item, ast.Assign) and isinstance(item.targets[0], ast.Attribute):
+					if isinstance(item.targets[0].value, ast.Name) and item.targets[0].value.id=='self':
+						attr = item.targets[0].attr
+						if attr not in node._struct_vars:
+							node._struct_vars[ attr ] = 'interface'
 
 		## methods
 		for method in method_list:
diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index 3d4450b..698dd50 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -146,7 +146,9 @@ def visit_ClassDef(self, node):
 				#props.update( [self.visit(a) for a in decor.args] )
 				for kw in decor.keywords:
 					props.add( kw.arg )
-					sdef[ kw.arg ] = kw.value.id
+					T = kw.value.id
+					if T == 'interface': T = 'interface{}'
+					sdef[ kw.arg ] = T
 
 
 		init = None
@@ -163,21 +165,11 @@ def visit_ClassDef(self, node):
 						v = b.value.values[i].s
 					else:
 						v = self.visit( b.value.values[i] )
+					if v == 'interface': v = 'interface{}'
 					sdef[k] = v
 
 		node._struct_def.update( sdef )
 
-		out.append( 'type %s struct {' %node.name)
-		if base_classes:
-			for bnode in base_classes:
-				## Go only needs the name of the parent struct and all its items are inserted automatically ##
-				out.append('%s' %bnode.name)
-
-		for name in sdef:
-			out.append('%s %s' %(name, sdef[name]))
-		out.append('}')
-
-
 		parent_init = None
 		if base_classes:
 			for bnode in base_classes:
@@ -196,6 +188,17 @@ def visit_ClassDef(self, node):
 						out.append( self.visit(b) )
 
 
+		out.append( 'type %s struct {' %node.name)
+		if base_classes:
+			for bnode in base_classes:
+				## Go only needs the name of the parent struct and all its items are inserted automatically ##
+				out.append('%s' %bnode.name)
+
+		for name in sdef:
+			out.append('%s %s' %(name, sdef[name]))
+		out.append('}')
+
+
 		for b in node.body:
 			if isinstance(b, ast.FunctionDef):
 				out.append( self.visit(b) )
@@ -216,6 +219,9 @@ def visit_ClassDef(self, node):
 		else:
 			out.append( 'func __new__%s() *%s { return &%s{} }' %(node.name, node.name, node.name))
 
+
+
+
 		self.catch_call = set()
 		self._class_stack.pop()
 		return '\n'.join(out)
@@ -553,10 +559,15 @@ def _visit_function(self, node):
 
 					## check for super classes - generics ##
 					if args_typedefs[ key.arg ] in self._classes:
-						classname = args_typedefs[ key.arg ]
-						generics.add( classname ) # switch v.(type) for each
-						generics = generics.union( self._classes[classname]._subclasses )
-						args_typedefs[ key.arg ] = 'interface{}'
+						if node.name=='__init__':
+							#raise SyntaxError('generic in init')
+							args_typedefs[ key.arg ] = 'interface{}'
+							#self._class_stack[-1]._struct_def[ key.arg ] = 'interface{}'
+						else:
+							classname = args_typedefs[ key.arg ]
+							generics.add( classname ) # switch v.(type) for each
+							generics = generics.union( self._classes[classname]._subclasses )
+							args_typedefs[ key.arg ] = 'interface{}'
 
 			elif isinstance(decor, ast.Call) and isinstance(decor.func, ast.Name) and decor.func.id == '__typedef_chan__':
 				for key in decor.keywords:
@@ -595,7 +606,7 @@ def _visit_function(self, node):
 
 			if arg_name in args_typedefs:
 				arg_type = args_typedefs[arg_name]
-				if i==0 and generics:
+				if generics and (i==0 or (is_method and i==1)):
 					a = '__gen__ %s' %arg_type
 				else:
 					a = '%s %s' %(arg_name, arg_type)
diff --git a/regtests/go/generics_methods.py b/regtests/go/generics_methods.py
new file mode 100644
index 0000000..62d8a95
--- /dev/null
+++ b/regtests/go/generics_methods.py
@@ -0,0 +1,33 @@
+class G:
+	def method(self):
+		print 'hi'
+
+class H( G ):
+	def method(self):
+		print 'world'
+
+class A:
+	def __init__(self, a:G):
+		self.x = a
+
+	def call(self):
+		self.f( self.x )
+
+	def f(self, a:G):
+		print(a)
+
+
+class B( A ):
+	def f(self, g:G):
+		g.method()
+
+
+
+def main():
+	g = G()
+	h = H()
+	b1 = B( g )
+	b2 = B( h )
+
+	b1.call()
+	b2.call()
\ No newline at end of file

From 6090d324b7612d464f81842bc7ac8604703ac6ec Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Sun, 5 Oct 2014 05:34:30 -0700
Subject: [PATCH 31/58] improved generics.

---
 pythonjs/pythonjs_to_go.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index 698dd50..82c2edc 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -560,7 +560,9 @@ def _visit_function(self, node):
 					## check for super classes - generics ##
 					if args_typedefs[ key.arg ] in self._classes:
 						if node.name=='__init__':
-							#raise SyntaxError('generic in init')
+							## generics type switch is not possible in __init__ because
+							## it is used to generate the type struct, where types are static.
+							## as a workaround generics passed to init always become `interface{}`
 							args_typedefs[ key.arg ] = 'interface{}'
 							#self._class_stack[-1]._struct_def[ key.arg ] = 'interface{}'
 						else:

From ee918689cc7dcdba795cc31e1f3e602dac003721 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Sun, 5 Oct 2014 08:39:09 -0700
Subject: [PATCH 32/58] Generics: support returning different subclass types.

---
 pythonjs/pythonjs_to_go.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index 82c2edc..614aabf 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -549,6 +549,8 @@ def _visit_function(self, node):
 		chan_args_typedefs = {}
 		return_type = None
 		generics = set()
+		args_generics = dict()
+
 		for decor in node.decorator_list:
 			if isinstance(decor, ast.Call) and isinstance(decor.func, ast.Name) and decor.func.id == '__typedef__':
 				for key in decor.keywords:
@@ -570,6 +572,7 @@ def _visit_function(self, node):
 							generics.add( classname ) # switch v.(type) for each
 							generics = generics.union( self._classes[classname]._subclasses )
 							args_typedefs[ key.arg ] = 'interface{}'
+							args_generics[ key.arg ] = classname
 
 			elif isinstance(decor, ast.Call) and isinstance(decor.func, ast.Name) and decor.func.id == '__typedef_chan__':
 				for key in decor.keywords:
@@ -608,7 +611,8 @@ def _visit_function(self, node):
 
 			if arg_name in args_typedefs:
 				arg_type = args_typedefs[arg_name]
-				if generics and (i==0 or (is_method and i==1)):
+				#if generics and (i==0 or (is_method and i==1)):
+				if generics and arg_name in args_generics.keys():  ## TODO - multiple generics in args
 					a = '__gen__ %s' %arg_type
 				else:
 					a = '%s %s' %(arg_name, arg_type)
@@ -632,6 +636,7 @@ def _visit_function(self, node):
 				args.append( a )
 				node._arg_names.append( arg_name )
 
+		##############################################
 		if oargs:
 			#args.append( '[%s]' % ','.join(oargs) )
 			#args.append( '{%s}' % ','.join(oargs) )
@@ -674,15 +679,20 @@ def _visit_function(self, node):
 				#out.append('} else { %s := %s }' %(n,v))
 
 		if generics:
+			gname = args_names[ args_names.index(args_generics.keys()[0]) ]
 			out.append(self.indent() + 'switch __gen__.(type) {')
 			self.push()
 			for gt in generics:
 				out.append(self.indent() + 'case *%s:' %gt)
 				self.push()
-				out.append(self.indent() + '%s,_ := __gen__.(*%s)' %(args_names[0],gt) )
+				out.append(self.indent() + '%s,_ := __gen__.(*%s)' %(gname,gt) )
 				for b in node.body:
 					v = self.visit(b)
-					if v: out.append( self.indent() + v )
+					if v:
+						if v.strip().startswith('return ') and '*'+gt != return_type:
+							v += '.(%s) // this works?' %return_type
+							v = v.replace(gname, '__gen__') ## TODO - fix - this breaks easily
+						out.append( self.indent() + v )
 				self.pull()
 			self.pull()
 			out.append('}')

From 9af21623f3243978d0a4b2e766ce773dba3ec12b Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Sun, 5 Oct 2014 21:10:44 -0700
Subject: [PATCH 33/58] improved Generics.

---
 pythonjs/pythonjs_to_go.py |  17 +++++-
 regtests/bench/richards.py | 107 +++++++++++++++++++++----------------
 2 files changed, 77 insertions(+), 47 deletions(-)

diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index 614aabf..ce75bf6 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -408,6 +408,13 @@ def _visit_call_helper(self, node, force_name=None):
 			fname += str(len(node.args))
 		elif fname == 'len':
 			return 'len(*%s)' %self.visit(node.args[0])
+		elif fname == 'go.type_assert':
+			type = self.visit(node.args[1])
+			if type == 'self':
+				type = '*' + self._class_stack[-1].name
+			else:
+				type = '*' + type
+			return 'interface{}(%s).(%s)' %(self.visit(node.args[0]), type)
 		#elif fname.startswith('__js_global_get_'):
 		#	gname = fname.split('_')[-1]
 		#	fname = 'js.Global.Get("%s").Call' %gname
@@ -689,10 +696,16 @@ def _visit_function(self, node):
 				for b in node.body:
 					v = self.visit(b)
 					if v:
+						## TODO - fix - this breaks easily
 						if v.strip().startswith('return ') and '*'+gt != return_type:
-							v += '.(%s) // this works?' %return_type
-							v = v.replace(gname, '__gen__') ## TODO - fix - this breaks easily
+							if gname in v and v.strip() != 'return self':
+								if '(' not in v:
+									v += '.(%s)' %return_type
+									#if v.split('return ')[-1].strip()==gname:
+									v = v.replace(gname, '__gen__')
+
 						out.append( self.indent() + v )
+
 				self.pull()
 			self.pull()
 			out.append('}')
diff --git a/regtests/bench/richards.py b/regtests/bench/richards.py
index 9394bca..d1d1f7e 100644
--- a/regtests/bench/richards.py
+++ b/regtests/bench/richards.py
@@ -151,45 +151,35 @@ def trace(a:string):
 	print(a)
 
 
-TASKTABSIZE = 10
 
-class TaskWorkArea(object):
-	def __init__(self):
-		#[]Task      self.taskTab = [None] * TASKTABSIZE
-		[]Task      self.taskTab  = []Task()
-		for i in range(TASKTABSIZE):
-			self.taskTab.append(None)
-		*Task  self.taskList = None
-
-		int self.holdCount = 0
-		int self.qpktCount = 0
-
-taskWorkArea = TaskWorkArea()
 
 class Task(TaskState):
 
 	# note: r:TaskRec is the super class, TODO cast to its subclass.
-	def __init__(self,i:int, p:int, w:*Packet, initialState:*TaskState,r:*TaskRec):
-		*Task    self.link = taskWorkArea.taskList
-		int           self.ident = i
-		int           self.priority = p
+	def __init__(self,i:int, p:int, w:*Packet, initialState:*TaskState,r:TaskRec):
+		*Task    self.link = taskWorkArea.task
+		int      self.ident = i
+		int      self.priority = p
 		*Packet  self.input = w
 
 		bool self.packet_pending = initialState.isPacketPending()
 		bool self.task_waiting = initialState.isTaskWaiting()
 		bool self.task_holding = initialState.isTaskHolding()
 
-		*TaskRec  self.handle = r
+		#*TaskRec  self.handle = r
+		self.handle = r  ## generic
 
-		taskWorkArea.taskList = self
-		taskWorkArea.taskTab[i] = self
+		#taskWorkArea.taskList = self
+		#taskWorkArea.taskTab[i] = self
+		taskWorkArea.set_task(self, i)
 
-	def fn(self, pkt:*Packet, r:*TaskRec) -> self:
+	def fn(self, pkt:*Packet, r:TaskRec) -> self:
 		#raise NotImplementedError
 		print('NotImplementedError')
+		print(r)
 		return self
 
-	def addPacket(self,p:*Packet, old:*Task) -> self:
+	def addPacket(self,p:*Packet, old:Task) -> self:
 		if self.input is None:
 			self.input = p
 			self.packet_pending = True
@@ -212,7 +202,12 @@ def runTask(self) -> self:
 		#else:
 		#	msg = None
 
-		return self.fn(msg,self.handle)
+		#return self.fn(msg,self.handle)  ## self.handle is generic (interface{})
+		#return self.run_fn( msg, self.handle )
+		return self.fn(msg, go.type_assert(self.handle, TaskRec))  ## self.handle is generic (interface{})
+
+	#def run_fn(self, msg:*Packet, handle:TaskRec) -> self:
+	#	return self.fn(msg, handle)
 
 
 	def waitTask(self) -> self:
@@ -230,7 +225,7 @@ def release(self,i:int) -> self:
 		t = self.findtcb(i)
 		t.task_holding = False
 		if t.priority > self.priority:
-			return t
+			return go.type_assert(t, self)
 		else:
 			return self
 
@@ -240,7 +235,9 @@ def qpkt(self, pkt:*Packet) -> self:
 		taskWorkArea.qpktCount += 1
 		pkt.link = None
 		pkt.ident = self.ident
-		return t.addPacket(pkt,self)
+		#return t.addPacket(pkt,self)
+		#return t.addPacket(pkt, go.type_assert(self, self))
+		return go.type_assert( t.addPacket(pkt,self), self )
 
 
 	def findtcb(self,id:int) -> *Task:
@@ -250,15 +247,18 @@ def findtcb(self,id:int) -> *Task:
 		return t
 			
 
+
 # DeviceTask
 
 
 class DeviceTask(Task):
-	def __init__(self,i:int, p:int, w:*Packet, s:*TaskState,r:*TaskRec):
+	def __init__(self,i:int, p:int, w:*Packet, s:*TaskState, r:TaskRec):
 		Task.__init__(self,i,p,w,s,r)
 
-	def fn(self,pkt:Packet, r:TaskRec) -> self:
-		d = r
+	#######def fn(self,pkt:*Packet, r:TaskRec) -> self:
+	#def fn(self,pkt:*Packet, r:*DeviceTaskRec) -> self:
+	def fn(self,pkt:*Packet, r:*TaskRec) -> self:
+		d = go.type_assert(r, DeviceTaskRec)
 		#assert isinstance(d, DeviceTaskRec)
 		#class:DeviceTaskRec  d = r
 
@@ -271,17 +271,17 @@ def fn(self,pkt:Packet, r:TaskRec) -> self:
 				return self.qpkt(pkt)
 		else:
 			d.pending = pkt
-			if tracing: trace(pkt.datum)
-			return self.hold()
+			##########if tracing: trace(pkt.datum)
+			return go.type_assert(self.hold(), self)
 
 
 
 class HandlerTask(Task):
-	def __init__(self,i:int, p:int, w:*Packet, s:*TaskState,r:*TaskRec):
+	def __init__(self,i:int, p:int, w:*Packet, s:*TaskState, r:TaskRec):
 		Task.__init__(self,i,p,w,s,r)
 
 	def fn(self, pkt:*Packet, r:*TaskRec) -> self:
-		h = r
+		h = go.type_assert(r, HandlerTaskRec)
 		#class:HandlerTaskRec h = r
 		#assert isinstance(h, HandlerTaskRec)  ## old style typedef
 
@@ -311,15 +311,16 @@ def fn(self, pkt:*Packet, r:*TaskRec) -> self:
 
 
 class IdleTask(Task):
-	def __init__(self,i:int, p:int, w:*Packet, s:*TaskState,r:*TaskRec):
+	def __init__(self,i:int, p:int, w:*Packet, s:*TaskState, r:TaskRec):
 		Task.__init__(self,i,0,None,s,r)
 
 	def fn(self,pkt:*Packet,r:*TaskRec) -> self:
-		i = r
+		i = go.type_assert(r, IdleTaskRec)
 		#assert isinstance(i, IdleTaskRec)
 		i.count -= 1
 		if i.count == 0:
-			return self.hold()
+			#return self.hold()
+			return go.type_assert(self.hold(), self)
 		elif i.control & 1 == 0:
 			i.control //= 2
 			return self.release(I_DEVA)
@@ -334,15 +335,17 @@ def fn(self,pkt:*Packet,r:*TaskRec) -> self:
 A = ord('A')
 
 class WorkTask(Task):
-	def __init__(self,i:int, p:int, w:*Packet, s:*TaskState, r:*TaskRec):
+	def __init__(self,i:int, p:int, w:*Packet, s:*TaskState, r:TaskRec):
 		Task.__init__(self,i,p,w,s,r)
 
 	def fn(self,pkt:*Packet, r:*TaskRec) -> self:
-		w = r
+		w = go.type_assert(r, WorkerTaskRec)
 		#assert isinstance(w, WorkerTaskRec)
 		if pkt is None:
 			return self.waitTask()
 
+		#int dest
+		dest = 0
 		if w.destination == I_HANDLERA:
 			dest = I_HANDLERB
 		else:
@@ -361,18 +364,31 @@ def fn(self,pkt:*Packet, r:*TaskRec) -> self:
 		return self.qpkt(pkt)
 
 
+class TaskWorkArea(object):
+	def __init__(self):
+		[]Task      self.taskTab  = [10]Task()
+		*Task       self.task     = None
+		int self.holdCount = 0
+		int self.qpktCount = 0
+
+	def set_task(self, t:Task, i:int):
+		c = go.type_assert(t, Task)
+		self.task = c
+		self.taskTab[i] = c
+
+taskWorkArea = TaskWorkArea()
+
 def schedule():
-	t = taskWorkArea.taskList
+	t = taskWorkArea.task
 	while t is not None:
-		pkt = None
-
-		if tracing:
-			print("tcb =",t.ident)
+		#pkt = None
+		#if tracing:
+		#	print("tcb =",t.ident)
 
 		if t.isTaskHoldingOrWaiting():
 			t = t.link
 		else:
-			if tracing: trace(chr(ord("0")+t.ident))
+			###########if tracing: trace(chr(ord("0")+t.ident))
 			t = t.runTask()
 
 class Richards(object):
@@ -382,7 +398,8 @@ def run(self, iterations:int) ->bool:
 			taskWorkArea.holdCount = 0
 			taskWorkArea.qpktCount = 0
 
-			IdleTask(I_IDLE, 1, 10000, TaskState().running(), IdleTaskRec())
+			#IdleTask(I_IDLE, 1, 10000, TaskState().running(), IdleTaskRec())
+			IdleTask(I_IDLE, 1, None, TaskState().running(), IdleTaskRec())
 
 			wkq = Packet(None, 0, K_WORK)
 			wkq = Packet(wkq , 0, K_WORK)
@@ -424,6 +441,6 @@ def main():
 	#print("#Richards benchmark (Python) starting. iterations="+str(iterations))
 	total_s = entry_point(iterations)
 	#print("#Total time for %s iterations: %s secs" %(iterations,total_s))
-	s = total_s / iterations
+	s = total_s / float64(iterations)
 	#print("#Average seconds per iteration:", s)
 	print(s)

From 650b6380aa67642ea6700bce360094ad7acc2c7e Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Sun, 5 Oct 2014 22:58:15 -0700
Subject: [PATCH 34/58] fixed duplicate field in sub-structs.

---
 pythonjs/pythonjs_to_go.py |  6 ++++++
 pythonjs/typedpython.py    |  2 +-
 regtests/go/subclass.py    | 20 ++++++++------------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index ce75bf6..9cdae27 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -193,6 +193,12 @@ def visit_ClassDef(self, node):
 			for bnode in base_classes:
 				## Go only needs the name of the parent struct and all its items are inserted automatically ##
 				out.append('%s' %bnode.name)
+				## Go allows multiple a variable to redefined by the sub-struct,
+				## but this can throw an error: `invalid operation: ambiguous selector`
+				## removing the duplicate name here fixes that error.
+				for key in bnode._struct_def.keys():
+					if key in sdef:
+						sdef.pop(key)
 
 		for name in sdef:
 			out.append('%s %s' %(name, sdef[name]))
diff --git a/pythonjs/typedpython.py b/pythonjs/typedpython.py
index 36c1127..055fe5f 100644
--- a/pythonjs/typedpython.py
+++ b/pythonjs/typedpython.py
@@ -1,7 +1,7 @@
 # _*_ coding: utf-8 _*_
 
 
-types = ['str', 'list', 'dict', 'bool']
+types = ['string', 'str', 'list', 'dict', 'bool']
 
 glsl_types = ['struct*', 'int*', 'float*', 'vec2', 'vec3', 'vec4', 'mat2', 'mat3', 'mat4']
 glsl_xtypes = ['mat2x2', 'mat3x3', 'mat4x4']  ## others not supported in WebGLSL
diff --git a/regtests/go/subclass.py b/regtests/go/subclass.py
index 69e87b9..e49a96e 100644
--- a/regtests/go/subclass.py
+++ b/regtests/go/subclass.py
@@ -2,25 +2,21 @@
 simple class
 '''
 class A:
-	{
-		x:int,
-		y:int,
-		z:int,
-	}
 	def __init__(self, x:int, y:int, z:int=1):
-		self.x = x
-		self.y = y
-		self.z = z
+		int self.x = x
+		int self.y = y
+		int self.z = z
 
 	def mymethod(self, m:int) -> int:
 		return self.x * m
 
 class B(A):
-	{
-		w:string
-	}
+	def __init__(self, s:string):
+		string self.w = s
+		int    self.x = 1
 
 	def method2(self, v:string) ->string:
+		print(self.x)
 		self.w = v
 		return self.w
 
@@ -39,5 +35,5 @@ def main():
 	c = call_method( a.mymethod, 4 )
 	print( c )
 
-	x = B(1,2,z=3)
+	x = B('testing...')
 	print( x.method2('hello world') )
\ No newline at end of file

From 6d9f84ccf62c2aee8a1f5c70b7edd06531a6a128 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Mon, 6 Oct 2014 17:20:22 -0700
Subject: [PATCH 35/58] Generics: return variable subclass using
 `go.type_assert(X, self)` to cast to subclass type. TODO: do not include
 super class in generic type switch, and gather all classes and subclasses
 before doing main translation (to generate the generic switch properly)

---
 pythonjs/pythonjs_to_go.py                    | 13 +++-
 .../go/generics_subcls_return_a_subcls.py     | 61 +++++++++++++++++++
 2 files changed, 71 insertions(+), 3 deletions(-)
 create mode 100644 regtests/go/generics_subcls_return_a_subcls.py

diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index 9cdae27..4dd1db4 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -417,10 +417,13 @@ def _visit_call_helper(self, node, force_name=None):
 		elif fname == 'go.type_assert':
 			type = self.visit(node.args[1])
 			if type == 'self':
-				type = '*' + self._class_stack[-1].name
+				type = '&' + self._class_stack[-1].name
 			else:
 				type = '*' + type
-			return 'interface{}(%s).(%s)' %(self.visit(node.args[0]), type)
+			#return 'interface{}(%s).(%s)' %(self.visit(node.args[0]), type)
+			return '%s(*%s)' %(type, self.visit(node.args[0]) )
+
+
 		#elif fname.startswith('__js_global_get_'):
 		#	gname = fname.split('_')[-1]
 		#	fname = 'js.Global.Get("%s").Call' %gname
@@ -546,7 +549,11 @@ def visit_Return(self, node):
 		if isinstance(node.value, ast.Tuple):
 			return 'return %s' % ', '.join(map(self.visit, node.value.elts))
 		if node.value:
-			return 'return %s' % self.visit(node.value)
+			v = self.visit(node.value)
+			if v.startswith('&'):
+				return '_hack := %s; return &_hack' %v[1:]
+			else:
+				return 'return %s' % v
 		return 'return'
 
 	def _visit_function(self, node):
diff --git a/regtests/go/generics_subcls_return_a_subcls.py b/regtests/go/generics_subcls_return_a_subcls.py
new file mode 100644
index 0000000..5e38bed
--- /dev/null
+++ b/regtests/go/generics_subcls_return_a_subcls.py
@@ -0,0 +1,61 @@
+'''
+generics classes with common base.
+'''
+class A:
+	def __init__(self, x:int):
+		int self.x = x
+		int self.z = 0
+
+	def bar(self) -> int:
+		return self.x
+
+	def foo( self, o:A, s:bool ) -> self:
+		if s:
+			return go.type_assert(o, self)
+		else:
+			return self
+
+class B(A):
+	def __init__(self):
+		A.__init__(self, 10)
+		int self.z = 1
+
+	def bar(self) ->int:
+		return self.x + self.z
+
+class C(A):
+	def __init__(self):
+		A.__init__(self, 100)
+		int self.z = 100
+
+	def bar(self) ->int:
+		return self.x + self.z
+
+
+def my_generic( g:A ) ->int:
+	return g.bar()
+
+def main():
+	a = A( 1000 )
+	b = B()
+	c = C()
+
+	x = my_generic( a )
+	TestError(a.x == x )
+
+	y = my_generic( b )
+	TestError( y==11 )
+
+	z = my_generic( c )
+	TestError( z==200 )
+
+	TestError( b.z==1 )
+	TestError( c.z==100 )
+
+	x = my_generic( b.foo(c, false) )
+	TestError(a.x == x )
+	x = my_generic( b.foo(c, true) )
+	TestError(a.x == 200 )
+
+	y = my_generic( c.foo(b, true) )
+	TestError( y==11 )
\ No newline at end of file

From beb475805f49f5e00f3afd5c4b7cd8a4b3aff132 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Tue, 7 Oct 2014 15:07:16 -0700
Subject: [PATCH 36/58] Generics: fixed return different subclass from a method
 defined on the base class.

---
 pythonjs/pythonjs-minimal.js                  | 1218 ++-
 pythonjs/pythonjs.js                          | 8409 ++++++++++-------
 pythonjs/pythonjs_to_go.py                    |   26 +-
 pythonjs/runtime/builtins.py                  |   71 +-
 pythonjs/runtime/builtins_core.py             |    2 +-
 .../go/generics_subcls_return_a_subcls.py     |   27 +-
 6 files changed, 5530 insertions(+), 4223 deletions(-)

diff --git a/pythonjs/pythonjs-minimal.js b/pythonjs/pythonjs-minimal.js
index f828906..8fefbd3 100644
--- a/pythonjs/pythonjs-minimal.js
+++ b/pythonjs/pythonjs-minimal.js
@@ -3,528 +3,704 @@ KeyError   = function(msg) {this.message = msg || "";}; KeyError.prototype = Obj
 ValueError = function(msg) {this.message = msg || "";}; ValueError.prototype = Object.create(Error.prototype); ValueError.prototype.name = "ValueError";
 AttributeError = function(msg) {this.message = msg || "";}; AttributeError.prototype = Object.create(Error.prototype);AttributeError.prototype.name = "AttributeError";
 RuntimeError   = function(msg) {this.message = msg || "";}; RuntimeError.prototype = Object.create(Error.prototype);RuntimeError.prototype.name = "RuntimeError";
-var hasattr = function(ob, attr) {
-  
-  return Object.hasOwnProperty.call(ob, attr);
-}
-
-var len = function(ob) {
-  
-  if (ob instanceof Array) {
-    return ob.length;
-  } else {
-    if (__is_typed_array(ob)) {
-      return ob.length;
-    } else {
-      if (ob instanceof ArrayBuffer) {
-        return ob.byteLength;
-      } else {
-        if (ob.__len__) {
-          return ob.__len__();
-        } else {
-          return Object.keys(ob).length;
-        }
-      }
-    }
-  }
-}
-
-var func = function(a) {
-  
-  if (this.indexOf(a)===-1) {
-    return false;
-  } else {
-    return true;
-  }
-}
-
-Object.defineProperty(String.prototype, "__contains__", { enumerable:false,value:func,writeable:true,configurable:true });
-var func = function(start, stop, step) {
-  
-  if (( start ) === undefined && ( stop ) === undefined && (step===-1)) {
-    return this.split("").reverse().join("");
-  } else {
-    if (( stop ) < 0) {
-      stop = (this.length + stop);
-    }
-    return this.substring(start, stop);
-  }
-}
-
-Object.defineProperty(String.prototype, "__getslice__", { enumerable:false,value:func,writeable:true,configurable:true });
-var func = function() {
-  
-  return this.split("\n");
-}
-
-Object.defineProperty(String.prototype, "splitlines", { enumerable:false,value:func,writeable:true,configurable:true });
-var func = function() {
-  
-  return this.trim();
-}
-
-Object.defineProperty(String.prototype, "strip", { enumerable:false,value:func,writeable:true,configurable:true });
-var func = function(a) {
-  
-  if (this.substring(0, a.length)===a) {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-Object.defineProperty(String.prototype, "startswith", { enumerable:false,value:func,writeable:true,configurable:true });
-var func = function(a) {
-  
-  if (this.substring((this.length - a.length), this.length)===a) {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-Object.defineProperty(String.prototype, "endswith", { enumerable:false,value:func,writeable:true,configurable:true });
-var func = function(a) {
-  var i,arr,out;
-  out = "";
-  if (a instanceof Array) {
-    arr = a;
-  } else {
-    arr = a["$wrapped"];
-  }
-  i = 0;
-    var __iter1 = arr;
-  if (! (__iter1 instanceof Array || typeof __iter1 == "string" || __is_typed_array(__iter1) || __is_some_array(__iter1) )) { __iter1 = __object_keys__(__iter1) }
-  for (var __idx1=0; __idx1 < __iter1.length; __idx1++) {
-    var value = __iter1[ __idx1 ];
-    out += value;
-    i += 1;
-    if (( i ) < arr.length) {
-      out += this;
-    }
-  }
-  return out;
-}
-
-Object.defineProperty(String.prototype, "join", { enumerable:false,value:func,writeable:true,configurable:true });
-var func = function() {
-  
-  return this.toUpperCase();
-}
-
-Object.defineProperty(String.prototype, "upper", { enumerable:false,value:func,writeable:true,configurable:true });
-var func = function() {
-  
-  return this.toLowerCase();
-}
-
-Object.defineProperty(String.prototype, "lower", { enumerable:false,value:func,writeable:true,configurable:true });
-var func = function(a) {
-  var i;
-  i = this.indexOf(a);
-  if (i===-1) {
-    throw new ValueError((a + " - not in string"));
-  }
-  return i;
-}
-
-Object.defineProperty(String.prototype, "index", { enumerable:false,value:func,writeable:true,configurable:true });
-var func = function(a) {
-  
-  if (this.indexOf(a)===-1) {
-    return false;
-  } else {
-    return true;
-  }
-}
-
-Object.defineProperty(Array.prototype, "__contains__", { enumerable:false,value:func,writeable:true,configurable:true });
-var func = function(start, stop, step) {
-  var i,arr,n;
-  arr = [];
-  start = (start | 0);
-  if (( stop ) === undefined) {
-    stop = this.length;
-  }
-  if (( start ) < 0) {
-    start = (this.length + start);
-  }
-  if (( stop ) < 0) {
-    stop = (this.length + stop);
-  }
-  if (typeof(step)==="number") {
-    if (( step ) < 0) {
-      i = start;
-      while (( i ) >= 0) {
-        arr.push(this[i]);
-        i += step;
-      }
-      return arr;
-    } else {
-      i = start;
-      n = stop;
-      while (( i ) < n) {
-        arr.push(this[i]);
-        i += step;
-      }
-      return arr;
-    }
-  } else {
-    i = start;
-    n = stop;
-    while (( i ) < n) {
-      arr.push(this[i]);
-      i += 1;
-    }
-    return arr;
-  }
-}
-
-Object.defineProperty(Array.prototype, "__getslice__", { enumerable:false,value:func,writeable:true,configurable:true });
-var func = function(start, stop, step, items) {
-  var arr;
-  if (( start ) === undefined) {
-    start = 0;
-  }
-  if (( stop ) === undefined) {
-    stop = this.length;
-  }
-  arr = [start, (stop - start)];
-    var __iter2 = items;
-  if (! (__iter2 instanceof Array || typeof __iter2 == "string" || __is_typed_array(__iter2) || __is_some_array(__iter2) )) { __iter2 = __object_keys__(__iter2) }
-  for (var __idx2=0; __idx2 < __iter2.length; __idx2++) {
-    var item = __iter2[ __idx2 ];
-    arr.push(item);
-  }
-  this.splice.apply(this, arr);
-}
-
-Object.defineProperty(Array.prototype, "__setslice__", { enumerable:false,value:func,writeable:true,configurable:true });
-var func = function(item) {
-  
-  this.push(item);
-  return this;
-}
-
-Object.defineProperty(Array.prototype, "append", { enumerable:false,value:func,writeable:true,configurable:true });
-var extend = function(other) {
-  
-    var __iter3 = other;
-  if (! (__iter3 instanceof Array || typeof __iter3 == "string" || __is_typed_array(__iter3) || __is_some_array(__iter3) )) { __iter3 = __object_keys__(__iter3) }
-  for (var __idx3=0; __idx3 < __iter3.length; __idx3++) {
-    var obj = __iter3[ __idx3 ];
-    this.push(obj);
-  }
-  return this;
-}
-
-Object.defineProperty(Array.prototype, "extend", { enumerable:false,value:extend,writeable:true,configurable:true });
-var func = function(item) {
-  var index;
-  index = this.indexOf(item);
-  this.splice(index, 1);
-}
-
-Object.defineProperty(Array.prototype, "remove", { enumerable:false,value:func,writeable:true,configurable:true });
-var insert = function(index, obj) {
-  
-  if (( index ) < 0) {
-    index = (this.length + index);
-  }
-  this.splice(index, 0, obj);
-}
-
-Object.defineProperty(Array.prototype, "insert", { enumerable:false,value:insert,writeable:true,configurable:true });
-var index = function(obj) {
-  
-  return this.indexOf(obj);
-}
-
-Object.defineProperty(Array.prototype, "index", { enumerable:false,value:index,writeable:true,configurable:true });
-var count = function(obj) {
-  var a;
-  a = 0;
-    var __iter4 = this;
-  if (! (__iter4 instanceof Array || typeof __iter4 == "string" || __is_typed_array(__iter4) || __is_some_array(__iter4) )) { __iter4 = __object_keys__(__iter4) }
-  for (var __idx4=0; __idx4 < __iter4.length; __idx4++) {
-    var item = __iter4[ __idx4 ];
-    if (( item ) === obj) {
-      a += 1;
-    }
-  }
-  return a;
-}
-
-Object.defineProperty(Array.prototype, "count", { enumerable:false,value:count,writeable:true,configurable:true });
-var __contains__ = function(ob, a) {
-  var t;
-  t = typeof(ob);
-  if (t==="string") {
-    if (ob.indexOf(a)===-1) {
-      return false;
-    } else {
-      return true;
-    }
-  } else {
-    if (t==="number") {
-      throw new TypeError;
-    } else {
-      if (__is_typed_array(ob)) {
-                var __iter5 = ob;
-        if (! (__iter5 instanceof Array || typeof __iter5 == "string" || __is_typed_array(__iter5) || __is_some_array(__iter5) )) { __iter5 = __object_keys__(__iter5) }
-        for (var __idx5=0; __idx5 < __iter5.length; __idx5++) {
-          var x = __iter5[ __idx5 ];
-          if (x===a) {
-            return true;
-          }
-        }
-        return false;
-      } else {
-        if (ob.__contains__) {
-          return ob.__contains__(a);
-        } else {
-          if (ob instanceof Object && Object.hasOwnProperty.call(ob, a)) {
-            return true;
-          } else {
-            return false;
-          }
-        }
-      }
-    }
-  }
+var hasattr = function(ob, attr)
+{
+	
+	return Object.hasOwnProperty.call(ob, attr);
+}
+
+var len = function(ob)
+{
+	
+	if (ob instanceof Array)
+	{
+		return ob.length;
+	}
+	else
+	{
+		if (__is_typed_array(ob))
+		{
+			return ob.length;
+		}
+		else
+		{
+			if (ob instanceof ArrayBuffer)
+			{
+				return ob.byteLength;
+			}
+			else
+			{
+				if (ob.__len__)
+				{
+					return ob.__len__();
+				}
+				else
+				{
+					return Object.keys(ob).length;
+				}
+			}
+		}
+	}
+}
+
+var func = function(a)
+{
+	
+	if (this.indexOf(a)===-1)
+	{
+		return false;
+	}
+	else
+	{
+		return true;
+	}
+}
+
+Object.defineProperty(String.prototype, "__contains__", { enumerable:false, value:func, writeable:true, configurable:true });
+var func = function(start, stop, step)
+{
+	
+	if (( start ) === undefined && ( stop ) === undefined && (step===-1))
+	{
+		return this.split("").reverse().join("");
+	}
+	else
+	{
+		if (( stop ) < 0)
+		{
+			stop = (this.length + stop);
+		}
+		return this.substring(start, stop);
+	}
+}
+
+Object.defineProperty(String.prototype, "__getslice__", { enumerable:false, value:func, writeable:true, configurable:true });
+var func = function()
+{
+	
+	return this.split("\n");
+}
+
+Object.defineProperty(String.prototype, "splitlines", { enumerable:false, value:func, writeable:true, configurable:true });
+var func = function()
+{
+	
+	return this.trim();
+}
+
+Object.defineProperty(String.prototype, "strip", { enumerable:false, value:func, writeable:true, configurable:true });
+var func = function(a)
+{
+	
+	if (this.substring(0, a.length)===a)
+	{
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+}
+
+Object.defineProperty(String.prototype, "startswith", { enumerable:false, value:func, writeable:true, configurable:true });
+var func = function(a)
+{
+	
+	if (this.substring((this.length - a.length), this.length)===a)
+	{
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+}
+
+Object.defineProperty(String.prototype, "endswith", { enumerable:false, value:func, writeable:true, configurable:true });
+var func = function(a)
+{
+	var i,arr,out;
+	out = "";
+	if (a instanceof Array)
+	{
+		arr = a;
+	}
+	else
+	{
+		arr = a["$wrapped"];
+	}
+	i = 0;
+		var __iter1 = arr;
+	if (! (__iter1 instanceof Array || typeof __iter1 == "string" || __is_typed_array(__iter1) || __is_some_array(__iter1) )) { __iter1 = __object_keys__(__iter1) }
+	for (var __i1=0; __i1 < __iter1.length; __i1++) {
+		var value = __iter1[ __i1 ];
+		out += value;
+		i += 1;
+		if (( i ) < arr.length)
+		{
+			out += this;
+		}
+	}
+	return out;
+}
+
+Object.defineProperty(String.prototype, "join", { enumerable:false, value:func, writeable:true, configurable:true });
+var func = function()
+{
+	
+	return this.toUpperCase();
+}
+
+Object.defineProperty(String.prototype, "upper", { enumerable:false, value:func, writeable:true, configurable:true });
+var func = function()
+{
+	
+	return this.toLowerCase();
+}
+
+Object.defineProperty(String.prototype, "lower", { enumerable:false, value:func, writeable:true, configurable:true });
+var func = function(a)
+{
+	var i;
+	i = this.indexOf(a);
+	if (i===-1)
+	{
+		throw new ValueError((a + " - not in string"));
+	}
+	return i;
+}
+
+Object.defineProperty(String.prototype, "index", { enumerable:false, value:func, writeable:true, configurable:true });
+var func = function(a)
+{
+	
+	if (this.indexOf(a)===-1)
+	{
+		return false;
+	}
+	else
+	{
+		return true;
+	}
+}
+
+Object.defineProperty(Array.prototype, "__contains__", { enumerable:false, value:func, writeable:true, configurable:true });
+var func = function(start, stop, step)
+{
+	var i,arr,n;
+	arr = [];
+	start = (start | 0);
+	if (( stop ) === undefined)
+	{
+		stop = this.length;
+	}
+	if (( start ) < 0)
+	{
+		start = (this.length + start);
+	}
+	if (( stop ) < 0)
+	{
+		stop = (this.length + stop);
+	}
+	if (typeof(step)==="number")
+	{
+		if (( step ) < 0)
+		{
+			i = start;
+			while (( i ) >= 0)
+			{
+				arr.push(this[i]);
+				i += step;
+			}
+			return arr;
+		}
+		else
+		{
+			i = start;
+			n = stop;
+			while (( i ) < n)
+			{
+				arr.push(this[i]);
+				i += step;
+			}
+			return arr;
+		}
+	}
+	else
+	{
+		i = start;
+		n = stop;
+		while (( i ) < n)
+		{
+			arr.push(this[i]);
+			i += 1;
+		}
+		return arr;
+	}
+}
+
+Object.defineProperty(Array.prototype, "__getslice__", { enumerable:false, value:func, writeable:true, configurable:true });
+var func = function(start, stop, step, items)
+{
+	var arr;
+	if (( start ) === undefined)
+	{
+		start = 0;
+	}
+	if (( stop ) === undefined)
+	{
+		stop = this.length;
+	}
+	arr = [start, (stop - start)];
+		var __iter2 = items;
+	if (! (__iter2 instanceof Array || typeof __iter2 == "string" || __is_typed_array(__iter2) || __is_some_array(__iter2) )) { __iter2 = __object_keys__(__iter2) }
+	for (var __i2=0; __i2 < __iter2.length; __i2++) {
+		var item = __iter2[ __i2 ];
+		arr.push(item);
+	}
+	this.splice.apply(this, arr);
+}
+
+Object.defineProperty(Array.prototype, "__setslice__", { enumerable:false, value:func, writeable:true, configurable:true });
+var func = function(item)
+{
+	
+	this.push(item);
+	return this;
+}
+
+Object.defineProperty(Array.prototype, "append", { enumerable:false, value:func, writeable:true, configurable:true });
+var extend = function(other)
+{
+	
+		var __iter3 = other;
+	if (! (__iter3 instanceof Array || typeof __iter3 == "string" || __is_typed_array(__iter3) || __is_some_array(__iter3) )) { __iter3 = __object_keys__(__iter3) }
+	for (var __i3=0; __i3 < __iter3.length; __i3++) {
+		var obj = __iter3[ __i3 ];
+		this.push(obj);
+	}
+	return this;
+}
+
+Object.defineProperty(Array.prototype, "extend", { enumerable:false, value:extend, writeable:true, configurable:true });
+var func = function(item)
+{
+	var index;
+	index = this.indexOf(item);
+	this.splice(index, 1);
+}
+
+Object.defineProperty(Array.prototype, "remove", { enumerable:false, value:func, writeable:true, configurable:true });
+var insert = function(index, obj)
+{
+	
+	if (( index ) < 0)
+	{
+		index = (this.length + index);
+	}
+	this.splice(index, 0, obj);
+}
+
+Object.defineProperty(Array.prototype, "insert", { enumerable:false, value:insert, writeable:true, configurable:true });
+var index = function(obj)
+{
+	
+	return this.indexOf(obj);
+}
+
+Object.defineProperty(Array.prototype, "index", { enumerable:false, value:index, writeable:true, configurable:true });
+var count = function(obj)
+{
+	var a;
+	a = 0;
+		var __iter4 = this;
+	if (! (__iter4 instanceof Array || typeof __iter4 == "string" || __is_typed_array(__iter4) || __is_some_array(__iter4) )) { __iter4 = __object_keys__(__iter4) }
+	for (var __i4=0; __i4 < __iter4.length; __i4++) {
+		var item = __iter4[ __i4 ];
+		if (( item ) === obj)
+		{
+			a += 1;
+		}
+	}
+	return a;
+}
+
+Object.defineProperty(Array.prototype, "count", { enumerable:false, value:count, writeable:true, configurable:true });
+var __contains__ = function(ob, a)
+{
+	var t;
+	t = typeof(ob);
+	if (t==="string")
+	{
+		if (ob.indexOf(a)===-1)
+		{
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+	else
+	{
+		if (t==="number")
+		{
+			throw new TypeError;
+		}
+		else
+		{
+			if (__is_typed_array(ob))
+			{
+								var __iter5 = ob;
+				if (! (__iter5 instanceof Array || typeof __iter5 == "string" || __is_typed_array(__iter5) || __is_some_array(__iter5) )) { __iter5 = __object_keys__(__iter5) }
+				for (var __i5=0; __i5 < __iter5.length; __i5++) {
+					var x = __iter5[ __i5 ];
+					if (x===a)
+					{
+						return true;
+					}
+				}
+				return false;
+			}
+			else
+			{
+				if (ob.__contains__)
+				{
+					return ob.__contains__(a);
+				}
+				else
+				{
+					if (ob instanceof Object && Object.hasOwnProperty.call(ob, a))
+					{
+						return true;
+					}
+					else
+					{
+						return false;
+					}
+				}
+			}
+		}
+	}
 }
 
 __dom_array_types__ = [];
-if (typeof(NodeList)==="function") {
-  __dom_array_types__ = [NodeList, FileList, DOMStringList, HTMLCollection, SVGNumberList, SVGTransformList];
-  if (typeof(DataTransferItemList)==="function") {
-    __dom_array_types__.push(DataTransferItemList);
-  }
-  if (typeof(HTMLAllCollection)==="function") {
-    __dom_array_types__.push(HTMLAllCollection);
-  }
-  if (typeof(SVGElementInstanceList)==="function") {
-    __dom_array_types__.push(SVGElementInstanceList);
-  }
-  if (typeof(ClientRectList)==="function") {
-    __dom_array_types__.push(ClientRectList);
-  }
-}
-var __is_some_array = function(ob) {
-  
-  if (( __dom_array_types__.length ) > 0) {
-        var __iter6 = __dom_array_types__;
-    if (! (__iter6 instanceof Array || typeof __iter6 == "string" || __is_typed_array(__iter6) || __is_some_array(__iter6) )) { __iter6 = __object_keys__(__iter6) }
-    for (var __idx6=0; __idx6 < __iter6.length; __idx6++) {
-      var t = __iter6[ __idx6 ];
-      if (ob instanceof t) {
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
-var __is_typed_array = function(ob) {
-  
-  if (ob instanceof Int8Array || ob instanceof Uint8Array) {
-    return true;
-  } else {
-    if (ob instanceof Int16Array || ob instanceof Uint16Array) {
-      return true;
-    } else {
-      if (ob instanceof Int32Array || ob instanceof Uint32Array) {
-        return true;
-      } else {
-        if (ob instanceof Float32Array || ob instanceof Float64Array) {
-          return true;
-        } else {
-          return false;
-        }
-      }
-    }
-  }
-}
-
-var __js_typed_array = function(t, a) {
-  var arr;
-  if (t==="i") {
-    arr =  new Int32Array(a.length);
-  }
-  arr.set(a);
-  return arr;
-}
-
-var __object_keys__ = function(ob) {
-  var arr;
-  "\n		notes:\n			. Object.keys(ob) will not work because we create PythonJS objects using `Object.create(null)`\n			. this is different from Object.keys because it traverses the prototype chain.\n		";
-  arr = [];
-  for (var key in ob) { arr.push(key) };
-  return arr;
-}
-
-var __sprintf = function(fmt, args) {
-  var chunks,item,arr;
-  if (args instanceof Array) {
-    chunks = fmt.split("%s");
-    arr = [];
-    var i;
-    i = 0;
-        var __iter7 = chunks;
-    if (! (__iter7 instanceof Array || typeof __iter7 == "string" || __is_typed_array(__iter7) || __is_some_array(__iter7) )) { __iter7 = __object_keys__(__iter7) }
-    for (var __idx7=0; __idx7 < __iter7.length; __idx7++) {
-      var txt = __iter7[ __idx7 ];
-      arr.append(txt);
-      if (( i ) >= args.length) {
-        break;
-      }
-      item = args[i];
-      if (typeof(item)==="string") {
-        arr.append(item);
-      } else {
-        if (typeof(item)==="number") {
-          arr.append(("" + item));
-        } else {
-          arr.append(Object.prototype.toString.call(item));
-        }
-      }
-      i += 1;
-    }
-    return "".join(arr);
-  } else {
-    return __replace_method(fmt, "%s", args);
-  }
-}
-
-var __jsdict = function(items) {
-  var d,key;
-  d = {};
-    var __iter8 = items;
-  if (! (__iter8 instanceof Array || typeof __iter8 == "string" || __is_typed_array(__iter8) || __is_some_array(__iter8) )) { __iter8 = __object_keys__(__iter8) }
-  for (var __idx8=0; __idx8 < __iter8.length; __idx8++) {
-    var item = __iter8[ __idx8 ];
-    key = item[0];
-    if (key instanceof Array) {
-      key = JSON.stringify(key);
-    } else {
-      if (key.__uid__) {
-        key = key.__uid__;
-      }
-    }
-    d[key] = item[1];
-  }
-  return d;
-}
-
-var __jsdict_get = function(ob, key, default_value) {
-  
-  if (ob instanceof Object) {
-    if (key instanceof Array) {
-      key = JSON.stringify(key);
-    }
-    if (key in ob) {
-      return ob[key];
-    }
-    return default_value;
-  } else {
-    if (( default_value ) !== undefined) {
-      return ob.get(key, default_value);
-    } else {
-      return ob.get(key);
-    }
-  }
-}
-
-var __jsdict_set = function(ob, key, value) {
-  
-  if (ob instanceof Object) {
-    if (key instanceof Array) {
-      key = JSON.stringify(key);
-    }
-    ob[key] = value;
-  } else {
-    ob.set(key,value);
-  }
-}
-
-var __jsdict_keys = function(ob) {
-  
-  if (ob instanceof Object) {
-    return Object.keys( ob );
-  } else {
-    return ob.keys();
-  }
-}
-
-var __jsdict_values = function(ob) {
-  var arr,value;
-  if (ob instanceof Object) {
-    arr = [];
-        var __iter9 = ob;
-    if (! (__iter9 instanceof Array || typeof __iter9 == "string" || __is_typed_array(__iter9) || __is_some_array(__iter9) )) { __iter9 = __object_keys__(__iter9) }
-    for (var __idx9=0; __idx9 < __iter9.length; __idx9++) {
-      var key = __iter9[ __idx9 ];
-      if (ob.hasOwnProperty(key)) {
-        value = ob[key];
-        arr.push(value);
-      }
-    }
-    return arr;
-  } else {
-    return ob.values();
-  }
-}
-
-var __jsdict_items = function(ob) {
-  var arr,value;
-  if (ob instanceof Object || ( ob.items ) === undefined) {
-    arr = [];
-        var __iter10 = ob;
-    if (! (__iter10 instanceof Array || typeof __iter10 == "string" || __is_typed_array(__iter10) || __is_some_array(__iter10) )) { __iter10 = __object_keys__(__iter10) }
-    for (var __idx10=0; __idx10 < __iter10.length; __idx10++) {
-      var key = __iter10[ __idx10 ];
-      if (Object.hasOwnProperty.call(ob, key)) {
-        value = ob[key];
-        arr.push([key, value]);
-      }
-    }
-    return arr;
-  } else {
-    return ob.items();
-  }
-}
-
-var __jsdict_pop = function(ob, key, _kwargs_) {
-  var v;
-  if (!( _kwargs_ instanceof Object )) {;
-  var _kwargs_ = {ob: arguments[0],key: arguments[1],_default: arguments[2]};
-  };
-  if (_kwargs_ === undefined || _kwargs_._default === undefined) {var _default = null} else {var _default=_kwargs_._default};
-  if (ob instanceof Array) {
-    if (ob.length) {
-      if (( key ) === undefined) {
-        return ob.pop();
-      } else {
-        return ob.splice(key, 1)[0];
-      }
-    } else {
-      throw new IndexError(key);
-    }
-  } else {
-    if (ob instanceof Object) {
-      if (key in ob) {
-        v = ob[key];
-        delete ob[key];
-        return v;
-      } else {
-        if (( _default ) === undefined) {
-          throw new KeyError(key);
-        } else {
-          return _default;
-        }
-      }
-    } else {
-      return ob.pop(key, _default);
-    }
-  }
+if (typeof(NodeList)==="function")
+{
+	__dom_array_types__ = [NodeList, FileList, DOMStringList, HTMLCollection, SVGNumberList, SVGTransformList];
+	if (typeof(DataTransferItemList)==="function")
+	{
+		__dom_array_types__.push(DataTransferItemList);
+	}
+	if (typeof(HTMLAllCollection)==="function")
+	{
+		__dom_array_types__.push(HTMLAllCollection);
+	}
+	if (typeof(SVGElementInstanceList)==="function")
+	{
+		__dom_array_types__.push(SVGElementInstanceList);
+	}
+	if (typeof(ClientRectList)==="function")
+	{
+		__dom_array_types__.push(ClientRectList);
+	}
+}
+var __is_some_array = function(ob)
+{
+	
+	if (( __dom_array_types__.length ) > 0)
+	{
+				var __iter6 = __dom_array_types__;
+		if (! (__iter6 instanceof Array || typeof __iter6 == "string" || __is_typed_array(__iter6) || __is_some_array(__iter6) )) { __iter6 = __object_keys__(__iter6) }
+		for (var __i6=0; __i6 < __iter6.length; __i6++) {
+			var t = __iter6[ __i6 ];
+			if (ob instanceof t)
+			{
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
+var __is_typed_array = function(ob)
+{
+	
+	if (ob instanceof Int8Array || ob instanceof Uint8Array)
+	{
+		return true;
+	}
+	else
+	{
+		if (ob instanceof Int16Array || ob instanceof Uint16Array)
+		{
+			return true;
+		}
+		else
+		{
+			if (ob instanceof Int32Array || ob instanceof Uint32Array)
+			{
+				return true;
+			}
+			else
+			{
+				if (ob instanceof Float32Array || ob instanceof Float64Array)
+				{
+					return true;
+				}
+				else
+				{
+					return false;
+				}
+			}
+		}
+	}
+}
+
+var __js_typed_array = function(t, a)
+{
+	var arr;
+	if (t==="i")
+	{
+		arr =  new Int32Array(a.length);
+	}
+	arr.set(a);
+	return arr;
+}
+
+/* notes:
+			. Object.keys(ob) will not work because we create PythonJS objects using `Object.create(null)`
+			. this is different from Object.keys because it traverses the prototype chain. */
+var __object_keys__ = function(ob)
+{
+	var arr;
+	arr = [];
+	for (var key in ob) { arr.push(key) };
+	return arr;
+}
+
+var __sprintf = function(fmt, args)
+{
+	var chunks,item,arr;
+	if (args instanceof Array)
+	{
+		chunks = fmt.split("%s");
+		arr = [];
+		var i;
+		i = 0;
+				var __iter7 = chunks;
+		if (! (__iter7 instanceof Array || typeof __iter7 == "string" || __is_typed_array(__iter7) || __is_some_array(__iter7) )) { __iter7 = __object_keys__(__iter7) }
+		for (var __i7=0; __i7 < __iter7.length; __i7++) {
+			var txt = __iter7[ __i7 ];
+			arr.append(txt);
+			if (( i ) >= args.length)
+			{
+				break;
+			}
+			item = args[i];
+			if (typeof(item)==="string")
+			{
+				arr.append(item);
+			}
+			else
+			{
+				if (typeof(item)==="number")
+				{
+					arr.append(("" + item));
+				}
+				else
+				{
+					arr.append(Object.prototype.toString.call(item));
+				}
+			}
+			i += 1;
+		}
+		return "".join(arr);
+	}
+	else
+	{
+		return fmt.replace('%s', args);
+	}
+}
+
+var __jsdict = function(items)
+{
+	var d,key;
+	d = {};
+		var __iter8 = items;
+	if (! (__iter8 instanceof Array || typeof __iter8 == "string" || __is_typed_array(__iter8) || __is_some_array(__iter8) )) { __iter8 = __object_keys__(__iter8) }
+	for (var __i8=0; __i8 < __iter8.length; __i8++) {
+		var item = __iter8[ __i8 ];
+		key = item[0];
+		if (key instanceof Array)
+		{
+			key = JSON.stringify(key);
+		}
+		else
+		{
+			if (key.__uid__)
+			{
+				key = key.__uid__;
+			}
+		}
+		d[key] = item[1];
+	}
+	return d;
+}
+
+var __jsdict_get = function(ob, key, default_value)
+{
+	
+	if (ob instanceof Object)
+	{
+		if (key instanceof Array)
+		{
+			key = JSON.stringify(key);
+		}
+		if (key in ob)
+		{
+			return ob[key];
+		}
+		return default_value;
+	}
+	else
+	{
+		if (( default_value ) !== undefined)
+		{
+			return ob.get(key, default_value);
+		}
+		else
+		{
+			return ob.get(key);
+		}
+	}
+}
+
+var __jsdict_set = function(ob, key, value)
+{
+	
+	if (ob instanceof Object)
+	{
+		if (key instanceof Array)
+		{
+			key = JSON.stringify(key);
+		}
+		ob[key] = value;
+	}
+	else
+	{
+		ob.set(key,value);
+	}
+}
+
+var __jsdict_keys = function(ob)
+{
+	
+	if (ob instanceof Object)
+	{
+		return Object.keys( ob );
+	}
+	else
+	{
+		return ob.keys();
+	}
+}
+
+var __jsdict_values = function(ob)
+{
+	var arr,value;
+	if (ob instanceof Object)
+	{
+		arr = [];
+				var __iter9 = ob;
+		if (! (__iter9 instanceof Array || typeof __iter9 == "string" || __is_typed_array(__iter9) || __is_some_array(__iter9) )) { __iter9 = __object_keys__(__iter9) }
+		for (var __i9=0; __i9 < __iter9.length; __i9++) {
+			var key = __iter9[ __i9 ];
+			if (ob.hasOwnProperty(key))
+			{
+				value = ob[key];
+				arr.push(value);
+			}
+		}
+		return arr;
+	}
+	else
+	{
+		return ob.values();
+	}
+}
+
+var __jsdict_items = function(ob)
+{
+	var arr,value;
+	if (ob instanceof Object || ( ob.items ) === undefined)
+	{
+		arr = [];
+				var __iter10 = ob;
+		if (! (__iter10 instanceof Array || typeof __iter10 == "string" || __is_typed_array(__iter10) || __is_some_array(__iter10) )) { __iter10 = __object_keys__(__iter10) }
+		for (var __i10=0; __i10 < __iter10.length; __i10++) {
+			var key = __iter10[ __i10 ];
+			if (Object.hasOwnProperty.call(ob, key))
+			{
+				value = ob[key];
+				arr.push([key, value]);
+			}
+		}
+		return arr;
+	}
+	else
+	{
+		return ob.items();
+	}
+}
+
+var __jsdict_pop = function(ob, key, _kwargs_)
+{
+	var v;
+	var _default = (_kwargs_ === undefined || _kwargs_._default === undefined)?	null : _kwargs_._default;
+	if (ob instanceof Array)
+	{
+		if (ob.length)
+		{
+			if (( key ) === undefined)
+			{
+				return ob.pop();
+			}
+			else
+			{
+				return ob.splice(key, 1)[0];
+			}
+		}
+		else
+		{
+			throw new IndexError(key);
+		}
+	}
+	else
+	{
+		if (ob instanceof Object)
+		{
+			if (key in ob)
+			{
+				v = ob[key];
+				delete ob[key];
+				return v;
+			}
+			else
+			{
+				if (( _default ) === undefined)
+				{
+					throw new KeyError(key);
+				}
+				else
+				{
+					return _default;
+				}
+			}
+		}
+		else
+		{
+			return ob.pop(key, _default);
+		}
+	}
 }
diff --git a/pythonjs/pythonjs.js b/pythonjs/pythonjs.js
index 54a5229..89582c9 100644
--- a/pythonjs/pythonjs.js
+++ b/pythonjs/pythonjs.js
@@ -2,486 +2,704 @@ __NULL_OBJECT__ = Object.create(null);
 __WEBWORKER__ = false;
 __NODEJS__ = false;
 __BROWSER__ = false;
-if (typeof(process)!=="undefined") {
-  __NODEJS__ = true;
-}
-if (typeof(window)!=="undefined") {
-  __BROWSER__ = true;
-}
-if (typeof(importScripts)==="function") {
-  __WEBWORKER__ = true;
-}
-var __create_array__ = function() {
-  "Used to fix a bug/feature of Javascript where new Array(number)\n	created a array with number of undefined elements which is not\n	what we want";
-  var i,array;
-  array = [];
-  i = 0;
-  while (( i ) < arguments.length) {
-    array.push(arguments[i]);
-    i += 1;
-  }
-  return array;
-}
-
-var __get__ = function(object, attribute, error_message) {
-  "Retrieve an attribute, method, property, or wrapper function.\n\n	method are actually functions which are converted to methods by\n	prepending their arguments with the current object. Properties are\n	not functions!\n\n	DOM support:\n		http://stackoverflow.com/questions/14202699/document-createelement-not-working\n		https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/instanceof\n\n	Direct JavaScript Calls:\n		if an external javascript function is found, and it was not a wrapper that was generated here,\n		check the function for a 'cached_wrapper' attribute, if none is found then generate a new\n		wrapper, cache it on the function, and return the wrapper.\n	";
-  if (( object ) === null) {
-    if (error_message) {
-      throw new AttributeError(("(`null` has no attributes) " + error_message));
-    } else {
-      throw new AttributeError(("null object (None) has no attribute: " + attribute));
-    }
-  } else {
-    if (( object ) === undefined) {
-      if (error_message) {
-        throw new AttributeError(("(`undefined` has no attributes) " + error_message));
-      } else {
-        throw new AttributeError(("undefined has no attribute: " + attribute));
-      }
-    }
-  }
-  if (attribute==="__call__") {
-    if (object.pythonscript_function || object.is_wrapper) {
-      return object;
-    } else {
-      if (object.cached_wrapper) {
-        return object.cached_wrapper;
-      } else {
-        if ({}.toString.call(object) === '[object Function]') {
-                    var wrapper = function(args, kwargs) {
-            var i,arg,keys;
-            if (args!==null) {
-              i = 0;
-              while (( i ) < args.length) {
-                arg = args[i];
-                if (arg && (typeof(arg)==="object")) {
-                  if (arg.jsify) {
-                    args[i] = arg.jsify();
-                  }
-                }
-                i += 1;
-              }
-            }
-            if (kwargs!==null) {
-              keys = __object_keys__(kwargs);
-              if (keys.length!==0) {
-                args.push(kwargs);
-                i = 0;
-                while (( i ) < keys.length) {
-                  arg = kwargs[keys[i]];
-                  if (arg && (typeof(arg)==="object")) {
-                    if (arg.jsify) {
-                      kwargs[keys[i]] = arg.jsify();
-                    }
-                  }
-                  i += 1;
-                }
-              }
-            }
-            return object.apply(null, args);
-          }
-
-          wrapper.is_wrapper = true;
-          object.cached_wrapper = wrapper;
-          return wrapper;
-        }
-      }
-    }
-  }
-  if (Object.hasOwnProperty.call(object, "__getattribute__")) {
-    return object.__getattribute__(attribute);
-  }
-  var attr;
-  attr = object[attribute];
-  if (( __NODEJS__ ) === false && ( __WEBWORKER__ ) === false) {
-    if (object instanceof HTMLDocument) {
-      if (typeof(attr) === 'function') {
-                var wrapper = function(args, kwargs) {
-          return attr.apply(object, args);
-        }
-
-        wrapper.is_wrapper = true;
-        return wrapper;
-      } else {
-        return attr;
-      }
-    } else {
-      if (object instanceof HTMLElement) {
-        if (typeof(attr) === 'function') {
-                    var wrapper = function(args, kwargs) {
-            return attr.apply(object, args);
-          }
-
-          wrapper.is_wrapper = true;
-          return wrapper;
-        } else {
-          return attr;
-        }
-      }
-    }
-  }
-  if (( attr ) !== undefined) {
-    if (typeof(attr)==="function") {
-      if (attr.pythonscript_function === undefined && attr.is_wrapper === undefined) {
-        if (attr.prototype instanceof Object && ( Object.keys(attr.prototype).length ) > 0) {
-          return attr;
-        }
-                var wrapper = function(args, kwargs) {
-          var i,arg,keys;
-          if (args!==null) {
-            i = 0;
-            while (( i ) < args.length) {
-              arg = args[i];
-              if (arg && (typeof(arg)==="object")) {
-                if (arg.jsify) {
-                  args[i] = arg.jsify();
-                }
-              }
-              i += 1;
-            }
-          }
-          if (kwargs!==null) {
-            keys = __object_keys__(kwargs);
-            if (keys.length!==0) {
-              args.push(kwargs);
-              i = 0;
-              while (( i ) < keys.length) {
-                arg = kwargs[keys[i]];
-                if (arg && (typeof(arg)==="object")) {
-                  if (arg.jsify) {
-                    kwargs[keys[i]] = arg.jsify();
-                  }
-                }
-                i += 1;
-              }
-            }
-          }
-          return attr.apply(object, args);
-        }
-
-        wrapper.is_wrapper = true;
-        wrapper.wrapped = attr;
-        return wrapper;
-      } else {
-        if (attr.is_classmethod) {
-                    var method = function() {
-            var args;
-            args = Array.prototype.slice.call(arguments);
-            if (args[0] instanceof Array && {}.toString.call(args[1]) === '[object Object]' && (args.length===2)) {
-              /*pass*/
-            } else {
-              args = [args, {}];
-            }
-            if (object.__class__) {
-              args[0].splice(0, 0, object.__class__);
-            } else {
-              args[0].splice(0, 0, object);
-            }
-            return attr.apply(this, args);
-          }
-
-          method.is_wrapper = true;
-          object[attribute] = method;
-          return method;
-        } else {
-          return attr;
-        }
-      }
-    } else {
-      return attr;
-    }
-  }
-  var __class__,bases;
-  __class__ = object.__class__;
-  if (__class__) {
-    if (( attribute )  in  __class__.__properties__) {
-      return __class__.__properties__[attribute]["get"]([object], {});
-    }
-    if (( attribute )  in  __class__.__unbound_methods__) {
-      attr = __class__.__unbound_methods__[attribute];
-      if (attr.fastdef) {
-                var method = function(args, kwargs) {
-          if (arguments && arguments[0]) {
-            arguments[0].splice(0, 0, object);
-            return attr.apply(this, arguments);
-          } else {
-            return attr([object], {  });
-          }
-        }
-
-      } else {
-                var method = function(args, kwargs) {
-          if (arguments.length===0) {
-            return attr([object], __NULL_OBJECT__);
-          } else {
-            if (args instanceof Array && ( typeof(kwargs) ) === "object" && (arguments.length===2)) {
-              args.splice(0, 0, object);
-              if (( kwargs ) === undefined) {
-                return attr(args, __NULL_OBJECT__);
-              } else {
-                return attr(args, kwargs);
-              }
-            } else {
-              args = Array.prototype.slice.call(arguments);
-              args.splice(0, 0, object);
-              args = [args, __NULL_OBJECT__];
-              return attr.apply(this, args);
-            }
-          }
-        }
-
-      }
-      method.is_wrapper = true;
-      object[attribute] = method;
-      return method;
-    }
-    attr = __class__[attribute];
-    if (( attribute )  in  __class__) {
-      if ({}.toString.call(attr) === '[object Function]') {
-        if (attr.is_wrapper) {
-          return attr;
-        } else {
-          if (attr.fastdef) {
-                        var method = function(args, kwargs) {
-              if (arguments && arguments[0]) {
-                arguments[0].splice(0, 0, object);
-                return attr.apply(this, arguments);
-              } else {
-                return attr([object], {  });
-              }
-            }
-
-          } else {
-                        var method = function(args, kwargs) {
-              if (arguments.length===0) {
-                return attr([object], __NULL_OBJECT__);
-              } else {
-                if (args instanceof Array && ( typeof(kwargs) ) === "object" && (arguments.length===2)) {
-                  args.splice(0, 0, object);
-                  if (( kwargs ) === undefined) {
-                    return attr(args, __NULL_OBJECT__);
-                  } else {
-                    return attr(args, kwargs);
-                  }
-                } else {
-                  args = Array.prototype.slice.call(arguments);
-                  args.splice(0, 0, object);
-                  args = [args, __NULL_OBJECT__];
-                  return attr.apply(this, args);
-                }
-              }
-            }
-
-          }
-        }
-        method.is_wrapper = true;
-        object[attribute] = method;
-        return method;
-      } else {
-        return attr;
-      }
-    }
-    bases = __class__.__bases__;
-        var __iter1 = bases;
-    if (! (__iter1 instanceof Array || typeof __iter1 == "string" || __is_typed_array(__iter1) || __is_some_array(__iter1) )) { __iter1 = __object_keys__(__iter1) }
-    for (var __idx1=0; __idx1 < __iter1.length; __idx1++) {
-      var base = __iter1[ __idx1 ];
-      attr = _get_upstream_attribute(base, attribute);
-      if (( attr ) !== undefined) {
-        if ({}.toString.call(attr) === '[object Function]') {
-          if (attr.fastdef) {
-                        var method = function(args, kwargs) {
-              if (arguments && arguments[0]) {
-                arguments[0].splice(0, 0, object);
-                return attr.apply(this, arguments);
-              } else {
-                return attr([object], {  });
-              }
-            }
-
-          } else {
-                        var method = function(args, kwargs) {
-              if (arguments.length===0) {
-                return attr([object], __NULL_OBJECT__);
-              } else {
-                if (args instanceof Array && ( typeof(kwargs) ) === "object" && (arguments.length===2)) {
-                  args.splice(0, 0, object);
-                  if (( kwargs ) === undefined) {
-                    return attr(args, __NULL_OBJECT__);
-                  } else {
-                    return attr(args, kwargs);
-                  }
-                } else {
-                  args = Array.prototype.slice.call(arguments);
-                  args.splice(0, 0, object);
-                  args = [args, __NULL_OBJECT__];
-                  return attr.apply(this, args);
-                }
-              }
-            }
-
-          }
-          method.is_wrapper = true;
-          object[attribute] = method;
-          return method;
-        } else {
-          return attr;
-        }
-      }
-    }
-        var __iter2 = bases;
-    if (! (__iter2 instanceof Array || typeof __iter2 == "string" || __is_typed_array(__iter2) || __is_some_array(__iter2) )) { __iter2 = __object_keys__(__iter2) }
-    for (var __idx2=0; __idx2 < __iter2.length; __idx2++) {
-      var base = __iter2[ __idx2 ];
-      var prop;
-      prop = _get_upstream_property(base, attribute);
-      if (( prop ) !== undefined) {
-        return prop["get"]([object], {});
-      }
-    }
-    if (( "__getattr__" )  in  __class__) {
-      return __class__["__getattr__"]([object, attribute], {});
-    }
-        var __iter3 = bases;
-    if (! (__iter3 instanceof Array || typeof __iter3 == "string" || __is_typed_array(__iter3) || __is_some_array(__iter3) )) { __iter3 = __object_keys__(__iter3) }
-    for (var __idx3=0; __idx3 < __iter3.length; __idx3++) {
-      var base = __iter3[ __idx3 ];
-      var f;
-      f = _get_upstream_attribute(base, "__getattr__");
-      if (( f ) !== undefined) {
-        return f([object, attribute], {});
-      }
-    }
-  }
-  if (attribute==="__getitem__") {
-        var wrapper = function(args, kwargs) {
-      v = object[args[0]];
-      if (( v ) === undefined) {
-        throw new KeyError(args[0]);
-      }
-    }
-
-    wrapper.is_wrapper = true;
-    return wrapper;
-  } else {
-    if (attribute==="__setitem__") {
-            var wrapper = function(args, kwargs) {
-        object[args[0]] = args[1];
-      }
-
-      wrapper.is_wrapper = true;
-      return wrapper;
-    }
-  }
-  if (typeof(object, "function") && object.is_wrapper) {
-    return object.wrapped[attribute];
-  }
-  if ((attribute==="__iter__") && object instanceof Object) {
-        var wrapper = function(args, kwargs) {
-      return  new __ArrayIterator(Object.keys(object), 0);
-    }
-
-    wrapper.is_wrapper = true;
-    return wrapper;
-  }
-  if ((attribute==="__contains__") && object instanceof Object) {
-        var wrapper = function(args, kwargs) {
-      return (Object.keys(object).indexOf(args[0])!==-1);
-    }
-
-    wrapper.is_wrapper = true;
-    return wrapper;
-  }
-  if (( attr ) === undefined) {
-    if (error_message) {
-      throw new AttributeError(error_message);
-    } else {
-      throw new AttributeError(attribute);
-    }
-  } else {
-    return attr;
-  }
-}
-
-var _get_upstream_attribute = function(base, attr) {
-  if (( attr )  in  base) {
-    return base[attr];
-  }
-    var __iter4 = base.__bases__;
-  if (! (__iter4 instanceof Array || typeof __iter4 == "string" || __is_typed_array(__iter4) || __is_some_array(__iter4) )) { __iter4 = __object_keys__(__iter4) }
-  for (var __idx4=0; __idx4 < __iter4.length; __idx4++) {
-    var parent = __iter4[ __idx4 ];
-    return _get_upstream_attribute(parent, attr);
-  }
-}
-
-var _get_upstream_property = function(base, attr) {
-  if (( attr )  in  base.__properties__) {
-    return base.__properties__[attr];
-  }
-    var __iter5 = base.__bases__;
-  if (! (__iter5 instanceof Array || typeof __iter5 == "string" || __is_typed_array(__iter5) || __is_some_array(__iter5) )) { __iter5 = __object_keys__(__iter5) }
-  for (var __idx5=0; __idx5 < __iter5.length; __idx5++) {
-    var parent = __iter5[ __idx5 ];
-    return _get_upstream_property(parent, attr);
-  }
-}
-
-var __set__ = function(object, attribute, value) {
-  "\n	__setattr__ is always called when an attribute is set,\n	unlike __getattr__ that only triggers when an attribute is not found,\n	this asymmetry is in fact part of the Python spec.\n	note there is no __setattribute__\n\n	In normal Python a property setter is not called before __setattr__,\n	this is bad language design because the user has been more explicit\n	in having the property setter.\n\n	In PythonJS, property setters are called instead of __setattr__.\n	";
-  if (( "__class__" )  in  object && (object.__class__.__setters__.indexOf(attribute)!==-1)) {
-    object[attribute] = value;
-  } else {
-    if (( "__setattr__" )  in  object) {
-      object.__setattr__(attribute, value);
-    } else {
-      object[attribute] = value;
-    }
-  }
-}
-
-var __getargs__ = function(func_name, signature, args, kwargs) {
-  "Based on ``signature`` and ``args``, ``kwargs`` parameters retrieve\n	the actual parameters.\n\n	This will set default keyword arguments and retrieve positional arguments\n	in kwargs if their called as such";
-  if (( args ) === null) {
-    args = [];
-  }
-  if (( kwargs ) === null) {
-    kwargs = {  };
-  }
-  out = {  };
-  if (( args.length ) > signature.args.length) {
-    if (signature.vararg) {
-      /*pass*/
-    } else {
-      console.log(("Error in function->" + func_name));
-      console.log("args:", args, "kwargs:", kwargs, "sig:", signature);
-      throw new TypeError("Supplemental positional arguments provided but signature doesn't accept them");
-    }
-  }
-  j = 0;
-  while (( j ) < signature.args.length) {
-    name = signature.args[j];
-    if (( name )  in  kwargs) {
-      out[name] = kwargs[name];
-    } else {
-      if (( j ) < args.length) {
-        out[name] = args[j];
-      } else {
-        if (( name )  in  signature.kwargs) {
-          out[name] = signature.kwargs[name];
-        }
-      }
-    }
-    j += 1;
-  }
-  args = args.slice(j);
-  if (signature.vararg) {
-    out[signature.vararg] = args;
-  }
-  if (signature.varkwarg) {
-    out[signature.varkwarg] = kwargs;
-  }
-  return out;
+if (typeof(process)!=="undefined")
+{
+	__NODEJS__ = true;
+}
+if (typeof(window)!=="undefined")
+{
+	__BROWSER__ = true;
+}
+if (typeof(importScripts)==="function")
+{
+	__WEBWORKER__ = true;
+}
+/* Used to fix a bug/feature of Javascript where new Array(number)
+	created a array with number of undefined elements which is not
+	what we want */
+var __create_array__ = function()
+{
+	var i,array;
+	array = [];
+	i = 0;
+	while (( i ) < arguments.length)
+	{
+		array.push(arguments[i]);
+		i += 1;
+	}
+	return array;
+}
+
+/* Retrieve an attribute, method, property, or wrapper function.
+
+	method are actually functions which are converted to methods by
+	prepending their arguments with the current object. Properties are
+	not functions!
+
+	DOM support:
+		http://stackoverflow.com/questions/14202699/document-createelement-not-working
+		https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/instanceof
+
+	Direct JavaScript Calls:
+		if an external javascript function is found, and it was not a wrapper that was generated here,
+		check the function for a 'cached_wrapper' attribute, if none is found then generate a new
+		wrapper, cache it on the function, and return the wrapper. */
+var __get__ = function(object, attribute, error_message)
+{
+	if (( object ) === null)
+	{
+		if (error_message)
+		{
+			throw new AttributeError(("(`null` has no attributes) " + error_message));
+		}
+		else
+		{
+			throw new AttributeError(("null object (None) has no attribute: " + attribute));
+		}
+	}
+	else
+	{
+		if (( object ) === undefined)
+		{
+			if (error_message)
+			{
+				throw new AttributeError(("(`undefined` has no attributes) " + error_message));
+			}
+			else
+			{
+				throw new AttributeError(("undefined has no attribute: " + attribute));
+			}
+		}
+	}
+	if (attribute==="__call__")
+	{
+		if (object.pythonscript_function || object.is_wrapper)
+		{
+			return object;
+		}
+		else
+		{
+			if (object.cached_wrapper)
+			{
+				return object.cached_wrapper;
+			}
+			else
+			{
+				if ({}.toString.call(object) === '[object Function]')
+				{
+										var wrapper = function(args, kwargs)
+					{
+						var i,arg,keys;
+						if (args!==null)
+						{
+							i = 0;
+							while (( i ) < args.length)
+							{
+								arg = args[i];
+								if (arg && (typeof(arg)==="object"))
+								{
+									if (arg.jsify)
+									{
+										args[i] = arg.jsify();
+									}
+								}
+								i += 1;
+							}
+						}
+						if (kwargs!==null)
+						{
+							keys = __object_keys__(kwargs);
+							if (keys.length!==0)
+							{
+								args.push(kwargs);
+								i = 0;
+								while (( i ) < keys.length)
+								{
+									arg = kwargs[keys[i]];
+									if (arg && (typeof(arg)==="object"))
+									{
+										if (arg.jsify)
+										{
+											kwargs[keys[i]] = arg.jsify();
+										}
+									}
+									i += 1;
+								}
+							}
+						}
+						return object.apply(null, args);
+					}
+
+					wrapper.is_wrapper = true;
+					object.cached_wrapper = wrapper;
+					return wrapper;
+				}
+			}
+		}
+	}
+	if (Object.hasOwnProperty.call(object, "__getattribute__"))
+	{
+		return object.__getattribute__(attribute);
+	}
+	var attr;
+	attr = object[attribute];
+	if (( __NODEJS__ ) === false && ( __WEBWORKER__ ) === false)
+	{
+		if (object instanceof HTMLDocument)
+		{
+			if (typeof(attr) === 'function')
+			{
+								var wrapper = function(args, kwargs)
+				{
+					return attr.apply(object, args);
+				}
+
+				wrapper.is_wrapper = true;
+				return wrapper;
+			}
+			else
+			{
+				return attr;
+			}
+		}
+		else
+		{
+			if (object instanceof HTMLElement)
+			{
+				if (typeof(attr) === 'function')
+				{
+										var wrapper = function(args, kwargs)
+					{
+						return attr.apply(object, args);
+					}
+
+					wrapper.is_wrapper = true;
+					return wrapper;
+				}
+				else
+				{
+					return attr;
+				}
+			}
+		}
+	}
+	if (( attr ) !== undefined)
+	{
+		if (typeof(attr)==="function")
+		{
+			if (attr.pythonscript_function === undefined && attr.is_wrapper === undefined)
+			{
+				if (attr.prototype instanceof Object && ( Object.keys(attr.prototype).length ) > 0)
+				{
+					return attr;
+				}
+								var wrapper = function(args, kwargs)
+				{
+					var i,arg,keys;
+					if (args!==null)
+					{
+						i = 0;
+						while (( i ) < args.length)
+						{
+							arg = args[i];
+							if (arg && (typeof(arg)==="object"))
+							{
+								if (arg.jsify)
+								{
+									args[i] = arg.jsify();
+								}
+							}
+							i += 1;
+						}
+					}
+					if (kwargs!==null)
+					{
+						keys = __object_keys__(kwargs);
+						if (keys.length!==0)
+						{
+							args.push(kwargs);
+							i = 0;
+							while (( i ) < keys.length)
+							{
+								arg = kwargs[keys[i]];
+								if (arg && (typeof(arg)==="object"))
+								{
+									if (arg.jsify)
+									{
+										kwargs[keys[i]] = arg.jsify();
+									}
+								}
+								i += 1;
+							}
+						}
+					}
+					return attr.apply(object, args);
+				}
+
+				wrapper.is_wrapper = true;
+				wrapper.wrapped = attr;
+				return wrapper;
+			}
+			else
+			{
+				if (attr.is_classmethod)
+				{
+										var method = function()
+					{
+						var args;
+						args = Array.prototype.slice.call(arguments);
+						if (args[0] instanceof Array && {}.toString.call(args[1]) === '[object Object]' && (args.length===2))
+						{
+							/*pass*/
+						}
+						else
+						{
+							args = [args, {}];
+						}
+						if (object.__class__)
+						{
+							args[0].splice(0, 0, object.__class__);
+						}
+						else
+						{
+							args[0].splice(0, 0, object);
+						}
+						return attr.apply(this, args);
+					}
+
+					method.is_wrapper = true;
+					object[attribute] = method;
+					return method;
+				}
+				else
+				{
+					return attr;
+				}
+			}
+		}
+		else
+		{
+			return attr;
+		}
+	}
+	var __class__,bases;
+	__class__ = object.__class__;
+	if (__class__)
+	{
+		if (( attribute )  in  __class__.__properties__)
+		{
+			return __class__.__properties__[attribute]["get"]([object], {});
+		}
+		if (( attribute )  in  __class__.__unbound_methods__)
+		{
+			attr = __class__.__unbound_methods__[attribute];
+			if (attr.fastdef)
+			{
+								var method = function(args, kwargs)
+				{
+					if (arguments && arguments[0])
+					{
+						arguments[0].splice(0, 0, object);
+						return attr.apply(this, arguments);
+					}
+					else
+					{
+						return attr([object], {  });
+					}
+				}
+
+			}
+			else
+			{
+								var method = function(args, kwargs)
+				{
+					if (arguments.length===0)
+					{
+						return attr([object], __NULL_OBJECT__);
+					}
+					else
+					{
+						if (args instanceof Array && ( typeof(kwargs) ) === "object" && (arguments.length===2))
+						{
+							args.splice(0, 0, object);
+							if (( kwargs ) === undefined)
+							{
+								return attr(args, __NULL_OBJECT__);
+							}
+							else
+							{
+								return attr(args, kwargs);
+							}
+						}
+						else
+						{
+							args = Array.prototype.slice.call(arguments);
+							args.splice(0, 0, object);
+							args = [args, __NULL_OBJECT__];
+							return attr.apply(this, args);
+						}
+					}
+				}
+
+			}
+			method.is_wrapper = true;
+			object[attribute] = method;
+			return method;
+		}
+		attr = __class__[attribute];
+		if (( attribute )  in  __class__)
+		{
+			if ({}.toString.call(attr) === '[object Function]')
+			{
+				if (attr.is_wrapper)
+				{
+					return attr;
+				}
+				else
+				{
+					if (attr.fastdef)
+					{
+												var method = function(args, kwargs)
+						{
+							if (arguments && arguments[0])
+							{
+								arguments[0].splice(0, 0, object);
+								return attr.apply(this, arguments);
+							}
+							else
+							{
+								return attr([object], {  });
+							}
+						}
+
+					}
+					else
+					{
+												var method = function(args, kwargs)
+						{
+							if (arguments.length===0)
+							{
+								return attr([object], __NULL_OBJECT__);
+							}
+							else
+							{
+								if (args instanceof Array && ( typeof(kwargs) ) === "object" && (arguments.length===2))
+								{
+									args.splice(0, 0, object);
+									if (( kwargs ) === undefined)
+									{
+										return attr(args, __NULL_OBJECT__);
+									}
+									else
+									{
+										return attr(args, kwargs);
+									}
+								}
+								else
+								{
+									args = Array.prototype.slice.call(arguments);
+									args.splice(0, 0, object);
+									args = [args, __NULL_OBJECT__];
+									return attr.apply(this, args);
+								}
+							}
+						}
+
+					}
+				}
+				method.is_wrapper = true;
+				object[attribute] = method;
+				return method;
+			}
+			else
+			{
+				return attr;
+			}
+		}
+		bases = __class__.__bases__;
+				var __iter1 = bases;
+		if (! (__iter1 instanceof Array || typeof __iter1 == "string" || __is_typed_array(__iter1) || __is_some_array(__iter1) )) { __iter1 = __object_keys__(__iter1) }
+		for (var __i1=0; __i1 < __iter1.length; __i1++) {
+			var base = __iter1[ __i1 ];
+			attr = _get_upstream_attribute(base, attribute);
+			if (( attr ) !== undefined)
+			{
+				if ({}.toString.call(attr) === '[object Function]')
+				{
+					if (attr.fastdef)
+					{
+												var method = function(args, kwargs)
+						{
+							if (arguments && arguments[0])
+							{
+								arguments[0].splice(0, 0, object);
+								return attr.apply(this, arguments);
+							}
+							else
+							{
+								return attr([object], {  });
+							}
+						}
+
+					}
+					else
+					{
+												var method = function(args, kwargs)
+						{
+							if (arguments.length===0)
+							{
+								return attr([object], __NULL_OBJECT__);
+							}
+							else
+							{
+								if (args instanceof Array && ( typeof(kwargs) ) === "object" && (arguments.length===2))
+								{
+									args.splice(0, 0, object);
+									if (( kwargs ) === undefined)
+									{
+										return attr(args, __NULL_OBJECT__);
+									}
+									else
+									{
+										return attr(args, kwargs);
+									}
+								}
+								else
+								{
+									args = Array.prototype.slice.call(arguments);
+									args.splice(0, 0, object);
+									args = [args, __NULL_OBJECT__];
+									return attr.apply(this, args);
+								}
+							}
+						}
+
+					}
+					method.is_wrapper = true;
+					object[attribute] = method;
+					return method;
+				}
+				else
+				{
+					return attr;
+				}
+			}
+		}
+				var __iter2 = bases;
+		if (! (__iter2 instanceof Array || typeof __iter2 == "string" || __is_typed_array(__iter2) || __is_some_array(__iter2) )) { __iter2 = __object_keys__(__iter2) }
+		for (var __i2=0; __i2 < __iter2.length; __i2++) {
+			var base = __iter2[ __i2 ];
+			var prop;
+			prop = _get_upstream_property(base, attribute);
+			if (( prop ) !== undefined)
+			{
+				return prop["get"]([object], {});
+			}
+		}
+		if (( "__getattr__" )  in  __class__)
+		{
+			return __class__["__getattr__"]([object, attribute], {});
+		}
+				var __iter3 = bases;
+		if (! (__iter3 instanceof Array || typeof __iter3 == "string" || __is_typed_array(__iter3) || __is_some_array(__iter3) )) { __iter3 = __object_keys__(__iter3) }
+		for (var __i3=0; __i3 < __iter3.length; __i3++) {
+			var base = __iter3[ __i3 ];
+			var f;
+			f = _get_upstream_attribute(base, "__getattr__");
+			if (( f ) !== undefined)
+			{
+				return f([object, attribute], {});
+			}
+		}
+	}
+	if (attribute==="__getitem__")
+	{
+				var wrapper = function(args, kwargs)
+		{
+			v = object[args[0]];
+			if (( v ) === undefined)
+			{
+				throw new KeyError(args[0]);
+			}
+		}
+
+		wrapper.is_wrapper = true;
+		return wrapper;
+	}
+	else
+	{
+		if (attribute==="__setitem__")
+		{
+						var wrapper = function(args, kwargs)
+			{
+				object[args[0]] = args[1];
+			}
+
+			wrapper.is_wrapper = true;
+			return wrapper;
+		}
+	}
+	if (typeof(object, "function") && object.is_wrapper)
+	{
+		return object.wrapped[attribute];
+	}
+	if ((attribute==="__iter__") && object instanceof Object)
+	{
+				var wrapper = function(args, kwargs)
+		{
+			return  new __ArrayIterator(Object.keys(object), 0);
+		}
+
+		wrapper.is_wrapper = true;
+		return wrapper;
+	}
+	if ((attribute==="__contains__") && object instanceof Object)
+	{
+				var wrapper = function(args, kwargs)
+		{
+			return (Object.keys(object).indexOf(args[0])!==-1);
+		}
+
+		wrapper.is_wrapper = true;
+		return wrapper;
+	}
+	if (( attr ) === undefined)
+	{
+		if (error_message)
+		{
+			throw new AttributeError(error_message);
+		}
+		else
+		{
+			throw new AttributeError(attribute);
+		}
+	}
+	else
+	{
+		return attr;
+	}
+}
+
+var _get_upstream_attribute = function(base, attr)
+{
+	if (( attr )  in  base)
+	{
+		return base[attr];
+	}
+		var __iter4 = base.__bases__;
+	if (! (__iter4 instanceof Array || typeof __iter4 == "string" || __is_typed_array(__iter4) || __is_some_array(__iter4) )) { __iter4 = __object_keys__(__iter4) }
+	for (var __i4=0; __i4 < __iter4.length; __i4++) {
+		var parent = __iter4[ __i4 ];
+		return _get_upstream_attribute(parent, attr);
+	}
+}
+
+var _get_upstream_property = function(base, attr)
+{
+	if (( attr )  in  base.__properties__)
+	{
+		return base.__properties__[attr];
+	}
+		var __iter5 = base.__bases__;
+	if (! (__iter5 instanceof Array || typeof __iter5 == "string" || __is_typed_array(__iter5) || __is_some_array(__iter5) )) { __iter5 = __object_keys__(__iter5) }
+	for (var __i5=0; __i5 < __iter5.length; __i5++) {
+		var parent = __iter5[ __i5 ];
+		return _get_upstream_property(parent, attr);
+	}
+}
+
+/* __setattr__ is always called when an attribute is set,
+	unlike __getattr__ that only triggers when an attribute is not found,
+	this asymmetry is in fact part of the Python spec.
+	note there is no __setattribute__
+
+	In normal Python a property setter is not called before __setattr__,
+	this is bad language design because the user has been more explicit
+	in having the property setter.
+
+	In PythonJS, property setters are called instead of __setattr__. */
+var __set__ = function(object, attribute, value)
+{
+	if (( "__class__" )  in  object && (object.__class__.__setters__.indexOf(attribute)!==-1))
+	{
+		object[attribute] = value;
+	}
+	else
+	{
+		if (( "__setattr__" )  in  object)
+		{
+			object.__setattr__(attribute, value);
+		}
+		else
+		{
+			object[attribute] = value;
+		}
+	}
+}
+
+/* Based on ``signature`` and ``args``, ``kwargs`` parameters retrieve
+	the actual parameters.
+
+	This will set default keyword arguments and retrieve positional arguments
+	in kwargs if their called as such */
+var __getargs__ = function(func_name, signature, args, kwargs)
+{
+	if (( args ) === null)
+	{
+		args = [];
+	}
+	if (( kwargs ) === null)
+	{
+		kwargs = {  };
+	}
+	out = {  };
+	if (( args.length ) > signature.args.length)
+	{
+		if (signature.vararg)
+		{
+			/*pass*/
+		}
+		else
+		{
+			console.log(("Error in function->" + func_name));
+			console.log("args:", args, "kwargs:", kwargs, "sig:", signature);
+			throw new TypeError("Supplemental positional arguments provided but signature doesn't accept them");
+		}
+	}
+	j = 0;
+	while (( j ) < signature.args.length)
+	{
+		name = signature.args[j];
+		if (( name )  in  kwargs)
+		{
+			out[name] = kwargs[name];
+		}
+		else
+		{
+			if (( j ) < args.length)
+			{
+				out[name] = args[j];
+			}
+			else
+			{
+				if (( name )  in  signature.kwargs)
+				{
+					out[name] = signature.kwargs[name];
+				}
+			}
+		}
+		j += 1;
+	}
+	args = args.slice(j);
+	if (signature.vararg)
+	{
+		out[signature.vararg] = args;
+	}
+	if (signature.varkwarg)
+	{
+		out[signature.varkwarg] = kwargs;
+	}
+	return out;
 }
 
 IndexError = function(msg) {this.message = msg || "";}; IndexError.prototype = Object.create(Error.prototype); IndexError.prototype.name = "IndexError";
@@ -489,3328 +707,4213 @@ KeyError   = function(msg) {this.message = msg || "";}; KeyError.prototype = Obj
 ValueError = function(msg) {this.message = msg || "";}; ValueError.prototype = Object.create(Error.prototype); ValueError.prototype.name = "ValueError";
 AttributeError = function(msg) {this.message = msg || "";}; AttributeError.prototype = Object.create(Error.prototype);AttributeError.prototype.name = "AttributeError";
 RuntimeError   = function(msg) {this.message = msg || "";}; RuntimeError.prototype = Object.create(Error.prototype);RuntimeError.prototype.name = "RuntimeError";
-var hasattr = function(ob, attr) {
-  
-  return Object.hasOwnProperty.call(ob, attr);
-}
-
-var len = function(ob) {
-  
-  if (ob instanceof Array) {
-    return ob.length;
-  } else {
-    if (__is_typed_array(ob)) {
-      return ob.length;
-    } else {
-      if (ob instanceof ArrayBuffer) {
-        return ob.byteLength;
-      } else {
-        if (ob.__len__) {
-          return ob.__len__();
-        } else {
-          return Object.keys(ob).length;
-        }
-      }
-    }
-  }
-}
-
-var func = function(a) {
-  
-  if (this.indexOf(a)===-1) {
-    return false;
-  } else {
-    return true;
-  }
-}
-
-Object.defineProperty(String.prototype, "__contains__", { enumerable:false,value:func,writeable:true,configurable:true });
-var func = function(start, stop, step) {
-  
-  if (( start ) === undefined && ( stop ) === undefined && (step===-1)) {
-    return this.split("").reverse().join("");
-  } else {
-    if (( stop ) < 0) {
-      stop = (this.length + stop);
-    }
-    return this.substring(start, stop);
-  }
-}
-
-Object.defineProperty(String.prototype, "__getslice__", { enumerable:false,value:func,writeable:true,configurable:true });
-var func = function() {
-  
-  return this.split("\n");
-}
-
-Object.defineProperty(String.prototype, "splitlines", { enumerable:false,value:func,writeable:true,configurable:true });
-var func = function() {
-  
-  return this.trim();
-}
-
-Object.defineProperty(String.prototype, "strip", { enumerable:false,value:func,writeable:true,configurable:true });
-var func = function(a) {
-  
-  if (this.substring(0, a.length)===a) {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-Object.defineProperty(String.prototype, "startswith", { enumerable:false,value:func,writeable:true,configurable:true });
-var func = function(a) {
-  
-  if (this.substring((this.length - a.length), this.length)===a) {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-Object.defineProperty(String.prototype, "endswith", { enumerable:false,value:func,writeable:true,configurable:true });
-var func = function(a) {
-  var i,arr,out;
-  out = "";
-  if (a instanceof Array) {
-    arr = a;
-  } else {
-    arr = a["$wrapped"];
-  }
-  i = 0;
-    var __iter1 = arr;
-  if (! (__iter1 instanceof Array || typeof __iter1 == "string" || __is_typed_array(__iter1) || __is_some_array(__iter1) )) { __iter1 = __object_keys__(__iter1) }
-  for (var __idx1=0; __idx1 < __iter1.length; __idx1++) {
-    var value = __iter1[ __idx1 ];
-    out += value;
-    i += 1;
-    if (( i ) < arr.length) {
-      out += this;
-    }
-  }
-  return out;
-}
-
-Object.defineProperty(String.prototype, "join", { enumerable:false,value:func,writeable:true,configurable:true });
-var func = function() {
-  
-  return this.toUpperCase();
-}
-
-Object.defineProperty(String.prototype, "upper", { enumerable:false,value:func,writeable:true,configurable:true });
-var func = function() {
-  
-  return this.toLowerCase();
-}
-
-Object.defineProperty(String.prototype, "lower", { enumerable:false,value:func,writeable:true,configurable:true });
-var func = function(a) {
-  var i;
-  i = this.indexOf(a);
-  if (i===-1) {
-    throw new ValueError((a + " - not in string"));
-  }
-  return i;
-}
-
-Object.defineProperty(String.prototype, "index", { enumerable:false,value:func,writeable:true,configurable:true });
-var func = function(a) {
-  
-  if (this.indexOf(a)===-1) {
-    return false;
-  } else {
-    return true;
-  }
-}
-
-Object.defineProperty(Array.prototype, "__contains__", { enumerable:false,value:func,writeable:true,configurable:true });
-var func = function(start, stop, step) {
-  var i,arr,n;
-  arr = [];
-  start = (start | 0);
-  if (( stop ) === undefined) {
-    stop = this.length;
-  }
-  if (( start ) < 0) {
-    start = (this.length + start);
-  }
-  if (( stop ) < 0) {
-    stop = (this.length + stop);
-  }
-  if (typeof(step)==="number") {
-    if (( step ) < 0) {
-      i = start;
-      while (( i ) >= 0) {
-        arr.push(this[i]);
-        i += step;
-      }
-      return arr;
-    } else {
-      i = start;
-      n = stop;
-      while (( i ) < n) {
-        arr.push(this[i]);
-        i += step;
-      }
-      return arr;
-    }
-  } else {
-    i = start;
-    n = stop;
-    while (( i ) < n) {
-      arr.push(this[i]);
-      i += 1;
-    }
-    return arr;
-  }
-}
-
-Object.defineProperty(Array.prototype, "__getslice__", { enumerable:false,value:func,writeable:true,configurable:true });
-var func = function(start, stop, step, items) {
-  var arr;
-  if (( start ) === undefined) {
-    start = 0;
-  }
-  if (( stop ) === undefined) {
-    stop = this.length;
-  }
-  arr = [start, (stop - start)];
-    var __iter2 = items;
-  if (! (__iter2 instanceof Array || typeof __iter2 == "string" || __is_typed_array(__iter2) || __is_some_array(__iter2) )) { __iter2 = __object_keys__(__iter2) }
-  for (var __idx2=0; __idx2 < __iter2.length; __idx2++) {
-    var item = __iter2[ __idx2 ];
-    arr.push(item);
-  }
-  this.splice.apply(this, arr);
-}
-
-Object.defineProperty(Array.prototype, "__setslice__", { enumerable:false,value:func,writeable:true,configurable:true });
-var func = function(item) {
-  
-  this.push(item);
-  return this;
-}
-
-Object.defineProperty(Array.prototype, "append", { enumerable:false,value:func,writeable:true,configurable:true });
-var extend = function(other) {
-  
-    var __iter3 = other;
-  if (! (__iter3 instanceof Array || typeof __iter3 == "string" || __is_typed_array(__iter3) || __is_some_array(__iter3) )) { __iter3 = __object_keys__(__iter3) }
-  for (var __idx3=0; __idx3 < __iter3.length; __idx3++) {
-    var obj = __iter3[ __idx3 ];
-    this.push(obj);
-  }
-  return this;
-}
-
-Object.defineProperty(Array.prototype, "extend", { enumerable:false,value:extend,writeable:true,configurable:true });
-var func = function(item) {
-  var index;
-  index = this.indexOf(item);
-  this.splice(index, 1);
-}
-
-Object.defineProperty(Array.prototype, "remove", { enumerable:false,value:func,writeable:true,configurable:true });
-var insert = function(index, obj) {
-  
-  if (( index ) < 0) {
-    index = (this.length + index);
-  }
-  this.splice(index, 0, obj);
-}
-
-Object.defineProperty(Array.prototype, "insert", { enumerable:false,value:insert,writeable:true,configurable:true });
-var index = function(obj) {
-  
-  return this.indexOf(obj);
-}
-
-Object.defineProperty(Array.prototype, "index", { enumerable:false,value:index,writeable:true,configurable:true });
-var count = function(obj) {
-  var a;
-  a = 0;
-    var __iter4 = this;
-  if (! (__iter4 instanceof Array || typeof __iter4 == "string" || __is_typed_array(__iter4) || __is_some_array(__iter4) )) { __iter4 = __object_keys__(__iter4) }
-  for (var __idx4=0; __idx4 < __iter4.length; __idx4++) {
-    var item = __iter4[ __idx4 ];
-    if (( item ) === obj) {
-      a += 1;
-    }
-  }
-  return a;
-}
-
-Object.defineProperty(Array.prototype, "count", { enumerable:false,value:count,writeable:true,configurable:true });
-var __contains__ = function(ob, a) {
-  var t;
-  t = typeof(ob);
-  if (t==="string") {
-    if (ob.indexOf(a)===-1) {
-      return false;
-    } else {
-      return true;
-    }
-  } else {
-    if (t==="number") {
-      throw new TypeError;
-    } else {
-      if (__is_typed_array(ob)) {
-                var __iter5 = ob;
-        if (! (__iter5 instanceof Array || typeof __iter5 == "string" || __is_typed_array(__iter5) || __is_some_array(__iter5) )) { __iter5 = __object_keys__(__iter5) }
-        for (var __idx5=0; __idx5 < __iter5.length; __idx5++) {
-          var x = __iter5[ __idx5 ];
-          if (x===a) {
-            return true;
-          }
-        }
-        return false;
-      } else {
-        if (ob.__contains__) {
-          return ob.__contains__(a);
-        } else {
-          if (ob instanceof Object && Object.hasOwnProperty.call(ob, a)) {
-            return true;
-          } else {
-            return false;
-          }
-        }
-      }
-    }
-  }
+var hasattr = function(ob, attr)
+{
+	
+	return Object.hasOwnProperty.call(ob, attr);
+}
+
+var len = function(ob)
+{
+	
+	if (ob instanceof Array)
+	{
+		return ob.length;
+	}
+	else
+	{
+		if (__is_typed_array(ob))
+		{
+			return ob.length;
+		}
+		else
+		{
+			if (ob instanceof ArrayBuffer)
+			{
+				return ob.byteLength;
+			}
+			else
+			{
+				if (ob.__len__)
+				{
+					return ob.__len__();
+				}
+				else
+				{
+					return Object.keys(ob).length;
+				}
+			}
+		}
+	}
+}
+
+var func = function(a)
+{
+	
+	if (this.indexOf(a)===-1)
+	{
+		return false;
+	}
+	else
+	{
+		return true;
+	}
+}
+
+Object.defineProperty(String.prototype, "__contains__", { enumerable:false, value:func, writeable:true, configurable:true });
+var func = function(start, stop, step)
+{
+	
+	if (( start ) === undefined && ( stop ) === undefined && (step===-1))
+	{
+		return this.split("").reverse().join("");
+	}
+	else
+	{
+		if (( stop ) < 0)
+		{
+			stop = (this.length + stop);
+		}
+		return this.substring(start, stop);
+	}
+}
+
+Object.defineProperty(String.prototype, "__getslice__", { enumerable:false, value:func, writeable:true, configurable:true });
+var func = function()
+{
+	
+	return this.split("\n");
+}
+
+Object.defineProperty(String.prototype, "splitlines", { enumerable:false, value:func, writeable:true, configurable:true });
+var func = function()
+{
+	
+	return this.trim();
+}
+
+Object.defineProperty(String.prototype, "strip", { enumerable:false, value:func, writeable:true, configurable:true });
+var func = function(a)
+{
+	
+	if (this.substring(0, a.length)===a)
+	{
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+}
+
+Object.defineProperty(String.prototype, "startswith", { enumerable:false, value:func, writeable:true, configurable:true });
+var func = function(a)
+{
+	
+	if (this.substring((this.length - a.length), this.length)===a)
+	{
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+}
+
+Object.defineProperty(String.prototype, "endswith", { enumerable:false, value:func, writeable:true, configurable:true });
+var func = function(a)
+{
+	var i,arr,out;
+	out = "";
+	if (a instanceof Array)
+	{
+		arr = a;
+	}
+	else
+	{
+		arr = a["$wrapped"];
+	}
+	i = 0;
+		var __iter1 = arr;
+	if (! (__iter1 instanceof Array || typeof __iter1 == "string" || __is_typed_array(__iter1) || __is_some_array(__iter1) )) { __iter1 = __object_keys__(__iter1) }
+	for (var __i1=0; __i1 < __iter1.length; __i1++) {
+		var value = __iter1[ __i1 ];
+		out += value;
+		i += 1;
+		if (( i ) < arr.length)
+		{
+			out += this;
+		}
+	}
+	return out;
+}
+
+Object.defineProperty(String.prototype, "join", { enumerable:false, value:func, writeable:true, configurable:true });
+var func = function()
+{
+	
+	return this.toUpperCase();
+}
+
+Object.defineProperty(String.prototype, "upper", { enumerable:false, value:func, writeable:true, configurable:true });
+var func = function()
+{
+	
+	return this.toLowerCase();
+}
+
+Object.defineProperty(String.prototype, "lower", { enumerable:false, value:func, writeable:true, configurable:true });
+var func = function(a)
+{
+	var i;
+	i = this.indexOf(a);
+	if (i===-1)
+	{
+		throw new ValueError((a + " - not in string"));
+	}
+	return i;
+}
+
+Object.defineProperty(String.prototype, "index", { enumerable:false, value:func, writeable:true, configurable:true });
+var func = function(a)
+{
+	
+	if (this.indexOf(a)===-1)
+	{
+		return false;
+	}
+	else
+	{
+		return true;
+	}
+}
+
+Object.defineProperty(Array.prototype, "__contains__", { enumerable:false, value:func, writeable:true, configurable:true });
+var func = function(start, stop, step)
+{
+	var i,arr,n;
+	arr = [];
+	start = (start | 0);
+	if (( stop ) === undefined)
+	{
+		stop = this.length;
+	}
+	if (( start ) < 0)
+	{
+		start = (this.length + start);
+	}
+	if (( stop ) < 0)
+	{
+		stop = (this.length + stop);
+	}
+	if (typeof(step)==="number")
+	{
+		if (( step ) < 0)
+		{
+			i = start;
+			while (( i ) >= 0)
+			{
+				arr.push(this[i]);
+				i += step;
+			}
+			return arr;
+		}
+		else
+		{
+			i = start;
+			n = stop;
+			while (( i ) < n)
+			{
+				arr.push(this[i]);
+				i += step;
+			}
+			return arr;
+		}
+	}
+	else
+	{
+		i = start;
+		n = stop;
+		while (( i ) < n)
+		{
+			arr.push(this[i]);
+			i += 1;
+		}
+		return arr;
+	}
+}
+
+Object.defineProperty(Array.prototype, "__getslice__", { enumerable:false, value:func, writeable:true, configurable:true });
+var func = function(start, stop, step, items)
+{
+	var arr;
+	if (( start ) === undefined)
+	{
+		start = 0;
+	}
+	if (( stop ) === undefined)
+	{
+		stop = this.length;
+	}
+	arr = [start, (stop - start)];
+		var __iter2 = items;
+	if (! (__iter2 instanceof Array || typeof __iter2 == "string" || __is_typed_array(__iter2) || __is_some_array(__iter2) )) { __iter2 = __object_keys__(__iter2) }
+	for (var __i2=0; __i2 < __iter2.length; __i2++) {
+		var item = __iter2[ __i2 ];
+		arr.push(item);
+	}
+	this.splice.apply(this, arr);
+}
+
+Object.defineProperty(Array.prototype, "__setslice__", { enumerable:false, value:func, writeable:true, configurable:true });
+var func = function(item)
+{
+	
+	this.push(item);
+	return this;
+}
+
+Object.defineProperty(Array.prototype, "append", { enumerable:false, value:func, writeable:true, configurable:true });
+var extend = function(other)
+{
+	
+		var __iter3 = other;
+	if (! (__iter3 instanceof Array || typeof __iter3 == "string" || __is_typed_array(__iter3) || __is_some_array(__iter3) )) { __iter3 = __object_keys__(__iter3) }
+	for (var __i3=0; __i3 < __iter3.length; __i3++) {
+		var obj = __iter3[ __i3 ];
+		this.push(obj);
+	}
+	return this;
+}
+
+Object.defineProperty(Array.prototype, "extend", { enumerable:false, value:extend, writeable:true, configurable:true });
+var func = function(item)
+{
+	var index;
+	index = this.indexOf(item);
+	this.splice(index, 1);
+}
+
+Object.defineProperty(Array.prototype, "remove", { enumerable:false, value:func, writeable:true, configurable:true });
+var insert = function(index, obj)
+{
+	
+	if (( index ) < 0)
+	{
+		index = (this.length + index);
+	}
+	this.splice(index, 0, obj);
+}
+
+Object.defineProperty(Array.prototype, "insert", { enumerable:false, value:insert, writeable:true, configurable:true });
+var index = function(obj)
+{
+	
+	return this.indexOf(obj);
+}
+
+Object.defineProperty(Array.prototype, "index", { enumerable:false, value:index, writeable:true, configurable:true });
+var count = function(obj)
+{
+	var a;
+	a = 0;
+		var __iter4 = this;
+	if (! (__iter4 instanceof Array || typeof __iter4 == "string" || __is_typed_array(__iter4) || __is_some_array(__iter4) )) { __iter4 = __object_keys__(__iter4) }
+	for (var __i4=0; __i4 < __iter4.length; __i4++) {
+		var item = __iter4[ __i4 ];
+		if (( item ) === obj)
+		{
+			a += 1;
+		}
+	}
+	return a;
+}
+
+Object.defineProperty(Array.prototype, "count", { enumerable:false, value:count, writeable:true, configurable:true });
+var __contains__ = function(ob, a)
+{
+	var t;
+	t = typeof(ob);
+	if (t==="string")
+	{
+		if (ob.indexOf(a)===-1)
+		{
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+	else
+	{
+		if (t==="number")
+		{
+			throw new TypeError;
+		}
+		else
+		{
+			if (__is_typed_array(ob))
+			{
+								var __iter5 = ob;
+				if (! (__iter5 instanceof Array || typeof __iter5 == "string" || __is_typed_array(__iter5) || __is_some_array(__iter5) )) { __iter5 = __object_keys__(__iter5) }
+				for (var __i5=0; __i5 < __iter5.length; __i5++) {
+					var x = __iter5[ __i5 ];
+					if (x===a)
+					{
+						return true;
+					}
+				}
+				return false;
+			}
+			else
+			{
+				if (ob.__contains__)
+				{
+					return ob.__contains__(a);
+				}
+				else
+				{
+					if (ob instanceof Object && Object.hasOwnProperty.call(ob, a))
+					{
+						return true;
+					}
+					else
+					{
+						return false;
+					}
+				}
+			}
+		}
+	}
 }
 
 __dom_array_types__ = [];
-if (typeof(NodeList)==="function") {
-  __dom_array_types__ = [NodeList, FileList, DOMStringList, HTMLCollection, SVGNumberList, SVGTransformList];
-  if (typeof(DataTransferItemList)==="function") {
-    __dom_array_types__.push(DataTransferItemList);
-  }
-  if (typeof(HTMLAllCollection)==="function") {
-    __dom_array_types__.push(HTMLAllCollection);
-  }
-  if (typeof(SVGElementInstanceList)==="function") {
-    __dom_array_types__.push(SVGElementInstanceList);
-  }
-  if (typeof(ClientRectList)==="function") {
-    __dom_array_types__.push(ClientRectList);
-  }
-}
-var __is_some_array = function(ob) {
-  
-  if (( __dom_array_types__.length ) > 0) {
-        var __iter6 = __dom_array_types__;
-    if (! (__iter6 instanceof Array || typeof __iter6 == "string" || __is_typed_array(__iter6) || __is_some_array(__iter6) )) { __iter6 = __object_keys__(__iter6) }
-    for (var __idx6=0; __idx6 < __iter6.length; __idx6++) {
-      var t = __iter6[ __idx6 ];
-      if (ob instanceof t) {
-        return true;
-      }
-    }
-  }
-  return false;
-}
-
-var __is_typed_array = function(ob) {
-  
-  if (ob instanceof Int8Array || ob instanceof Uint8Array) {
-    return true;
-  } else {
-    if (ob instanceof Int16Array || ob instanceof Uint16Array) {
-      return true;
-    } else {
-      if (ob instanceof Int32Array || ob instanceof Uint32Array) {
-        return true;
-      } else {
-        if (ob instanceof Float32Array || ob instanceof Float64Array) {
-          return true;
-        } else {
-          return false;
-        }
-      }
-    }
-  }
-}
-
-var __js_typed_array = function(t, a) {
-  var arr;
-  if (t==="i") {
-    arr =  new Int32Array(a.length);
-  }
-  arr.set(a);
-  return arr;
-}
-
-var __object_keys__ = function(ob) {
-  var arr;
-  "\n		notes:\n			. Object.keys(ob) will not work because we create PythonJS objects using `Object.create(null)`\n			. this is different from Object.keys because it traverses the prototype chain.\n		";
-  arr = [];
-  for (var key in ob) { arr.push(key) };
-  return arr;
-}
-
-var __sprintf = function(fmt, args) {
-  var chunks,item,arr;
-  if (args instanceof Array) {
-    chunks = fmt.split("%s");
-    arr = [];
-    var i;
-    i = 0;
-        var __iter7 = chunks;
-    if (! (__iter7 instanceof Array || typeof __iter7 == "string" || __is_typed_array(__iter7) || __is_some_array(__iter7) )) { __iter7 = __object_keys__(__iter7) }
-    for (var __idx7=0; __idx7 < __iter7.length; __idx7++) {
-      var txt = __iter7[ __idx7 ];
-      arr.append(txt);
-      if (( i ) >= args.length) {
-        break;
-      }
-      item = args[i];
-      if (typeof(item)==="string") {
-        arr.append(item);
-      } else {
-        if (typeof(item)==="number") {
-          arr.append(("" + item));
-        } else {
-          arr.append(Object.prototype.toString.call(item));
-        }
-      }
-      i += 1;
-    }
-    return "".join(arr);
-  } else {
-    return __replace_method(fmt, "%s", args);
-  }
-}
-
-var __jsdict = function(items) {
-  var d,key;
-  d = {};
-    var __iter8 = items;
-  if (! (__iter8 instanceof Array || typeof __iter8 == "string" || __is_typed_array(__iter8) || __is_some_array(__iter8) )) { __iter8 = __object_keys__(__iter8) }
-  for (var __idx8=0; __idx8 < __iter8.length; __idx8++) {
-    var item = __iter8[ __idx8 ];
-    key = item[0];
-    if (key instanceof Array) {
-      key = JSON.stringify(key);
-    } else {
-      if (key.__uid__) {
-        key = key.__uid__;
-      }
-    }
-    d[key] = item[1];
-  }
-  return d;
-}
-
-var __jsdict_get = function(ob, key, default_value) {
-  
-  if (ob instanceof Object) {
-    if (key instanceof Array) {
-      key = JSON.stringify(key);
-    }
-    if (key in ob) {
-      return ob[key];
-    }
-    return default_value;
-  } else {
-    if (( default_value ) !== undefined) {
-      return ob.get(key, default_value);
-    } else {
-      return ob.get(key);
-    }
-  }
-}
-
-var __jsdict_set = function(ob, key, value) {
-  
-  if (ob instanceof Object) {
-    if (key instanceof Array) {
-      key = JSON.stringify(key);
-    }
-    ob[key] = value;
-  } else {
-    ob.set(key,value);
-  }
-}
-
-var __jsdict_keys = function(ob) {
-  
-  if (ob instanceof Object) {
-    return Object.keys( ob );
-  } else {
-    return ob.keys();
-  }
-}
-
-var __jsdict_values = function(ob) {
-  var arr,value;
-  if (ob instanceof Object) {
-    arr = [];
-        var __iter9 = ob;
-    if (! (__iter9 instanceof Array || typeof __iter9 == "string" || __is_typed_array(__iter9) || __is_some_array(__iter9) )) { __iter9 = __object_keys__(__iter9) }
-    for (var __idx9=0; __idx9 < __iter9.length; __idx9++) {
-      var key = __iter9[ __idx9 ];
-      if (ob.hasOwnProperty(key)) {
-        value = ob[key];
-        arr.push(value);
-      }
-    }
-    return arr;
-  } else {
-    return ob.values();
-  }
-}
-
-var __jsdict_items = function(ob) {
-  var arr,value;
-  if (ob instanceof Object || ( ob.items ) === undefined) {
-    arr = [];
-        var __iter10 = ob;
-    if (! (__iter10 instanceof Array || typeof __iter10 == "string" || __is_typed_array(__iter10) || __is_some_array(__iter10) )) { __iter10 = __object_keys__(__iter10) }
-    for (var __idx10=0; __idx10 < __iter10.length; __idx10++) {
-      var key = __iter10[ __idx10 ];
-      if (Object.hasOwnProperty.call(ob, key)) {
-        value = ob[key];
-        arr.push([key, value]);
-      }
-    }
-    return arr;
-  } else {
-    return ob.items();
-  }
-}
-
-var __jsdict_pop = function(ob, key, _kwargs_) {
-  var v;
-  if (!( _kwargs_ instanceof Object )) {;
-  var _kwargs_ = {ob: arguments[0],key: arguments[1],_default: arguments[2]};
-  };
-  if (_kwargs_ === undefined || _kwargs_._default === undefined) {var _default = null} else {var _default=_kwargs_._default};
-  if (ob instanceof Array) {
-    if (ob.length) {
-      if (( key ) === undefined) {
-        return ob.pop();
-      } else {
-        return ob.splice(key, 1)[0];
-      }
-    } else {
-      throw new IndexError(key);
-    }
-  } else {
-    if (ob instanceof Object) {
-      if (key in ob) {
-        v = ob[key];
-        delete ob[key];
-        return v;
-      } else {
-        if (( _default ) === undefined) {
-          throw new KeyError(key);
-        } else {
-          return _default;
-        }
-      }
-    } else {
-      return ob.pop(key, _default);
-    }
-  }
-}
-
-var int16 = function(a) {
-  var arr;
-  arr =  new Int16Array(1);
-  arr[0] = a;
-  return arr;
-}
-
-var __gpu_object = function(cls, struct_name, data_name) {
-  
-  cls.prototype.__struct_name__ = struct_name;
-  cls.prototype.__struct_data__ = data_name;
+if (typeof(NodeList)==="function")
+{
+	__dom_array_types__ = [NodeList, FileList, DOMStringList, HTMLCollection, SVGNumberList, SVGTransformList];
+	if (typeof(DataTransferItemList)==="function")
+	{
+		__dom_array_types__.push(DataTransferItemList);
+	}
+	if (typeof(HTMLAllCollection)==="function")
+	{
+		__dom_array_types__.push(HTMLAllCollection);
+	}
+	if (typeof(SVGElementInstanceList)==="function")
+	{
+		__dom_array_types__.push(SVGElementInstanceList);
+	}
+	if (typeof(ClientRectList)==="function")
+	{
+		__dom_array_types__.push(ClientRectList);
+	}
+}
+var __is_some_array = function(ob)
+{
+	
+	if (( __dom_array_types__.length ) > 0)
+	{
+				var __iter6 = __dom_array_types__;
+		if (! (__iter6 instanceof Array || typeof __iter6 == "string" || __is_typed_array(__iter6) || __is_some_array(__iter6) )) { __iter6 = __object_keys__(__iter6) }
+		for (var __i6=0; __i6 < __iter6.length; __i6++) {
+			var t = __iter6[ __i6 ];
+			if (ob instanceof t)
+			{
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
+var __is_typed_array = function(ob)
+{
+	
+	if (ob instanceof Int8Array || ob instanceof Uint8Array)
+	{
+		return true;
+	}
+	else
+	{
+		if (ob instanceof Int16Array || ob instanceof Uint16Array)
+		{
+			return true;
+		}
+		else
+		{
+			if (ob instanceof Int32Array || ob instanceof Uint32Array)
+			{
+				return true;
+			}
+			else
+			{
+				if (ob instanceof Float32Array || ob instanceof Float64Array)
+				{
+					return true;
+				}
+				else
+				{
+					return false;
+				}
+			}
+		}
+	}
+}
+
+var __js_typed_array = function(t, a)
+{
+	var arr;
+	if (t==="i")
+	{
+		arr =  new Int32Array(a.length);
+	}
+	arr.set(a);
+	return arr;
+}
+
+/* notes:
+			. Object.keys(ob) will not work because we create PythonJS objects using `Object.create(null)`
+			. this is different from Object.keys because it traverses the prototype chain. */
+var __object_keys__ = function(ob)
+{
+	var arr;
+	arr = [];
+	for (var key in ob) { arr.push(key) };
+	return arr;
+}
+
+var __sprintf = function(fmt, args)
+{
+	var chunks,item,arr;
+	if (args instanceof Array)
+	{
+		chunks = fmt.split("%s");
+		arr = [];
+		var i;
+		i = 0;
+				var __iter7 = chunks;
+		if (! (__iter7 instanceof Array || typeof __iter7 == "string" || __is_typed_array(__iter7) || __is_some_array(__iter7) )) { __iter7 = __object_keys__(__iter7) }
+		for (var __i7=0; __i7 < __iter7.length; __i7++) {
+			var txt = __iter7[ __i7 ];
+			arr.append(txt);
+			if (( i ) >= args.length)
+			{
+				break;
+			}
+			item = args[i];
+			if (typeof(item)==="string")
+			{
+				arr.append(item);
+			}
+			else
+			{
+				if (typeof(item)==="number")
+				{
+					arr.append(("" + item));
+				}
+				else
+				{
+					arr.append(Object.prototype.toString.call(item));
+				}
+			}
+			i += 1;
+		}
+		return "".join(arr);
+	}
+	else
+	{
+		return fmt.replace('%s', args);
+	}
+}
+
+var __jsdict = function(items)
+{
+	var d,key;
+	d = {};
+		var __iter8 = items;
+	if (! (__iter8 instanceof Array || typeof __iter8 == "string" || __is_typed_array(__iter8) || __is_some_array(__iter8) )) { __iter8 = __object_keys__(__iter8) }
+	for (var __i8=0; __i8 < __iter8.length; __i8++) {
+		var item = __iter8[ __i8 ];
+		key = item[0];
+		if (key instanceof Array)
+		{
+			key = JSON.stringify(key);
+		}
+		else
+		{
+			if (key.__uid__)
+			{
+				key = key.__uid__;
+			}
+		}
+		d[key] = item[1];
+	}
+	return d;
+}
+
+var __jsdict_get = function(ob, key, default_value)
+{
+	
+	if (ob instanceof Object)
+	{
+		if (key instanceof Array)
+		{
+			key = JSON.stringify(key);
+		}
+		if (key in ob)
+		{
+			return ob[key];
+		}
+		return default_value;
+	}
+	else
+	{
+		if (( default_value ) !== undefined)
+		{
+			return ob.get(key, default_value);
+		}
+		else
+		{
+			return ob.get(key);
+		}
+	}
+}
+
+var __jsdict_set = function(ob, key, value)
+{
+	
+	if (ob instanceof Object)
+	{
+		if (key instanceof Array)
+		{
+			key = JSON.stringify(key);
+		}
+		ob[key] = value;
+	}
+	else
+	{
+		ob.set(key,value);
+	}
+}
+
+var __jsdict_keys = function(ob)
+{
+	
+	if (ob instanceof Object)
+	{
+		return Object.keys( ob );
+	}
+	else
+	{
+		return ob.keys();
+	}
+}
+
+var __jsdict_values = function(ob)
+{
+	var arr,value;
+	if (ob instanceof Object)
+	{
+		arr = [];
+				var __iter9 = ob;
+		if (! (__iter9 instanceof Array || typeof __iter9 == "string" || __is_typed_array(__iter9) || __is_some_array(__iter9) )) { __iter9 = __object_keys__(__iter9) }
+		for (var __i9=0; __i9 < __iter9.length; __i9++) {
+			var key = __iter9[ __i9 ];
+			if (ob.hasOwnProperty(key))
+			{
+				value = ob[key];
+				arr.push(value);
+			}
+		}
+		return arr;
+	}
+	else
+	{
+		return ob.values();
+	}
+}
+
+var __jsdict_items = function(ob)
+{
+	var arr,value;
+	if (ob instanceof Object || ( ob.items ) === undefined)
+	{
+		arr = [];
+				var __iter10 = ob;
+		if (! (__iter10 instanceof Array || typeof __iter10 == "string" || __is_typed_array(__iter10) || __is_some_array(__iter10) )) { __iter10 = __object_keys__(__iter10) }
+		for (var __i10=0; __i10 < __iter10.length; __i10++) {
+			var key = __iter10[ __i10 ];
+			if (Object.hasOwnProperty.call(ob, key))
+			{
+				value = ob[key];
+				arr.push([key, value]);
+			}
+		}
+		return arr;
+	}
+	else
+	{
+		return ob.items();
+	}
+}
+
+var __jsdict_pop = function(ob, key, _kwargs_)
+{
+	var v;
+	var _default = (_kwargs_ === undefined || _kwargs_._default === undefined)?	null : _kwargs_._default;
+	if (ob instanceof Array)
+	{
+		if (ob.length)
+		{
+			if (( key ) === undefined)
+			{
+				return ob.pop();
+			}
+			else
+			{
+				return ob.splice(key, 1)[0];
+			}
+		}
+		else
+		{
+			throw new IndexError(key);
+		}
+	}
+	else
+	{
+		if (ob instanceof Object)
+		{
+			if (key in ob)
+			{
+				v = ob[key];
+				delete ob[key];
+				return v;
+			}
+			else
+			{
+				if (( _default ) === undefined)
+				{
+					throw new KeyError(key);
+				}
+				else
+				{
+					return _default;
+				}
+			}
+		}
+		else
+		{
+			return ob.pop(key, _default);
+		}
+	}
+}
+
+var int16 = function(a)
+{
+	var arr;
+	arr =  new Int16Array(1);
+	arr[0] = a;
+	return arr;
+}
+
+var __gpu_object = function(cls, struct_name, data_name)
+{
+	
+	cls.prototype.__struct_name__ = struct_name;
+	cls.prototype.__struct_data__ = data_name;
 }
 
 gpu = { "object":__gpu_object };
-var glsljit_runtime = function(header) {
-  
-  return  new GLSLJITRuntime(header);
-}
-
-var GLSLJITRuntime = function(header) {
-  GLSLJITRuntime.__init__(this, header);
-  this.__class__ = GLSLJITRuntime;
-}
-
-GLSLJITRuntime.prototype.__init__ = function(header) {
-  
-  this.header = header;
-  this.shader = [];
-  this.object_packagers = [];
-  this.struct_types = __jsdict([]);
-  this.glsltypes = ["vec2", "vec3", "vec4", "mat4"];
-  this.matrices = [];
-}
-
-GLSLJITRuntime.__init__ = function () { return GLSLJITRuntime.prototype.__init__.apply(arguments[0], Array.prototype.slice.call(arguments,1)) };
-GLSLJITRuntime.prototype.compile_header = function() {
-  var a,b;
-  a = [];
-    var __iter11 = this.struct_types;
-  if (! (__iter11 instanceof Array || typeof __iter11 == "string" || __is_typed_array(__iter11) || __is_some_array(__iter11) )) { __iter11 = __object_keys__(__iter11) }
-  for (var __idx11=0; __idx11 < __iter11.length; __idx11++) {
-    var sname = __iter11[ __idx11 ];
-    if (__contains__(this.glsltypes, sname)) {
-      /*pass*/
-    } else {
-      a.push(this.struct_types[sname]["code"]);
-    }
-  }
-  a.push(__sprintf("int matrix_index() { return int(get_global_id().y*%s.0); }", this.matrices.length));
-  a.push("int matrix_row() { return int(get_global_id().x*4.0); }");
-  a = "\n".join(a);
-  b = "\n".join(this.header);
-  return "\n".join([a, b]);
-}
-
-GLSLJITRuntime.compile_header = function () { return GLSLJITRuntime.prototype.compile_header.apply(arguments[0], Array.prototype.slice.call(arguments,1)) };
-GLSLJITRuntime.prototype.compile_main = function() {
-  
-  return "\n".join(this.shader);
-}
-
-GLSLJITRuntime.compile_main = function () { return GLSLJITRuntime.prototype.compile_main.apply(arguments[0], Array.prototype.slice.call(arguments,1)) };
-GLSLJITRuntime.prototype.push = function(s) {
-  
-  this.shader.push(s);
-}
-
-GLSLJITRuntime.push = function () { return GLSLJITRuntime.prototype.push.apply(arguments[0], Array.prototype.slice.call(arguments,1)) };
-GLSLJITRuntime.prototype.define_structure = function(ob) {
-  var integers,arr,code,struct_name,struct_type,member_list,subtype,t,members,arrays,structs,floats;
-  struct_name = null;
-  if (ob.__struct_name__) {
-    struct_name = ob.__struct_name__;
-    if (__contains__(this.struct_types, struct_name)) {
-      return struct_name;
-    }
-  }
-  arrays = [];
-  floats = [];
-  integers = [];
-  structs = [];
-  struct_type = [];
-  if (struct_name && __contains__(this.glsltypes, struct_name)) {
-    return struct_name;
-  }
-    var __iter12 = dir(ob);
-  if (! (__iter12 instanceof Array || typeof __iter12 == "string" || __is_typed_array(__iter12) || __is_some_array(__iter12) )) { __iter12 = __object_keys__(__iter12) }
-  for (var __idx12=0; __idx12 < __iter12.length; __idx12++) {
-    var key = __iter12[ __idx12 ];
-    if ((key.length===1) && __contains__("0123456789", key)) {
-      throw new RuntimeError(key);
-    }
-    t = typeof(ob[key]);
-    if ((t==="object") && ob[key] instanceof Array && ob[key].length && (typeof(ob[key][0])==="number")) {
-      struct_type.push(("ARY_" + key));
-      arrays.push(key);
-    } else {
-      if (t==="number") {
-        struct_type.push(("NUM_" + key));
-        floats.push(key);
-      } else {
-        if (ob[key] instanceof Int16Array) {
-          struct_type.push(("INT_" + key));
-          if (ob[key].length===1) {
-            integers.push(key);
-          } else {
-            /*pass*/
-          }
-        } else {
-          if ((t==="object") && ob[key].__struct_name__) {
-            struct_type.push(("S_" + key));
-            structs.push(key);
-            if (! (__contains__(this.struct_types, ob[key].__struct_name__))) {
-              if (__contains__(this.glsltypes, ob[key].__struct_name__)) {
-                /*pass*/
-              } else {
-                this.define_structure(ob[key]);
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  if (( struct_name ) === null) {
-    struct_name = "".join(struct_type);
-    ob.__struct_name__ = struct_name;
-  }
-  if (! (__contains__(this.struct_types, struct_name))) {
-    member_list = [];
-        var __iter13 = integers;
-    if (! (__iter13 instanceof Array || typeof __iter13 == "string" || __is_typed_array(__iter13) || __is_some_array(__iter13) )) { __iter13 = __object_keys__(__iter13) }
-    for (var __idx13=0; __idx13 < __iter13.length; __idx13++) {
-      var key = __iter13[ __idx13 ];
-      member_list.append((("int " + key) + ";"));
-    }
-        var __iter14 = floats;
-    if (! (__iter14 instanceof Array || typeof __iter14 == "string" || __is_typed_array(__iter14) || __is_some_array(__iter14) )) { __iter14 = __object_keys__(__iter14) }
-    for (var __idx14=0; __idx14 < __iter14.length; __idx14++) {
-      var key = __iter14[ __idx14 ];
-      member_list.append((("float " + key) + ";"));
-    }
-        var __iter15 = arrays;
-    if (! (__iter15 instanceof Array || typeof __iter15 == "string" || __is_typed_array(__iter15) || __is_some_array(__iter15) )) { __iter15 = __object_keys__(__iter15) }
-    for (var __idx15=0; __idx15 < __iter15.length; __idx15++) {
-      var key = __iter15[ __idx15 ];
-      arr = ob[key];
-      member_list.append((((("float " + key) + "[") + arr.length) + "];"));
-    }
-        var __iter16 = structs;
-    if (! (__iter16 instanceof Array || typeof __iter16 == "string" || __is_typed_array(__iter16) || __is_some_array(__iter16) )) { __iter16 = __object_keys__(__iter16) }
-    for (var __idx16=0; __idx16 < __iter16.length; __idx16++) {
-      var key = __iter16[ __idx16 ];
-      subtype = ob[key].__struct_name__;
-      member_list.append((((subtype + " ") + key) + ";"));
-    }
-    if (len(member_list)===0) {
-      throw new RuntimeError(struct_name);
-    }
-    members = "".join(member_list);
-    code = (((("struct " + struct_name) + " {") + members) + "};");
-    this.struct_types[struct_name] = __jsdict([["arrays", arrays], ["floats", floats], ["integers", integers], ["structs", structs], ["code", code]]);
-  }
-  return struct_name;
-}
-
-GLSLJITRuntime.define_structure = function () { return GLSLJITRuntime.prototype.define_structure.apply(arguments[0], Array.prototype.slice.call(arguments,1)) };
-GLSLJITRuntime.prototype.structure = function(ob, name) {
-  var sname,stype,args,value,has_arrays,o,aname,wrapper;
-  wrapper = null;
-  if (ob instanceof Object) {
-    /*pass*/
-  } else {
-    if (( ob.__class__ ) === dict) {
-      wrapper = ob;
-      ob = ob["$wrapped"];
-    }
-  }
-  sname = this.define_structure(ob);
-  if (wrapper) {
-    wrapper.__struct_name__ = sname;
-  }
-  args = [];
-  stype = this.struct_types[sname];
-  if (! (__contains__(this.struct_types, sname))) {
-    if (__contains__(this.glsltypes, sname)) {
-      if (sname==="mat4") {
-        if (ob.__struct_data__) {
-          o = ob[ob.__struct_data__];
-        } else {
-          o = ob;
-        }
-        var i,i__end__;
-        i = 0;
-        i__end__ = o.length;
-        while (( i ) < i__end__) {
-          value = (o[i] + "");
-          if (! (__contains__(value, "."))) {
-            value += ".0";
-          }
-          args.push(value);
-          i += 1;
-        }
-      }
-    } else {
-      throw new RuntimeError(("no method to pack structure: " + sname));
-    }
-  }
-  has_arrays = false;
-  if (stype) {
-    if (( stype["arrays"].length ) > 0) {
-      has_arrays = true;
-    }
-        var __iter17 = stype["integers"];
-    if (! (__iter17 instanceof Array || typeof __iter17 == "string" || __is_typed_array(__iter17) || __is_some_array(__iter17) )) { __iter17 = __object_keys__(__iter17) }
-    for (var __idx17=0; __idx17 < __iter17.length; __idx17++) {
-      var key = __iter17[ __idx17 ];
-      args.push((ob[key][0] + ""));
-    }
-        var __iter18 = stype["floats"];
-    if (! (__iter18 instanceof Array || typeof __iter18 == "string" || __is_typed_array(__iter18) || __is_some_array(__iter18) )) { __iter18 = __object_keys__(__iter18) }
-    for (var __idx18=0; __idx18 < __iter18.length; __idx18++) {
-      var key = __iter18[ __idx18 ];
-      value = (ob[key] + "");
-      if (! (__contains__(value, "."))) {
-        value += ".0";
-      }
-      args.push(value);
-    }
-        var __iter19 = stype["arrays"];
-    if (! (__iter19 instanceof Array || typeof __iter19 == "string" || __is_typed_array(__iter19) || __is_some_array(__iter19) )) { __iter19 = __object_keys__(__iter19) }
-    for (var __idx19=0; __idx19 < __iter19.length; __idx19++) {
-      var key = __iter19[ __idx19 ];
-      aname = (("_" + key) + name);
-      this.array(ob[key], aname);
-      args.push(aname);
-    }
-        var __iter20 = stype["structs"];
-    if (! (__iter20 instanceof Array || typeof __iter20 == "string" || __is_typed_array(__iter20) || __is_some_array(__iter20) )) { __iter20 = __object_keys__(__iter20) }
-    for (var __idx20=0; __idx20 < __iter20.length; __idx20++) {
-      var key = __iter20[ __idx20 ];
-      aname = (("_" + key) + name);
-      this.structure(ob[key], aname);
-      args.push(aname);
-    }
-  }
-  args = ",".join(args);
-  if (has_arrays) {
-    this.shader.push((((((((sname + " ") + name) + "=") + sname) + "(") + args) + ");"));
-  } else {
-    this.header.push((((((((("const " + sname) + " ") + name) + "=") + sname) + "(") + args) + ");"));
-  }
-  return stype;
-}
-
-GLSLJITRuntime.structure = function () { return GLSLJITRuntime.prototype.structure.apply(arguments[0], Array.prototype.slice.call(arguments,1)) };
-GLSLJITRuntime.prototype.int16array = function(ob, name) {
-  var a,i;
-  a = [(((("int " + name) + "[") + ob.length) + "]")];
-  i = 0;
-  while (( i ) < ob.length) {
-    a.push((((((";" + name) + "[") + i) + "]=") + ob[i]));
-    i += 1;
-  }
-  this.shader.push("".join(a));
-}
-
-GLSLJITRuntime.int16array = function () { return GLSLJITRuntime.prototype.int16array.apply(arguments[0], Array.prototype.slice.call(arguments,1)) };
-GLSLJITRuntime.prototype.array = function(ob, name) {
-  var a,i,j,subname,subarr,v;
-  if (ob[0] instanceof Array) {
-    a = [];
-    i = 0;
-    while (( i ) < ob.length) {
-      subarr = ob[i];
-      subname = __sprintf("%s_%s", [name, i]);
-      if (a.length===0) {
-        a.append((((("float " + subname) + "[") + subarr.length) + "]"));
-      } else {
-        a.append(((((";float " + subname) + "[") + subarr.length) + "]"));
-      }
-      j = 0;
-      while (( j ) < subarr.length) {
-        v = (subarr[j] + "");
-        if (! (__contains__(v, "."))) {
-          v += ".0";
-        }
-        a.push((((((";" + subname) + "[") + j) + "]=") + v));
-        j += 1;
-      }
-      i += 1;
-    }
-    this.shader.push("".join(a));
-  } else {
-    if (ob[0] instanceof Object || ( ob[0].__class__ ) === dict) {
-      i = 0;
-      while (( i ) < ob.length) {
-        this.structure(ob[i], ((name + "_") + i));
-        i += 1;
-      }
-    } else {
-      a = [(((("float " + name) + "[") + ob.length) + "];")];
-      i = 0;
-      while (( i ) < ob.length) {
-        a.push((((((name + "[") + i) + "]=") + ob[i]) + ";"));
-        i += 1;
-      }
-      this.shader.push("".join(a));
-    }
-  }
-}
-
-GLSLJITRuntime.array = function () { return GLSLJITRuntime.prototype.array.apply(arguments[0], Array.prototype.slice.call(arguments,1)) };
-GLSLJITRuntime.prototype.object = function(ob, name) {
-  var func,cls;
-    var __iter21 = this.object_packagers;
-  if (! (__iter21 instanceof Array || typeof __iter21 == "string" || __is_typed_array(__iter21) || __is_some_array(__iter21) )) { __iter21 = __object_keys__(__iter21) }
-  for (var __idx21=0; __idx21 < __iter21.length; __idx21++) {
-    var p = __iter21[ __idx21 ];
-    cls = p[0];
-    func = p[1];
-    if (ob instanceof cls) {
-      return func(ob);
-    }
-  }
-}
-
-GLSLJITRuntime.object = function () { return GLSLJITRuntime.prototype.object.apply(arguments[0], Array.prototype.slice.call(arguments,1)) };
-GLSLJITRuntime.prototype.unpack_array2d = function(arr, dims) {
-  var h,rows,w,row;
-  if (typeof(dims)==="number") {
-    return arr;
-  }
-  w = dims[0];
-  h = dims[1];
-  row = [];
-  rows = [row];
-    var __iter22 = arr;
-  if (! (__iter22 instanceof Array || typeof __iter22 == "string" || __is_typed_array(__iter22) || __is_some_array(__iter22) )) { __iter22 = __object_keys__(__iter22) }
-  for (var __idx22=0; __idx22 < __iter22.length; __idx22++) {
-    var value = __iter22[ __idx22 ];
-    row.append(value);
-    if (( row.length ) >= w) {
-      row = [];
-      rows.append(row);
-    }
-  }
-  __jsdict_pop(rows);
-  if (rows.length!==h) {
-    console.log("ERROR: __unpack_array2d, invalid height.");
-  }
-  return rows;
-}
-
-GLSLJITRuntime.unpack_array2d = function () { return GLSLJITRuntime.prototype.unpack_array2d.apply(arguments[0], Array.prototype.slice.call(arguments,1)) };
-GLSLJITRuntime.prototype.unpack_vec4 = function(arr, dims) {
-  var rows,i,h,vec,w,row;
-  if (typeof(dims)==="number") {
-    w = dims;
-    h = 1;
-  } else {
-    w = dims[0];
-    h = dims[1];
-  }
-  rows = [];
-  i = 0;
-  var y,y__end__;
-  y = 0;
-  y__end__ = h;
-  while (( y ) < y__end__) {
-    row = [];
-    rows.append(row);
-    var x,x__end__;
-    x = 0;
-    x__end__ = w;
-    while (( x ) < x__end__) {
-      vec = [];
-      var j,j__end__;
-      j = 0;
-      j__end__ = 4;
-      while (( j ) < j__end__) {
-        vec.append(arr[i]);
-        i += 1;
-        j += 1;
-      }
-      row.append(vec);
-      x += 1;
-    }
-    y += 1;
-  }
-  if (rows.length!==h) {
-    console.log("ERROR: __unpack_vec4, invalid height.");
-  }
-  return rows;
-}
-
-GLSLJITRuntime.unpack_vec4 = function () { return GLSLJITRuntime.prototype.unpack_vec4.apply(arguments[0], Array.prototype.slice.call(arguments,1)) };
-GLSLJITRuntime.prototype.unpack_mat4 = function(arr) {
-  var i;
-  i = 0;
-    var __iter23 = this.matrices;
-  if (! (__iter23 instanceof Array || typeof __iter23 == "string" || __is_typed_array(__iter23) || __is_some_array(__iter23) )) { __iter23 = __object_keys__(__iter23) }
-  for (var __idx23=0; __idx23 < __iter23.length; __idx23++) {
-    var mat = __iter23[ __idx23 ];
-    var j,j__end__;
-    j = 0;
-    j__end__ = 16;
-    while (( j ) < j__end__) {
-      mat[j] = arr[i];
-      i += 1;
-      j += 1;
-    }
-  }
-  return this.matrices;
-}
-
-GLSLJITRuntime.unpack_mat4 = function () { return GLSLJITRuntime.prototype.unpack_mat4.apply(arguments[0], Array.prototype.slice.call(arguments,1)) };
+var glsljit_runtime = function(header)
+{
+	
+	return  new GLSLJITRuntime(header);
+}
+
+var GLSLJITRuntime = function(header)
+{
+	this.__init__(header);
+}
+
+GLSLJITRuntime.prototype.__init__ = function(header)
+{
+	
+	this.header = header;
+	this.shader = [];
+	this.object_packagers = [];
+	this.struct_types = {  };
+	this.glsltypes = ["vec2", "vec3", "vec4", "mat4"];
+	this.matrices = [];
+}
+
+GLSLJITRuntime.prototype.compile_header = function()
+{
+	var a,b;
+	a = [];
+		var __iter11 = this.struct_types;
+	if (! (__iter11 instanceof Array || typeof __iter11 == "string" || __is_typed_array(__iter11) || __is_some_array(__iter11) )) { __iter11 = __object_keys__(__iter11) }
+	for (var __i11=0; __i11 < __iter11.length; __i11++) {
+		var sname = __iter11[ __i11 ];
+		if (__contains__(this.glsltypes, sname))
+		{
+			/*pass*/
+		}
+		else
+		{
+			a.push(this.struct_types[sname]["code"]);
+		}
+	}
+	a.push(__sprintf("int matrix_index() { return int(get_global_id().y*%s.0); }", this.matrices.length));
+	a.push("int matrix_row() { return int(get_global_id().x*4.0); }");
+	a = "\n".join(a);
+	b = "\n".join(this.header);
+	return "\n".join([a, b]);
+}
+
+GLSLJITRuntime.prototype.compile_main = function()
+{
+	
+	return "\n".join(this.shader);
+}
+
+GLSLJITRuntime.prototype.push = function(s)
+{
+	
+	this.shader.push(s);
+}
+
+GLSLJITRuntime.prototype.define_structure = function(ob)
+{
+	var integers,arr,code,struct_name,struct_type,member_list,subtype,t,members,arrays,structs,floats;
+	struct_name = null;
+	if (ob.__struct_name__)
+	{
+		struct_name = ob.__struct_name__;
+		if (__contains__(this.struct_types, struct_name))
+		{
+			return struct_name;
+		}
+	}
+	arrays = [];
+	floats = [];
+	integers = [];
+	structs = [];
+	struct_type = [];
+	if (struct_name && __contains__(this.glsltypes, struct_name))
+	{
+		return struct_name;
+	}
+		var __iter12 = dir(ob);
+	if (! (__iter12 instanceof Array || typeof __iter12 == "string" || __is_typed_array(__iter12) || __is_some_array(__iter12) )) { __iter12 = __object_keys__(__iter12) }
+	for (var __i12=0; __i12 < __iter12.length; __i12++) {
+		var key = __iter12[ __i12 ];
+		if ((key.length===1) && __contains__("0123456789", key))
+		{
+			throw new RuntimeError(key);
+		}
+		t = typeof(ob[key]);
+		if ((t==="object") && ob[key] instanceof Array && ob[key].length && (typeof(ob[key][0])==="number"))
+		{
+			struct_type.push(("ARY_" + key));
+			arrays.push(key);
+		}
+		else
+		{
+			if (t==="number")
+			{
+				struct_type.push(("NUM_" + key));
+				floats.push(key);
+			}
+			else
+			{
+				if (ob[key] instanceof Int16Array)
+				{
+					struct_type.push(("INT_" + key));
+					if (ob[key].length===1)
+					{
+						integers.push(key);
+					}
+					else
+					{
+						/*pass*/
+					}
+				}
+				else
+				{
+					if ((t==="object") && ob[key].__struct_name__)
+					{
+						struct_type.push(("S_" + key));
+						structs.push(key);
+						if (! (__contains__(this.struct_types, ob[key].__struct_name__)))
+						{
+							if (__contains__(this.glsltypes, ob[key].__struct_name__))
+							{
+								/*pass*/
+							}
+							else
+							{
+								this.define_structure(ob[key]);
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+	if (( struct_name ) === null)
+	{
+		struct_name = "".join(struct_type);
+		ob.__struct_name__ = struct_name;
+	}
+	if (! (__contains__(this.struct_types, struct_name)))
+	{
+		member_list = [];
+				var __iter13 = integers;
+		if (! (__iter13 instanceof Array || typeof __iter13 == "string" || __is_typed_array(__iter13) || __is_some_array(__iter13) )) { __iter13 = __object_keys__(__iter13) }
+		for (var __i13=0; __i13 < __iter13.length; __i13++) {
+			var key = __iter13[ __i13 ];
+			member_list.append((("int " + key) + ";"));
+		}
+				var __iter14 = floats;
+		if (! (__iter14 instanceof Array || typeof __iter14 == "string" || __is_typed_array(__iter14) || __is_some_array(__iter14) )) { __iter14 = __object_keys__(__iter14) }
+		for (var __i14=0; __i14 < __iter14.length; __i14++) {
+			var key = __iter14[ __i14 ];
+			member_list.append((("float " + key) + ";"));
+		}
+				var __iter15 = arrays;
+		if (! (__iter15 instanceof Array || typeof __iter15 == "string" || __is_typed_array(__iter15) || __is_some_array(__iter15) )) { __iter15 = __object_keys__(__iter15) }
+		for (var __i15=0; __i15 < __iter15.length; __i15++) {
+			var key = __iter15[ __i15 ];
+			arr = ob[key];
+			member_list.append((((("float " + key) + "[") + arr.length) + "];"));
+		}
+				var __iter16 = structs;
+		if (! (__iter16 instanceof Array || typeof __iter16 == "string" || __is_typed_array(__iter16) || __is_some_array(__iter16) )) { __iter16 = __object_keys__(__iter16) }
+		for (var __i16=0; __i16 < __iter16.length; __i16++) {
+			var key = __iter16[ __i16 ];
+			subtype = ob[key].__struct_name__;
+			member_list.append((((subtype + " ") + key) + ";"));
+		}
+		if (len(member_list)===0)
+		{
+			throw new RuntimeError(struct_name);
+		}
+		members = "".join(member_list);
+		code = (((("struct " + struct_name) + " {") + members) + "};");
+		this.struct_types[struct_name] = { "arrays":arrays, "floats":floats, "integers":integers, "structs":structs, "code":code };
+	}
+	return struct_name;
+}
+
+GLSLJITRuntime.prototype.structure = function(ob, name)
+{
+	var sname,stype,args,value,has_arrays,o,aname,wrapper;
+	wrapper = null;
+	if (ob instanceof Object)
+	{
+		/*pass*/
+	}
+	else
+	{
+		if (( ob.__class__ ) === dict)
+		{
+			wrapper = ob;
+			ob = ob["$wrapped"];
+		}
+	}
+	sname = this.define_structure(ob);
+	if (wrapper)
+	{
+		wrapper.__struct_name__ = sname;
+	}
+	args = [];
+	stype = this.struct_types[sname];
+	if (! (__contains__(this.struct_types, sname)))
+	{
+		if (__contains__(this.glsltypes, sname))
+		{
+			if (sname==="mat4")
+			{
+				if (ob.__struct_data__)
+				{
+					o = ob[ob.__struct_data__];
+				}
+				else
+				{
+					o = ob;
+				}
+				var i,i__end__;
+				i = 0;
+				i__end__ = o.length;
+				while (( i ) < i__end__)
+				{
+					value = (o[i] + "");
+					if (! (__contains__(value, ".")))
+					{
+						value += ".0";
+					}
+					args.push(value);
+					i += 1;
+				}
+			}
+		}
+		else
+		{
+			throw new RuntimeError(("no method to pack structure: " + sname));
+		}
+	}
+	has_arrays = false;
+	if (stype)
+	{
+		if (( stype["arrays"].length ) > 0)
+		{
+			has_arrays = true;
+		}
+				var __iter17 = stype["integers"];
+		if (! (__iter17 instanceof Array || typeof __iter17 == "string" || __is_typed_array(__iter17) || __is_some_array(__iter17) )) { __iter17 = __object_keys__(__iter17) }
+		for (var __i17=0; __i17 < __iter17.length; __i17++) {
+			var key = __iter17[ __i17 ];
+			args.push((ob[key][0] + ""));
+		}
+				var __iter18 = stype["floats"];
+		if (! (__iter18 instanceof Array || typeof __iter18 == "string" || __is_typed_array(__iter18) || __is_some_array(__iter18) )) { __iter18 = __object_keys__(__iter18) }
+		for (var __i18=0; __i18 < __iter18.length; __i18++) {
+			var key = __iter18[ __i18 ];
+			value = (ob[key] + "");
+			if (! (__contains__(value, ".")))
+			{
+				value += ".0";
+			}
+			args.push(value);
+		}
+				var __iter19 = stype["arrays"];
+		if (! (__iter19 instanceof Array || typeof __iter19 == "string" || __is_typed_array(__iter19) || __is_some_array(__iter19) )) { __iter19 = __object_keys__(__iter19) }
+		for (var __i19=0; __i19 < __iter19.length; __i19++) {
+			var key = __iter19[ __i19 ];
+			aname = (("_" + key) + name);
+			this.array(ob[key], aname);
+			args.push(aname);
+		}
+				var __iter20 = stype["structs"];
+		if (! (__iter20 instanceof Array || typeof __iter20 == "string" || __is_typed_array(__iter20) || __is_some_array(__iter20) )) { __iter20 = __object_keys__(__iter20) }
+		for (var __i20=0; __i20 < __iter20.length; __i20++) {
+			var key = __iter20[ __i20 ];
+			aname = (("_" + key) + name);
+			this.structure(ob[key], aname);
+			args.push(aname);
+		}
+	}
+	args = ",".join(args);
+	if (has_arrays)
+	{
+		this.shader.push((((((((sname + " ") + name) + "=") + sname) + "(") + args) + ");"));
+	}
+	else
+	{
+		this.header.push((((((((("const " + sname) + " ") + name) + "=") + sname) + "(") + args) + ");"));
+	}
+	return stype;
+}
+
+GLSLJITRuntime.prototype.int16array = function(ob, name)
+{
+	var a,i;
+	a = [(((("int " + name) + "[") + ob.length) + "]")];
+	i = 0;
+	while (( i ) < ob.length)
+	{
+		a.push((((((";" + name) + "[") + i) + "]=") + ob[i]));
+		i += 1;
+	}
+	this.shader.push("".join(a));
+}
+
+GLSLJITRuntime.prototype.array = function(ob, name)
+{
+	var a,i,j,subname,subarr,v;
+	if (ob[0] instanceof Array)
+	{
+		a = [];
+		i = 0;
+		while (( i ) < ob.length)
+		{
+			subarr = ob[i];
+			subname = __sprintf("%s_%s", [name, i]);
+			if (a.length===0)
+			{
+				a.append((((("float " + subname) + "[") + subarr.length) + "]"));
+			}
+			else
+			{
+				a.append(((((";float " + subname) + "[") + subarr.length) + "]"));
+			}
+			j = 0;
+			while (( j ) < subarr.length)
+			{
+				v = (subarr[j] + "");
+				if (! (__contains__(v, ".")))
+				{
+					v += ".0";
+				}
+				a.push((((((";" + subname) + "[") + j) + "]=") + v));
+				j += 1;
+			}
+			i += 1;
+		}
+		this.shader.push("".join(a));
+	}
+	else
+	{
+		if (ob[0] instanceof Object || ( ob[0].__class__ ) === dict)
+		{
+			i = 0;
+			while (( i ) < ob.length)
+			{
+				this.structure(ob[i], ((name + "_") + i));
+				i += 1;
+			}
+		}
+		else
+		{
+			a = [(((("float " + name) + "[") + ob.length) + "];")];
+			i = 0;
+			while (( i ) < ob.length)
+			{
+				a.push((((((name + "[") + i) + "]=") + ob[i]) + ";"));
+				i += 1;
+			}
+			this.shader.push("".join(a));
+		}
+	}
+}
+
+GLSLJITRuntime.prototype.object = function(ob, name)
+{
+	var func,cls;
+		var __iter21 = this.object_packagers;
+	if (! (__iter21 instanceof Array || typeof __iter21 == "string" || __is_typed_array(__iter21) || __is_some_array(__iter21) )) { __iter21 = __object_keys__(__iter21) }
+	for (var __i21=0; __i21 < __iter21.length; __i21++) {
+		var p = __iter21[ __i21 ];
+		cls = p[0];
+		func = p[1];
+		if (ob instanceof cls)
+		{
+			return func(ob);
+		}
+	}
+}
+
+GLSLJITRuntime.prototype.unpack_array2d = function(arr, dims)
+{
+	var h,rows,w,row;
+	if (typeof(dims)==="number")
+	{
+		return arr;
+	}
+	w = dims[0];
+	h = dims[1];
+	row = [];
+	rows = [row];
+		var __iter22 = arr;
+	if (! (__iter22 instanceof Array || typeof __iter22 == "string" || __is_typed_array(__iter22) || __is_some_array(__iter22) )) { __iter22 = __object_keys__(__iter22) }
+	for (var __i22=0; __i22 < __iter22.length; __i22++) {
+		var value = __iter22[ __i22 ];
+		row.append(value);
+		if (( row.length ) >= w)
+		{
+			row = [];
+			rows.append(row);
+		}
+	}
+	__jsdict_pop(rows);
+	if (rows.length!==h)
+	{
+		console.log("ERROR: __unpack_array2d, invalid height.");
+	}
+	return rows;
+}
+
+GLSLJITRuntime.prototype.unpack_vec4 = function(arr, dims)
+{
+	var rows,i,h,vec,w,row;
+	if (typeof(dims)==="number")
+	{
+		w = dims;
+		h = 1;
+	}
+	else
+	{
+		w = dims[0];
+		h = dims[1];
+	}
+	rows = [];
+	i = 0;
+	var y,y__end__;
+	y = 0;
+	y__end__ = h;
+	while (( y ) < y__end__)
+	{
+		row = [];
+		rows.append(row);
+		var x,x__end__;
+		x = 0;
+		x__end__ = w;
+		while (( x ) < x__end__)
+		{
+			vec = [];
+			var j,j__end__;
+			j = 0;
+			j__end__ = 4;
+			while (( j ) < j__end__)
+			{
+				vec.append(arr[i]);
+				i += 1;
+				j += 1;
+			}
+			row.append(vec);
+			x += 1;
+		}
+		y += 1;
+	}
+	if (rows.length!==h)
+	{
+		console.log("ERROR: __unpack_vec4, invalid height.");
+	}
+	return rows;
+}
+
+GLSLJITRuntime.prototype.unpack_mat4 = function(arr)
+{
+	var i;
+	i = 0;
+		var __iter23 = this.matrices;
+	if (! (__iter23 instanceof Array || typeof __iter23 == "string" || __is_typed_array(__iter23) || __is_some_array(__iter23) )) { __iter23 = __object_keys__(__iter23) }
+	for (var __i23=0; __i23 < __iter23.length; __i23++) {
+		var mat = __iter23[ __i23 ];
+		var j,j__end__;
+		j = 0;
+		j__end__ = 16;
+		while (( j ) < j__end__)
+		{
+			mat[j] = arr[i];
+			i += 1;
+			j += 1;
+		}
+	}
+	return this.matrices;
+}
+
 _PythonJS_UID = 0;
-var __getfast__ = function(ob, attr) {
-  var v;
-  v = ob[attr];
-  if (( v ) === undefined) {
-    throw new AttributeError(attr);
-  } else {
-    return v;
-  }
-}
-
-var __wrap_function__ = function(f) {
-  
-  f.is_wrapper = true;
-  return f;
-}
-
-var __getattr__ = function(ob, a) {
-  
-  if (ob.__getattr__) {
-    return ob.__getattr__(a);
-  }
+var __getfast__ = function(ob, attr)
+{
+	var v;
+	v = ob[attr];
+	if (( v ) === undefined)
+	{
+		throw new AttributeError(attr);
+	}
+	else
+	{
+		return v;
+	}
+}
+
+var __wrap_function__ = function(f)
+{
+	
+	f.is_wrapper = true;
+	return f;
+}
+
+var __getattr__ = function(ob, a)
+{
+	
+	if (ob.__getattr__)
+	{
+		return ob.__getattr__(a);
+	}
 };__getattr__.is_wrapper = true;
-var __test_if_true__ = function(ob) {
-  
-  if (( ob ) === true) {
-    return true;
-  } else {
-    if (( ob ) === false) {
-      return false;
-    } else {
-      if (typeof(ob)==="string") {
-        return (ob.length!==0);
-      } else {
-        if (! (ob)) {
-          return false;
-        } else {
-          if (ob instanceof Array) {
-            return (ob.length!==0);
-          } else {
-            if (typeof(ob)==="function") {
-              return true;
-            } else {
-              if (ob.__class__ && ( ob.__class__ ) === dict) {
-                return (Object.keys(ob["$wrapped"]).length!==0);
-              } else {
-                if (ob instanceof Object) {
-                  return (Object.keys(ob).length!==0);
-                } else {
-                  return true;
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
+var __test_if_true__ = function(ob)
+{
+	
+	if (( ob ) === true)
+	{
+		return true;
+	}
+	else
+	{
+		if (( ob ) === false)
+		{
+			return false;
+		}
+		else
+		{
+			if (typeof(ob)==="string")
+			{
+				return (ob.length!==0);
+			}
+			else
+			{
+				if (! (ob))
+				{
+					return false;
+				}
+				else
+				{
+					if (ob instanceof Array)
+					{
+						return (ob.length!==0);
+					}
+					else
+					{
+						if (typeof(ob)==="function")
+						{
+							return true;
+						}
+						else
+						{
+							if (ob.__class__ && ( ob.__class__ ) === dict)
+							{
+								return (Object.keys(ob["$wrapped"]).length!==0);
+							}
+							else
+							{
+								if (ob instanceof Object)
+								{
+									return (Object.keys(ob).length!==0);
+								}
+								else
+								{
+									return true;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
 };__test_if_true__.is_wrapper = true;
-var __replace_method = function(ob, a, b) {
-  
-  if (typeof(ob)==="string") {
-    return ob.split(a).join(b);
-  } else {
-    return ob.replace(a, b);
-  }
+var __replace_method = function(ob, a, b)
+{
+	
+	if (typeof(ob)==="string")
+	{
+		return ob.split(a).join(b);
+	}
+	else
+	{
+		return ob.replace(a, b);
+	}
 };__replace_method.is_wrapper = true;
-var __split_method = function(ob, delim) {
-  
-  if (typeof(ob)==="string") {
-    if (( delim ) === undefined) {
-      return ob.split(" ");
-    } else {
-      return ob.split(delim);
-    }
-  } else {
-    if (( delim ) === undefined) {
-      return ob.split();
-    } else {
-      return ob.split(delim);
-    }
-  }
+var __split_method = function(ob, delim)
+{
+	
+	if (typeof(ob)==="string")
+	{
+		if (( delim ) === undefined)
+		{
+			return ob.split(" ");
+		}
+		else
+		{
+			return ob.split(delim);
+		}
+	}
+	else
+	{
+		if (( delim ) === undefined)
+		{
+			return ob.split();
+		}
+		else
+		{
+			return ob.split(delim);
+		}
+	}
 };__split_method.is_wrapper = true;
-var __add_op = function(a, b) {
-  var c,t;
-  t = typeof(a);
-  if ((t==="string") || (t==="number")) {
-    return a+b;
-  } else {
-    if (a instanceof Array) {
-      c = [];
-      c.extend(a);
-      c.extend(b);
-      return c;
-    } else {
-      if (a.__add__) {
-        return a.__add__(b);
-      } else {
-        throw new TypeError("invalid objects for addition");
-      }
-    }
-  }
-}
-
-var __mul_op = function(a, b) {
-  var c,arr,t;
-  t = typeof(a);
-  if (t==="number") {
-    return a * b;
-  } else {
-    if (t==="string") {
-      arr = [];
-      var i,i__end__;
-      i = 0;
-      i__end__ = b;
-      while (( i ) < i__end__) {
-        arr.append(a);
-        i += 1;
-      }
-      return "".join(arr);
-    } else {
-      if (a instanceof Array) {
-        c = [];
-        
-        i = 0;
-        i__end__ = b;
-        while (( i ) < i__end__) {
-          c.extend(a);
-          i += 1;
-        }
-        return c;
-      } else {
-        if (a.__mul__) {
-          return a.__mul__(b);
-        } else {
-          throw new TypeError("invalid objects for multiplication");
-        }
-      }
-    }
-  }
-}
-
-var dir = function(ob) {
-  
-  if (ob instanceof Object) {
-    return Object.keys( ob );
-  } else {
-    return __object_keys__(ob);
-  }
-}
-
-var __bind_property_descriptors__ = function(o, klass) {
-  var prop,desc;
-    var __iter24 = klass.__properties__;
-  if (! (__iter24 instanceof Array || typeof __iter24 == "string" || __is_typed_array(__iter24) || __is_some_array(__iter24) )) { __iter24 = __object_keys__(__iter24) }
-  for (var __idx24=0; __idx24 < __iter24.length; __idx24++) {
-    var name = __iter24[ __idx24 ];
-    desc = __jsdict([["enumerable", true]]);
-    prop = klass.__properties__[name];
-    if (prop["get"]) {
-      desc["get"] = __generate_getter__(klass, o, name);
-    }
-    if (prop["set"]) {
-      desc["set"] = __generate_setter__(klass, o, name);
-    }
-    Object.defineProperty(o, name, desc);
-  }
-    var __iter25 = klass.__bases__;
-  if (! (__iter25 instanceof Array || typeof __iter25 == "string" || __is_typed_array(__iter25) || __is_some_array(__iter25) )) { __iter25 = __object_keys__(__iter25) }
-  for (var __idx25=0; __idx25 < __iter25.length; __idx25++) {
-    var base = __iter25[ __idx25 ];
-    __bind_property_descriptors__(o, base);
-  }
-}
-
-var __generate_getter__ = function(klass, o, n) {
-  
-    var __lambda__ = function() {
-    
-    return klass.__properties__[n]["get"]([o], __jsdict([]));
-  }
-
-  return __lambda__;
-}
-
-var __generate_setter__ = function(klass, o, n) {
-  
-    var __lambda__ = function(v) {
-    
-    return klass.__properties__[n]["set"]([o, v], __jsdict([]));
-  }
-
-  return __lambda__;
-}
-
-var __create_class__ = function(class_name, parents, attrs, props) {
-  var f,klass,prop;
-  "Create a PythonScript class";
-  klass = Object.create(null);
-  klass.__bases__ = parents;
-  klass.__name__ = class_name;
-  klass.__unbound_methods__ = Object.create(null);
-  klass.__all_method_names__ = [];
-  klass.__properties__ = props;
-  klass.__attributes__ = attrs;
-    var __iter26 = attrs;
-  if (! (__iter26 instanceof Array || typeof __iter26 == "string" || __is_typed_array(__iter26) || __is_some_array(__iter26) )) { __iter26 = __object_keys__(__iter26) }
-  for (var __idx26=0; __idx26 < __iter26.length; __idx26++) {
-    var key = __iter26[ __idx26 ];
-    if (typeof(attrs[key])==="function") {
-      klass.__all_method_names__.push(key);
-      f = attrs[key];
-      if (hasattr(f, "is_classmethod") && f.is_classmethod) {
-        /*pass*/
-      } else {
-        if (hasattr(f, "is_staticmethod") && f.is_staticmethod) {
-          /*pass*/
-        } else {
-          klass.__unbound_methods__[key] = attrs[key];
-        }
-      }
-    }
-    if (key==="__getattribute__") {
-      continue
-    }
-    klass[key] = attrs[key];
-  }
-  klass.__setters__ = [];
-  klass.__getters__ = [];
-    var __iter27 = klass.__properties__;
-  if (! (__iter27 instanceof Array || typeof __iter27 == "string" || __is_typed_array(__iter27) || __is_some_array(__iter27) )) { __iter27 = __object_keys__(__iter27) }
-  for (var __idx27=0; __idx27 < __iter27.length; __idx27++) {
-    var name = __iter27[ __idx27 ];
-    prop = klass.__properties__[name];
-    klass.__getters__.push(name);
-    if (prop["set"]) {
-      klass.__setters__.push(name);
-    }
-  }
-    var __iter28 = klass.__bases__;
-  if (! (__iter28 instanceof Array || typeof __iter28 == "string" || __is_typed_array(__iter28) || __is_some_array(__iter28) )) { __iter28 = __object_keys__(__iter28) }
-  for (var __idx28=0; __idx28 < __iter28.length; __idx28++) {
-    var base = __iter28[ __idx28 ];
-    Array.prototype.push.apply(klass.__getters__, base.__getters__);
-    Array.prototype.push.apply(klass.__setters__, base.__setters__);
-    Array.prototype.push.apply(klass.__all_method_names__, base.__all_method_names__);
-  }
-    var __call__ = function() {
-    var has_getattr,wrapper,object,has_getattribute;
-    "Create a PythonJS object";
-    object = Object.create(null);
-    object.__class__ = klass;
-    object.__dict__ = object;
-    has_getattribute = false;
-    has_getattr = false;
-        var __iter29 = klass.__all_method_names__;
-    if (! (__iter29 instanceof Array || typeof __iter29 == "string" || __is_typed_array(__iter29) || __is_some_array(__iter29) )) { __iter29 = __object_keys__(__iter29) }
-    for (var __idx29=0; __idx29 < __iter29.length; __idx29++) {
-      var name = __iter29[ __idx29 ];
-      if (name==="__getattribute__") {
-        has_getattribute = true;
-      } else {
-        if (name==="__getattr__") {
-          has_getattr = true;
-        } else {
-          wrapper = __get__(object, name);
-          if (! (wrapper.is_wrapper)) {
-            console.log(["RUNTIME ERROR: failed to get wrapper for:", name]);
-          }
-        }
-      }
-    }
-    if (has_getattr) {
-      __get__(object, "__getattr__");
-    }
-    if (has_getattribute) {
-      __get__(object, "__getattribute__");
-    }
-    __bind_property_descriptors__(object, klass);
-    if (object.__init__) {
-      object.__init__.apply(this, arguments);
-    }
-    return object;
-  }
-
-  __call__.is_wrapper = true;
-  klass.__call__ = __call__;
-  return klass;
-}
-
-var type = function(args, kwargs) {
-  
-  var __sig__,__args__;
-  __sig__ = { kwargs:{"bases": null, "class_dict": null},args:["ob_or_class_name", "bases", "class_dict"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("type", __sig__, args, kwargs);
-  var ob_or_class_name = __args__['ob_or_class_name'];
-  var bases = __args__['bases'];
-  var class_dict = __args__['class_dict'];
-  "\n	type(object) -> the object's type\n	type(name, bases, dict) -> a __new__>>type  ## broken? - TODO test\n	";
-  if (( bases ) === null && ( class_dict ) === null) {
-    return ob_or_class_name.__class__;
-  } else {
-    return create_class(ob_or_class_name, bases, class_dict);
-  }
+var __add_op = function(a, b)
+{
+	var c,t;
+	t = typeof(a);
+	if ((t==="string") || (t==="number"))
+	{
+		return a+b;
+	}
+	else
+	{
+		if (a instanceof Array)
+		{
+			c = [];
+			c.extend(a);
+			c.extend(b);
+			return c;
+		}
+		else
+		{
+			if (a.__add__)
+			{
+				return a.__add__(b);
+			}
+			else
+			{
+				throw new TypeError("invalid objects for addition");
+			}
+		}
+	}
+}
+
+var __mul_op = function(a, b)
+{
+	var c,arr,t;
+	t = typeof(a);
+	if (t==="number")
+	{
+		return a * b;
+	}
+	else
+	{
+		if (t==="string")
+		{
+			arr = [];
+			var i,i__end__;
+			i = 0;
+			i__end__ = b;
+			while (( i ) < i__end__)
+			{
+				arr.append(a);
+				i += 1;
+			}
+			return "".join(arr);
+		}
+		else
+		{
+			if (a instanceof Array)
+			{
+				c = [];
+				
+				i = 0;
+				i__end__ = b;
+				while (( i ) < i__end__)
+				{
+					c.extend(a);
+					i += 1;
+				}
+				return c;
+			}
+			else
+			{
+				if (a.__mul__)
+				{
+					return a.__mul__(b);
+				}
+				else
+				{
+					throw new TypeError("invalid objects for multiplication");
+				}
+			}
+		}
+	}
+}
+
+var dir = function(ob)
+{
+	
+	if (ob instanceof Object)
+	{
+		return Object.keys( ob );
+	}
+	else
+	{
+		return __object_keys__(ob);
+	}
+}
+
+var __bind_property_descriptors__ = function(o, klass)
+{
+	var prop,desc;
+		var __iter24 = klass.__properties__;
+	if (! (__iter24 instanceof Array || typeof __iter24 == "string" || __is_typed_array(__iter24) || __is_some_array(__iter24) )) { __iter24 = __object_keys__(__iter24) }
+	for (var __i24=0; __i24 < __iter24.length; __i24++) {
+		var name = __iter24[ __i24 ];
+		desc = { "enumerable":true };
+		prop = klass.__properties__[name];
+		if (prop["get"])
+		{
+			desc["get"] = __generate_getter__(klass, o, name);
+		}
+		if (prop["set"])
+		{
+			desc["set"] = __generate_setter__(klass, o, name);
+		}
+		Object.defineProperty(o, name, desc);
+	}
+		var __iter25 = klass.__bases__;
+	if (! (__iter25 instanceof Array || typeof __iter25 == "string" || __is_typed_array(__iter25) || __is_some_array(__iter25) )) { __iter25 = __object_keys__(__iter25) }
+	for (var __i25=0; __i25 < __iter25.length; __i25++) {
+		var base = __iter25[ __i25 ];
+		__bind_property_descriptors__(o, base);
+	}
+}
+
+var __generate_getter__ = function(klass, o, n)
+{
+	
+		var __lambda__ = function()
+	{
+		
+		return klass.__properties__[n]["get"]([o], {  });
+	}
+
+	return __lambda__;
+}
+
+var __generate_setter__ = function(klass, o, n)
+{
+	
+		var __lambda__ = function(v)
+	{
+		
+		return klass.__properties__[n]["set"]([o, v], {  });
+	}
+
+	return __lambda__;
+}
+
+/* Create a PythonScript class */
+var __create_class__ = function(class_name, parents, attrs, props)
+{
+	var f,klass,prop;
+	klass = Object.create(null);
+	klass.__bases__ = parents;
+	klass.__name__ = class_name;
+	klass.__unbound_methods__ = Object.create(null);
+	klass.__all_method_names__ = [];
+	klass.__properties__ = props;
+	klass.__attributes__ = attrs;
+		var __iter26 = attrs;
+	if (! (__iter26 instanceof Array || typeof __iter26 == "string" || __is_typed_array(__iter26) || __is_some_array(__iter26) )) { __iter26 = __object_keys__(__iter26) }
+	for (var __i26=0; __i26 < __iter26.length; __i26++) {
+		var key = __iter26[ __i26 ];
+		if (typeof(attrs[key])==="function")
+		{
+			klass.__all_method_names__.push(key);
+			f = attrs[key];
+			if (hasattr(f, "is_classmethod") && f.is_classmethod)
+			{
+				/*pass*/
+			}
+			else
+			{
+				if (hasattr(f, "is_staticmethod") && f.is_staticmethod)
+				{
+					/*pass*/
+				}
+				else
+				{
+					klass.__unbound_methods__[key] = attrs[key];
+				}
+			}
+		}
+		if (key==="__getattribute__")
+		{
+			continue
+		}
+		klass[key] = attrs[key];
+	}
+	klass.__setters__ = [];
+	klass.__getters__ = [];
+		var __iter27 = klass.__properties__;
+	if (! (__iter27 instanceof Array || typeof __iter27 == "string" || __is_typed_array(__iter27) || __is_some_array(__iter27) )) { __iter27 = __object_keys__(__iter27) }
+	for (var __i27=0; __i27 < __iter27.length; __i27++) {
+		var name = __iter27[ __i27 ];
+		prop = klass.__properties__[name];
+		klass.__getters__.push(name);
+		if (prop["set"])
+		{
+			klass.__setters__.push(name);
+		}
+	}
+		var __iter28 = klass.__bases__;
+	if (! (__iter28 instanceof Array || typeof __iter28 == "string" || __is_typed_array(__iter28) || __is_some_array(__iter28) )) { __iter28 = __object_keys__(__iter28) }
+	for (var __i28=0; __i28 < __iter28.length; __i28++) {
+		var base = __iter28[ __i28 ];
+		Array.prototype.push.apply(klass.__getters__, base.__getters__);
+		Array.prototype.push.apply(klass.__setters__, base.__setters__);
+		Array.prototype.push.apply(klass.__all_method_names__, base.__all_method_names__);
+	}
+		/* Create a PythonJS object */
+var __call__ = function()
+	{
+		var has_getattr,wrapper,object,has_getattribute;
+		object = Object.create(null);
+		object.__class__ = klass;
+		object.__dict__ = object;
+		has_getattribute = false;
+		has_getattr = false;
+				var __iter29 = klass.__all_method_names__;
+		if (! (__iter29 instanceof Array || typeof __iter29 == "string" || __is_typed_array(__iter29) || __is_some_array(__iter29) )) { __iter29 = __object_keys__(__iter29) }
+		for (var __i29=0; __i29 < __iter29.length; __i29++) {
+			var name = __iter29[ __i29 ];
+			if (name==="__getattribute__")
+			{
+				has_getattribute = true;
+			}
+			else
+			{
+				if (name==="__getattr__")
+				{
+					has_getattr = true;
+				}
+				else
+				{
+					wrapper = __get__(object, name);
+					if (! (wrapper.is_wrapper))
+					{
+						console.log(["RUNTIME ERROR: failed to get wrapper for:", name]);
+					}
+				}
+			}
+		}
+		if (has_getattr)
+		{
+			__get__(object, "__getattr__");
+		}
+		if (has_getattribute)
+		{
+			__get__(object, "__getattribute__");
+		}
+		__bind_property_descriptors__(object, klass);
+		if (object.__init__)
+		{
+			object.__init__.apply(this, arguments);
+		}
+		return object;
+	}
+
+	__call__.is_wrapper = true;
+	klass.__call__ = __call__;
+	return klass;
+}
+
+/* type(object) -> the object's type
+	type(name, bases, dict) -> a __new__>>type  ## broken? - TODO test */
+var type = function(args, kwargs)
+{
+	
+	var __sig__,__args__;
+	__sig__ = { kwargs:{"bases": null, "class_dict": null}, args:["ob_or_class_name", "bases", "class_dict"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("type", __sig__, args, kwargs);
+	var ob_or_class_name = __args__['ob_or_class_name'];
+	var bases = __args__['bases'];
+	var class_dict = __args__['class_dict'];
+	if (( bases ) === null && ( class_dict ) === null)
+	{
+		return ob_or_class_name.__class__;
+	}
+	else
+	{
+		return create_class(ob_or_class_name, bases, class_dict);
+	}
 };type.is_wrapper = true;
-var getattr = function(args, kwargs) {
-  var prop;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{"property": false},args:["ob", "attr", "property"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("getattr", __sig__, args, kwargs);
-  var ob = __args__['ob'];
-  var attr = __args__['attr'];
-  var property = __args__['property'];
-  if (property) {
-    prop = _get_upstream_property(ob.__class__, attr);
-    if (prop && prop["get"]) {
-      return prop["get"]([ob], __jsdict([]));
-    } else {
-      console.log(["ERROR: getattr property error", prop]);
-    }
-  } else {
-    return __get__(ob, attr);
-  }
+var getattr = function(args, kwargs)
+{
+	var prop;
+	var __sig__,__args__;
+	__sig__ = { kwargs:{"property": false}, args:["ob", "attr", "property"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("getattr", __sig__, args, kwargs);
+	var ob = __args__['ob'];
+	var attr = __args__['attr'];
+	var property = __args__['property'];
+	if (property)
+	{
+		prop = _get_upstream_property(ob.__class__, attr);
+		if (prop && prop["get"])
+		{
+			return prop["get"]([ob], {  });
+		}
+		else
+		{
+			console.log(["ERROR: getattr property error", prop]);
+		}
+	}
+	else
+	{
+		return __get__(ob, attr);
+	}
 };getattr.is_wrapper = true;
-var setattr = function(args, kwargs) {
-  var prop;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{"property": false},args:["ob", "attr", "value", "property"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("setattr", __sig__, args, kwargs);
-  var ob = __args__['ob'];
-  var attr = __args__['attr'];
-  var value = __args__['value'];
-  var property = __args__['property'];
-  if (property) {
-    prop = _get_upstream_property(ob.__class__, attr);
-    if (prop && prop["set"]) {
-      prop["set"]([ob, value], __jsdict([]));
-    } else {
-      console.log(["ERROR: setattr property error", prop]);
-    }
-  } else {
-    __set__(ob, attr, value);
-  }
+var setattr = function(args, kwargs)
+{
+	var prop;
+	var __sig__,__args__;
+	__sig__ = { kwargs:{"property": false}, args:["ob", "attr", "value", "property"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("setattr", __sig__, args, kwargs);
+	var ob = __args__['ob'];
+	var attr = __args__['attr'];
+	var value = __args__['value'];
+	var property = __args__['property'];
+	if (property)
+	{
+		prop = _get_upstream_property(ob.__class__, attr);
+		if (prop && prop["set"])
+		{
+			prop["set"]([ob, value], {  });
+		}
+		else
+		{
+			console.log(["ERROR: setattr property error", prop]);
+		}
+	}
+	else
+	{
+		__set__(ob, attr, value);
+	}
 };setattr.is_wrapper = true;
-var issubclass = function(args, kwargs) {
-  var i,bases;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["C", "B"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("issubclass", __sig__, args, kwargs);
-  var C = __args__['C'];
-  var B = __args__['B'];
-  if (( C ) === B) {
-    return true;
-  }
-  bases = C.__bases__;
-  i = 0;
-  while (( i ) < __get__(bases, "length", "missing attribute `length` - line 228: while i < bases.length:")) {
-    if (issubclass([((bases instanceof Array) ? bases[i] : __get__(bases, "__getitem__", "line 229: if issubclass( bases[i], B ):")([i], __NULL_OBJECT__)), B], __NULL_OBJECT__)) {
-      return true;
-    }
-    i += 1;
-  }
-  return false;
+var issubclass = function(args, kwargs)
+{
+	var i,bases;
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["C", "B"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("issubclass", __sig__, args, kwargs);
+	var C = __args__['C'];
+	var B = __args__['B'];
+	if (( C ) === B)
+	{
+		return true;
+	}
+	bases = C.__bases__;
+	i = 0;
+	while (( i ) < __get__(bases, "length", "missing attribute `length` - line 204: while i < bases.length:"))
+	{
+		if (issubclass([((bases instanceof Array) ? bases[i] : __get__(bases, "__getitem__", "line 205: if issubclass( bases[i], B ):")([i], __NULL_OBJECT__)), B], __NULL_OBJECT__))
+		{
+			return true;
+		}
+		i += 1;
+	}
+	return false;
 };issubclass.is_wrapper = true;
-var isinstance = function(args, kwargs) {
-  var ob_class;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["ob", "klass"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("isinstance", __sig__, args, kwargs);
-  var ob = __args__['ob'];
-  var klass = __args__['klass'];
-  if (( ob ) === undefined || ( ob ) === null) {
-    return false;
-  } else {
-    if (ob instanceof Array && ( klass ) === list) {
-      return true;
-    } else {
-      if (! (Object.hasOwnProperty.call(ob, "__class__"))) {
-        return false;
-      }
-    }
-  }
-  ob_class = ob.__class__;
-  if (( ob_class ) === undefined) {
-    return false;
-  } else {
-    return issubclass([ob_class, klass], __NULL_OBJECT__);
-  }
+var isinstance = function(args, kwargs)
+{
+	var ob_class;
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["ob", "klass"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("isinstance", __sig__, args, kwargs);
+	var ob = __args__['ob'];
+	var klass = __args__['klass'];
+	if (( ob ) === undefined || ( ob ) === null)
+	{
+		return false;
+	}
+	else
+	{
+		if (ob instanceof Array && ( klass ) === list)
+		{
+			return true;
+		}
+		else
+		{
+			if (! (Object.hasOwnProperty.call(ob, "__class__")))
+			{
+				return false;
+			}
+		}
+	}
+	ob_class = ob.__class__;
+	if (( ob_class ) === undefined)
+	{
+		return false;
+	}
+	else
+	{
+		return issubclass([ob_class, klass], __NULL_OBJECT__);
+	}
 };isinstance.is_wrapper = true;
-var int = function(args, kwargs) {
-  
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["a"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("int", __sig__, args, kwargs);
-  var a = __args__['a'];
-  a = Math.round(a);
-  if (isNaN(a)) {
-    throw new ValueError("not a number");
-  }
-  return a;
+var int = function(args, kwargs)
+{
+	
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["a"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("int", __sig__, args, kwargs);
+	var a = __args__['a'];
+	a = Math.round(a);
+	if (isNaN(a))
+	{
+		throw new ValueError("not a number");
+	}
+	return a;
 };int.is_wrapper = true;
-var float = function(args, kwargs) {
-  var b;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["a"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("float", __sig__, args, kwargs);
-  var a = __args__['a'];
-  if (typeof(a)==="string") {
-    if (a.lower()==="nan") {
-      return NaN;
-    } else {
-      if (a.lower()==="inf") {
-        return Infinity;
-      }
-    }
-  }
-  b = Number(a);
-  if (isNaN(b)) {
-    throw new ValueError(("can not convert to float: " + a));
-  }
-  return b;
+var float = function(args, kwargs)
+{
+	var b;
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["a"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("float", __sig__, args, kwargs);
+	var a = __args__['a'];
+	if (typeof(a)==="string")
+	{
+		if (a.lower()==="nan")
+		{
+			return NaN;
+		}
+		else
+		{
+			if (a.lower()==="inf")
+			{
+				return Infinity;
+			}
+		}
+	}
+	b = Number(a);
+	if (isNaN(b))
+	{
+		throw new ValueError(("can not convert to float: " + a));
+	}
+	return b;
 };float.is_wrapper = true;
-var round = function(args, kwargs) {
-  var p,b;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{"places": 0},args:["a", "places"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("round", __sig__, args, kwargs);
-  var a = __args__['a'];
-  var places = __args__['places'];
-  b = ("" + a);
-  if (b.indexOf(".")===-1) {
-    return a;
-  } else {
-    p = Math.pow(10, places);
-    return (Math.round((a * p)) / p);
-  }
+var round = function(args, kwargs)
+{
+	var p,b;
+	var __sig__,__args__;
+	__sig__ = { kwargs:{"places": 0}, args:["a", "places"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("round", __sig__, args, kwargs);
+	var a = __args__['a'];
+	var places = __args__['places'];
+	b = ("" + a);
+	if (b.indexOf(".")===-1)
+	{
+		return a;
+	}
+	else
+	{
+		p = Math.pow(10, places);
+		return (Math.round((a * p)) / p);
+	}
 };round.is_wrapper = true;
-var str = function(args, kwargs) {
-  
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["s"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("str", __sig__, args, kwargs);
-  var s = __args__['s'];
-  return ("" + s);
+var str = function(args, kwargs)
+{
+	
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["s"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("str", __sig__, args, kwargs);
+	var s = __args__['s'];
+	return ("" + s);
 };str.is_wrapper = true;
-var _setup_str_prototype = function() {
-  
-  "\n	Extend JavaScript String.prototype with methods that implement the Python str API.\n	The decorator @String.prototype.[name] assigns the function to the prototype,\n	and ensures that the special 'this' variable will work.\n	";
-    var func = function(index) {
-    
-    if (( index ) < 0) {
-      return this[(this.length + index)];
-    } else {
-      return this[index];
-    }
-  }
-
-  Object.defineProperty(String.prototype, "get", { enumerable:false,value:func,writeable:true,configurable:true });
-    var func = function(self) {
-    
-    return __get__(Iterator, "__call__")([this, 0], __NULL_OBJECT__);
-  }
-
-  Object.defineProperty(String.prototype, "__iter__", { enumerable:false,value:func,writeable:true,configurable:true });
-    var func = function(idx) {
-    
-    if (( idx ) < 0) {
-      return this[(this.length + idx)];
-    } else {
-      return this[idx];
-    }
-  }
-
-  Object.defineProperty(String.prototype, "__getitem__", { enumerable:false,value:func,writeable:true,configurable:true });
-    var func = function() {
-    
-    return this.length;
-  }
-
-  Object.defineProperty(String.prototype, "__len__", { enumerable:false,value:func,writeable:true,configurable:true });
-    var func = function(a) {
-    
-    return this.indexOf(a);
-  }
-
-  Object.defineProperty(String.prototype, "find", { enumerable:false,value:func,writeable:true,configurable:true });
-    var func = function() {
-    var digits;
-    digits = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"];
-        var __iter30 = this;
-    if (! (__iter30 instanceof Array || typeof __iter30 == "string" || __is_typed_array(__iter30) || __is_some_array(__iter30) )) { __iter30 = __object_keys__(__iter30) }
-    for (var __idx30=0; __idx30 < __iter30.length; __idx30++) {
-      var char = __iter30[ __idx30 ];
-      if (__contains__(digits, char)) {
-        /*pass*/
-      } else {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  Object.defineProperty(String.prototype, "isdigit", { enumerable:false,value:func,writeable:true,configurable:true });
-    var func = function() {
-    var digits;
-    digits = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "."];
-        var __iter31 = this;
-    if (! (__iter31 instanceof Array || typeof __iter31 == "string" || __is_typed_array(__iter31) || __is_some_array(__iter31) )) { __iter31 = __object_keys__(__iter31) }
-    for (var __idx31=0; __idx31 < __iter31.length; __idx31++) {
-      var char = __iter31[ __idx31 ];
-      if (__contains__(digits, char)) {
-        /*pass*/
-      } else {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  Object.defineProperty(String.prototype, "isnumber", { enumerable:false,value:func,writeable:true,configurable:true });
-    var func = function(encoding) {
-    
-    return this;
-  }
-
-  Object.defineProperty(String.prototype, "decode", { enumerable:false,value:func,writeable:true,configurable:true });
-    var func = function(encoding) {
-    
-    return this;
-  }
-
-  Object.defineProperty(String.prototype, "encode", { enumerable:false,value:func,writeable:true,configurable:true });
-    var func = function(fmt) {
-    var keys,r;
-    r = this;
-    keys = Object.keys(fmt);
-        var __iter32 = keys;
-    if (! (__iter32 instanceof Array || typeof __iter32 == "string" || __is_typed_array(__iter32) || __is_some_array(__iter32) )) { __iter32 = __object_keys__(__iter32) }
-    for (var __idx32=0; __idx32 < __iter32.length; __idx32++) {
-      var key = __iter32[ __idx32 ];
-      r = r.split(key).join(fmt[key]);
-    }
-    r = r.split("{").join("").split("}").join("");
-    return r;
-  }
-
-  Object.defineProperty(String.prototype, "format", { enumerable:false,value:func,writeable:true,configurable:true });
+/* Extend JavaScript String.prototype with methods that implement the Python str API.
+	The decorator @String.prototype.[name] assigns the function to the prototype,
+	and ensures that the special 'this' variable will work. */
+var _setup_str_prototype = function()
+{
+	
+		var func = function(index)
+	{
+		
+		if (( index ) < 0)
+		{
+			return this[(this.length + index)];
+		}
+		else
+		{
+			return this[index];
+		}
+	}
+
+	Object.defineProperty(String.prototype, "get", { enumerable:false, value:func, writeable:true, configurable:true });
+		var func = function(self)
+	{
+		
+		return __get__(Iterator, "__call__")([this, 0], __NULL_OBJECT__);
+	}
+
+	Object.defineProperty(String.prototype, "__iter__", { enumerable:false, value:func, writeable:true, configurable:true });
+		var func = function(idx)
+	{
+		
+		if (( idx ) < 0)
+		{
+			return this[(this.length + idx)];
+		}
+		else
+		{
+			return this[idx];
+		}
+	}
+
+	Object.defineProperty(String.prototype, "__getitem__", { enumerable:false, value:func, writeable:true, configurable:true });
+		var func = function()
+	{
+		
+		return this.length;
+	}
+
+	Object.defineProperty(String.prototype, "__len__", { enumerable:false, value:func, writeable:true, configurable:true });
+		var func = function(a)
+	{
+		
+		return this.indexOf(a);
+	}
+
+	Object.defineProperty(String.prototype, "find", { enumerable:false, value:func, writeable:true, configurable:true });
+		var func = function()
+	{
+		var digits;
+		digits = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"];
+				var __iter30 = this;
+		if (! (__iter30 instanceof Array || typeof __iter30 == "string" || __is_typed_array(__iter30) || __is_some_array(__iter30) )) { __iter30 = __object_keys__(__iter30) }
+		for (var __i30=0; __i30 < __iter30.length; __i30++) {
+			var char = __iter30[ __i30 ];
+			if (__contains__(digits, char))
+			{
+				/*pass*/
+			}
+			else
+			{
+				return false;
+			}
+		}
+		return true;
+	}
+
+	Object.defineProperty(String.prototype, "isdigit", { enumerable:false, value:func, writeable:true, configurable:true });
+		var func = function()
+	{
+		var digits;
+		digits = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "."];
+				var __iter31 = this;
+		if (! (__iter31 instanceof Array || typeof __iter31 == "string" || __is_typed_array(__iter31) || __is_some_array(__iter31) )) { __iter31 = __object_keys__(__iter31) }
+		for (var __i31=0; __i31 < __iter31.length; __i31++) {
+			var char = __iter31[ __i31 ];
+			if (__contains__(digits, char))
+			{
+				/*pass*/
+			}
+			else
+			{
+				return false;
+			}
+		}
+		return true;
+	}
+
+	Object.defineProperty(String.prototype, "isnumber", { enumerable:false, value:func, writeable:true, configurable:true });
+		var func = function(encoding)
+	{
+		
+		return this;
+	}
+
+	Object.defineProperty(String.prototype, "decode", { enumerable:false, value:func, writeable:true, configurable:true });
+		var func = function(encoding)
+	{
+		
+		return this;
+	}
+
+	Object.defineProperty(String.prototype, "encode", { enumerable:false, value:func, writeable:true, configurable:true });
+		var func = function(fmt)
+	{
+		var keys,r;
+		r = this;
+		keys = Object.keys(fmt);
+				var __iter32 = keys;
+		if (! (__iter32 instanceof Array || typeof __iter32 == "string" || __is_typed_array(__iter32) || __is_some_array(__iter32) )) { __iter32 = __object_keys__(__iter32) }
+		for (var __i32=0; __i32 < __iter32.length; __i32++) {
+			var key = __iter32[ __i32 ];
+			r = r.split(key).join(fmt[key]);
+		}
+		r = r.split("{").join("").split("}").join("");
+		return r;
+	}
+
+	Object.defineProperty(String.prototype, "format", { enumerable:false, value:func, writeable:true, configurable:true });
 };_setup_str_prototype.is_wrapper = true;
 _setup_str_prototype();
-var __sort_method = function(ob) {
-  
-  if (ob instanceof Array) {
-        var f = function(a, b) {
-      
-      if (( a ) < b) {
-        return -1;
-      } else {
-        if (( a ) > b) {
-          return 1;
-        } else {
-          return 0;
-        }
-      }
-    }
-
-    return ob.sort( f );
-  } else {
-    return ob.sort();
-  }
-}
-
-var _setup_array_prototype = function() {
-  
-    var func = function() {
-    var i,item;
-    i = 0;
-    while (( i ) < this.length) {
-      item = this[i];
-      if (typeof(item)==="object") {
-        if (item.jsify) {
-          this[i] = item.jsify();
-        }
-      }
-      i += 1;
-    }
-    return this;
-  }
-
-  Object.defineProperty(Array.prototype, "jsify", { enumerable:false,value:func,writeable:true,configurable:true });
-    var func = function() {
-    
-    return this.length;
-  }
-
-  Object.defineProperty(Array.prototype, "__len__", { enumerable:false,value:func,writeable:true,configurable:true });
-    var func = function(index) {
-    
-    return this[index];
-  }
-
-  Object.defineProperty(Array.prototype, "get", { enumerable:false,value:func,writeable:true,configurable:true });
-    var __getitem__ = function(index) {
-    
-    if (( index ) < 0) {
-      index = (this.length + index);
-    }
-    return this[index];
-  }
-
-  Object.defineProperty(Array.prototype, "__getitem__", { enumerable:false,value:__getitem__,writeable:true,configurable:true });
-    var __setitem__ = function(index, value) {
-    
-    if (( index ) < 0) {
-      index = (this.length + index);
-    }
-    this[index] = value;
-  }
-
-  Object.defineProperty(Array.prototype, "__setitem__", { enumerable:false,value:__setitem__,writeable:true,configurable:true });
-    var func = function() {
-    
-    return __get__(Iterator, "__call__")([this, 0], __NULL_OBJECT__);
-  }
-
-  Object.defineProperty(Array.prototype, "__iter__", { enumerable:false,value:func,writeable:true,configurable:true });
-    var func = function(x, low, high) {
-    var a,mid;
-    if (( low ) === undefined) {
-      low = 0;
-    }
-    if (( high ) === undefined) {
-      high = this.length;
-    }
-    while (( low ) < high) {
-      a = (low + high);
-      mid = Math.floor((a / 2));
-      if (( x ) < this[mid]) {
-        high = mid;
-      } else {
-        low = (mid + 1);
-      }
-    }
-    return low;
-  }
-
-  Object.defineProperty(Array.prototype, "bisect", { enumerable:false,value:func,writeable:true,configurable:true });
-    var func = function(other) {
-    var f;
-        var __lambda__ = function(i) {
-      
-      return (other.indexOf(i)===-1);
-    }
-
-    f = __lambda__;
-    return this.filter(f);
-  }
-
-  Object.defineProperty(Array.prototype, "difference", { enumerable:false,value:func,writeable:true,configurable:true });
-    var func = function(other) {
-    var f;
-        var __lambda__ = function(i) {
-      
-      return (other.indexOf(i)!==-1);
-    }
-
-    f = __lambda__;
-    return this.filter(f);
-  }
-
-  Object.defineProperty(Array.prototype, "intersection", { enumerable:false,value:func,writeable:true,configurable:true });
-    var func = function(other) {
-    
-        var __iter33 = this;
-    if (! (__iter33 instanceof Array || typeof __iter33 == "string" || __is_typed_array(__iter33) || __is_some_array(__iter33) )) { __iter33 = __object_keys__(__iter33) }
-    for (var __idx33=0; __idx33 < __iter33.length; __idx33++) {
-      var item = __iter33[ __idx33 ];
-      if (other.indexOf(item)===-1) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  Object.defineProperty(Array.prototype, "issubset", { enumerable:false,value:func,writeable:true,configurable:true });
-    var func = function() {
-    var i,arr;
-    arr = [];
-    i = 0;
-    while (( i ) < this.length) {
-      arr.push(this[i]);
-      i += 1;
-    }
-    return arr;
-  }
-
-  Object.defineProperty(Array.prototype, "copy", { enumerable:false,value:func,writeable:true,configurable:true });
+var __sort_method = function(ob)
+{
+	
+	if (ob instanceof Array)
+	{
+				var f = function(a, b)
+		{
+			
+			if (( a ) < b)
+			{
+				return -1;
+			}
+			else
+			{
+				if (( a ) > b)
+				{
+					return 1;
+				}
+				else
+				{
+					return 0;
+				}
+			}
+		}
+
+		return ob.sort( f );
+	}
+	else
+	{
+		return ob.sort();
+	}
+}
+
+var _setup_array_prototype = function()
+{
+	
+		var func = function()
+	{
+		var i,item;
+		i = 0;
+		while (( i ) < this.length)
+		{
+			item = this[i];
+			if (typeof(item)==="object")
+			{
+				if (item.jsify)
+				{
+					this[i] = item.jsify();
+				}
+			}
+			i += 1;
+		}
+		return this;
+	}
+
+	Object.defineProperty(Array.prototype, "jsify", { enumerable:false, value:func, writeable:true, configurable:true });
+		var func = function()
+	{
+		
+		return this.length;
+	}
+
+	Object.defineProperty(Array.prototype, "__len__", { enumerable:false, value:func, writeable:true, configurable:true });
+		var func = function(index)
+	{
+		
+		return this[index];
+	}
+
+	Object.defineProperty(Array.prototype, "get", { enumerable:false, value:func, writeable:true, configurable:true });
+		var __getitem__ = function(index)
+	{
+		
+		if (( index ) < 0)
+		{
+			index = (this.length + index);
+		}
+		return this[index];
+	}
+
+	Object.defineProperty(Array.prototype, "__getitem__", { enumerable:false, value:__getitem__, writeable:true, configurable:true });
+		var __setitem__ = function(index, value)
+	{
+		
+		if (( index ) < 0)
+		{
+			index = (this.length + index);
+		}
+		this[index] = value;
+	}
+
+	Object.defineProperty(Array.prototype, "__setitem__", { enumerable:false, value:__setitem__, writeable:true, configurable:true });
+		var func = function()
+	{
+		
+		return __get__(Iterator, "__call__")([this, 0], __NULL_OBJECT__);
+	}
+
+	Object.defineProperty(Array.prototype, "__iter__", { enumerable:false, value:func, writeable:true, configurable:true });
+		var func = function(x, low, high)
+	{
+		var a,mid;
+		if (( low ) === undefined)
+		{
+			low = 0;
+		}
+		if (( high ) === undefined)
+		{
+			high = this.length;
+		}
+		while (( low ) < high)
+		{
+			a = (low + high);
+			mid = Math.floor((a / 2));
+			if (( x ) < this[mid])
+			{
+				high = mid;
+			}
+			else
+			{
+				low = (mid + 1);
+			}
+		}
+		return low;
+	}
+
+	Object.defineProperty(Array.prototype, "bisect", { enumerable:false, value:func, writeable:true, configurable:true });
+		var func = function(other)
+	{
+		var f;
+				var __lambda__ = function(i)
+		{
+			
+			return (other.indexOf(i)===-1);
+		}
+
+		f = __lambda__;
+		return this.filter(f);
+	}
+
+	Object.defineProperty(Array.prototype, "difference", { enumerable:false, value:func, writeable:true, configurable:true });
+		var func = function(other)
+	{
+		var f;
+				var __lambda__ = function(i)
+		{
+			
+			return (other.indexOf(i)!==-1);
+		}
+
+		f = __lambda__;
+		return this.filter(f);
+	}
+
+	Object.defineProperty(Array.prototype, "intersection", { enumerable:false, value:func, writeable:true, configurable:true });
+		var func = function(other)
+	{
+		
+				var __iter33 = this;
+		if (! (__iter33 instanceof Array || typeof __iter33 == "string" || __is_typed_array(__iter33) || __is_some_array(__iter33) )) { __iter33 = __object_keys__(__iter33) }
+		for (var __i33=0; __i33 < __iter33.length; __i33++) {
+			var item = __iter33[ __i33 ];
+			if (other.indexOf(item)===-1)
+			{
+				return false;
+			}
+		}
+		return true;
+	}
+
+	Object.defineProperty(Array.prototype, "issubset", { enumerable:false, value:func, writeable:true, configurable:true });
+		var func = function()
+	{
+		var i,arr;
+		arr = [];
+		i = 0;
+		while (( i ) < this.length)
+		{
+			arr.push(this[i]);
+			i += 1;
+		}
+		return arr;
+	}
+
+	Object.defineProperty(Array.prototype, "copy", { enumerable:false, value:func, writeable:true, configurable:true });
 };_setup_array_prototype.is_wrapper = true;
 _setup_array_prototype();
-var _setup_nodelist_prototype = function() {
-  
-    var func = function(a) {
-    
-    if (this.indexOf(a)===-1) {
-      return false;
-    } else {
-      return true;
-    }
-  }
-
-  Object.defineProperty(NodeList.prototype, "__contains__", { enumerable:false,value:func,writeable:true,configurable:true });
-    var func = function() {
-    
-    return this.length;
-  }
-
-  Object.defineProperty(NodeList.prototype, "__len__", { enumerable:false,value:func,writeable:true,configurable:true });
-    var func = function(index) {
-    
-    return this[index];
-  }
-
-  Object.defineProperty(NodeList.prototype, "get", { enumerable:false,value:func,writeable:true,configurable:true });
-    var __getitem__ = function(index) {
-    
-    if (( index ) < 0) {
-      index = (this.length + index);
-    }
-    return this[index];
-  }
-
-  Object.defineProperty(NodeList.prototype, "__getitem__", { enumerable:false,value:__getitem__,writeable:true,configurable:true });
-    var __setitem__ = function(index, value) {
-    
-    if (( index ) < 0) {
-      index = (this.length + index);
-    }
-    this[index] = value;
-  }
-
-  Object.defineProperty(NodeList.prototype, "__setitem__", { enumerable:false,value:__setitem__,writeable:true,configurable:true });
-    var func = function() {
-    
-    return __get__(Iterator, "__call__")([this, 0], __NULL_OBJECT__);
-  }
-
-  Object.defineProperty(NodeList.prototype, "__iter__", { enumerable:false,value:func,writeable:true,configurable:true });
-    var index = function(obj) {
-    
-    return this.indexOf(obj);
-  }
-
-  Object.defineProperty(NodeList.prototype, "index", { enumerable:false,value:index,writeable:true,configurable:true });
+var _setup_nodelist_prototype = function()
+{
+	
+		var func = function(a)
+	{
+		
+		if (this.indexOf(a)===-1)
+		{
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+
+	Object.defineProperty(NodeList.prototype, "__contains__", { enumerable:false, value:func, writeable:true, configurable:true });
+		var func = function()
+	{
+		
+		return this.length;
+	}
+
+	Object.defineProperty(NodeList.prototype, "__len__", { enumerable:false, value:func, writeable:true, configurable:true });
+		var func = function(index)
+	{
+		
+		return this[index];
+	}
+
+	Object.defineProperty(NodeList.prototype, "get", { enumerable:false, value:func, writeable:true, configurable:true });
+		var __getitem__ = function(index)
+	{
+		
+		if (( index ) < 0)
+		{
+			index = (this.length + index);
+		}
+		return this[index];
+	}
+
+	Object.defineProperty(NodeList.prototype, "__getitem__", { enumerable:false, value:__getitem__, writeable:true, configurable:true });
+		var __setitem__ = function(index, value)
+	{
+		
+		if (( index ) < 0)
+		{
+			index = (this.length + index);
+		}
+		this[index] = value;
+	}
+
+	Object.defineProperty(NodeList.prototype, "__setitem__", { enumerable:false, value:__setitem__, writeable:true, configurable:true });
+		var func = function()
+	{
+		
+		return __get__(Iterator, "__call__")([this, 0], __NULL_OBJECT__);
+	}
+
+	Object.defineProperty(NodeList.prototype, "__iter__", { enumerable:false, value:func, writeable:true, configurable:true });
+		var index = function(obj)
+	{
+		
+		return this.indexOf(obj);
+	}
+
+	Object.defineProperty(NodeList.prototype, "index", { enumerable:false, value:index, writeable:true, configurable:true });
 };_setup_nodelist_prototype.is_wrapper = true;
-if ((__NODEJS__===false) && (__WEBWORKER__===false)) {
-  _setup_nodelist_prototype();
-}
-var bisect = function(args, kwargs) {
-  
-  var __sig__,__args__;
-  __sig__ = { kwargs:{"low": null, "high": null},args:["a", "x", "low", "high"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("bisect", __sig__, args, kwargs);
-  var a = __args__['a'];
-  var x = __args__['x'];
-  var low = __args__['low'];
-  var high = __args__['high'];
-  return a.bisect(x, low, high);
+if ((__NODEJS__===false) && (__WEBWORKER__===false))
+{
+	_setup_nodelist_prototype();
+}
+var bisect = function(args, kwargs)
+{
+	
+	var __sig__,__args__;
+	__sig__ = { kwargs:{"low": null, "high": null}, args:["a", "x", "low", "high"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("bisect", __sig__, args, kwargs);
+	var a = __args__['a'];
+	var x = __args__['x'];
+	var low = __args__['low'];
+	var high = __args__['high'];
+	return a.bisect(x, low, high);
 };bisect.is_wrapper = true;
-var range = function(args, kwargs) {
-  var i,arr;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["num", "stop", "step"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("range", __sig__, args, kwargs);
-  var num = __args__['num'];
-  var stop = __args__['stop'];
-  var step = __args__['step'];
-  "Emulates Python's range function";
-  if (( stop ) !== undefined) {
-    i = num;
-    num = stop;
-  } else {
-    i = 0;
-  }
-  if (( step ) === undefined) {
-    step = 1;
-  }
-  arr = [];
-  while (( i ) < num) {
-    arr.push(i);
-    i += step;
-  }
-  return arr;
+/* Emulates Python's range function */
+var range = function(args, kwargs)
+{
+	var i,arr;
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["num", "stop", "step"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("range", __sig__, args, kwargs);
+	var num = __args__['num'];
+	var stop = __args__['stop'];
+	var step = __args__['step'];
+	if (( stop ) !== undefined)
+	{
+		i = num;
+		num = stop;
+	}
+	else
+	{
+		i = 0;
+	}
+	if (( step ) === undefined)
+	{
+		step = 1;
+	}
+	arr = [];
+	while (( i ) < num)
+	{
+		arr.push(i);
+		i += step;
+	}
+	return arr;
 };range.is_wrapper = true;
-var xrange = function(args, kwargs) {
-  
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["num", "stop", "step"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("xrange", __sig__, args, kwargs);
-  var num = __args__['num'];
-  var stop = __args__['stop'];
-  var step = __args__['step'];
-  return range([num, stop, step], __NULL_OBJECT__);
+var xrange = function(args, kwargs)
+{
+	
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["num", "stop", "step"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("xrange", __sig__, args, kwargs);
+	var num = __args__['num'];
+	var stop = __args__['stop'];
+	var step = __args__['step'];
+	return range([num, stop, step], __NULL_OBJECT__);
 };xrange.is_wrapper = true;
-var sum = function(args, kwargs) {
-  var a;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["arr"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("sum", __sig__, args, kwargs);
-  var arr = __args__['arr'];
-  a = 0;
-  var b,__iterator__12;
-  __iterator__12 = __get__(__get__(arr, "__iter__", "no iterator - line 478: for b in arr:"), "__call__")([], __NULL_OBJECT__);
-  var __next__12;
-  __next__12 = __get__(__iterator__12, "next");
-  while (( __iterator__12.index ) < __iterator__12.length) {
-    b = __next__12();
-    a += b;
-  }
-  return a;
+var sum = function(args, kwargs)
+{
+	var a;
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["arr"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("sum", __sig__, args, kwargs);
+	var arr = __args__['arr'];
+	a = 0;
+	var b,__iterator__12;
+	__iterator__12 = __get__(__get__(arr, "__iter__", "no iterator - line 436: for b in arr:"), "__call__")([], __NULL_OBJECT__);
+	var __next__12;
+	__next__12 = __get__(__iterator__12, "next");
+	while (( __iterator__12.index ) < __iterator__12.length)
+	{
+		b = __next__12();
+		a += b;
+	}
+	return a;
 };sum.is_wrapper = true;
 var StopIteration,__StopIteration_attrs,__StopIteration_parents;
 __StopIteration_attrs = {};
 __StopIteration_parents = [];
 __StopIteration_properties = {};
 StopIteration = __create_class__("StopIteration", __StopIteration_parents, __StopIteration_attrs, __StopIteration_properties);
-var next = function(args, kwargs) {
-  
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["obj"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("next", __sig__, args, kwargs);
-  var obj = __args__['obj'];
-  return __get__(__get__(obj, "next", "missing attribute `next` - line 484: return obj.next()"), "__call__")();
+var next = function(args, kwargs)
+{
+	
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["obj"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("next", __sig__, args, kwargs);
+	var obj = __args__['obj'];
+	return __get__(__get__(obj, "next", "missing attribute `next` - line 442: return obj.next()"), "__call__")();
 };next.is_wrapper = true;
-var map = function(args, kwargs) {
-  var arr,v;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["func", "objs"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("map", __sig__, args, kwargs);
-  var func = __args__['func'];
-  var objs = __args__['objs'];
-  arr = [];
-  var ob,__iterator__13;
-  __iterator__13 = __get__(__get__(objs, "__iter__", "no iterator - line 487: for ob in objs:"), "__call__")([], __NULL_OBJECT__);
-  var __next__13;
-  __next__13 = __get__(__iterator__13, "next");
-  while (( __iterator__13.index ) < __iterator__13.length) {
-    ob = __next__13();
-    v = __get__(func, "__call__")([ob], __NULL_OBJECT__);
-    arr.push(v);
-  }
-  return arr;
+var map = function(args, kwargs)
+{
+	var arr,v;
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["func", "objs"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("map", __sig__, args, kwargs);
+	var func = __args__['func'];
+	var objs = __args__['objs'];
+	arr = [];
+	var ob,__iterator__13;
+	__iterator__13 = __get__(__get__(objs, "__iter__", "no iterator - line 445: for ob in objs:"), "__call__")([], __NULL_OBJECT__);
+	var __next__13;
+	__next__13 = __get__(__iterator__13, "next");
+	while (( __iterator__13.index ) < __iterator__13.length)
+	{
+		ob = __next__13();
+		v = __get__(func, "__call__")([ob], __NULL_OBJECT__);
+		arr.push(v);
+	}
+	return arr;
 };map.is_wrapper = true;
-var filter = function(args, kwargs) {
-  var arr;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["func", "objs"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("filter", __sig__, args, kwargs);
-  var func = __args__['func'];
-  var objs = __args__['objs'];
-  arr = [];
-  var ob,__iterator__14;
-  __iterator__14 = __get__(__get__(objs, "__iter__", "no iterator - line 494: for ob in objs:"), "__call__")([], __NULL_OBJECT__);
-  var __next__14;
-  __next__14 = __get__(__iterator__14, "next");
-  while (( __iterator__14.index ) < __iterator__14.length) {
-    ob = __next__14();
-    if (__get__(func, "__call__")([ob], __NULL_OBJECT__)) {
-      arr.push(ob);
-    }
-  }
-  return arr;
+var filter = function(args, kwargs)
+{
+	var arr;
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["func", "objs"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("filter", __sig__, args, kwargs);
+	var func = __args__['func'];
+	var objs = __args__['objs'];
+	arr = [];
+	var ob,__iterator__14;
+	__iterator__14 = __get__(__get__(objs, "__iter__", "no iterator - line 452: for ob in objs:"), "__call__")([], __NULL_OBJECT__);
+	var __next__14;
+	__next__14 = __get__(__iterator__14, "next");
+	while (( __iterator__14.index ) < __iterator__14.length)
+	{
+		ob = __next__14();
+		if (__get__(func, "__call__")([ob], __NULL_OBJECT__))
+		{
+			arr.push(ob);
+		}
+	}
+	return arr;
 };filter.is_wrapper = true;
-var min = function(args, kwargs) {
-  var a;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["lst"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("min", __sig__, args, kwargs);
-  var lst = __args__['lst'];
-  a = null;
-  var value,__iterator__15;
-  __iterator__15 = __get__(__get__(lst, "__iter__", "no iterator - line 501: for value in lst:"), "__call__")([], __NULL_OBJECT__);
-  var __next__15;
-  __next__15 = __get__(__iterator__15, "next");
-  while (( __iterator__15.index ) < __iterator__15.length) {
-    value = __next__15();
-    if (( a ) === null) {
-      a = value;
-    } else {
-      if (( value ) < a) {
-        a = value;
-      }
-    }
-  }
-  return a;
+var min = function(args, kwargs)
+{
+	var a;
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["lst"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("min", __sig__, args, kwargs);
+	var lst = __args__['lst'];
+	a = null;
+	var value,__iterator__15;
+	__iterator__15 = __get__(__get__(lst, "__iter__", "no iterator - line 459: for value in lst:"), "__call__")([], __NULL_OBJECT__);
+	var __next__15;
+	__next__15 = __get__(__iterator__15, "next");
+	while (( __iterator__15.index ) < __iterator__15.length)
+	{
+		value = __next__15();
+		if (( a ) === null)
+		{
+			a = value;
+		}
+		else
+		{
+			if (( value ) < a)
+			{
+				a = value;
+			}
+		}
+	}
+	return a;
 };min.is_wrapper = true;
-var max = function(args, kwargs) {
-  var a;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["lst"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("max", __sig__, args, kwargs);
-  var lst = __args__['lst'];
-  a = null;
-  var value,__iterator__16;
-  __iterator__16 = __get__(__get__(lst, "__iter__", "no iterator - line 507: for value in lst:"), "__call__")([], __NULL_OBJECT__);
-  var __next__16;
-  __next__16 = __get__(__iterator__16, "next");
-  while (( __iterator__16.index ) < __iterator__16.length) {
-    value = __next__16();
-    if (( a ) === null) {
-      a = value;
-    } else {
-      if (( value ) > a) {
-        a = value;
-      }
-    }
-  }
-  return a;
+var max = function(args, kwargs)
+{
+	var a;
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["lst"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("max", __sig__, args, kwargs);
+	var lst = __args__['lst'];
+	a = null;
+	var value,__iterator__16;
+	__iterator__16 = __get__(__get__(lst, "__iter__", "no iterator - line 465: for value in lst:"), "__call__")([], __NULL_OBJECT__);
+	var __next__16;
+	__next__16 = __get__(__iterator__16, "next");
+	while (( __iterator__16.index ) < __iterator__16.length)
+	{
+		value = __next__16();
+		if (( a ) === null)
+		{
+			a = value;
+		}
+		else
+		{
+			if (( value ) > a)
+			{
+				a = value;
+			}
+		}
+	}
+	return a;
 };max.is_wrapper = true;
-var abs = function(args, kwargs) {
-  
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["num"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("abs", __sig__, args, kwargs);
-  var num = __args__['num'];
-  return Math.abs(num);
+var abs = function(args, kwargs)
+{
+	
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["num"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("abs", __sig__, args, kwargs);
+	var num = __args__['num'];
+	return Math.abs(num);
 };abs.is_wrapper = true;
-var ord = function(args, kwargs) {
-  
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["char"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("ord", __sig__, args, kwargs);
-  var char = __args__['char'];
-  return char.charCodeAt(0);
+var ord = function(args, kwargs)
+{
+	
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["char"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("ord", __sig__, args, kwargs);
+	var char = __args__['char'];
+	return char.charCodeAt(0);
 };ord.is_wrapper = true;
-var chr = function(args, kwargs) {
-  
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["num"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("chr", __sig__, args, kwargs);
-  var num = __args__['num'];
-  return String.fromCharCode(num);
+var chr = function(args, kwargs)
+{
+	
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["num"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("chr", __sig__, args, kwargs);
+	var num = __args__['num'];
+	return String.fromCharCode(num);
 };chr.is_wrapper = true;
-var __ArrayIterator = function(arr, index) {
-  __ArrayIterator.__init__(this, arr, index);
-  this.__class__ = __ArrayIterator;
+var __ArrayIterator = function(arr, index)
+{
+	this.__init__(arr, index);
 }
 
-__ArrayIterator.prototype.__init__ = function(arr, index) {
-  
-  this.arr = arr;
-  this.index = index;
-  this.length = arr.length;
+__ArrayIterator.prototype.__init__ = function(arr, index)
+{
+	
+	this.arr = arr;
+	this.index = index;
+	this.length = arr.length;
 }
 
-__ArrayIterator.__init__ = function () { return __ArrayIterator.prototype.__init__.apply(arguments[0], Array.prototype.slice.call(arguments,1)) };
-__ArrayIterator.prototype.next = function() {
-  var index,arr;
-  index = this.index;
-  this.index += 1;
-  arr = this.arr;
-  return arr[index];
+__ArrayIterator.prototype.next = function()
+{
+	var index,arr;
+	index = this.index;
+	this.index += 1;
+	arr = this.arr;
+	return arr[index];
 }
 
-__ArrayIterator.next = function () { return __ArrayIterator.prototype.next.apply(arguments[0], Array.prototype.slice.call(arguments,1)) };
 var Iterator,__Iterator_attrs,__Iterator_parents;
 __Iterator_attrs = {};
 __Iterator_parents = [];
 __Iterator_properties = {};
-var __Iterator___init__ = function(args, kwargs) {
-  
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["self", "obj", "index"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__Iterator___init__", __sig__, args, kwargs);
-  var self = __args__['self'];
-  var obj = __args__['obj'];
-  var index = __args__['index'];
-  self.obj = obj;
-  self.index = index;
-  self.length = __get__(len, "__call__")([obj], __NULL_OBJECT__);
-  self.obj_get = __get__(obj, "get", "missing attribute `get` - line 535: self.obj_get = obj.get  ## cache this for speed");
+var __Iterator___init__ = function(args, kwargs)
+{
+	
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["self", "obj", "index"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__Iterator___init__", __sig__, args, kwargs);
+	var self = __args__['self'];
+	var obj = __args__['obj'];
+	var index = __args__['index'];
+	self.obj = obj;
+	self.index = index;
+	self.length = __get__(len, "__call__")([obj], __NULL_OBJECT__);
+	self.obj_get = __get__(obj, "get", "missing attribute `get` - line 491: self.obj_get = obj.get  ## cache this for speed");
 };__Iterator___init__.is_wrapper = true;
 __Iterator_attrs.__init__ = __Iterator___init__;
-var __Iterator_next = function(args, kwargs) {
-  var index;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["self"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__Iterator_next", __sig__, args, kwargs);
-  var self = __args__['self'];
-  index = self.index;
-  self.index += 1;
-  return self.obj_get([index], __jsdict([]));
+var __Iterator_next = function(args, kwargs)
+{
+	var index;
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["self"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__Iterator_next", __sig__, args, kwargs);
+	var self = __args__['self'];
+	index = self.index;
+	self.index += 1;
+	return self.obj_get([index], {  });
 };__Iterator_next.is_wrapper = true;
 __Iterator_attrs.next = __Iterator_next;
 Iterator = __create_class__("Iterator", __Iterator_parents, __Iterator_attrs, __Iterator_properties);
-var tuple = function(args, kwargs) {
-  
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["a"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("tuple", __sig__, args, kwargs);
-  var a = __args__['a'];
-  if (Object.keys(arguments).length===0) {
-    return [];
-  } else {
-    if (a instanceof Array) {
-      return a.slice();
-    } else {
-      if (typeof(a)==="string") {
-        return a.split("");
-      } else {
-        console.log(a);
-        console.log(arguments);
-        throw new TypeError;
-      }
-    }
-  }
+var tuple = function(args, kwargs)
+{
+	
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["a"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("tuple", __sig__, args, kwargs);
+	var a = __args__['a'];
+	if (Object.keys(arguments).length===0)
+	{
+		return [];
+	}
+	else
+	{
+		if (a instanceof Array)
+		{
+			return a.slice();
+		}
+		else
+		{
+			if (typeof(a)==="string")
+			{
+				return a.split("");
+			}
+			else
+			{
+				console.log(a);
+				console.log(arguments);
+				throw new TypeError;
+			}
+		}
+	}
 };tuple.is_wrapper = true;
-var list = function(args, kwargs) {
-  
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["a"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("list", __sig__, args, kwargs);
-  var a = __args__['a'];
-  if (Object.keys(arguments).length===0) {
-    return [];
-  } else {
-    if (a instanceof Array) {
-      return a.slice();
-    } else {
-      if (typeof(a)==="string") {
-        return a.split("");
-      } else {
-        console.log(a);
-        console.log(arguments);
-        throw new TypeError;
-      }
-    }
-  }
+var list = function(args, kwargs)
+{
+	
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["a"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("list", __sig__, args, kwargs);
+	var a = __args__['a'];
+	if (Object.keys(arguments).length===0)
+	{
+		return [];
+	}
+	else
+	{
+		if (a instanceof Array)
+		{
+			return a.slice();
+		}
+		else
+		{
+			if (typeof(a)==="string")
+			{
+				return a.split("");
+			}
+			else
+			{
+				console.log(a);
+				console.log(arguments);
+				throw new TypeError;
+			}
+		}
+	}
 };list.is_wrapper = true;
-var __tuple_key__ = function(arr) {
-  var i,item,r,t;
-  r = [];
-  i = 0;
-  while (( i ) < arr.length) {
-    item = arr[i];
-    t = typeof(item);
-    if (t==="string") {
-      r.append((("'" + item) + "'"));
-    } else {
-      if (item instanceof Array) {
-        r.append(__tuple_key__(item));
-      } else {
-        if (t==="object") {
-          if (( item.__uid__ ) === undefined) {
-            throw new KeyError(item);
-          }
-          r.append(item.__uid__);
-        } else {
-          r.append(item);
-        }
-      }
-    }
-    i += 1;
-  }
-  return r.join(",");
+var __tuple_key__ = function(arr)
+{
+	var i,item,r,t;
+	r = [];
+	i = 0;
+	while (( i ) < arr.length)
+	{
+		item = arr[i];
+		t = typeof(item);
+		if (t==="string")
+		{
+			r.append((("'" + item) + "'"));
+		}
+		else
+		{
+			if (item instanceof Array)
+			{
+				r.append(__tuple_key__(item));
+			}
+			else
+			{
+				if (t==="object")
+				{
+					if (( item.__uid__ ) === undefined)
+					{
+						throw new KeyError(item);
+					}
+					r.append(item.__uid__);
+				}
+				else
+				{
+					r.append(item);
+				}
+			}
+		}
+		i += 1;
+	}
+	return r.join(",");
 }
 
 var dict,__dict_attrs,__dict_parents;
 __dict_attrs = {};
 __dict_parents = [];
 __dict_properties = {};
-var __dict___init__ = function(args, kwargs) {
-  var k,ob,value,v;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{"js_object": null, "pointer": null},args:["self", "js_object", "pointer"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__dict___init__", __sig__, args, kwargs);
-  var self = __args__['self'];
-  var js_object = __args__['js_object'];
-  var pointer = __args__['pointer'];
-  self["$wrapped"] = __jsdict([]);
-  if (( pointer ) !== null) {
-    self["$wrapped"] = pointer;
-  } else {
-    if (js_object) {
-      ob = js_object;
-      if (ob instanceof Array) {
-        var o,__iterator__17;
-        __iterator__17 = __get__(__get__(ob, "__iter__", "no iterator - line 597: for o in ob:"), "__call__")([], __NULL_OBJECT__);
-        var __next__17;
-        __next__17 = __get__(__iterator__17, "next");
-        while (( __iterator__17.index ) < __iterator__17.length) {
-          o = __next__17();
-          if (o instanceof Array) {
-            k = o[0];
-            v = o[1];
-          } else {
-            k = o["key"];
-            v = o["value"];
-          }
-                    try {
-__get__(__get__(self, "__setitem__", "missing attribute `__setitem__` - line 604: self.__setitem__( k,v )"), "__call__")([k, v], __NULL_OBJECT__);
-          } catch(__exception__) {
+var __dict___init__ = function(args, kwargs)
+{
+	var k,ob,value,v;
+	var __sig__,__args__;
+	__sig__ = { kwargs:{"js_object": null, "pointer": null}, args:["self", "js_object", "pointer"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__dict___init__", __sig__, args, kwargs);
+	var self = __args__['self'];
+	var js_object = __args__['js_object'];
+	var pointer = __args__['pointer'];
+	self["$wrapped"] = {  };
+	if (( pointer ) !== null)
+	{
+		self["$wrapped"] = pointer;
+	}
+	else
+	{
+		if (js_object)
+		{
+			ob = js_object;
+			if (ob instanceof Array)
+			{
+				var o,__iterator__17;
+				__iterator__17 = __get__(__get__(ob, "__iter__", "no iterator - line 549: for o in ob:"), "__call__")([], __NULL_OBJECT__);
+				var __next__17;
+				__next__17 = __get__(__iterator__17, "next");
+				while (( __iterator__17.index ) < __iterator__17.length)
+				{
+					o = __next__17();
+					if (o instanceof Array)
+					{
+						k = o[0];
+						v = o[1];
+					}
+					else
+					{
+						k = o["key"];
+						v = o["value"];
+					}
+										try {
+__get__(__get__(self, "__setitem__", "missing attribute `__setitem__` - line 556: self.__setitem__( k,v )"), "__call__")([k, v], __NULL_OBJECT__);
+					} catch(__exception__) {
 if (__exception__ == KeyError || __exception__ instanceof KeyError) {
 throw new KeyError("error in dict init, bad key");
 }
 
 }
-        }
-      } else {
-        if (isinstance([ob, dict], __NULL_OBJECT__)) {
-          var key,__iterator__18;
-          __iterator__18 = __get__(__get__(__jsdict_keys(ob), "__iter__", "no iterator - line 608: for key in ob.keys():"), "__call__")([], __NULL_OBJECT__);
-          var __next__18;
-          __next__18 = __get__(__iterator__18, "next");
-          while (( __iterator__18.index ) < __iterator__18.length) {
-            key = __next__18();
-            value = ((ob instanceof Array) ? ob[key] : __get__(ob, "__getitem__", "line 609: value = ob[ key ]")([key], __NULL_OBJECT__));
-            __get__(__get__(self, "__setitem__", "missing attribute `__setitem__` - line 610: self.__setitem__( key, value )"), "__call__")([key, value], __NULL_OBJECT__);
-          }
-        } else {
-          console.log(["ERROR init dict from:", js_object]);
-          throw new TypeError;
-        }
-      }
-    }
-  }
+				}
+			}
+			else
+			{
+				if (isinstance([ob, dict], __NULL_OBJECT__))
+				{
+					var key,__iterator__18;
+					__iterator__18 = __get__(__get__(__jsdict_keys(ob), "__iter__", "no iterator - line 560: for key in ob.keys():"), "__call__")([], __NULL_OBJECT__);
+					var __next__18;
+					__next__18 = __get__(__iterator__18, "next");
+					while (( __iterator__18.index ) < __iterator__18.length)
+					{
+						key = __next__18();
+						value = ((ob instanceof Array) ? ob[key] : __get__(ob, "__getitem__", "line 561: value = ob[ key ]")([key], __NULL_OBJECT__));
+						__get__(__get__(self, "__setitem__", "missing attribute `__setitem__` - line 562: self.__setitem__( key, value )"), "__call__")([key, value], __NULL_OBJECT__);
+					}
+				}
+				else
+				{
+					console.log(["ERROR init dict from:", js_object]);
+					throw new TypeError;
+				}
+			}
+		}
+	}
 };__dict___init__.is_wrapper = true;
 __dict_attrs.__init__ = __dict___init__;
-var __dict_jsify = function(args, kwargs) {
-  var keys,value;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["self"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__dict_jsify", __sig__, args, kwargs);
-  var self = __args__['self'];
-  keys = __get__(__object_keys__, "__call__")([self["$wrapped"]], __NULL_OBJECT__);
-  var key,__iterator__19;
-  __iterator__19 = __get__(__get__(keys, "__iter__", "no iterator - line 617: for key in keys:"), "__call__")([], __NULL_OBJECT__);
-  var __next__19;
-  __next__19 = __get__(__iterator__19, "next");
-  while (( __iterator__19.index ) < __iterator__19.length) {
-    key = __next__19();
-    value = __get__(self["$wrapped"], "__getitem__", "line 618: value = self[...][key]")([key], __NULL_OBJECT__);
-    if (typeof(value)==="object") {
-      if (__get__(hasattr, "__call__")([value, "jsify"], __NULL_OBJECT__)) {
-        __get__(__get__(self["$wrapped"], "__setitem__"), "__call__")([key, __get__(__get__(value, "jsify", "missing attribute `jsify` - line 621: self[...][key] = value.jsify()"), "__call__")()], {});
-      }
-    } else {
-      if (typeof(value)==="function") {
-        throw new RuntimeError("can not jsify function");
-      }
-    }
-  }
-  return self["$wrapped"];
+var __dict_jsify = function(args, kwargs)
+{
+	var keys,value;
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["self"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__dict_jsify", __sig__, args, kwargs);
+	var self = __args__['self'];
+	keys = __get__(__object_keys__, "__call__")([self["$wrapped"]], __NULL_OBJECT__);
+	var key,__iterator__19;
+	__iterator__19 = __get__(__get__(keys, "__iter__", "no iterator - line 568: for key in keys:"), "__call__")([], __NULL_OBJECT__);
+	var __next__19;
+	__next__19 = __get__(__iterator__19, "next");
+	while (( __iterator__19.index ) < __iterator__19.length)
+	{
+		key = __next__19();
+		value = __get__(self["$wrapped"], "__getitem__", "line 569: value = self[...][key]")([key], __NULL_OBJECT__);
+		if (typeof(value)==="object")
+		{
+			if (__get__(hasattr, "__call__")([value, "jsify"], __NULL_OBJECT__))
+			{
+				__get__(__get__(self["$wrapped"], "__setitem__"), "__call__")([key, __get__(__get__(value, "jsify", "missing attribute `jsify` - line 572: self[...][key] = value.jsify()"), "__call__")()], {});
+			}
+		}
+		else
+		{
+			if (typeof(value)==="function")
+			{
+				throw new RuntimeError("can not jsify function");
+			}
+		}
+	}
+	return self["$wrapped"];
 };__dict_jsify.is_wrapper = true;
 __dict_attrs.jsify = __dict_jsify;
-var __dict_copy = function(args, kwargs) {
-  
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["self"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__dict_copy", __sig__, args, kwargs);
-  var self = __args__['self'];
-  return __get__(dict, "__call__")([self], __NULL_OBJECT__);
+var __dict_copy = function(args, kwargs)
+{
+	
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["self"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__dict_copy", __sig__, args, kwargs);
+	var self = __args__['self'];
+	return __get__(dict, "__call__")([self], __NULL_OBJECT__);
 };__dict_copy.is_wrapper = true;
 __dict_attrs.copy = __dict_copy;
-var __dict_clear = function(args, kwargs) {
-  
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["self"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__dict_clear", __sig__, args, kwargs);
-  var self = __args__['self'];
-  self["$wrapped"] = __jsdict([]);
+var __dict_clear = function(args, kwargs)
+{
+	
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["self"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__dict_clear", __sig__, args, kwargs);
+	var self = __args__['self'];
+	self["$wrapped"] = {  };
 };__dict_clear.is_wrapper = true;
 __dict_attrs.clear = __dict_clear;
-var __dict_has_key = function(args, kwargs) {
-  var __dict;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["self", "key"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__dict_has_key", __sig__, args, kwargs);
-  var self = __args__['self'];
-  var key = __args__['key'];
-  __dict = self["$wrapped"];
-  if (typeof(key) === 'object' || typeof(key) === 'function') {
-    key = __get__(key, "__uid__", "missing attribute `__uid__` - line 634: key = key.__uid__");
-  }
-  if (key in __dict) {
-    return true;
-  } else {
-    return false;
-  }
+var __dict_has_key = function(args, kwargs)
+{
+	var __dict;
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["self", "key"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__dict_has_key", __sig__, args, kwargs);
+	var self = __args__['self'];
+	var key = __args__['key'];
+	__dict = self["$wrapped"];
+	if (typeof(key) === 'object' || typeof(key) === 'function')
+	{
+		key = __get__(key, "__uid__", "missing attribute `__uid__` - line 584: key = key.__uid__");
+	}
+	if (key in __dict)
+	{
+		return true;
+	}
+	else
+	{
+		return false;
+	}
 };__dict_has_key.is_wrapper = true;
 __dict_attrs.has_key = __dict_has_key;
-var __dict_update = function(args, kwargs) {
-  
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["self", "other"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__dict_update", __sig__, args, kwargs);
-  var self = __args__['self'];
-  var other = __args__['other'];
-  var key,__iterator__20;
-  __iterator__20 = __get__(__get__(other, "__iter__", "no iterator - line 640: for key in other:"), "__call__")([], __NULL_OBJECT__);
-  var __next__20;
-  __next__20 = __get__(__iterator__20, "next");
-  while (( __iterator__20.index ) < __iterator__20.length) {
-    key = __next__20();
-    __get__(__get__(self, "__setitem__", "missing attribute `__setitem__` - line 641: self.__setitem__( key, other[key] )"), "__call__")([key, ((other instanceof Array) ? other[key] : __get__(other, "__getitem__", "line 641: self.__setitem__( key, other[key] )")([key], __NULL_OBJECT__))], __NULL_OBJECT__);
-  }
+var __dict_update = function(args, kwargs)
+{
+	
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["self", "other"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__dict_update", __sig__, args, kwargs);
+	var self = __args__['self'];
+	var other = __args__['other'];
+	var key,__iterator__20;
+	__iterator__20 = __get__(__get__(other, "__iter__", "no iterator - line 590: for key in other:"), "__call__")([], __NULL_OBJECT__);
+	var __next__20;
+	__next__20 = __get__(__iterator__20, "next");
+	while (( __iterator__20.index ) < __iterator__20.length)
+	{
+		key = __next__20();
+		__get__(__get__(self, "__setitem__", "missing attribute `__setitem__` - line 591: self.__setitem__( key, other[key] )"), "__call__")([key, ((other instanceof Array) ? other[key] : __get__(other, "__getitem__", "line 591: self.__setitem__( key, other[key] )")([key], __NULL_OBJECT__))], __NULL_OBJECT__);
+	}
 };__dict_update.is_wrapper = true;
 __dict_attrs.update = __dict_update;
-var __dict_items = function(args, kwargs) {
-  var arr;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["self"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__dict_items", __sig__, args, kwargs);
-  var self = __args__['self'];
-  arr = [];
-  var key,__iterator__21;
-  __iterator__21 = __get__(__get__(__jsdict_keys(self), "__iter__", "no iterator - line 644: for key in self.keys():"), "__call__")([], __NULL_OBJECT__);
-  var __next__21;
-  __next__21 = __get__(__iterator__21, "next");
-  while (( __iterator__21.index ) < __iterator__21.length) {
-    key = __next__21();
-    __get__(__get__(arr, "append", "missing attribute `append` - line 645: arr.append( [key, self[key]] )"), "__call__")([[key, __get__(self, "__getitem__")([key], __NULL_OBJECT__)]], __NULL_OBJECT__);
-  }
-  return arr;
+var __dict_items = function(args, kwargs)
+{
+	var arr;
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["self"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__dict_items", __sig__, args, kwargs);
+	var self = __args__['self'];
+	arr = [];
+	var key,__iterator__21;
+	__iterator__21 = __get__(__get__(__jsdict_keys(self), "__iter__", "no iterator - line 594: for key in self.keys():"), "__call__")([], __NULL_OBJECT__);
+	var __next__21;
+	__next__21 = __get__(__iterator__21, "next");
+	while (( __iterator__21.index ) < __iterator__21.length)
+	{
+		key = __next__21();
+		__get__(__get__(arr, "append", "missing attribute `append` - line 595: arr.append( [key, self[key]] )"), "__call__")([[key, __get__(self, "__getitem__")([key], __NULL_OBJECT__)]], __NULL_OBJECT__);
+	}
+	return arr;
 };__dict_items.is_wrapper = true;
 __dict_attrs.items = __dict_items;
-var __dict_get = function(args, kwargs) {
-  
-  var __sig__,__args__;
-  __sig__ = { kwargs:{"_default": null},args:["self", "key", "_default"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__dict_get", __sig__, args, kwargs);
-  var self = __args__['self'];
-  var key = __args__['key'];
-  var _default = __args__['_default'];
-    try {
+var __dict_get = function(args, kwargs)
+{
+	
+	var __sig__,__args__;
+	__sig__ = { kwargs:{"_default": null}, args:["self", "key", "_default"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__dict_get", __sig__, args, kwargs);
+	var self = __args__['self'];
+	var key = __args__['key'];
+	var _default = __args__['_default'];
+		try {
 return __get__(self, "__getitem__")([key], __NULL_OBJECT__);
-  } catch(__exception__) {
+	} catch(__exception__) {
 return _default;
 
 }
 };__dict_get.is_wrapper = true;
 __dict_attrs.get = __dict_get;
-var __dict_set = function(args, kwargs) {
-  
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["self", "key", "value"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__dict_set", __sig__, args, kwargs);
-  var self = __args__['self'];
-  var key = __args__['key'];
-  var value = __args__['value'];
-  __get__(__get__(self, "__setitem__", "missing attribute `__setitem__` - line 653: self.__setitem__(key, value)"), "__call__")([key, value], __NULL_OBJECT__);
+var __dict_set = function(args, kwargs)
+{
+	
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["self", "key", "value"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__dict_set", __sig__, args, kwargs);
+	var self = __args__['self'];
+	var key = __args__['key'];
+	var value = __args__['value'];
+	__get__(__get__(self, "__setitem__", "missing attribute `__setitem__` - line 603: self.__setitem__(key, value)"), "__call__")([key, value], __NULL_OBJECT__);
 };__dict_set.is_wrapper = true;
 __dict_attrs.set = __dict_set;
-var __dict___len__ = function(args, kwargs) {
-  var __dict;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["self"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__dict___len__", __sig__, args, kwargs);
-  var self = __args__['self'];
-  __dict = self["$wrapped"];
-  return Object.keys(__dict).length;
+var __dict___len__ = function(args, kwargs)
+{
+	var __dict;
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["self"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__dict___len__", __sig__, args, kwargs);
+	var self = __args__['self'];
+	__dict = self["$wrapped"];
+	return Object.keys(__dict).length;
 };__dict___len__.is_wrapper = true;
 __dict_attrs.__len__ = __dict___len__;
-var __dict___getitem__ = function(args, kwargs) {
-  var __dict,msg,err;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["self", "key"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__dict___getitem__", __sig__, args, kwargs);
-  var self = __args__['self'];
-  var key = __args__['key'];
-  "\n		note: `\"4\"` and `4` are the same key in javascript, is there a sane way to workaround this,\n		that can remain compatible with external javascript?\n		";
-  __dict = self["$wrapped"];
-  err = false;
-  if (key instanceof Array) {
-    key = __tuple_key__(key);
-  } else {
-    if (typeof(key) === 'object' || typeof(key) === 'function') {
-      if (key.__uid__ && key.__uid__ in __dict) {
-        return __dict[key.__uid__];
-      } else {
-        err = true;
-      }
-    }
-  }
-  if (__dict && key in __dict) {
-    return __dict[key];
-  } else {
-    err = true;
-  }
-  if (err) {
-    msg = __sprintf("missing key: %s -\n", key);
-    throw new KeyError(__jsdict_keys(__dict));
-  }
+/* note: `"4"` and `4` are the same key in javascript, is there a sane way to workaround this,
+		that can remain compatible with external javascript? */
+var __dict___getitem__ = function(args, kwargs)
+{
+	var __dict,msg,err;
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["self", "key"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__dict___getitem__", __sig__, args, kwargs);
+	var self = __args__['self'];
+	var key = __args__['key'];
+	__dict = self["$wrapped"];
+	err = false;
+	if (key instanceof Array)
+	{
+		key = __tuple_key__(key);
+	}
+	else
+	{
+		if (typeof(key) === 'object' || typeof(key) === 'function')
+		{
+			if (key.__uid__ && key.__uid__ in __dict)
+			{
+				return __dict[key.__uid__];
+			}
+			else
+			{
+				err = true;
+			}
+		}
+	}
+	if (__dict && key in __dict)
+	{
+		return __dict[key];
+	}
+	else
+	{
+		err = true;
+	}
+	if (err)
+	{
+		msg = __sprintf("missing key: %s -\n", key);
+		throw new KeyError(__jsdict_keys(__dict));
+	}
 };__dict___getitem__.is_wrapper = true;
 __dict_attrs.__getitem__ = __dict___getitem__;
-var __dict___setitem__ = function(args, kwargs) {
-  var __dict;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["self", "key", "value"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__dict___setitem__", __sig__, args, kwargs);
-  var self = __args__['self'];
-  var key = __args__['key'];
-  var value = __args__['value'];
-  if (( key ) === undefined) {
-    throw new KeyError("undefined is invalid key type");
-  }
-  if (( key ) === null) {
-    throw new KeyError("null is invalid key type");
-  }
-  __dict = self["$wrapped"];
-  if (key instanceof Array) {
-    key = __tuple_key__(key);
-    if (( key ) === undefined) {
-      throw new KeyError("undefined is invalid key type (tuple)");
-    }
-    __dict[key] = value;
-  } else {
-    if (typeof(key) === 'object' || typeof(key) === 'function') {
-      if (key.__uid__ === undefined) {
-        key.__uid__ = '' + _PythonJS_UID++;
-      }
-      __dict[key.__uid__] = value;
-    } else {
-      __dict[key] = value;
-    }
-  }
+var __dict___setitem__ = function(args, kwargs)
+{
+	var __dict;
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["self", "key", "value"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__dict___setitem__", __sig__, args, kwargs);
+	var self = __args__['self'];
+	var key = __args__['key'];
+	var value = __args__['value'];
+	if (( key ) === undefined)
+	{
+		throw new KeyError("undefined is invalid key type");
+	}
+	if (( key ) === null)
+	{
+		throw new KeyError("null is invalid key type");
+	}
+	__dict = self["$wrapped"];
+	if (key instanceof Array)
+	{
+		key = __tuple_key__(key);
+		if (( key ) === undefined)
+		{
+			throw new KeyError("undefined is invalid key type (tuple)");
+		}
+		__dict[key] = value;
+	}
+	else
+	{
+		if (typeof(key) === 'object' || typeof(key) === 'function')
+		{
+			if (key.__uid__ === undefined)
+			{
+				key.__uid__ = '' + _PythonJS_UID++;
+			}
+			__dict[key.__uid__] = value;
+		}
+		else
+		{
+			__dict[key] = value;
+		}
+	}
 };__dict___setitem__.is_wrapper = true;
 __dict_attrs.__setitem__ = __dict___setitem__;
-var __dict_keys = function(args, kwargs) {
-  
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["self"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__dict_keys", __sig__, args, kwargs);
-  var self = __args__['self'];
-  return Object.keys(self["$wrapped"]);
+var __dict_keys = function(args, kwargs)
+{
+	
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["self"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__dict_keys", __sig__, args, kwargs);
+	var self = __args__['self'];
+	return Object.keys(self["$wrapped"]);
 };__dict_keys.is_wrapper = true;
 __dict_attrs.keys = __dict_keys;
-var __dict_pop = function(args, kwargs) {
-  var js_object,v;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{"d": null},args:["self", "key", "d"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__dict_pop", __sig__, args, kwargs);
-  var self = __args__['self'];
-  var key = __args__['key'];
-  var d = __args__['d'];
-  v = __jsdict_get(self, key, null);
-  if (( v ) === null) {
-    return d;
-  } else {
-    js_object = self["$wrapped"];
-    delete js_object[key];
-    return v;
-  }
+var __dict_pop = function(args, kwargs)
+{
+	var js_object,v;
+	var __sig__,__args__;
+	__sig__ = { kwargs:{"d": null}, args:["self", "key", "d"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__dict_pop", __sig__, args, kwargs);
+	var self = __args__['self'];
+	var key = __args__['key'];
+	var d = __args__['d'];
+	v = __jsdict_get(self, key, null);
+	if (( v ) === null)
+	{
+		return d;
+	}
+	else
+	{
+		js_object = self["$wrapped"];
+		delete js_object[key];
+		return v;
+	}
 };__dict_pop.is_wrapper = true;
 __dict_attrs.pop = __dict_pop;
-var __dict_values = function(args, kwargs) {
-  var keys,out;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["self"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__dict_values", __sig__, args, kwargs);
-  var self = __args__['self'];
-  keys = Object.keys(self["$wrapped"]);
-  out = [];
-    var __iter34 = keys;
-  if (! (__iter34 instanceof Array || typeof __iter34 == "string" || __is_typed_array(__iter34) || __is_some_array(__iter34) )) { __iter34 = __object_keys__(__iter34) }
-  for (var __idx34=0; __idx34 < __iter34.length; __idx34++) {
-    var key = __iter34[ __idx34 ];
-    out.push(self["$wrapped"][key]);
-  }
-  return out;
+var __dict_values = function(args, kwargs)
+{
+	var keys,out;
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["self"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__dict_values", __sig__, args, kwargs);
+	var self = __args__['self'];
+	keys = Object.keys(self["$wrapped"]);
+	out = [];
+		var __iter34 = keys;
+	if (! (__iter34 instanceof Array || typeof __iter34 == "string" || __is_typed_array(__iter34) || __is_some_array(__iter34) )) { __iter34 = __object_keys__(__iter34) }
+	for (var __i34=0; __i34 < __iter34.length; __i34++) {
+		var key = __iter34[ __i34 ];
+		out.push(self["$wrapped"][key]);
+	}
+	return out;
 };__dict_values.is_wrapper = true;
 __dict_attrs.values = __dict_values;
-var __dict___contains__ = function(args, kwargs) {
-  
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["self", "value"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__dict___contains__", __sig__, args, kwargs);
-  var self = __args__['self'];
-  var value = __args__['value'];
-    try {
+var __dict___contains__ = function(args, kwargs)
+{
+	
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["self", "value"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__dict___contains__", __sig__, args, kwargs);
+	var self = __args__['self'];
+	var value = __args__['value'];
+		try {
 __dict___getitem__([self, value], {});
 return true;
-  } catch(__exception__) {
+	} catch(__exception__) {
 return false;
 
 }
 };__dict___contains__.is_wrapper = true;
 __dict_attrs.__contains__ = __dict___contains__;
-var __dict___iter__ = function(args, kwargs) {
-  
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["self"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__dict___iter__", __sig__, args, kwargs);
-  var self = __args__['self'];
-  return __get__(Iterator, "__call__")([__jsdict_keys(self), 0], __NULL_OBJECT__);
+var __dict___iter__ = function(args, kwargs)
+{
+	
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["self"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__dict___iter__", __sig__, args, kwargs);
+	var self = __args__['self'];
+	return __get__(Iterator, "__call__")([__jsdict_keys(self), 0], __NULL_OBJECT__);
 };__dict___iter__.is_wrapper = true;
 __dict_attrs.__iter__ = __dict___iter__;
 dict = __create_class__("dict", __dict_parents, __dict_attrs, __dict_properties);
-var set = function(args, kwargs) {
-  var keys,mask,s,hashtable,key,fallback;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["a"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("set", __sig__, args, kwargs);
-  var a = __args__['a'];
-  "\n	This returns an array that is a minimal implementation of set.\n	Often sets are used simply to remove duplicate entries from a list, \n	and then it get converted back to a list, it is safe to use fastset for this.\n	The array prototype is overloaded with basic set functions:\n		difference\n		intersection\n		issubset\n	Note: sets in Python are not subscriptable, but can be iterated over.\n	Python docs say that set are unordered, some programs may rely on this disorder\n	for randomness, for sets of integers we emulate the unorder only uppon initalization \n	of the set, by masking the value by bits-1. Python implements sets starting with an \n	array of length 8, and mask of 7, if set length grows to 6 (3/4th), then it allocates \n	a __new__>>array of length 32 and mask of 31.  This is only emulated for arrays of \n	integers up to an array length of 1536.\n	";
-  hashtable = null;
-  if (( a.length ) <= 1536) {
-    hashtable = __jsdict([]);
-    keys = [];
-    if (( a.length ) < 6) {
-      mask = 7;
-    } else {
-      if (( a.length ) < 22) {
-        mask = 31;
-      } else {
-        if (( a.length ) < 86) {
-          mask = 127;
-        } else {
-          if (( a.length ) < 342) {
-            mask = 511;
-          } else {
-            mask = 2047;
-          }
-        }
-      }
-    }
-  }
-  fallback = false;
-  if (hashtable) {
-        var __iter35 = a;
-    if (! (__iter35 instanceof Array || typeof __iter35 == "string" || __is_typed_array(__iter35) || __is_some_array(__iter35) )) { __iter35 = __object_keys__(__iter35) }
-    for (var __idx35=0; __idx35 < __iter35.length; __idx35++) {
-      var b = __iter35[ __idx35 ];
-      if ((typeof(b)==="number") && ( b ) === ( (b | 0) )) {
-        key = (b & mask);
-        hashtable[key] = b;
-        keys.push(key);
-      } else {
-        fallback = true;
-        break;
-      }
-    }
-  } else {
-    fallback = true;
-  }
-  s = [];
-  if (fallback) {
-        var __iter36 = a;
-    if (! (__iter36 instanceof Array || typeof __iter36 == "string" || __is_typed_array(__iter36) || __is_some_array(__iter36) )) { __iter36 = __object_keys__(__iter36) }
-    for (var __idx36=0; __idx36 < __iter36.length; __idx36++) {
-      var item = __iter36[ __idx36 ];
-      if (s.indexOf(item)===-1) {
-        s.push(item);
-      }
-    }
-  } else {
-    __sort_method(keys);
-        var __iter37 = keys;
-    if (! (__iter37 instanceof Array || typeof __iter37 == "string" || __is_typed_array(__iter37) || __is_some_array(__iter37) )) { __iter37 = __object_keys__(__iter37) }
-    for (var __idx37=0; __idx37 < __iter37.length; __idx37++) {
-      var key = __iter37[ __idx37 ];
-      s.push(hashtable[key]);
-    }
-  }
-  return s;
+/* This returns an array that is a minimal implementation of set.
+	Often sets are used simply to remove duplicate entries from a list, 
+	and then it get converted back to a list, it is safe to use fastset for this.
+	The array prototype is overloaded with basic set functions:
+		difference
+		intersection
+		issubset
+	Note: sets in Python are not subscriptable, but can be iterated over.
+	Python docs say that set are unordered, some programs may rely on this disorder
+	for randomness, for sets of integers we emulate the unorder only uppon initalization 
+	of the set, by masking the value by bits-1. Python implements sets starting with an 
+	array of length 8, and mask of 7, if set length grows to 6 (3/4th), then it allocates 
+	a __new__>>array of length 32 and mask of 31.  This is only emulated for arrays of 
+	integers up to an array length of 1536. */
+var set = function(args, kwargs)
+{
+	var keys,mask,s,hashtable,key,fallback;
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["a"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("set", __sig__, args, kwargs);
+	var a = __args__['a'];
+	hashtable = null;
+	if (( a.length ) <= 1536)
+	{
+		hashtable = {  };
+		keys = [];
+		if (( a.length ) < 6)
+		{
+			mask = 7;
+		}
+		else
+		{
+			if (( a.length ) < 22)
+			{
+				mask = 31;
+			}
+			else
+			{
+				if (( a.length ) < 86)
+				{
+					mask = 127;
+				}
+				else
+				{
+					if (( a.length ) < 342)
+					{
+						mask = 511;
+					}
+					else
+					{
+						mask = 2047;
+					}
+				}
+			}
+		}
+	}
+	fallback = false;
+	if (hashtable)
+	{
+				var __iter35 = a;
+		if (! (__iter35 instanceof Array || typeof __iter35 == "string" || __is_typed_array(__iter35) || __is_some_array(__iter35) )) { __iter35 = __object_keys__(__iter35) }
+		for (var __i35=0; __i35 < __iter35.length; __i35++) {
+			var b = __iter35[ __i35 ];
+			if ((typeof(b)==="number") && ( b ) === ( (b | 0) ))
+			{
+				key = (b & mask);
+				hashtable[key] = b;
+				keys.push(key);
+			}
+			else
+			{
+				fallback = true;
+				break;
+			}
+		}
+	}
+	else
+	{
+		fallback = true;
+	}
+	s = [];
+	if (fallback)
+	{
+				var __iter36 = a;
+		if (! (__iter36 instanceof Array || typeof __iter36 == "string" || __is_typed_array(__iter36) || __is_some_array(__iter36) )) { __iter36 = __object_keys__(__iter36) }
+		for (var __i36=0; __i36 < __iter36.length; __i36++) {
+			var item = __iter36[ __i36 ];
+			if (s.indexOf(item)===-1)
+			{
+				s.push(item);
+			}
+		}
+	}
+	else
+	{
+		__sort_method(keys);
+				var __iter37 = keys;
+		if (! (__iter37 instanceof Array || typeof __iter37 == "string" || __is_typed_array(__iter37) || __is_some_array(__iter37) )) { __iter37 = __object_keys__(__iter37) }
+		for (var __i37=0; __i37 < __iter37.length; __i37++) {
+			var key = __iter37[ __i37 ];
+			s.push(hashtable[key]);
+		}
+	}
+	return s;
 };set.is_wrapper = true;
-var frozenset = function(args, kwargs) {
-  
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["a"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("frozenset", __sig__, args, kwargs);
-  var a = __args__['a'];
-  return set([a], __NULL_OBJECT__);
+var frozenset = function(args, kwargs)
+{
+	
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["a"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("frozenset", __sig__, args, kwargs);
+	var a = __args__['a'];
+	return set([a], __NULL_OBJECT__);
 };frozenset.is_wrapper = true;
 var array,__array_attrs,__array_parents;
 __array_attrs = {};
 __array_parents = [];
 __array_properties = {};
-__array_typecodes = __jsdict([["c", 1], ["b", 1], ["B", 1], ["u", 2], ["h", 2], ["H", 2], ["i", 4], ["I", 4], ["l", 4], ["L", 4], ["f", 4], ["d", 8], ["float32", 4], ["float16", 2], ["float8", 1], ["int32", 4], ["uint32", 4], ["int16", 2], ["uint16", 2], ["int8", 1], ["uint8", 1]]);
+__array_typecodes = { "c":1, "b":1, "B":1, "u":2, "h":2, "H":2, "i":4, "I":4, "l":4, "L":4, "f":4, "d":8, "float32":4, "float16":2, "float8":1, "int32":4, "uint32":4, "int16":2, "uint16":2, "int8":1, "uint8":1 };
 __array_attrs.typecodes = __array_typecodes;
-__array_typecode_names = __jsdict([["c", "Int8"], ["b", "Int8"], ["B", "Uint8"], ["u", "Uint16"], ["h", "Int16"], ["H", "Uint16"], ["i", "Int32"], ["I", "Uint32"], ["f", "Float32"], ["d", "Float64"], ["float32", "Float32"], ["float16", "Int16"], ["float8", "Int8"], ["int32", "Int32"], ["uint32", "Uint32"], ["int16", "Int16"], ["uint16", "Uint16"], ["int8", "Int8"], ["uint8", "Uint8"]]);
+__array_typecode_names = { "c":"Int8", "b":"Int8", "B":"Uint8", "u":"Uint16", "h":"Int16", "H":"Uint16", "i":"Int32", "I":"Uint32", "f":"Float32", "d":"Float64", "float32":"Float32", "float16":"Int16", "float8":"Int8", "int32":"Int32", "uint32":"Uint32", "int16":"Int16", "uint16":"Uint16", "int8":"Int8", "uint8":"Uint8" };
 __array_attrs.typecode_names = __array_typecode_names;
-var __array___init__ = function(args, kwargs) {
-  var size,buff;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{"initializer": null, "little_endian": false},args:["self", "typecode", "initializer", "little_endian"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__array___init__", __sig__, args, kwargs);
-  var self = __args__['self'];
-  var typecode = __args__['typecode'];
-  var initializer = __args__['initializer'];
-  var little_endian = __args__['little_endian'];
-  self.typecode = typecode;
-  self.itemsize = __get__(__get__(self, "typecodes", "missing attribute `typecodes` - line 837: self.itemsize = self.typecodes[ typecode ]"), "__getitem__", "line 837: self.itemsize = self.typecodes[ typecode ]")([typecode], __NULL_OBJECT__);
-  self.little_endian = little_endian;
-  if (initializer) {
-    self.length = __get__(len, "__call__")([initializer], __NULL_OBJECT__);
-    self.bytes = (self.length * self.itemsize);
-    if (self.typecode==="float8") {
-      self._scale = max([[abs([min([initializer], __NULL_OBJECT__)], __NULL_OBJECT__), max([initializer], __NULL_OBJECT__)]], __NULL_OBJECT__);
-      self._norm_get = (self._scale / 127);
-      self._norm_set = (1.0 / self._norm_get);
-    } else {
-      if (self.typecode==="float16") {
-        self._scale = max([[abs([min([initializer], __NULL_OBJECT__)], __NULL_OBJECT__), max([initializer], __NULL_OBJECT__)]], __NULL_OBJECT__);
-        self._norm_get = (self._scale / 32767);
-        self._norm_set = (1.0 / self._norm_get);
-      }
-    }
-  } else {
-    self.length = 0;
-    self.bytes = 0;
-  }
-  size = self.bytes;
-  buff = new ArrayBuffer(size);
-  self.dataview = new DataView(buff);
-  self.buffer = buff;
-  __get__(__get__(self, "fromlist", "missing attribute `fromlist` - line 858: self.fromlist( initializer )"), "__call__")([initializer], __NULL_OBJECT__);
+var __array___init__ = function(args, kwargs)
+{
+	var size,buff;
+	var __sig__,__args__;
+	__sig__ = { kwargs:{"initializer": null, "little_endian": false}, args:["self", "typecode", "initializer", "little_endian"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__array___init__", __sig__, args, kwargs);
+	var self = __args__['self'];
+	var typecode = __args__['typecode'];
+	var initializer = __args__['initializer'];
+	var little_endian = __args__['little_endian'];
+	self.typecode = typecode;
+	self.itemsize = __get__(__get__(self, "typecodes", "missing attribute `typecodes` - line 777: self.itemsize = self.typecodes[ typecode ]"), "__getitem__", "line 777: self.itemsize = self.typecodes[ typecode ]")([typecode], __NULL_OBJECT__);
+	self.little_endian = little_endian;
+	if (initializer)
+	{
+		self.length = __get__(len, "__call__")([initializer], __NULL_OBJECT__);
+		self.bytes = (self.length * self.itemsize);
+		if (self.typecode==="float8")
+		{
+			self._scale = max([[abs([min([initializer], __NULL_OBJECT__)], __NULL_OBJECT__), max([initializer], __NULL_OBJECT__)]], __NULL_OBJECT__);
+			self._norm_get = (self._scale / 127);
+			self._norm_set = (1.0 / self._norm_get);
+		}
+		else
+		{
+			if (self.typecode==="float16")
+			{
+				self._scale = max([[abs([min([initializer], __NULL_OBJECT__)], __NULL_OBJECT__), max([initializer], __NULL_OBJECT__)]], __NULL_OBJECT__);
+				self._norm_get = (self._scale / 32767);
+				self._norm_set = (1.0 / self._norm_get);
+			}
+		}
+	}
+	else
+	{
+		self.length = 0;
+		self.bytes = 0;
+	}
+	size = self.bytes;
+	buff = new ArrayBuffer(size);
+	self.dataview = new DataView(buff);
+	self.buffer = buff;
+	__get__(__get__(self, "fromlist", "missing attribute `fromlist` - line 798: self.fromlist( initializer )"), "__call__")([initializer], __NULL_OBJECT__);
 };__array___init__.is_wrapper = true;
 __array_attrs.__init__ = __array___init__;
-var __array___len__ = function(args, kwargs) {
-  
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["self"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__array___len__", __sig__, args, kwargs);
-  var self = __args__['self'];
-  return self.length;
+var __array___len__ = function(args, kwargs)
+{
+	
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["self"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__array___len__", __sig__, args, kwargs);
+	var self = __args__['self'];
+	return self.length;
 };__array___len__.is_wrapper = true;
 __array_attrs.__len__ = __array___len__;
-var __array___contains__ = function(args, kwargs) {
-  var arr;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["self", "value"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__array___contains__", __sig__, args, kwargs);
-  var self = __args__['self'];
-  var value = __args__['value'];
-  arr = __get__(__get__(self, "to_array", "missing attribute `to_array` - line 864: arr = self.to_array()"), "__call__")();
-  if (arr.indexOf(value)===-1) {
-    return false;
-  } else {
-    return true;
-  }
+var __array___contains__ = function(args, kwargs)
+{
+	var arr;
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["self", "value"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__array___contains__", __sig__, args, kwargs);
+	var self = __args__['self'];
+	var value = __args__['value'];
+	arr = __get__(__get__(self, "to_array", "missing attribute `to_array` - line 802: arr = self.to_array()"), "__call__")();
+	if (arr.indexOf(value)===-1)
+	{
+		return false;
+	}
+	else
+	{
+		return true;
+	}
 };__array___contains__.is_wrapper = true;
 __array_attrs.__contains__ = __array___contains__;
-var __array___getitem__ = function(args, kwargs) {
-  var func_name,dataview,value,step,func,offset;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["self", "index"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__array___getitem__", __sig__, args, kwargs);
-  var self = __args__['self'];
-  var index = __args__['index'];
-  step = self.itemsize;
-  offset = (step * index);
-  dataview = self.dataview;
-  func_name = ("get" + __get__(__get__(self, "typecode_names", "missing attribute `typecode_names` - line 872: func_name = 'get'+self.typecode_names[ self.typecode ]"), "__getitem__", "line 872: func_name = 'get'+self.typecode_names[ self.typecode ]")([self.typecode], __NULL_OBJECT__));
-  func = dataview[func_name].bind(dataview);
-  if (( offset ) < self.bytes) {
-    value = func(offset);
-    if (self.typecode==="float8") {
-      value = (value * self._norm_get);
-    } else {
-      if (self.typecode==="float16") {
-        value = (value * self._norm_get);
-      }
-    }
-    return value;
-  } else {
-    throw new IndexError(index);
-  }
+var __array___getitem__ = function(args, kwargs)
+{
+	var func_name,dataview,value,step,func,offset;
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["self", "index"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__array___getitem__", __sig__, args, kwargs);
+	var self = __args__['self'];
+	var index = __args__['index'];
+	step = self.itemsize;
+	offset = (step * index);
+	dataview = self.dataview;
+	func_name = ("get" + __get__(__get__(self, "typecode_names", "missing attribute `typecode_names` - line 810: func_name = 'get'+self.typecode_names[ self.typecode ]"), "__getitem__", "line 810: func_name = 'get'+self.typecode_names[ self.typecode ]")([self.typecode], __NULL_OBJECT__));
+	func = dataview[func_name].bind(dataview);
+	if (( offset ) < self.bytes)
+	{
+		value = func(offset);
+		if (self.typecode==="float8")
+		{
+			value = (value * self._norm_get);
+		}
+		else
+		{
+			if (self.typecode==="float16")
+			{
+				value = (value * self._norm_get);
+			}
+		}
+		return value;
+	}
+	else
+	{
+		throw new IndexError(index);
+	}
 };__array___getitem__.is_wrapper = true;
 __array_attrs.__getitem__ = __array___getitem__;
-var __array___setitem__ = function(args, kwargs) {
-  var func_name,dataview,step,func,offset;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["self", "index", "value"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__array___setitem__", __sig__, args, kwargs);
-  var self = __args__['self'];
-  var index = __args__['index'];
-  var value = __args__['value'];
-  step = self.itemsize;
-  if (( index ) < 0) {
-    index = ((self.length + index) - 1);
-  }
-  offset = (step * index);
-  dataview = self.dataview;
-  func_name = ("set" + __get__(__get__(self, "typecode_names", "missing attribute `typecode_names` - line 888: func_name = 'set'+self.typecode_names[ self.typecode ]"), "__getitem__", "line 888: func_name = 'set'+self.typecode_names[ self.typecode ]")([self.typecode], __NULL_OBJECT__));
-  func = dataview[func_name].bind(dataview);
-  if (( offset ) < self.bytes) {
-    if (self.typecode==="float8") {
-      value = (value * self._norm_set);
-    } else {
-      if (self.typecode==="float16") {
-        value = (value * self._norm_set);
-      }
-    }
-    func(offset, value);
-  } else {
-    throw new IndexError(index);
-  }
+var __array___setitem__ = function(args, kwargs)
+{
+	var func_name,dataview,step,func,offset;
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["self", "index", "value"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__array___setitem__", __sig__, args, kwargs);
+	var self = __args__['self'];
+	var index = __args__['index'];
+	var value = __args__['value'];
+	step = self.itemsize;
+	if (( index ) < 0)
+	{
+		index = ((self.length + index) - 1);
+	}
+	offset = (step * index);
+	dataview = self.dataview;
+	func_name = ("set" + __get__(__get__(self, "typecode_names", "missing attribute `typecode_names` - line 826: func_name = 'set'+self.typecode_names[ self.typecode ]"), "__getitem__", "line 826: func_name = 'set'+self.typecode_names[ self.typecode ]")([self.typecode], __NULL_OBJECT__));
+	func = dataview[func_name].bind(dataview);
+	if (( offset ) < self.bytes)
+	{
+		if (self.typecode==="float8")
+		{
+			value = (value * self._norm_set);
+		}
+		else
+		{
+			if (self.typecode==="float16")
+			{
+				value = (value * self._norm_set);
+			}
+		}
+		func(offset, value);
+	}
+	else
+	{
+		throw new IndexError(index);
+	}
 };__array___setitem__.is_wrapper = true;
 __array_attrs.__setitem__ = __array___setitem__;
-var __array___iter__ = function(args, kwargs) {
-  
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["self"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__array___iter__", __sig__, args, kwargs);
-  var self = __args__['self'];
-  return __get__(Iterator, "__call__")([self, 0], __NULL_OBJECT__);
+var __array___iter__ = function(args, kwargs)
+{
+	
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["self"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__array___iter__", __sig__, args, kwargs);
+	var self = __args__['self'];
+	return __get__(Iterator, "__call__")([self, 0], __NULL_OBJECT__);
 };__array___iter__.is_wrapper = true;
 __array_attrs.__iter__ = __array___iter__;
-var __array_get = function(args, kwargs) {
-  
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["self", "index"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__array_get", __sig__, args, kwargs);
-  var self = __args__['self'];
-  var index = __args__['index'];
-  return __array___getitem__([self, index], {});
+var __array_get = function(args, kwargs)
+{
+	
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["self", "index"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__array_get", __sig__, args, kwargs);
+	var self = __args__['self'];
+	var index = __args__['index'];
+	return __array___getitem__([self, index], {});
 };__array_get.is_wrapper = true;
 __array_attrs.get = __array_get;
-var __array_fromlist = function(args, kwargs) {
-  var typecode,i,func_name,dataview,length,item,step,func,offset,size;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["self", "lst"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__array_fromlist", __sig__, args, kwargs);
-  var self = __args__['self'];
-  var lst = __args__['lst'];
-  length = __get__(len, "__call__")([lst], __NULL_OBJECT__);
-  step = self.itemsize;
-  typecode = self.typecode;
-  size = (length * step);
-  dataview = self.dataview;
-  func_name = ("set" + __get__(__get__(self, "typecode_names", "missing attribute `typecode_names` - line 908: func_name = 'set'+self.typecode_names[ typecode ]"), "__getitem__", "line 908: func_name = 'set'+self.typecode_names[ typecode ]")([typecode], __NULL_OBJECT__));
-  func = dataview[func_name].bind(dataview);
-  if (( size ) <= self.bytes) {
-    i = 0;
-    offset = 0;
-    while (( i ) < length) {
-      item = ((lst instanceof Array) ? lst[i] : __get__(lst, "__getitem__", "line 913: item = lst[i]")([i], __NULL_OBJECT__));
-      if (typecode==="float8") {
-        item *= self._norm_set;
-      } else {
-        if (typecode==="float16") {
-          item *= self._norm_set;
-        }
-      }
-      func(offset,item);
-      offset += step;
-      i += 1;
-    }
-  } else {
-    throw new TypeError;
-  }
+var __array_fromlist = function(args, kwargs)
+{
+	var typecode,i,func_name,dataview,length,item,step,func,offset,size;
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["self", "lst"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__array_fromlist", __sig__, args, kwargs);
+	var self = __args__['self'];
+	var lst = __args__['lst'];
+	length = __get__(len, "__call__")([lst], __NULL_OBJECT__);
+	step = self.itemsize;
+	typecode = self.typecode;
+	size = (length * step);
+	dataview = self.dataview;
+	func_name = ("set" + __get__(__get__(self, "typecode_names", "missing attribute `typecode_names` - line 846: func_name = 'set'+self.typecode_names[ typecode ]"), "__getitem__", "line 846: func_name = 'set'+self.typecode_names[ typecode ]")([typecode], __NULL_OBJECT__));
+	func = dataview[func_name].bind(dataview);
+	if (( size ) <= self.bytes)
+	{
+		i = 0;
+		offset = 0;
+		while (( i ) < length)
+		{
+			item = ((lst instanceof Array) ? lst[i] : __get__(lst, "__getitem__", "line 851: item = lst[i]")([i], __NULL_OBJECT__));
+			if (typecode==="float8")
+			{
+				item *= self._norm_set;
+			}
+			else
+			{
+				if (typecode==="float16")
+				{
+					item *= self._norm_set;
+				}
+			}
+			func(offset,item);
+			offset += step;
+			i += 1;
+		}
+	}
+	else
+	{
+		throw new TypeError;
+	}
 };__array_fromlist.is_wrapper = true;
 __array_attrs.fromlist = __array_fromlist;
-var __array_resize = function(args, kwargs) {
-  var source,new_buff,target,new_size,buff;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["self", "length"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__array_resize", __sig__, args, kwargs);
-  var self = __args__['self'];
-  var length = __args__['length'];
-  buff = self.buffer;
-  source = new Uint8Array(buff);
-  new_size = (length * self.itemsize);
-  new_buff = new ArrayBuffer(new_size);
-  target = new Uint8Array(new_buff);
-  target.set(source);
-  self.length = length;
-  self.bytes = new_size;
-  self.buffer = new_buff;
-  self.dataview = new DataView(new_buff);
+var __array_resize = function(args, kwargs)
+{
+	var source,new_buff,target,new_size,buff;
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["self", "length"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__array_resize", __sig__, args, kwargs);
+	var self = __args__['self'];
+	var length = __args__['length'];
+	buff = self.buffer;
+	source = new Uint8Array(buff);
+	new_size = (length * self.itemsize);
+	new_buff = new ArrayBuffer(new_size);
+	target = new Uint8Array(new_buff);
+	target.set(source);
+	self.length = length;
+	self.bytes = new_size;
+	self.buffer = new_buff;
+	self.dataview = new DataView(new_buff);
 };__array_resize.is_wrapper = true;
 __array_attrs.resize = __array_resize;
-var __array_append = function(args, kwargs) {
-  var length;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["self", "value"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__array_append", __sig__, args, kwargs);
-  var self = __args__['self'];
-  var value = __args__['value'];
-  length = self.length;
-  __get__(__get__(self, "resize", "missing attribute `resize` - line 936: self.resize( self.length + 1 )"), "__call__")([(self.length + 1)], __NULL_OBJECT__);
-  __get__(__get__(self, "__setitem__"), "__call__")([length, value], {});
+var __array_append = function(args, kwargs)
+{
+	var length;
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["self", "value"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__array_append", __sig__, args, kwargs);
+	var self = __args__['self'];
+	var value = __args__['value'];
+	length = self.length;
+	__get__(__get__(self, "resize", "missing attribute `resize` - line 874: self.resize( self.length + 1 )"), "__call__")([(self.length + 1)], __NULL_OBJECT__);
+	__get__(__get__(self, "__setitem__"), "__call__")([length, value], {});
 };__array_append.is_wrapper = true;
 __array_attrs.append = __array_append;
-var __array_extend = function(args, kwargs) {
-  
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["self", "lst"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__array_extend", __sig__, args, kwargs);
-  var self = __args__['self'];
-  var lst = __args__['lst'];
-  var value,__iterator__26;
-  __iterator__26 = __get__(__get__(lst, "__iter__", "no iterator - line 939: for value in lst:"), "__call__")([], __NULL_OBJECT__);
-  var __next__26;
-  __next__26 = __get__(__iterator__26, "next");
-  while (( __iterator__26.index ) < __iterator__26.length) {
-    value = __next__26();
-    __get__(__get__(self, "append", "missing attribute `append` - line 940: self.append( value )"), "__call__")([value], __NULL_OBJECT__);
-  }
+var __array_extend = function(args, kwargs)
+{
+	
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["self", "lst"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__array_extend", __sig__, args, kwargs);
+	var self = __args__['self'];
+	var lst = __args__['lst'];
+	var value,__iterator__26;
+	__iterator__26 = __get__(__get__(lst, "__iter__", "no iterator - line 877: for value in lst:"), "__call__")([], __NULL_OBJECT__);
+	var __next__26;
+	__next__26 = __get__(__iterator__26, "next");
+	while (( __iterator__26.index ) < __iterator__26.length)
+	{
+		value = __next__26();
+		__get__(__get__(self, "append", "missing attribute `append` - line 878: self.append( value )"), "__call__")([value], __NULL_OBJECT__);
+	}
 };__array_extend.is_wrapper = true;
 __array_attrs.extend = __array_extend;
-var __array_to_array = function(args, kwargs) {
-  var i,item,arr;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["self"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__array_to_array", __sig__, args, kwargs);
-  var self = __args__['self'];
-  arr = [];
-  i = 0;
-  while (( i ) < self.length) {
-    item = __array___getitem__([self, i], {});
-    arr.push( item );
-    i += 1;
-  }
-  return arr;
+var __array_to_array = function(args, kwargs)
+{
+	var i,item,arr;
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["self"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__array_to_array", __sig__, args, kwargs);
+	var self = __args__['self'];
+	arr = [];
+	i = 0;
+	while (( i ) < self.length)
+	{
+		item = __array___getitem__([self, i], {});
+		arr.push( item );
+		i += 1;
+	}
+	return arr;
 };__array_to_array.is_wrapper = true;
 __array_attrs.to_array = __array_to_array;
-var __array_to_list = function(args, kwargs) {
-  
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["self"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__array_to_list", __sig__, args, kwargs);
-  var self = __args__['self'];
-  return __get__(__get__(self, "to_array", "missing attribute `to_array` - line 950: return self.to_array()"), "__call__")();
+var __array_to_list = function(args, kwargs)
+{
+	
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["self"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__array_to_list", __sig__, args, kwargs);
+	var self = __args__['self'];
+	return __get__(__get__(self, "to_array", "missing attribute `to_array` - line 888: return self.to_array()"), "__call__")();
 };__array_to_list.is_wrapper = true;
 __array_attrs.to_list = __array_to_list;
-var __array_to_ascii = function(args, kwargs) {
-  var i,length,arr,string;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["self"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__array_to_ascii", __sig__, args, kwargs);
-  var self = __args__['self'];
-  string = "";
-  arr = __get__(__get__(self, "to_array", "missing attribute `to_array` - line 953: arr = self.to_array()"), "__call__")();
-  i = 0;
-  length = __get__(arr, "length", "missing attribute `length` - line 954: i = 0; length = arr.length");
-  while (( i ) < length) {
-    var num = arr[i];
-    var char = String.fromCharCode(num);
-    string += char;
-    i += 1;
-  }
-  return string;
+var __array_to_ascii = function(args, kwargs)
+{
+	var i,length,s,arr;
+	var __sig__,__args__;
+	__sig__ = { kwargs:{}, args:["self"] };
+	if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2))
+	{
+		/*pass*/
+	}
+	else
+	{
+		args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
+		kwargs = {};
+	}
+	__args__ = __getargs__("__array_to_ascii", __sig__, args, kwargs);
+	var self = __args__['self'];
+	s = "";
+	arr = __get__(__get__(self, "to_array", "missing attribute `to_array` - line 891: arr = self.to_array()"), "__call__")();
+	i = 0;
+	length = __get__(arr, "length", "missing attribute `length` - line 892: i = 0; length = arr.length");
+	while (( i ) < length)
+	{
+		var char = String.fromCharCode(arr[i]);
+		s += char;
+		i += 1;
+	}
+	return s;
 };__array_to_ascii.is_wrapper = true;
 __array_attrs.to_ascii = __array_to_ascii;
 array = __create_class__("array", __array_parents, __array_attrs, __array_properties);
-var file,__file_attrs,__file_parents;
-__file_attrs = {};
-__file_parents = [];
-__file_properties = {};
-var __file___init__ = function(args, kwargs) {
-  
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["self", "path", "flags"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__file___init__", __sig__, args, kwargs);
-  var self = __args__['self'];
-  var path = __args__['path'];
-  var flags = __args__['flags'];
-  self.path = path;
-  if (flags==="rb") {
-    self.flags = "r";
-    self.binary = true;
-  } else {
-    if (flags==="wb") {
-      self.flags = "w";
-      self.binary = true;
-    } else {
-      self.flags = flags;
-      self.binary = false;
-    }
-  }
-  self.flags = flags;
-};__file___init__.is_wrapper = true;
-__file_attrs.__init__ = __file___init__;
-var __file_read = function(args, kwargs) {
-  var _fs,path;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{"binary": false},args:["self", "binary"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__file_read", __sig__, args, kwargs);
-  var self = __args__['self'];
-  var binary = __args__['binary'];
-  _fs = __get__(require, "__call__")(["fs"], __NULL_OBJECT__);
-  path = self.path;
-  if (binary || self.binary) {
-    return _fs.readFileSync(path, { encoding:null });
-  } else {
-    return _fs.readFileSync(path, __jsdict([["encoding", "utf8"]]));
-  }
-};__file_read.is_wrapper = true;
-__file_attrs.read = __file_read;
-var __file_write = function(args, kwargs) {
-  var path,buff,_fs;
-  var __sig__,__args__;
-  __sig__ = { kwargs:{"binary": false},args:["self", "data", "binary"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__file_write", __sig__, args, kwargs);
-  var self = __args__['self'];
-  var data = __args__['data'];
-  var binary = __args__['binary'];
-  _fs = __get__(require, "__call__")(["fs"], __NULL_OBJECT__);
-  path = self.path;
-  if (binary || self.binary) {
-    binary = (binary || self.binary);
-    if (binary==="base64") {
-      buff =  new Buffer(data, "base64");
-      _fs.writeFileSync(path, buff, __jsdict([["encoding", null]]));
-    } else {
-      _fs.writeFileSync(path, data, __jsdict([["encoding", null]]));
-    }
-  } else {
-    _fs.writeFileSync(path, data, __jsdict([["encoding", "utf8"]]));
-  }
-};__file_write.is_wrapper = true;
-__file_attrs.write = __file_write;
-var __file_close = function(args, kwargs) {
-  
-  var __sig__,__args__;
-  __sig__ = { kwargs:{},args:["self"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__file_close", __sig__, args, kwargs);
-  var self = __args__['self'];
-  /*pass*/
-};__file_close.is_wrapper = true;
-__file_attrs.close = __file_close;
-file = __create_class__("file", __file_parents, __file_attrs, __file_properties);
-var __open__ = function(args, kwargs) {
-  
-  var __sig__,__args__;
-  __sig__ = { kwargs:{"mode": null},args:["path", "mode"] };
-  if (args instanceof Array && (Object.prototype.toString.call(kwargs)==="[object Object]") && (arguments.length===2)) {
-    /*pass*/
-  } else {
-    args = Array.prototype.slice.call(arguments, 0, __sig__.args.length);
-    kwargs = {};
-  }
-  __args__ = __getargs__("__open__", __sig__, args, kwargs);
-  var path = __args__['path'];
-  var mode = __args__['mode'];
-  return __get__(file, "__call__")([path, mode], __NULL_OBJECT__);
-};__open__.is_wrapper = true;
-json = __jsdict([["loads", (function (s) {return JSON.parse(s);})], ["dumps", (function (o) {return JSON.stringify(o);})]]);
-var __get_other_workers_with_shared_arg = function(worker, ob) {
-  var a,other,args;
-  a = [];
-    var __iter38 = threading.workers;
-  if (! (__iter38 instanceof Array || typeof __iter38 == "string" || __is_typed_array(__iter38) || __is_some_array(__iter38) )) { __iter38 = __object_keys__(__iter38) }
-  for (var __idx38=0; __idx38 < __iter38.length; __idx38++) {
-    var b = __iter38[ __idx38 ];
-    other = b["worker"];
-    args = b["args"];
-    if (( other ) !== worker) {
-            var __iter39 = args;
-      if (! (__iter39 instanceof Array || typeof __iter39 == "string" || __is_typed_array(__iter39) || __is_some_array(__iter39) )) { __iter39 = __object_keys__(__iter39) }
-      for (var __idx39=0; __idx39 < __iter39.length; __idx39++) {
-        var arg = __iter39[ __idx39 ];
-        if (( arg ) === ob) {
-          if (! (__contains__(a, other))) {
-            a.append(other);
-          }
-        }
-      }
-    }
-  }
-  return a;
-}
-
-threading = __jsdict([["workers", []], ["_blocking_callback", null]]);
-var __start_new_thread = function(f, args) {
-  var jsargs,worker;
-  worker =  new Worker(f);
-  worker.__uid__ = len(threading.workers);
-  threading.workers.append(__jsdict([["worker", worker], ["args", args]]));
-    var func = function(event) {
-    var a,res,value;
-    if (event.data.type==="terminate") {
-      worker.terminate();
-    } else {
-      if (event.data.type==="call") {
-        res = __module__[event.data.function].apply(null, event.data.args);
-        if (( res ) !== null && ( res ) !== undefined) {
-          worker.postMessage(__jsdict([["type", "return_to_blocking_callback"], ["result", res]]));
-        }
-      } else {
-        if (event.data.type==="append") {
-          a = args[event.data.argindex];
-          a.push(event.data.value);
-                    var __iter40 = __get_other_workers_with_shared_arg(worker, a);
-          if (! (__iter40 instanceof Array || typeof __iter40 == "string" || __is_typed_array(__iter40) || __is_some_array(__iter40) )) { __iter40 = __object_keys__(__iter40) }
-          for (var __idx40=0; __idx40 < __iter40.length; __idx40++) {
-            var other = __iter40[ __idx40 ];
-            other.postMessage(__jsdict([["type", "append"], ["argindex", event.data.argindex], ["value", event.data.value]]));
-          }
-        } else {
-          if (event.data.type==="__setitem__") {
-            a = args[event.data.argindex];
-            value = event.data.value;
-            if (a.__setitem__) {
-              a.__setitem__(event.data.index, value);
-            } else {
-              a[event.data.index] = value;
-            }
-                        var __iter41 = __get_other_workers_with_shared_arg(worker, a);
-            if (! (__iter41 instanceof Array || typeof __iter41 == "string" || __is_typed_array(__iter41) || __is_some_array(__iter41) )) { __iter41 = __object_keys__(__iter41) }
-            for (var __idx41=0; __idx41 < __iter41.length; __idx41++) {
-              var other = __iter41[ __idx41 ];
-              other.postMessage(__jsdict([["type", "__setitem__"], ["argindex", event.data.argindex], ["key", event.data.index], ["value", event.data.value]]));
-            }
-          } else {
-            throw new RuntimeError("unknown event");
-          }
-        }
-      }
-    }
-  }
-
-  worker.onmessage = func;
-  jsargs = [];
-  var i;
-  i = 0;
-    var __iter42 = args;
-  if (! (__iter42 instanceof Array || typeof __iter42 == "string" || __is_typed_array(__iter42) || __is_some_array(__iter42) )) { __iter42 = __object_keys__(__iter42) }
-  for (var __idx42=0; __idx42 < __iter42.length; __idx42++) {
-    var arg = __iter42[ __idx42 ];
-    if (arg.jsify) {
-      jsargs.append(arg.jsify());
-    } else {
-      jsargs.append(arg);
-    }
-    if (arg instanceof Array) {
-      __gen_worker_append(worker, arg, i);
-    }
-    i += 1;
-  }
-  worker.postMessage(__jsdict([["type", "execute"], ["args", jsargs]]));
-  return worker;
-}
-
-var __gen_worker_append = function(worker, ob, index) {
-  
-    var append = function(item) {
-    
-    worker.postMessage(__jsdict([["type", "append"], ["argindex", index], ["value", item]]));
-    ob.push(item);
-  }
-
-  Object.defineProperty(ob, "append", __jsdict([["enumerable", false], ["value", append], ["writeable", true], ["configurable", true]]));
-}
-
-var __webworker_wrap = function(ob, argindex) {
-  
-  if (ob instanceof Array) {
-        var func = function(index, item) {
-      
-      postMessage(__jsdict([["type", "__setitem__"], ["index", index], ["value", item], ["argindex", argindex]]));
-      Array.prototype.__setitem__.call(ob, index, item);
-    }
-
-    Object.defineProperty(ob, "__setitem__", __jsdict([["enumerable", false], ["value", func], ["writeable", true], ["configurable", true]]));
-        var func = function(item) {
-      
-      postMessage(__jsdict([["type", "append"], ["value", item], ["argindex", argindex]]));
-      Array.prototype.push.call(ob, item);
-    }
-
-    Object.defineProperty(ob, "append", __jsdict([["enumerable", false], ["value", func], ["writeable", true], ["configurable", true]]));
-  } else {
-    if (typeof(ob)==="object") {
-            var func = function(key, item) {
-        
-        postMessage(__jsdict([["type", "__setitem__"], ["index", key], ["value", item], ["argindex", argindex]]));
-        ob[key] = item;
-      }
-
-      Object.defineProperty(ob, "__setitem__", __jsdict([["enumerable", false], ["value", func], ["writeable", true], ["configurable", true]]));
-    }
-  }
-  return ob;
-}
-
-var __rpc__ = function(url, func, args) {
-  var req;
-  req =  new XMLHttpRequest();
-  req.open("POST", url, false);
-  req.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
-  req.send(JSON.stringify(__jsdict([["call", func], ["args", args]])));
-  return JSON.parse(req.responseText);
-}
-
-var __rpc_iter__ = function(url, attr) {
-  var req;
-  req =  new XMLHttpRequest();
-  req.open("POST", url, false);
-  req.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
-  req.send(JSON.stringify(__jsdict([["iter", attr]])));
-  return JSON.parse(req.responseText);
-}
-
-var __rpc_set__ = function(url, attr, value) {
-  var req;
-  req =  new XMLHttpRequest();
-  req.open("POST", url, false);
-  req.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
-  req.send(JSON.stringify(__jsdict([["set", attr], ["value", value]])));
-}
-
-var __rpc_get__ = function(url, attr) {
-  var req;
-  req =  new XMLHttpRequest();
-  req.open("POST", url, false);
-  req.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
-  req.send(JSON.stringify(__jsdict([["get", attr]])));
-  return JSON.parse(req.responseText);
+var file = function(path, flags)
+{
+	this.__init__(path, flags);
+}
+
+file.prototype.__init__ = function(path, flags)
+{
+	
+	this.path = path;
+	if (flags==="rb")
+	{
+		this.flags = "r";
+		this.binary = true;
+	}
+	else
+	{
+		if (flags==="wb")
+		{
+			this.flags = "w";
+			this.binary = true;
+		}
+		else
+		{
+			this.flags = flags;
+			this.binary = false;
+		}
+	}
+	this.flags = flags;
+}
+
+file.prototype.read = function(_kwargs_)
+{
+	var _fs,path;
+	var binary = (_kwargs_ === undefined || _kwargs_.binary === undefined)?	false : _kwargs_.binary;
+	_fs = require("fs");
+	path = this.path;
+	if (binary || this.binary)
+	{
+		return _fs.readFileSync(path, { encoding:null });
+	}
+	else
+	{
+		return _fs.readFileSync(path, { "encoding":"utf8" });
+	}
+}
+
+file.prototype.write = function(data, _kwargs_)
+{
+	var path,buff,_fs;
+	var binary = (_kwargs_ === undefined || _kwargs_.binary === undefined)?	false : _kwargs_.binary;
+	_fs = require("fs");
+	path = this.path;
+	if (binary || this.binary)
+	{
+		binary = (binary || this.binary);
+		if (binary==="base64")
+		{
+			buff =  new Buffer(data, "base64");
+			_fs.writeFileSync(path, buff, { "encoding":null });
+		}
+		else
+		{
+			_fs.writeFileSync(path, data, { "encoding":null });
+		}
+	}
+	else
+	{
+		_fs.writeFileSync(path, data, { "encoding":"utf8" });
+	}
+}
+
+file.prototype.close = function()
+{
+	
+	/*pass*/
+}
+
+var __open__ = function(path, _kwargs_)
+{
+	
+	var mode = (_kwargs_ === undefined || _kwargs_.mode === undefined)?	null : _kwargs_.mode;
+	return  new file(path, mode);
+}
+
+json = { "loads":(function (s) {return JSON.parse(s);}), "dumps":(function (o) {return JSON.stringify(o);}) };
+var __get_other_workers_with_shared_arg = function(worker, ob)
+{
+	var a,other,args;
+	a = [];
+		var __iter38 = threading.workers;
+	if (! (__iter38 instanceof Array || typeof __iter38 == "string" || __is_typed_array(__iter38) || __is_some_array(__iter38) )) { __iter38 = __object_keys__(__iter38) }
+	for (var __i38=0; __i38 < __iter38.length; __i38++) {
+		var b = __iter38[ __i38 ];
+		other = b["worker"];
+		args = b["args"];
+		if (( other ) !== worker)
+		{
+						var __iter39 = args;
+			if (! (__iter39 instanceof Array || typeof __iter39 == "string" || __is_typed_array(__iter39) || __is_some_array(__iter39) )) { __iter39 = __object_keys__(__iter39) }
+			for (var __i39=0; __i39 < __iter39.length; __i39++) {
+				var arg = __iter39[ __i39 ];
+				if (( arg ) === ob)
+				{
+					if (! (__contains__(a, other)))
+					{
+						a.append(other);
+					}
+				}
+			}
+		}
+	}
+	return a;
+}
+
+threading = { "workers":[], "_blocking_callback":null };
+var __start_new_thread = function(f, args)
+{
+	var jsargs,worker;
+	worker =  new Worker(f);
+	worker.__uid__ = len(threading.workers);
+	threading.workers.append({ "worker":worker, "args":args });
+		var func = function(event)
+	{
+		var a,res,value;
+		if (event.data.type==="terminate")
+		{
+			worker.terminate();
+		}
+		else
+		{
+			if (event.data.type==="call")
+			{
+				res = __module__[event.data.function].apply(null, event.data.args);
+				if (( res ) !== null && ( res ) !== undefined)
+				{
+					worker.postMessage({ "type":"return_to_blocking_callback", "result":res });
+				}
+			}
+			else
+			{
+				if (event.data.type==="append")
+				{
+					a = args[event.data.argindex];
+					a.push(event.data.value);
+										var __iter40 = __get_other_workers_with_shared_arg(worker, a);
+					if (! (__iter40 instanceof Array || typeof __iter40 == "string" || __is_typed_array(__iter40) || __is_some_array(__iter40) )) { __iter40 = __object_keys__(__iter40) }
+					for (var __i40=0; __i40 < __iter40.length; __i40++) {
+						var other = __iter40[ __i40 ];
+						other.postMessage({ "type":"append", "argindex":event.data.argindex, "value":event.data.value });
+					}
+				}
+				else
+				{
+					if (event.data.type==="__setitem__")
+					{
+						a = args[event.data.argindex];
+						value = event.data.value;
+						if (a.__setitem__)
+						{
+							a.__setitem__(event.data.index, value);
+						}
+						else
+						{
+							a[event.data.index] = value;
+						}
+												var __iter41 = __get_other_workers_with_shared_arg(worker, a);
+						if (! (__iter41 instanceof Array || typeof __iter41 == "string" || __is_typed_array(__iter41) || __is_some_array(__iter41) )) { __iter41 = __object_keys__(__iter41) }
+						for (var __i41=0; __i41 < __iter41.length; __i41++) {
+							var other = __iter41[ __i41 ];
+							other.postMessage({ "type":"__setitem__", "argindex":event.data.argindex, "key":event.data.index, "value":event.data.value });
+						}
+					}
+					else
+					{
+						throw new RuntimeError("unknown event");
+					}
+				}
+			}
+		}
+	}
+
+	worker.onmessage = func;
+	jsargs = [];
+	var i;
+	i = 0;
+		var __iter42 = args;
+	if (! (__iter42 instanceof Array || typeof __iter42 == "string" || __is_typed_array(__iter42) || __is_some_array(__iter42) )) { __iter42 = __object_keys__(__iter42) }
+	for (var __i42=0; __i42 < __iter42.length; __i42++) {
+		var arg = __iter42[ __i42 ];
+		if (arg.jsify)
+		{
+			jsargs.append(arg.jsify());
+		}
+		else
+		{
+			jsargs.append(arg);
+		}
+		if (arg instanceof Array)
+		{
+			__gen_worker_append(worker, arg, i);
+		}
+		i += 1;
+	}
+	worker.postMessage({ "type":"execute", "args":jsargs });
+	return worker;
+}
+
+var __gen_worker_append = function(worker, ob, index)
+{
+	
+		var append = function(item)
+	{
+		
+		worker.postMessage({ "type":"append", "argindex":index, "value":item });
+		ob.push(item);
+	}
+
+	Object.defineProperty(ob, "append", { "enumerable":false, "value":append, "writeable":true, "configurable":true });
+}
+
+var __webworker_wrap = function(ob, argindex)
+{
+	
+	if (ob instanceof Array)
+	{
+				var func = function(index, item)
+		{
+			
+			postMessage({ "type":"__setitem__", "index":index, "value":item, "argindex":argindex });
+			Array.prototype.__setitem__.call(ob, index, item);
+		}
+
+		Object.defineProperty(ob, "__setitem__", { "enumerable":false, "value":func, "writeable":true, "configurable":true });
+				var func = function(item)
+		{
+			
+			postMessage({ "type":"append", "value":item, "argindex":argindex });
+			Array.prototype.push.call(ob, item);
+		}
+
+		Object.defineProperty(ob, "append", { "enumerable":false, "value":func, "writeable":true, "configurable":true });
+	}
+	else
+	{
+		if (typeof(ob)==="object")
+		{
+						var func = function(key, item)
+			{
+				
+				postMessage({ "type":"__setitem__", "index":key, "value":item, "argindex":argindex });
+				ob[key] = item;
+			}
+
+			Object.defineProperty(ob, "__setitem__", { "enumerable":false, "value":func, "writeable":true, "configurable":true });
+		}
+	}
+	return ob;
+}
+
+var __rpc__ = function(url, func, args)
+{
+	var req;
+	req =  new XMLHttpRequest();
+	req.open("POST", url, false);
+	req.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
+	req.send(JSON.stringify({ "call":func, "args":args }));
+	return JSON.parse(req.responseText);
+}
+
+var __rpc_iter__ = function(url, attr)
+{
+	var req;
+	req =  new XMLHttpRequest();
+	req.open("POST", url, false);
+	req.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
+	req.send(JSON.stringify({ "iter":attr }));
+	return JSON.parse(req.responseText);
+}
+
+var __rpc_set__ = function(url, attr, value)
+{
+	var req;
+	req =  new XMLHttpRequest();
+	req.open("POST", url, false);
+	req.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
+	req.send(JSON.stringify({ "set":attr, "value":value }));
+}
+
+var __rpc_get__ = function(url, attr)
+{
+	var req;
+	req =  new XMLHttpRequest();
+	req.open("POST", url, false);
+	req.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
+	req.send(JSON.stringify({ "get":attr }));
+	return JSON.parse(req.responseText);
 }
diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index 4dd1db4..de14bc4 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -57,7 +57,7 @@ def __init__(self, requirejs=False, insert_runtime=False):
 		self._known_vars = set()
 		self._kwargs_type_ = dict()
 
-		self._imports = []
+		self._imports = set()
 		self._ids = 0
 
 	def visit_Is(self, node):
@@ -301,7 +301,7 @@ def visit_Import(self, node):
 		r = [alias.name.replace('__SLASH__', '/') for alias in node.names]
 		if r:
 			for name in r:
-				self._imports.append('import("%s");' %name)
+				self._imports.add('import("%s");' %name)
 		return ''
 
 	def visit_Module(self, node):
@@ -333,7 +333,7 @@ def visit_Module(self, node):
 			lines.append( '  __use__%s bool' %name)
 		lines.append('}')
 
-		lines = header + self._imports + lines
+		lines = header + list(self._imports) + lines
 		return '\n'.join( lines )
 
 
@@ -702,7 +702,18 @@ def _visit_function(self, node):
 			gname = args_names[ args_names.index(args_generics.keys()[0]) ]
 			out.append(self.indent() + 'switch __gen__.(type) {')
 			self.push()
-			for gt in generics:
+			gsorted = list(generics)
+			gsorted.sort()
+			gsorted.reverse()
+			#for gt in generics:
+			## this fails with a struct returned from a super method that returns self,
+			## the generic function will fail with a nil struct, while it still works when passed the instance directly.
+			for gt in gsorted:
+				assert gt in self._classes
+				#if node.name in self._classes[gt]._subclasses:
+				if len(self._classes[gt]._parents) == 0:
+					if return_type=='*'+gt or not is_method: pass
+					else: continue
 				out.append(self.indent() + 'case *%s:' %gt)
 				self.push()
 				out.append(self.indent() + '%s,_ := __gen__.(*%s)' %(gname,gt) )
@@ -722,6 +733,9 @@ def _visit_function(self, node):
 				self.pull()
 			self.pull()
 			out.append('}')
+			out.append('fmt.Println("Generics RuntimeError - type not in type switch")')
+			#out.append('fmt.Println(__gen__)')
+
 			if return_type == 'int':
 				out.append('return 0')
 			elif return_type == 'float':
@@ -879,7 +893,9 @@ def main(script, insert_runtime=True):
 		raise err
 
 	#raise RuntimeError(script)
-	return GoGenerator().visit(tree)
+	g = GoGenerator()
+	g.visit(tree) # first pass gathers classes
+	return g.visit(tree)
 	try:
 		return GoGenerator().visit(tree)
 	except SyntaxError as err:
diff --git a/pythonjs/runtime/builtins.py b/pythonjs/runtime/builtins.py
index d77d2e4..ac83d1c 100644
--- a/pythonjs/runtime/builtins.py
+++ b/pythonjs/runtime/builtins.py
@@ -1160,51 +1160,49 @@ def to_list(self):
 		return self.to_array()
 
 	def to_ascii(self):
-		string = ''
+		s = ''
 		arr = self.to_array()
 		i = 0; length = arr.length
 		while i < length:
-			JS('var num = arr[i]')
-			JS('var char = String.fromCharCode(num)')
-			string += char
+			JS('var char = String.fromCharCode(arr[i])')
+			s += char
 			i += 1
-		return string
+		return s
 
+with javascript:
 
-## file IO ##
-class file:
-	'''
-	TODO, support multiple read/writes.  Currently this just reads all data,
-	and writes all data.
-	'''
-	def __init__(self, path, flags):
-		self.path = path
-
-		if flags == 'rb':
-			self.flags = 'r'
-			self.binary = True
-		elif flags == 'wb':
-			self.flags = 'w'
-			self.binary = True
-		else:
-			self.flags = flags
-			self.binary = False
+	## file IO ##
+	class file:
+		'''
+		TODO, support multiple read/writes.  Currently this just reads all data,
+		and writes all data.
+		'''
+		def __init__(self, path, flags):
+			self.path = path
+
+			if flags == 'rb':
+				self.flags = 'r'
+				self.binary = True
+			elif flags == 'wb':
+				self.flags = 'w'
+				self.binary = True
+			else:
+				self.flags = flags
+				self.binary = False
 
-		self.flags = flags
+			self.flags = flags
 
-	def read(self, binary=False):
-		_fs = require('fs')
-		path = self.path
-		with javascript:
+		def read(self, binary=False):
+			_fs = require('fs')
+			path = self.path
 			if binary or self.binary:
 				return _fs.readFileSync( path, encoding=None )
 			else:
 				return _fs.readFileSync( path, {'encoding':'utf8'} )
 
-	def write(self, data, binary=False):
-		_fs = require('fs')
-		path = self.path
-		with javascript:
+		def write(self, data, binary=False):
+			_fs = require('fs')
+			path = self.path
 			if binary or self.binary:
 				binary = binary or self.binary
 				if binary == 'base64':  ## TODO: fixme, something bad in this if test
@@ -1220,14 +1218,13 @@ def write(self, data, binary=False):
 				#print('write utf8 data')
 				_fs.writeFileSync( path, data, {'encoding':'utf8'} )
 
-	def close(self):
-		pass
+		def close(self):
+			pass
 
-def __open__( path, mode=None):  ## this can not be named `open` because it replaces `window.open`
-	return file( path, mode )
+	def __open__( path, mode=None):  ## this can not be named `open` because it replaces `window.open`
+		return file( path, mode )
 
 
-with javascript:
 
 	## mini json library ##
 	json = {
diff --git a/pythonjs/runtime/builtins_core.py b/pythonjs/runtime/builtins_core.py
index 8d25516..237b0ef 100644
--- a/pythonjs/runtime/builtins_core.py
+++ b/pythonjs/runtime/builtins_core.py
@@ -272,7 +272,7 @@ def __sprintf(fmt, args):
 					arr.append( Object.prototype.toString.call(item) )
 			return ''.join(arr)
 		else:
-			return fmt.replace('%s', args)
+			return inline("fmt.replace('%s', args)")
 
 
 
diff --git a/regtests/go/generics_subcls_return_a_subcls.py b/regtests/go/generics_subcls_return_a_subcls.py
index 5e38bed..7850287 100644
--- a/regtests/go/generics_subcls_return_a_subcls.py
+++ b/regtests/go/generics_subcls_return_a_subcls.py
@@ -40,6 +40,9 @@ def main():
 	b = B()
 	c = C()
 
+	TestError(a.x == a.bar() )
+	TestError(a.x == a.foo(a,false).bar() )
+
 	x = my_generic( a )
 	TestError(a.x == x )
 
@@ -52,10 +55,22 @@ def main():
 	TestError( b.z==1 )
 	TestError( c.z==100 )
 
-	x = my_generic( b.foo(c, false) )
-	TestError(a.x == x )
-	x = my_generic( b.foo(c, true) )
-	TestError(a.x == 200 )
+	w = b.bar()
+	print(w)
+
+
+	## all of below breaks  ##
+
+	bb = b.foo(c, false)
+	w = bb.bar()
+	print(w)
+
+	w = my_generic( b.foo(c, false) )  ## calls B.bar()
+	print(w)
+	TestError( w == y )
+
+	w = my_generic( b.foo(c, true) )   ## calls C.bar()
+	TestError( w == z )
 
-	y = my_generic( c.foo(b, true) )
-	TestError( y==11 )
\ No newline at end of file
+	w = my_generic( c.foo(b, true) )   ## calls B.bar()
+	TestError( w==y )
\ No newline at end of file

From 14d19b84c7d6ecd26d10b64da0572303ed811af3 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Wed, 8 Oct 2014 16:56:24 -0700
Subject: [PATCH 37/58] Generics: fixed return different subclass type from
 method defined in base class.

---
 pythonjs/pythonjs_to_go.py                    | 16 +++++++++++----
 .../go/generics_subcls_return_a_subcls.py     | 20 +++++++++++++------
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index de14bc4..ba29da1 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -106,9 +106,10 @@ def visit_Name(self, node):
 
 	def visit_ClassDef(self, node):
 		self._class_stack.append( node )
-		node._parents = set()
-		node._struct_def = dict()
-		node._subclasses = set()  ## required for generics generator
+		if not hasattr(node, '_parents'):  ## only setup on the first pass
+			node._parents = set()
+			node._struct_def = dict()
+			node._subclasses = set()  ## required for generics generator
 		out = []
 		sdef = dict()
 		props = set()
@@ -711,9 +712,16 @@ def _visit_function(self, node):
 			for gt in gsorted:
 				assert gt in self._classes
 				#if node.name in self._classes[gt]._subclasses:
-				if len(self._classes[gt]._parents) == 0:
+				#if len(self._classes[gt]._parents) == 0:
+
+				## if in super class ##
+				if self._class_stack and len(self._classes[self._class_stack[-1].name]._parents) == 0:
+					if return_type=='*'+gt or not is_method: pass
+					else: continue
+				elif len(self._classes[gt]._parents) == 0: ## or if the generic is the super class skip it.
 					if return_type=='*'+gt or not is_method: pass
 					else: continue
+
 				out.append(self.indent() + 'case *%s:' %gt)
 				self.push()
 				out.append(self.indent() + '%s,_ := __gen__.(*%s)' %(gname,gt) )
diff --git a/regtests/go/generics_subcls_return_a_subcls.py b/regtests/go/generics_subcls_return_a_subcls.py
index 7850287..9ff41a0 100644
--- a/regtests/go/generics_subcls_return_a_subcls.py
+++ b/regtests/go/generics_subcls_return_a_subcls.py
@@ -56,17 +56,25 @@ def main():
 	TestError( c.z==100 )
 
 	w = b.bar()
-	print(w)
+	#print(w)
 
+	bb = b.foo(b, false)
+	w = bb.bar()
+	TestError(w==y)
 
-	## all of below breaks  ##
+	cc = c.foo(b, false)
+	w = cc.bar()
+	#print(w)
+	TestError(w==z)
 
-	bb = b.foo(c, false)
-	w = bb.bar()
-	print(w)
+	#bb = c.foo(b, true)  ## reassignment to bb type of B should be allowed, because this works at runtime, but goc throws an error.
+	d = c.foo(b, true)
+	w = d.bar()
+	#print(w)
+	TestError(w==y)
 
 	w = my_generic( b.foo(c, false) )  ## calls B.bar()
-	print(w)
+	#print(w)
 	TestError( w == y )
 
 	w = my_generic( b.foo(c, true) )   ## calls C.bar()

From 3e7347e0e1b7ee124fa7e9fe58c4fa2e22f274c3 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Wed, 8 Oct 2014 17:00:36 -0700
Subject: [PATCH 38/58] fixed for loop over map

---
 pythonjs/pythonjs_to_go.py | 4 ++--
 regtests/go/loop_map.py    | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index ba29da1..9cbdf52 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -388,11 +388,11 @@ def visit_For(self, node):
 			iter = self.visit( node.iter )
 			key = self.visit(node.target.elts[0])
 			val = self.visit(node.target.elts[1])
-			lines.append('for %s,%s := range %s {' %(key,val, iter))
+			lines.append('for %s,%s := range *%s {' %(key,val, iter))
 
 		else:
 			iter = self.visit( node.iter )
-			lines.append('for _,%s := range %s {' %(target, iter))
+			lines.append('for _,%s := range *%s {' %(target, iter))
 
 		self.push()
 		for b in node.body:
diff --git a/regtests/go/loop_map.py b/regtests/go/loop_map.py
index 403647d..d12633b 100644
--- a/regtests/go/loop_map.py
+++ b/regtests/go/loop_map.py
@@ -6,9 +6,11 @@ def main():
 	a = {'x':100, 'y':200}
 	b = ''
 	c = 0
-	for key,value in a:
+	for key, value in a:
+		#print( key )
+		#print( value )
 		b += key
 		c += value
 
-	print( b )
-	print( c )
\ No newline at end of file
+	#print( b )
+	#print( c )
\ No newline at end of file

From b385d72dea96aede6aaa1f8d298ab54a238221fc Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Wed, 8 Oct 2014 17:02:42 -0700
Subject: [PATCH 39/58] fixed for loop over array

---
 pythonjs/pythonjs_to_go.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index 9cbdf52..6321f1e 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -375,7 +375,7 @@ def visit_For(self, node):
 				iter = self.visit(node.iter.args[0])
 				idx = self.visit(node.target.elts[0])
 				tar = self.visit(node.target.elts[1])
-				lines.append('for %s,%s := range %s {' %(idx,tar, iter))
+				lines.append('for %s,%s := range *%s {' %(idx,tar, iter))
 
 			else: ## generator function
 				gfunc = node.iter.func.id

From 45c121d6984c7841fe112fd89a38504b980ed853 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Wed, 8 Oct 2014 17:18:14 -0700
Subject: [PATCH 40/58] fixed int slices.  TODO how to get addr without
 slice_hack

---
 pythonjs/pythonjs_to_go.py      |  5 ++++-
 pythonjs/runtime/go_builtins.py | 17 +++++++++++------
 regtests/go/loop_arrays.py      |  8 ++++++++
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index 6321f1e..59dceec 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -263,7 +263,10 @@ def visit_Subscript(self, node):
 				return self._visit_subscript_ellipsis( node )
 		else:
 			## deference pointer and then index
-			return '(*%s)[%s]' % (self.visit(node.value), self.visit(node.slice))
+			if isinstance(node.slice, ast.Slice):
+				return '__slice_hack__((*%s)[%s])' % (self.visit(node.value), self.visit(node.slice))
+			else:
+				return '(*%s)[%s]' % (self.visit(node.value), self.visit(node.slice))
 
 
 	def visit_Slice(self, node):
diff --git a/pythonjs/runtime/go_builtins.py b/pythonjs/runtime/go_builtins.py
index bef6fd1..3a93368 100644
--- a/pythonjs/runtime/go_builtins.py
+++ b/pythonjs/runtime/go_builtins.py
@@ -59,30 +59,35 @@
 	}
 }
 
-func range1( x int ) []int {
+func range1( x int ) *[]int {
 	arr := make([]int, x)
 	for i := 0; i < x; i++ {
 		arr[i]=i
 	}
-	return arr
+	return &arr
 }
 
-func range2( start int, stop int ) []int {
+func range2( start int, stop int ) *[]int {
 	arr := make([]int, stop-start)
 	for i := start; i < stop; i++ {
 		arr[i]=i
 	}
-	return arr
+	return &arr
 }
 
-func range3( start int, stop int, step int ) []int {
+func range3( start int, stop int, step int ) *[]int {
 	arr := make([]int, stop-start)
 	for i := start; i < stop; i+=step {
 		arr[i]=i
 	}
-	return arr
+	return &arr
 }
 
+func __slice_hack__( arr []int ) *[]int {
+	return &arr
+}
+
+
 """)
 
 
diff --git a/regtests/go/loop_arrays.py b/regtests/go/loop_arrays.py
index b1ec850..38967d8 100644
--- a/regtests/go/loop_arrays.py
+++ b/regtests/go/loop_arrays.py
@@ -32,3 +32,11 @@ def main():
 	for i in range( len(arr) ):
 		e += 1
 	TestError( e == 3 )
+
+	s = a[:2]
+	TestError( len(s)==2 )
+	e = 0
+	for i in s:
+		e += i
+	TestError( e == 3 )
+		
\ No newline at end of file

From 95231015cdd6fce3ffef7658fdc9dd91959805dd Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Wed, 8 Oct 2014 17:41:31 -0700
Subject: [PATCH 41/58] removed __slice_hack__

---
 pythonjs/pythonjs_to_go.py      | 9 +++++++--
 pythonjs/runtime/go_builtins.py | 4 ----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index 59dceec..55955db 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -264,7 +264,7 @@ def visit_Subscript(self, node):
 		else:
 			## deference pointer and then index
 			if isinstance(node.slice, ast.Slice):
-				return '__slice_hack__((*%s)[%s])' % (self.visit(node.value), self.visit(node.slice))
+				return '&(*%s)[%s]' % (self.visit(node.value), self.visit(node.slice))
 			else:
 				return '(*%s)[%s]' % (self.visit(node.value), self.visit(node.slice))
 
@@ -857,7 +857,12 @@ def visit_Assign(self, node):
 			value = self.visit(node.value)
 			self._vars.remove( target )
 			self._known_vars.add( target )
-			return '%s := %s;' % (target, value)
+			if value.startswith('&(*') and '[' in value and ']' in value:  ## slice hack
+				v = value[1:]
+				return '_tmp := %s; %s := &_tmp;' %(v, target)
+
+			else:
+				return '%s := %s;' % (target, value)
 
 		else:
 			value = self.visit(node.value)
diff --git a/pythonjs/runtime/go_builtins.py b/pythonjs/runtime/go_builtins.py
index 3a93368..481266f 100644
--- a/pythonjs/runtime/go_builtins.py
+++ b/pythonjs/runtime/go_builtins.py
@@ -83,10 +83,6 @@
 	return &arr
 }
 
-func __slice_hack__( arr []int ) *[]int {
-	return &arr
-}
-
 
 """)
 

From d95fe442c95fe75e366a4fed0d0a265b1c6976cb Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Wed, 8 Oct 2014 17:55:13 -0700
Subject: [PATCH 42/58] fixed calling variable argument functions with
 `f(*arr)`

---
 pythonjs/pythonjs_to_go.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index 55955db..8a86eb9 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -449,7 +449,7 @@ def _visit_call_helper(self, node, force_name=None):
 
 		if node.starargs:
 			if args: args += ','
-			args += '%s...' %self.visit(node.starargs)
+			args += '*%s...' %self.visit(node.starargs)
 
 		if is_append:
 			## deference pointer as first arg to append, assign to temp variable, then set the pointer to the new array.
@@ -646,13 +646,8 @@ def _visit_function(self, node):
 
 			dindex = i - offset
 
-			if a.startswith('__variable_args__'): ## TODO support go `...` varargs
-				#varargs_name = a.split('__')[-1]
-				#varargs = ['_vararg_%s'%n for n in range(16) ]
-				#args.append( '[%s]'%','.join(varargs) )
-				raise SyntaxError('TODO *args')
 
-			elif dindex >= 0 and node.args.defaults:
+			if dindex >= 0 and node.args.defaults:
 				default_value = self.visit( node.args.defaults[dindex] )
 				self._kwargs_type_[ arg_name ] = arg_type
 				oargs.append( (arg_name, default_value) )
@@ -667,10 +662,11 @@ def _visit_function(self, node):
 			args.append( '__kwargs _kwargs_type_')
 			node._arg_names.append( '__kwargs' )
 
+		starargs = None
 		if node.args.vararg:
 			starargs = node.args.vararg
 			assert starargs in args_typedefs
-			args.append( '%s ...%s' %(starargs, args_typedefs[starargs]))
+			args.append( '__vargs__ ...%s' %args_typedefs[starargs])
 			node._arg_names.append( starargs )
 
 		node._args_signature = ','.join(args)
@@ -702,6 +698,9 @@ def _visit_function(self, node):
 				out.append('}')
 				#out.append('} else { %s := %s }' %(n,v))
 
+		if starargs:
+			out.append('%s := &__vargs__' %starargs)
+
 		if generics:
 			gname = args_names[ args_names.index(args_generics.keys()[0]) ]
 			out.append(self.indent() + 'switch __gen__.(type) {')

From 22da368d9b1e529bd51eab3a1d08c7ee8b515de1 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Thu, 9 Oct 2014 00:04:15 -0700
Subject: [PATCH 43/58] fixed maps.

---
 pythonjs/python_to_pythonjs.py |  4 ++--
 pythonjs/pythonjs_to_go.py     |  1 -
 pythonjs/typedpython.py        | 14 +++++++++-----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
index 8968a84..28174fb 100755
--- a/pythonjs/python_to_pythonjs.py
+++ b/pythonjs/python_to_pythonjs.py
@@ -1515,8 +1515,8 @@ def visit_BinOp(self, node):
 						is_go_listcomp = True
 						node.right.go_listcomp_type = node.left.args[0].id
 					elif node.left.func.id=='__go__map__':
-						is_go_listcomp = True
-						if isinstance(node.left.args[1], ast.Call):
+						if isinstance(node.left.args[1], ast.Call):  ## map comprehension
+							is_go_listcomp = True
 							node.right.go_dictcomp_type =  ( node.left.args[0].id, self.visit(node.left.args[1]) )
 						else:
 							node.right.go_dictcomp_type =  ( node.left.args[0].id, node.left.args[1].id )
diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index 8a86eb9..2d4a23d 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -907,7 +907,6 @@ def main(script, insert_runtime=True):
 		sys.stderr.write(script)
 		raise err
 
-	#raise RuntimeError(script)
 	g = GoGenerator()
 	g.visit(tree) # first pass gathers classes
 	return g.visit(tree)
diff --git a/pythonjs/typedpython.py b/pythonjs/typedpython.py
index 055fe5f..3b3ad49 100644
--- a/pythonjs/typedpython.py
+++ b/pythonjs/typedpython.py
@@ -517,11 +517,7 @@ def wrapper(a:int, c:chan int):
 ## becomes: __go__arrayfixed__(3, string) << (x,y,z)
 a = [ 3 ]int(x,y,z)
 
-## in go becomes: map[string]int{x,y,z}
-## becomes: __go__map__(string, int) << {'x':x, 'y':y, 'z':z}
-a = map[string]int{
-	"x":x, "y":y, "z":z
-}
+
 
 def f(a:int, b:int, c:int) ->int:
 	return a+b+c
@@ -567,6 +563,14 @@ def mappass( a:map[string]int ):
 functions = map[string]func(int)(int){}
 []int a = go( f() for f in funtions )
 
+## in go becomes: map[string]int{x,y,z}
+## becomes: __go__map__(string, int) << {'x':x, 'y':y, 'z':z}
+a = map[string]int{
+	"x":x, 
+	"y":y, 
+	"z":z
+}
+
 '''
 
 if __name__ == '__main__':

From 9c7b57f3e3901ca13ceaf24b5cd411f242c40763 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Thu, 9 Oct 2014 04:49:28 -0700
Subject: [PATCH 44/58] Generics: subclasses become union of all their
 attributes, so that a subclass can define its "own" attributes and these will
 be inserted into the struct of the other subclasses (but not used).

---
 pythonjs/pythonjs_to_go.py                    | 24 +++++++++++----
 .../go/generics_subcls_return_a_subcls.py     | 29 +++++++++++++++----
 2 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index 2d4a23d..c19920a 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -110,6 +110,9 @@ def visit_ClassDef(self, node):
 			node._parents = set()
 			node._struct_def = dict()
 			node._subclasses = set()  ## required for generics generator
+			## subclasses must be a struct union so that Go can convert between struct types
+			node._subclasses_union = dict()
+
 		out = []
 		sdef = dict()
 		props = set()
@@ -170,6 +173,13 @@ def visit_ClassDef(self, node):
 					sdef[k] = v
 
 		node._struct_def.update( sdef )
+		unionstruct = dict()
+		unionstruct.update( sdef )
+		for pname in node._parents:
+			parent = self._classes[ pname ]
+			parent._subclasses_union.update( sdef )        ## first pass
+			unionstruct.update( parent._subclasses_union ) ## second pass
+
 
 		parent_init = None
 		if base_classes:
@@ -198,11 +208,15 @@ def visit_ClassDef(self, node):
 				## but this can throw an error: `invalid operation: ambiguous selector`
 				## removing the duplicate name here fixes that error.
 				for key in bnode._struct_def.keys():
-					if key in sdef:
-						sdef.pop(key)
-
-		for name in sdef:
-			out.append('%s %s' %(name, sdef[name]))
+					#if key in sdef:
+					#	sdef.pop(key)
+					if key in unionstruct:
+						unionstruct.pop(key)
+
+		#for name in sdef:
+		#	out.append('%s %s' %(name, sdef[name]))
+		for name in unionstruct:
+			out.append('%s %s' %(name, unionstruct[name]))
 		out.append('}')
 
 
diff --git a/regtests/go/generics_subcls_return_a_subcls.py b/regtests/go/generics_subcls_return_a_subcls.py
index 9ff41a0..1047e51 100644
--- a/regtests/go/generics_subcls_return_a_subcls.py
+++ b/regtests/go/generics_subcls_return_a_subcls.py
@@ -21,15 +21,18 @@ def __init__(self):
 		int self.z = 1
 
 	def bar(self) ->int:
+		print('calling B.bar')
 		return self.x + self.z
 
 class C(A):
 	def __init__(self):
 		A.__init__(self, 100)
 		int self.z = 100
+		int self.w = 1
 
 	def bar(self) ->int:
-		return self.x + self.z
+		print('calling C.bar')
+		return self.x + self.z + self.w
 
 
 def my_generic( g:A ) ->int:
@@ -50,7 +53,7 @@ def main():
 	TestError( y==11 )
 
 	z = my_generic( c )
-	TestError( z==200 )
+	TestError( z==201 )
 
 	TestError( b.z==1 )
 	TestError( c.z==100 )
@@ -62,15 +65,21 @@ def main():
 	w = bb.bar()
 	TestError(w==y)
 
+	print('testing C returned from B.foo')
+	w = b.foo(c, true).bar()
+	print(b.foo(c, true).w)
+	TestError(w==z)
+
+
 	cc = c.foo(b, false)
 	w = cc.bar()
-	#print(w)
 	TestError(w==z)
 
-	#bb = c.foo(b, true)  ## reassignment to bb type of B should be allowed, because this works at runtime, but goc throws an error.
+	## reassignment to bb type of *B should be allowed, because this works at runtime, but goc throws an error,
+	## because it thinks that c.foo can only return *C
+	#bb = c.foo(b, true)
 	d = c.foo(b, true)
 	w = d.bar()
-	#print(w)
 	TestError(w==y)
 
 	w = my_generic( b.foo(c, false) )  ## calls B.bar()
@@ -78,7 +87,15 @@ def main():
 	TestError( w == y )
 
 	w = my_generic( b.foo(c, true) )   ## calls C.bar()
+	print(w)
 	TestError( w == z )
 
-	w = my_generic( c.foo(b, true) )   ## calls B.bar()
+	print('testing B returned from C.foo')
+	u = c.foo(b, true)
+	print(u.x)
+	print(u.z)
+	print(u.w)
+	w = my_generic( u )   ## calls B.bar()
+	print(w)
+	print(y)
 	TestError( w==y )
\ No newline at end of file

From 4a52a7b753505e81ed48d6b9ca67ee518b593926 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Thu, 9 Oct 2014 14:12:49 -0700
Subject: [PATCH 45/58] workaround for forcing a subclass to its true type
 using super class `object` that contains `__class__` the name of the class,
 and in a generic function switch on the name instead of `G.(type)` because
 that can be wrong because methods in a base class that return self cast any
 subclass it returns to the type of the class instance the method is called
 from. added debug printing to catch nil pointer in unsafe switch using
 __class__ name.

---
 pythonjs/pythonjs_to_go.py      | 42 ++++++++++++++++++++++++++++++---
 pythonjs/runtime/go_builtins.py | 12 ++++++++--
 2 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index c19920a..fa863c6 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -200,6 +200,9 @@ def visit_ClassDef(self, node):
 
 
 		out.append( 'type %s struct {' %node.name)
+		if len(node._parents)==0:
+			out.append('__object__')
+
 		if base_classes:
 			for bnode in base_classes:
 				## Go only needs the name of the parent struct and all its items are inserted automatically ##
@@ -234,6 +237,13 @@ def visit_ClassDef(self, node):
 			out.append( 'func __new__%s( %s ) *%s {' %(node.name, init._args_signature, node.name))
 			out.append( '  ob := %s{}' %node.name )
 			out.append( '  ob.__init__(%s)' %','.join(init._arg_names))
+			## used by generics to workaround the problem that a super method that returns `self`,
+			## may infact return wrong subclass type, because a struct to return that is not of type
+			## self will be cast to self - while this is ok if just reading attributes from it,
+			## it fails with method calls, because the casting operation on the struct changes it's
+			## method pointers.  by storing the class name on the instance, it can be used in a generics
+			## type switch to get to the real class and call the right methods.
+			out.append( '  ob.__class__ = "%s"' %node.name)
 			out.append( '  return &ob')
 			out.append('}')
 
@@ -717,7 +727,24 @@ def _visit_function(self, node):
 
 		if generics:
 			gname = args_names[ args_names.index(args_generics.keys()[0]) ]
-			out.append(self.indent() + 'switch __gen__.(type) {')
+
+			#panic: runtime error: invalid memory address or nil pointer dereference
+			#[signal 0xb code=0x1 addr=0x0 pc=0x402440]
+			##out.append(self.indent() + '__type__ := __gen__.(object).getclassname()')
+
+
+			out.append(self.indent() + '__type__ := ""')
+			out.append(self.indent() + '__super__, __ok__ := __gen__.(object)')
+			out.append('fmt.Println("address:", &__super__)')
+			out.append('if __ok__ { __type__ = __super__.getclassname();')
+			out.append('} else { fmt.Println("Gython RuntimeError - invalid pointer or object is not in struct"); }')
+
+
+			#out.append(self.indent() + '__type__ := __object__(&__gen__).__class__')
+			#out.append(self.indent() + 'switch __gen__.(type) {')
+			out.append('fmt.Println("class name: ", __type__)')
+			out.append(self.indent() + 'switch __type__ {')
+
 			self.push()
 			gsorted = list(generics)
 			gsorted.sort()
@@ -738,9 +765,15 @@ def _visit_function(self, node):
 					if return_type=='*'+gt or not is_method: pass
 					else: continue
 
-				out.append(self.indent() + 'case *%s:' %gt)
+				######out.append(self.indent() + 'case *%s:' %gt)
+				out.append(self.indent() + 'case "%s":' %gt)
 				self.push()
-				out.append(self.indent() + '%s,_ := __gen__.(*%s)' %(gname,gt) )
+
+				#out.append(self.indent() + '%s,_ := __gen__.(*%s)' %(gname,gt) )  ## can not depend on the struct type, because subclasses are unions.
+				out.append(self.indent() + '%s,__ok__ := __gen__.(*%s)' %(gname,gt) )  ## can not depend on the struct type, because subclasses are unions.
+
+				out.append('if __ok__ {')
+
 				for b in node.body:
 					v = self.visit(b)
 					if v:
@@ -754,6 +787,9 @@ def _visit_function(self, node):
 
 						out.append( self.indent() + v )
 
+				out.append('} else { fmt.Println("Gython RuntimeError - invalid pointer", %s); fmt.Println(__super__); fmt.Println(__gen__);}' %gname)
+
+
 				self.pull()
 			self.pull()
 			out.append('}')
diff --git a/pythonjs/runtime/go_builtins.py b/pythonjs/runtime/go_builtins.py
index 481266f..585f4a8 100644
--- a/pythonjs/runtime/go_builtins.py
+++ b/pythonjs/runtime/go_builtins.py
@@ -6,8 +6,16 @@
 
 inline("""
 
-func myappend(self []int, x int) ([]int){
-	return append(self, x)
+type __object__ struct {
+	__class__ string
+}
+
+type object interface{
+	getclassname() string
+}
+
+func (self __object__) getclassname() string {
+	return self.__class__
 }
 
 func ord(x string) int {

From 8c6ee4cc2ff086fea620f224e75da88e90cfe565 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Sat, 11 Oct 2014 07:44:51 -0700
Subject: [PATCH 46/58] Generics, allow return multiple subclasses from method
 call that returns `self` - only works in an assignment to a variable, a type
 switch is generated in the caller, and the function body is branched from
 that point.

---
 pythonjs/python_to_pythonjs.py |   8 +-
 pythonjs/pythonjs_to_go.py     | 150 ++++++++++++++++++++++++++++++---
 2 files changed, 142 insertions(+), 16 deletions(-)

diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
index 28174fb..153a8c0 100755
--- a/pythonjs/python_to_pythonjs.py
+++ b/pythonjs/python_to_pythonjs.py
@@ -2563,10 +2563,10 @@ def visit_Call(self, node):
 			if node.starargs:
 				args.append('*%s' %self.visit(node.starargs))
 
-			if isinstance(node.func, Name) and node.func.id in self._js_classes:
-				return '__new__%s(%s)' %( self.visit(node.func), ','.join(args) )
-			else:
-				return '%s(%s)' %( self.visit(node.func), ','.join(args) )
+			#if isinstance(node.func, Name) and node.func.id in self._js_classes:  ## TODO moving to pythonjs_to_go
+			#	return '__new__%s(%s)' %( self.visit(node.func), ','.join(args) )
+			#else:
+			return '%s(%s)' %( self.visit(node.func), ','.join(args) )
 
 		elif self._with_js or self._with_dart:
 			args = list( map(self.visit, node.args) )
diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index fa863c6..d1feb7f 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -8,6 +8,8 @@
 
 go_types = 'bool string int float64'.split()
 
+class GenerateGenericSwitch( SyntaxError ): pass
+
 def transform_gopherjs( node ):
 	gt = GopherjsTransformer()
 	gt.visit( node )
@@ -51,6 +53,12 @@ def __init__(self, requirejs=False, insert_runtime=False):
 		self._with_gojs = False
 		self._class_stack = list()
 		self._classes = dict()		## name : node
+		#	node._parents = set()
+		#	node._struct_def = dict()
+		#	node._subclasses = set()  ## required for generics generator
+		#	## subclasses must be a struct union so that Go can convert between struct types
+		#	node._subclasses_union = dict()
+		self.method_returns_multiple_subclasses = dict() # class name : method name that can return multiple subclass types
 		self._class_props = dict()
 
 		self._vars = set()
@@ -59,6 +67,8 @@ def __init__(self, requirejs=False, insert_runtime=False):
 
 		self._imports = set()
 		self._ids = 0
+		self._known_instances = dict()
+		self._scope_stack = list()
 
 	def visit_Is(self, node):
 		return '=='
@@ -104,6 +114,24 @@ def visit_Name(self, node):
 		#	return 'nil'
 		return node.id
 
+	def get_subclasses( self, C ):
+		'''
+		returns all sibling subclasses, C can be a subclass or the base class
+		'''
+		subclasses = set()
+		self._collect_subclasses(C, subclasses)
+		return subclasses
+
+	def _collect_subclasses(self, C, subclasses):
+		node = self._classes[ C ]
+		if len(node._parents)==0:
+			for sub in node._subclasses:
+				subclasses.add( sub )
+		else:
+			for parent in node._parents:
+				self._collect_subclasses(parent, subclasses)
+
+
 	def visit_ClassDef(self, node):
 		self._class_stack.append( node )
 		if not hasattr(node, '_parents'):  ## only setup on the first pass
@@ -121,6 +149,8 @@ def visit_ClassDef(self, node):
 
 		self._classes[ node.name ] = node
 		self._class_props[ node.name ] = props
+		if node.name not in self.method_returns_multiple_subclasses:
+			self.method_returns_multiple_subclasses[ node.name ] = set()
 
 
 		for base in node.bases:
@@ -436,8 +466,8 @@ def _visit_call_helper(self, node, force_name=None):
 			is_append = True
 			arr = fname.split('.append')[0]
 
-		if fname=='__DOLLAR__': fname = '$'
-		elif fname == 'range':
+		#if fname=='__DOLLAR__': fname = '$'
+		if fname == 'range':
 			assert len(node.args)
 			fname += str(len(node.args))
 		elif fname == 'len':
@@ -452,11 +482,6 @@ def _visit_call_helper(self, node, force_name=None):
 			return '%s(*%s)' %(type, self.visit(node.args[0]) )
 
 
-		#elif fname.startswith('__js_global_get_'):
-		#	gname = fname.split('_')[-1]
-		#	fname = 'js.Global.Get("%s").Call' %gname
-
-
 		if node.args:
 			args = [self.visit(e) for e in node.args]
 			args = ', '.join([e for e in args if e])
@@ -491,6 +516,20 @@ def _visit_call_helper(self, node, force_name=None):
 				return 'Call("%s",%s)' % (fname, args)
 
 		else:
+
+			if isinstance(node.func, ast.Attribute) and False:
+				if isinstance(node.func.value, ast.Name):
+					varname = node.func.value.id
+					if varname in self._known_vars:
+						#raise SyntaxError(varname + ' is known class::' + self._known_instances[varname] + '%s(%s)' % (fname, args))
+
+
+
+						cname = self._known_instances[varname]
+						if node.func.attr in self.method_returns_multiple_subclasses[ cname ]:
+							raise SyntaxError('%s(%s)' % (fname, args))
+
+
 			return '%s(%s)' % (fname, args)
 
 	def _visit_call_helper_go(self, node):
@@ -598,6 +637,7 @@ def _visit_function(self, node):
 		return_type = None
 		generics = set()
 		args_generics = dict()
+		returns_self = False
 
 		for decor in node.decorator_list:
 			if isinstance(decor, ast.Call) and isinstance(decor.func, ast.Name) and decor.func.id == '__typedef__':
@@ -635,7 +675,8 @@ def _visit_function(self, node):
 
 				if return_type == 'self':
 					return_type = '*' + self._class_stack[-1].name
-
+					returns_self = True
+					self.method_returns_multiple_subclasses[ self._class_stack[-1].name ].add(node.name)
 
 		node._arg_names = args_names = []
 		args = []
@@ -779,11 +820,12 @@ def _visit_function(self, node):
 					if v:
 						## TODO - fix - this breaks easily
 						if v.strip().startswith('return ') and '*'+gt != return_type:
-							if gname in v and v.strip() != 'return self':
+							if gname in v and v.strip() != 'return self' and returns_self:
 								if '(' not in v:
 									v += '.(%s)' %return_type
 									#if v.split('return ')[-1].strip()==gname:
 									v = v.replace(gname, '__gen__')
+									self.method_returns_multiple_subclasses[ self._class_stack[-1].name ].add(node.name)
 
 						out.append( self.indent() + v )
 
@@ -809,14 +851,78 @@ def _visit_function(self, node):
 				out.append('return %s' %(return_type.replace('*','&')+'{}'))
 
 		else:
-			for b in node.body:
-				v = self.visit(b)
-				if v: out.append( self.indent() + v )
+			body = node.body[:]
+			body.reverse()
+			self._scope_stack.append( (self._vars, self._known_vars))
+			self.generate_generic_branches( body, out, self._vars, self._known_vars )
+			#for b in node.body:
+
+
 
 		self.pull()
 		out.append( self.indent()+'}' )
 		return '\n'.join(out)
 
+	def generate_generic_branches(self, body, out, force_vars, force_used_vars):
+		force_vars, force_used_vars = self._scope_stack[-1]
+		self._vars = force_vars
+		self._known_vars = force_used_vars
+
+		out.append('/*force vars: %s*/' %self._vars)
+		out.append('/*force used: %s*/' %self._known_vars)
+
+		prev_vars = None
+		prev_used = None
+		vars = None
+		used = None
+		while len(body):
+			prev_vars = vars
+			prev_used = used
+			vars = set(self._vars)
+			used = set(self._known_vars)
+
+
+			b = body.pop()
+			try:
+				self._scope_stack.append( (vars, used))
+				v = self.visit(b)
+				if v: out.append( self.indent() + v )
+				self._scope_stack.pop()
+			except GenerateGenericSwitch as err:
+				#raise SyntaxError(prev_vars)
+				out.append('/* GenerateGenericSwitch */')
+				out.append('/*vars: %s*/' %self._vars)
+				out.append('/*used: %s*/' %self._known_vars)
+				out.append('/*prev vars: %s*/' %prev_vars)
+				out.append('/*prev used: %s*/' %prev_used)
+
+
+
+				G = err[0]
+				out.append(self.indent()+'__subclass__ := %s' %G['value'])
+				out.append(self.indent()+'switch __subclass__.__class__ {')
+				self.push()
+
+				subclasses = self.get_subclasses( G['class'] )
+				for sub in subclasses:
+					#self._vars = prev_vars
+					#self._known_vars = prev_used
+
+
+					out.append(self.indent()+'case "%s":' %sub)
+					self.push()
+					#out.append(self.indent()+'%s := __subclass__.(*%s)' %(G['target'], sub)) ## error not an interface
+					out.append(self.indent()+'%s := %s(*__subclass__)' %(G['target'], sub))
+
+					self.generate_generic_branches( body[:], out, prev_vars, prev_used )
+
+					self.pull()
+				self.pull()
+				out.append(self.indent()+'}')
+				self._scope_stack.append( (prev_vars, prev_used))
+				return #self._scope_stack.pop()
+
+
 	def _visit_call_helper_var(self, node):
 		args = [ self.visit(a) for a in node.args ]
 		#if args:
@@ -910,6 +1016,26 @@ def visit_Assign(self, node):
 				v = value[1:]
 				return '_tmp := %s; %s := &_tmp;' %(v, target)
 
+			elif isinstance(node.value.func, ast.Attribute) and isinstance(node.value.func.value, ast.Name):
+				varname = node.value.func.value.id
+				if varname in self._known_vars:
+					#raise SyntaxError(varname + ' is known class::' + self._known_instances[varname] + '%s(%s)' % (fname, args))
+					cname = self._known_instances[varname]
+					if node.value.func.attr in self.method_returns_multiple_subclasses[ cname ]:
+						self._known_instances[target] = cname
+						#raise SyntaxError('xxxxxxxxx %s - %s' % (self.visit(node.value), target ) )
+						raise GenerateGenericSwitch( {'target':target, 'value':value, 'class':cname, 'method':node.value.func.attr} )
+				return '%s := %s;' % (target, value)
+
+
+			elif isinstance(node.value, ast.Call) and isinstance(node.value.func, ast.Name):
+				if node.value.func.id in self._classes:
+					#raise SyntaxError(value+' in classes')
+					self._known_instances[ target ] = node.value.func.id
+					return '%s := __new__%s;' %(target, value)
+				else:
+					return '%s := %s;' % (target, value)
+
 			else:
 				return '%s := %s;' % (target, value)
 

From 86c2b316848ebdadce7ac4c04e6779b510e709e1 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Sat, 11 Oct 2014 12:48:08 -0700
Subject: [PATCH 47/58] Generics: fixes and notes.

---
 pythonjs/pythonjs_to_go.py                    | 10 +--
 .../go/generics_subcls_return_a_subcls.py     | 76 ++++++++++---------
 2 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index d1feb7f..7b64698 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -776,15 +776,11 @@ def _visit_function(self, node):
 
 			out.append(self.indent() + '__type__ := ""')
 			out.append(self.indent() + '__super__, __ok__ := __gen__.(object)')
-			out.append('fmt.Println("address:", &__super__)')
 			out.append('if __ok__ { __type__ = __super__.getclassname();')
 			out.append('} else { fmt.Println("Gython RuntimeError - invalid pointer or object is not in struct"); }')
-
-
-			#out.append(self.indent() + '__type__ := __object__(&__gen__).__class__')
-			#out.append(self.indent() + 'switch __gen__.(type) {')
-			out.append('fmt.Println("class name: ", __type__)')
 			out.append(self.indent() + 'switch __type__ {')
+			#out.append(self.indent() + 'switch __gen__.(type) {')  ## this is not always correct
+			#out.append('fmt.Println("class name: ", __type__)')
 
 			self.push()
 			gsorted = list(generics)
@@ -1016,7 +1012,7 @@ def visit_Assign(self, node):
 				v = value[1:]
 				return '_tmp := %s; %s := &_tmp;' %(v, target)
 
-			elif isinstance(node.value.func, ast.Attribute) and isinstance(node.value.func.value, ast.Name):
+			elif isinstance(node.value, ast.Call) and isinstance(node.value.func, ast.Attribute) and isinstance(node.value.func.value, ast.Name):
 				varname = node.value.func.value.id
 				if varname in self._known_vars:
 					#raise SyntaxError(varname + ' is known class::' + self._known_instances[varname] + '%s(%s)' % (fname, args))
diff --git a/regtests/go/generics_subcls_return_a_subcls.py b/regtests/go/generics_subcls_return_a_subcls.py
index 1047e51..d0dd11d 100644
--- a/regtests/go/generics_subcls_return_a_subcls.py
+++ b/regtests/go/generics_subcls_return_a_subcls.py
@@ -6,22 +6,28 @@ def __init__(self, x:int):
 		int self.x = x
 		int self.z = 0
 
-	def bar(self) -> int:
-		return self.x
 
-	def foo( self, o:A, s:bool ) -> self:
+	def some_subclass( self, o:A, s:bool ) -> self:
 		if s:
+			## forces the return type to be self, if the result from this method is an assignment
+			## then a switch is generated, and the function body is put into each case,
+			## this allow methods to work on the returned instance.
 			return go.type_assert(o, self)
 		else:
 			return self
 
+	def bar(self) -> int:
+		return self.x
+
+
 class B(A):
 	def __init__(self):
 		A.__init__(self, 10)
 		int self.z = 1
 
 	def bar(self) ->int:
-		print('calling B.bar')
+		#print('calling B.bar')
+		#print(self.__class__)
 		return self.x + self.z
 
 class C(A):
@@ -31,20 +37,21 @@ def __init__(self):
 		int self.w = 1
 
 	def bar(self) ->int:
-		print('calling C.bar')
+		#print('calling C.bar')
+		#print(self.__class__)
 		return self.x + self.z + self.w
 
 
 def my_generic( g:A ) ->int:
 	return g.bar()
 
+
 def main():
 	a = A( 1000 )
 	b = B()
 	c = C()
 
 	TestError(a.x == a.bar() )
-	TestError(a.x == a.foo(a,false).bar() )
 
 	x = my_generic( a )
 	TestError(a.x == x )
@@ -58,44 +65,45 @@ def main():
 	TestError( b.z==1 )
 	TestError( c.z==100 )
 
-	w = b.bar()
-	#print(w)
 
-	bb = b.foo(b, false)
+	## calling a method that has returns multiple subclasses with the result assigned to variable
+	## will generate a switch that enables methods
+	w = 0
+	## tests returning self
+	bb = b.some_subclass(b, false)
 	w = bb.bar()
 	TestError(w==y)
-
-	print('testing C returned from B.foo')
-	w = b.foo(c, true).bar()
-	print(b.foo(c, true).w)
+	cc = c.some_subclass(b, false)
+	w = cc.bar()
 	TestError(w==z)
 
 
-	cc = c.foo(b, false)
-	w = cc.bar()
+	## tests returning the other subclass type
+	ccc = b.some_subclass(c, true)
+	w = ccc.bar()
 	TestError(w==z)
+	bbb = c.some_subclass(b, true)
+	w = bbb.bar()
+	TestError(w==y)
+
+
+	## Gotchas ##
+
+	## calls B.bar(), my_generic still works when b returns self,
+	## if C is returned, then my_generic breaks.
+	w = my_generic( b.some_subclass(c, false) )
+	#print(w)
+	TestError( w == y )
+
 
 	## reassignment to bb type of *B should be allowed, because this works at runtime, but goc throws an error,
-	## because it thinks that c.foo can only return *C
-	#bb = c.foo(b, true)
-	d = c.foo(b, true)
+	## because it thinks that c.some_subclass can only return *C, and `bb` above got retyped as *B.
+	#bb = c.some_subclass(b, true)
+	d = c.some_subclass(b, true)
 	w = d.bar()
 	TestError(w==y)
 
-	w = my_generic( b.foo(c, false) )  ## calls B.bar()
-	#print(w)
-	TestError( w == y )
 
-	w = my_generic( b.foo(c, true) )   ## calls C.bar()
-	print(w)
-	TestError( w == z )
-
-	print('testing B returned from C.foo')
-	u = c.foo(b, true)
-	print(u.x)
-	print(u.z)
-	print(u.w)
-	w = my_generic( u )   ## calls B.bar()
-	print(w)
-	print(y)
-	TestError( w==y )
\ No newline at end of file
+
+
+	print('----------no panics----------')
\ No newline at end of file

From 0df3e06c15ecf610719e96d34f46872c08202636 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Sat, 11 Oct 2014 19:01:32 -0700
Subject: [PATCH 48/58] Generics: fixed scope stack for methods that return
 multiple subclass types.

---
 pythonjs/pythonjs_to_go.py       | 55 ++++++++++++++--------
 regtests/go/generics_mreturns.py | 80 ++++++++++++++++++++++++++++++++
 2 files changed, 115 insertions(+), 20 deletions(-)
 create mode 100644 regtests/go/generics_mreturns.py

diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index 7b64698..084ca75 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -849,9 +849,10 @@ def _visit_function(self, node):
 		else:
 			body = node.body[:]
 			body.reverse()
-			self._scope_stack.append( (self._vars, self._known_vars))
+			#self._scope_stack.append( (self._vars, self._known_vars))
 			self.generate_generic_branches( body, out, self._vars, self._known_vars )
 			#for b in node.body:
+		self._scope_stack = []
 
 
 
@@ -860,38 +861,50 @@ def _visit_function(self, node):
 		return '\n'.join(out)
 
 	def generate_generic_branches(self, body, out, force_vars, force_used_vars):
-		force_vars, force_used_vars = self._scope_stack[-1]
-		self._vars = force_vars
-		self._known_vars = force_used_vars
+		#out.append('/* GenerateGeneric */')
+		#out.append('/*vars: %s*/' %self._vars)
+		#out.append('/*used: %s*/' %self._known_vars)
 
-		out.append('/*force vars: %s*/' %self._vars)
-		out.append('/*force used: %s*/' %self._known_vars)
+		#force_vars, force_used_vars = self._scope_stack[-1]
+		self._vars = set(force_vars)
+		self._known_vars = set(force_used_vars)
+
+		#out.append('/*force vars: %s*/' %force_vars)
+		#out.append('/*force used: %s*/' %force_used_vars)
 
 		prev_vars = None
 		prev_used = None
 		vars = None
 		used = None
+
+		vars = set(self._vars)
+		used = set(self._known_vars)
+
+		#out.append('/*Sstack len: %s*/' %len(self._scope_stack))
+		#if self._scope_stack:
+		#	out.append('/*stack: %s - %s*/' %self._scope_stack[-1])
+		#	out.append('/*STAK: %s */' %self._scope_stack)
+
+
 		while len(body):
 			prev_vars = vars
 			prev_used = used
-			vars = set(self._vars)
-			used = set(self._known_vars)
-
 
 			b = body.pop()
 			try:
-				self._scope_stack.append( (vars, used))
 				v = self.visit(b)
 				if v: out.append( self.indent() + v )
-				self._scope_stack.pop()
 			except GenerateGenericSwitch as err:
-				#raise SyntaxError(prev_vars)
-				out.append('/* GenerateGenericSwitch */')
-				out.append('/*vars: %s*/' %self._vars)
-				out.append('/*used: %s*/' %self._known_vars)
-				out.append('/*prev vars: %s*/' %prev_vars)
-				out.append('/*prev used: %s*/' %prev_used)
+				self._scope_stack.append( (set(self._vars), set(self._known_vars)))
 
+				#out.append('/* 		GenerateGenericSwitch */')
+				#out.append('/*	vars: %s*/' %self._vars)
+				#out.append('/*	used: %s*/' %self._known_vars)
+				#out.append('/*	prev vars: %s*/' %prev_vars)
+				#out.append('/*	prev used: %s*/' %prev_used)
+				#out.append('/*	stack: %s - %s*/' %self._scope_stack[-1])
+				#out.append('/*	stack len: %s*/' %len(self._scope_stack))
+				#out.append('/*	stack: %s*/' %self._scope_stack)
 
 
 				G = err[0]
@@ -910,13 +923,15 @@ def generate_generic_branches(self, body, out, force_vars, force_used_vars):
 					#out.append(self.indent()+'%s := __subclass__.(*%s)' %(G['target'], sub)) ## error not an interface
 					out.append(self.indent()+'%s := %s(*__subclass__)' %(G['target'], sub))
 
-					self.generate_generic_branches( body[:], out, prev_vars, prev_used )
+					pv, pu = self._scope_stack[-1]
+					self.generate_generic_branches( body[:], out, pv, pu )
 
 					self.pull()
+				self._scope_stack.pop()
+
 				self.pull()
 				out.append(self.indent()+'}')
-				self._scope_stack.append( (prev_vars, prev_used))
-				return #self._scope_stack.pop()
+				return
 
 
 	def _visit_call_helper_var(self, node):
diff --git a/regtests/go/generics_mreturns.py b/regtests/go/generics_mreturns.py
new file mode 100644
index 0000000..cc4b899
--- /dev/null
+++ b/regtests/go/generics_mreturns.py
@@ -0,0 +1,80 @@
+'''
+generics classes with common base.
+'''
+class A:
+	def __init__(self, x:int):
+		int self.x = x
+		int self.z = 0
+
+
+	def some_subclass( self, o:A, s:bool ) -> self:
+		if s:
+			## forces the return type to be self, if the result from this method is an assignment
+			## then a switch is generated, and the function body is put into each case,
+			## this allow methods to work on the returned instance.
+			return go.type_assert(o, self)
+		else:
+			return self
+
+	def bar(self) -> int:
+		return self.x
+
+
+class B(A):
+	def __init__(self):
+		A.__init__(self, 10)
+		int self.z = 1
+
+	def bar(self) ->int:
+		#print('calling B.bar')
+		#print(self.__class__)
+		return self.x + self.z
+
+class C(A):
+	def __init__(self):
+		A.__init__(self, 100)
+		int self.z = 100
+		int self.w = 1
+
+	def bar(self) ->int:
+		#print('calling C.bar')
+		#print(self.__class__)
+		return self.x + self.z + self.w
+
+
+def my_generic( g:A ) ->int:
+	return g.bar()
+
+
+def main():
+	a = A( 1000 )
+	b = B()
+	c = C()
+
+	TestError(a.x == a.bar() )
+
+	x = my_generic( a )
+	TestError(a.x == x )
+
+	y = my_generic( b )
+	TestError( y==11 )
+
+	z = my_generic( c )
+	TestError( z==201 )
+
+
+
+	## calling a method that has returns multiple subclasses with the result assigned to variable
+	## will generate a switch that enables methods
+	#w = 0
+	## tests returning self
+	bb = b.some_subclass(b, false)
+	w = bb.bar()
+	TestError(w==y)
+	cc = c.some_subclass(b, false)
+	w = cc.bar()
+	TestError(w==z)
+
+
+
+	print('----------no panics----------')
\ No newline at end of file

From d5efc7288622e77c079be343382652cdda5718df Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Sun, 12 Oct 2014 01:11:55 -0700
Subject: [PATCH 49/58] Generics: multiple subclass return needs to take
 pointer of subclass.

---
 pythonjs/pythonjs_to_go.py       | 26 ++++++++++++++------------
 regtests/go/generics_mreturns.py | 14 +++++++++++---
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index 084ca75..3991ce8 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -776,8 +776,8 @@ def _visit_function(self, node):
 
 			out.append(self.indent() + '__type__ := ""')
 			out.append(self.indent() + '__super__, __ok__ := __gen__.(object)')
-			out.append('if __ok__ { __type__ = __super__.getclassname();')
-			out.append('} else { fmt.Println("Gython RuntimeError - invalid pointer or object is not in struct"); }')
+			out.append(self.indent() + 'if __ok__ { __type__ = __super__.getclassname();')
+			out.append(self.indent() + '} else { fmt.Println("Gython RuntimeError - struct must implement the `object` interface"); }')
 			out.append(self.indent() + 'switch __type__ {')
 			#out.append(self.indent() + 'switch __gen__.(type) {')  ## this is not always correct
 			#out.append('fmt.Println("class name: ", __type__)')
@@ -809,7 +809,7 @@ def _visit_function(self, node):
 				#out.append(self.indent() + '%s,_ := __gen__.(*%s)' %(gname,gt) )  ## can not depend on the struct type, because subclasses are unions.
 				out.append(self.indent() + '%s,__ok__ := __gen__.(*%s)' %(gname,gt) )  ## can not depend on the struct type, because subclasses are unions.
 
-				out.append('if __ok__ {')
+				out.append(self.indent() + 'if __ok__ {')
 
 				for b in node.body:
 					v = self.visit(b)
@@ -825,26 +825,26 @@ def _visit_function(self, node):
 
 						out.append( self.indent() + v )
 
-				out.append('} else { fmt.Println("Gython RuntimeError - invalid pointer", %s); fmt.Println(__super__); fmt.Println(__gen__);}' %gname)
+				out.append(self.indent() + '} else { fmt.Println("Generics RuntimeError - generic argument is not a pointer to a struct", %s); fmt.Println("struct: ",__gen__);}' %gname)
 
 
 				self.pull()
 			self.pull()
-			out.append('}')
-			out.append('fmt.Println("Generics RuntimeError - type not in type switch")')
+			out.append(self.indent() + '}')
+			out.append(self.indent() + 'fmt.Println("Generics RuntimeError - failed to convert type to:", __type__)')
 			#out.append('fmt.Println(__gen__)')
 
 			if return_type == 'int':
-				out.append('return 0')
+				out.append(self.indent() + 'return 0')
 			elif return_type == 'float':
-				out.append('return 0.0')
+				out.append(self.indent() + 'return 0.0')
 			elif return_type == 'string':
-				out.append('return ""')
+				out.append(self.indent() + 'return ""')
 			elif return_type == 'bool':
-				out.append('return false')
+				out.append(self.indent() + 'return false')
 			elif return_type:
 				#raise NotImplementedError('TODO other generic function return types', return_type)
-				out.append('return %s' %(return_type.replace('*','&')+'{}'))
+				out.append(self.indent() + 'return %s' %(return_type.replace('*','&')+'{}'))
 
 		else:
 			body = node.body[:]
@@ -921,7 +921,9 @@ def generate_generic_branches(self, body, out, force_vars, force_used_vars):
 					out.append(self.indent()+'case "%s":' %sub)
 					self.push()
 					#out.append(self.indent()+'%s := __subclass__.(*%s)' %(G['target'], sub)) ## error not an interface
-					out.append(self.indent()+'%s := %s(*__subclass__)' %(G['target'], sub))
+					#out.append(self.indent()+'%s := %s(*__subclass__)' %(G['target'], sub))
+					out.append(self.indent()+'__addr := %s(*__subclass__)' %sub)
+					out.append(self.indent()+'%s := &__addr' %G['target'])
 
 					pv, pu = self._scope_stack[-1]
 					self.generate_generic_branches( body[:], out, pv, pu )
diff --git a/regtests/go/generics_mreturns.py b/regtests/go/generics_mreturns.py
index cc4b899..7ce3aeb 100644
--- a/regtests/go/generics_mreturns.py
+++ b/regtests/go/generics_mreturns.py
@@ -60,13 +60,13 @@ def main():
 	TestError( y==11 )
 
 	z = my_generic( c )
+	##z = my_generic( b.some_subclass(c,true) )  ## todo fixme
 	TestError( z==201 )
 
 
-
 	## calling a method that has returns multiple subclasses with the result assigned to variable
 	## will generate a switch that enables methods
-	#w = 0
+
 	## tests returning self
 	bb = b.some_subclass(b, false)
 	w = bb.bar()
@@ -76,5 +76,13 @@ def main():
 	TestError(w==z)
 
 
+	## tests returning other
+	ccc = b.some_subclass(c, true)
+	w = ccc.bar()
+	TestError(w==z)
+	bbb = c.some_subclass(b, true)
+	w = bbb.bar()
+	TestError(w==y)
+	TestError( my_generic(bbb)==y)
+
 
-	print('----------no panics----------')
\ No newline at end of file

From f37d2670bbc2a15904881bd84202864f0c80bbdc Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Mon, 13 Oct 2014 05:05:48 -0700
Subject: [PATCH 50/58] new test array of objects.

---
 pythonjs/pythonjs_to_go.py                    | 30 +++++++++++++---
 regtests/go/array_of_objects.py               | 34 +++++++++++++++++++
 regtests/go/generics_mreturns.py              | 21 +++++++++++-
 .../go/generics_subcls_return_a_subcls.py     |  2 +-
 4 files changed, 81 insertions(+), 6 deletions(-)
 create mode 100644 regtests/go/array_of_objects.py

diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index 3991ce8..d71819f 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -68,6 +68,7 @@ def __init__(self, requirejs=False, insert_runtime=False):
 		self._imports = set()
 		self._ids = 0
 		self._known_instances = dict()
+		self._known_arrays    = dict()
 		self._scope_stack = list()
 
 	def visit_Is(self, node):
@@ -504,7 +505,20 @@ def _visit_call_helper(self, node, force_name=None):
 			## deference pointer as first arg to append, assign to temp variable, then set the pointer to the new array.
 			id = self._ids
 			self._ids += 1
-			return '__%s := append(*%s,%s); *%s = __%s;' % (id, arr, args, arr, id)
+			item = args
+
+			if item in self._known_instances:
+				classname = self._known_instances[ item ]
+				#raise SyntaxError( self._known_instances[item] )
+				#if arr in self._known_vars:
+				#	raise SyntaxError('kow')
+				if arr in self._known_arrays and classname != self._known_arrays[arr]:
+					#raise SyntaxError( self._known_arrays[arr])
+					item = '%s(*%s)' %(self._known_arrays[arr], item)
+					r = '__addr%s := %s;' %(id,item)
+					return r + '__%s := append(*%s,&__addr%s); *%s = __%s;' % (id, arr, id, arr, id)
+
+			return '__%s := append(*%s,%s); *%s = __%s;' % (id, arr, item, arr, id)
 
 		elif self._with_gojs:
 			if isinstance(node.func, ast.Attribute):
@@ -551,7 +565,7 @@ def _visit_call_helper_go(self, node):
 				if a in go_types:
 					return '*[]%s' %a
 				else:
-					return '*[]*%s' %a
+					return '*[]*%s' %a  ## todo - self._catch_assignment_array_of_obs = true
 
 			else:
 				a = self.visit(node.args[0])
@@ -593,6 +607,7 @@ def visit_BinOp(self, node):
 						if T in go_types:
 							return '&[]%s%s' %(T, right)
 						else:
+							self._catch_assignment = {'class':T}  ## visit_Assign catches this
 							return '&[]*%s%s' %(T, right)
 					elif node.left.func.id == '__go__arrayfixed__':
 						asize = self.visit(node.left.args[0])
@@ -1008,8 +1023,8 @@ def visit_With(self, node):
 		return '\n'.join(r)
 
 	def visit_Assign(self, node):
-		if isinstance(node.targets[0], ast.Tuple):
-			raise NotImplementedError('TODO')
+		if isinstance(node.targets[0], ast.Tuple): raise NotImplementedError('TODO')
+		self._catch_assignment = False
 
 		target = self.visit( node.targets[0] )
 
@@ -1025,6 +1040,11 @@ def visit_Assign(self, node):
 			value = self.visit(node.value)
 			self._vars.remove( target )
 			self._known_vars.add( target )
+
+			if value.startswith('&[]*') and self._catch_assignment:
+				self._known_arrays[ target ] = self._catch_assignment['class']
+
+
 			if value.startswith('&(*') and '[' in value and ']' in value:  ## slice hack
 				v = value[1:]
 				return '_tmp := %s; %s := &_tmp;' %(v, target)
@@ -1061,6 +1081,8 @@ def visit_Assign(self, node):
 				v = value[1:]
 				return '_tmp := %s; %s = &_tmp;' %(v, target)
 			else:
+				#if value.startswith('&[]*') and self._catch_assignment:
+				#	raise SyntaxError(value)
 				return '%s = %s;' % (target, value)
 
 	def visit_While(self, node):
diff --git a/regtests/go/array_of_objects.py b/regtests/go/array_of_objects.py
new file mode 100644
index 0000000..c3fed7b
--- /dev/null
+++ b/regtests/go/array_of_objects.py
@@ -0,0 +1,34 @@
+'''array of objects'''
+class A: pass
+class B(A): pass
+class C(A): pass
+
+def push( arr:[]int, x:int ):
+    arr.append( x )
+
+def push2( arr:[]*A, x:*A ):
+    arr.append( x )
+
+def main():
+    arr = []int()
+    arr.append(1)
+    push( arr, 100)
+    TestError( len(arr)==2 )
+    print(arr)
+
+    a1 = A(); a2 = A(); a3 = A()
+    obarr = []A( a1, a2 )
+    print(obarr)
+
+    push2( obarr, a3 )
+    print(obarr)
+    TestError( len(obarr)==3 )
+
+    b1 = B()
+    print(b1)
+    #obarr.append( b1 )  ## fails
+
+    barr = []B( b1, )  ## todo single item array should not require `,`
+    c1 = C()
+    barr.append( c1 )
+    print(barr)
\ No newline at end of file
diff --git a/regtests/go/generics_mreturns.py b/regtests/go/generics_mreturns.py
index 7ce3aeb..76d1622 100644
--- a/regtests/go/generics_mreturns.py
+++ b/regtests/go/generics_mreturns.py
@@ -46,7 +46,7 @@ def my_generic( g:A ) ->int:
 	return g.bar()
 
 
-def main():
+def mainx():
 	a = A( 1000 )
 	b = B()
 	c = C()
@@ -86,3 +86,22 @@ def main():
 	TestError( my_generic(bbb)==y)
 
 
+def main():
+	a = A( 1000 )
+	b = B()
+	c = C()
+
+	## tests returning self
+	bb = b.some_subclass(b, false)
+	w = bb.bar()
+
+	cc = c.some_subclass(b, false)
+	w = cc.bar()
+
+
+	## tests returning other
+	ccc = b.some_subclass(c, true)
+	w = ccc.bar()
+
+	bbb = c.some_subclass(b, true)
+	w = bbb.bar()
diff --git a/regtests/go/generics_subcls_return_a_subcls.py b/regtests/go/generics_subcls_return_a_subcls.py
index d0dd11d..fec2372 100644
--- a/regtests/go/generics_subcls_return_a_subcls.py
+++ b/regtests/go/generics_subcls_return_a_subcls.py
@@ -68,7 +68,7 @@ def main():
 
 	## calling a method that has returns multiple subclasses with the result assigned to variable
 	## will generate a switch that enables methods
-	w = 0
+	#w = 0
 	## tests returning self
 	bb = b.some_subclass(b, false)
 	w = bb.bar()

From 77d1c8d90de5f683526884d08745955caecec72b Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Mon, 13 Oct 2014 15:29:02 -0700
Subject: [PATCH 51/58] fixed creating new class instances at global scope.

---
 pythonjs/pythonjs_to_go.py | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index d71819f..cebdd4f 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -478,7 +478,7 @@ def _visit_call_helper(self, node, force_name=None):
 			if type == 'self':
 				type = '&' + self._class_stack[-1].name
 			else:
-				type = '*' + type
+				type = '*' + type  ## TODO tests - should this be &
 			#return 'interface{}(%s).(%s)' %(self.visit(node.args[0]), type)
 			return '%s(*%s)' %(type, self.visit(node.args[0]) )
 
@@ -789,10 +789,16 @@ def _visit_function(self, node):
 			##out.append(self.indent() + '__type__ := __gen__.(object).getclassname()')
 
 
-			out.append(self.indent() + '__type__ := ""')
+			out.append(self.indent() + '__type__ := "INVALID"')
 			out.append(self.indent() + '__super__, __ok__ := __gen__.(object)')
+
+			#out.append(self.indent() + '__type__ = __super__.getclassname();')        ## TODO FIX ME
+			#out.append(self.indent() + 'fmt.Println(__type__); ')
+			#out.append(self.indent() + 'if __type__=="" { fmt.Println(__gen__.(object).__class__); }')
+
 			out.append(self.indent() + 'if __ok__ { __type__ = __super__.getclassname();')
 			out.append(self.indent() + '} else { fmt.Println("Gython RuntimeError - struct must implement the `object` interface"); }')
+
 			out.append(self.indent() + 'switch __type__ {')
 			#out.append(self.indent() + 'switch __gen__.(type) {')  ## this is not always correct
 			#out.append('fmt.Println("class name: ", __type__)')
@@ -846,7 +852,7 @@ def _visit_function(self, node):
 				self.pull()
 			self.pull()
 			out.append(self.indent() + '}')
-			out.append(self.indent() + 'fmt.Println("Generics RuntimeError - failed to convert type to:", __type__)')
+			out.append(self.indent() + 'fmt.Println("Generics RuntimeError - failed to convert type to:", __type__, __gen__)')
 			#out.append('fmt.Println(__gen__)')
 
 			if return_type == 'int':
@@ -1034,7 +1040,12 @@ def visit_Assign(self, node):
 
 		elif not self._function_stack:
 			value = self.visit(node.value)
-			return 'var %s = %s;' % (target, value)
+			#return 'var %s = %s;' % (target, value)
+			if isinstance(node.value, ast.Call) and isinstance(node.value.func, ast.Name) and node.value.func.id in self._classes:
+				value = '__new__' + value
+				return 'var %s *%s = %s;' % (target, node.value.func.id, value)
+			else:
+				return 'var %s = %s;' % (target, value)
 
 		elif isinstance(node.targets[0], ast.Name) and node.targets[0].id in self._vars:
 			value = self.visit(node.value)

From 20a6bc3aa6e5c848eb20db45484f3f0fdec2b742 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Wed, 22 Oct 2014 05:56:43 -0700
Subject: [PATCH 52/58] notes for `go.type_assert( A, self)` where A could be
 an empty interface or pointer to a struct, fails with hack using reflect and
 type switch because the Go compiler will not allow the case the invalid case
 (even if it never happens at runtime).  TODO: internally track the type of
 `A`, or run the output code two times through the Go compiler to see which
 variables are structs or interfaces from errors printed to stdout.

---
 pythonjs/pythonjs_to_go.py   | 83 ++++++++++++++++++++++++++++++++----
 regtests/go/generics_init.py | 43 +++++++++++++++++++
 2 files changed, 117 insertions(+), 9 deletions(-)
 create mode 100644 regtests/go/generics_init.py

diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index cebdd4f..940fc8d 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -9,6 +9,7 @@
 go_types = 'bool string int float64'.split()
 
 class GenerateGenericSwitch( SyntaxError ): pass
+class GenerateTypeAssert( SyntaxError ): pass
 
 def transform_gopherjs( node ):
 	gt = GopherjsTransformer()
@@ -71,6 +72,8 @@ def __init__(self, requirejs=False, insert_runtime=False):
 		self._known_arrays    = dict()
 		self._scope_stack = list()
 
+		self.interfaces = dict()
+
 	def visit_Is(self, node):
 		return '=='
 	def visit_IsNot(self, node):
@@ -152,6 +155,8 @@ def visit_ClassDef(self, node):
 		self._class_props[ node.name ] = props
 		if node.name not in self.method_returns_multiple_subclasses:
 			self.method_returns_multiple_subclasses[ node.name ] = set()
+		
+		self.interfaces[ node.name ] = set()
 
 
 		for base in node.bases:
@@ -203,6 +208,11 @@ def visit_ClassDef(self, node):
 					if v == 'interface': v = 'interface{}'
 					sdef[k] = v
 
+		for k in sdef:
+			v = sdef[k]
+			if v=='interface{}':
+				self.interfaces[node.name].add(k)
+
 		node._struct_def.update( sdef )
 		unionstruct = dict()
 		unionstruct.update( sdef )
@@ -367,6 +377,7 @@ def visit_Module(self, node):
 		header = [
 			'package main',
 			'import "fmt"',
+			'import "reflect"'
 		]
 		lines = []
 
@@ -474,13 +485,23 @@ def _visit_call_helper(self, node, force_name=None):
 		elif fname == 'len':
 			return 'len(*%s)' %self.visit(node.args[0])
 		elif fname == 'go.type_assert':
+			val = self.visit(node.args[0])
 			type = self.visit(node.args[1])
+			raise GenerateTypeAssert( {'type':type, 'value':val} )
+			## below is deprecated
 			if type == 'self':
-				type = '&' + self._class_stack[-1].name
+				## todo how to better mark interfaces, runtime type switch?
+				if '.' in type and type.split('.')[0]=='self' and type.split('.')[-1] in self.interfaces[self._class_stack[-1].name]:
+					val += '.(%s)' %self._class_stack[-1].name
+					return '&%s(%s)' %(type, val )
+				else:
+					type = '&' + self._class_stack[-1].name
 			else:
 				type = '*' + type  ## TODO tests - should this be &
 			#return 'interface{}(%s).(%s)' %(self.visit(node.args[0]), type)
-			return '%s(*%s)' %(type, self.visit(node.args[0]) )
+
+
+			return '%s(*%s)' %(type, val )
 
 
 		if node.args:
@@ -631,7 +652,37 @@ def visit_Return(self, node):
 		if isinstance(node.value, ast.Tuple):
 			return 'return %s' % ', '.join(map(self.visit, node.value.elts))
 		if node.value:
-			v = self.visit(node.value)
+			try:
+				v = self.visit(node.value)
+			except GenerateTypeAssert as err:
+				G = err[0]
+				type = G['type']
+				if type == 'self':
+					type = self._class_stack[-1].name
+
+
+				## This hack using reflect will not work for either case where the value
+				## maybe an empty interface, or a pointer to a struct, because it is known
+				## to the Go compiler if the value is an interface or pointer to struct,
+				## and will not allow the alternate case.
+				## case struct pointer:  invalid type assertion: __unknown__.(*A) (non-interface type *A on left)
+				## case empty interface: cannot convert __unknown__ (type interface {}) to type B: need type assertion
+				out = [
+					'__unknown__ := %s' %G['value'],
+					'switch reflect.TypeOf(__unknown__).Kind() {',
+					' case reflect.Interface:',
+					'    __addr := __unknown__.(*%s)' %type,
+					'    return __addr',
+					' case reflect.Ptr:',
+					'    __addr := %s(__unknown__)' %type,
+					'    return __addr',
+					'}'
+				]
+
+				return '\n'.join(out)
+
+
+
 			if v.startswith('&'):
 				return '_hack := %s; return &_hack' %v[1:]
 			else:
@@ -1131,12 +1182,26 @@ def main(script, insert_runtime=True):
 
 	g = GoGenerator()
 	g.visit(tree) # first pass gathers classes
-	return g.visit(tree)
-	try:
-		return GoGenerator().visit(tree)
-	except SyntaxError as err:
-		sys.stderr.write(script)
-		raise err
+	pass2 = g.visit(tree)
+
+	exe = os.path.expanduser('~/go/bin/go')
+	if not os.path.isfile(exe):
+		raise RuntimeError('go not found in ~/go/bin/go')
+
+	## TODO - parse output of build, checking for `need type assertion`, 
+	## and swap interface logic with struct conversion logic in pass3.
+	path = '/tmp/pass2.go'
+	open(path, 'wb').write( pass2 )
+	import subprocess
+	subprocess.check_call([exe, 'build', path], cwd='/tmp')
+
+	return pass2
+
+	#try:
+	#	return GoGenerator().visit(tree)
+	#except SyntaxError as err:
+	#	sys.stderr.write(script)
+	#	raise err
 
 
 
diff --git a/regtests/go/generics_init.py b/regtests/go/generics_init.py
new file mode 100644
index 0000000..2854e5b
--- /dev/null
+++ b/regtests/go/generics_init.py
@@ -0,0 +1,43 @@
+'''
+passing generic attribute to method
+'''
+class BaseA:
+	def __init__(self, x:int, g:BaseX):
+		int self.x = x
+		self.g = g
+
+	def foo( self ) -> self:
+		return self.bar( self.g )
+
+	def bar(self, g:BaseX) -> self:
+		if g.flag:
+			return go.type_assert(g.ob, self)
+		else:
+			return self
+
+
+class B( BaseA ): pass
+class C( BaseA ): pass
+
+class BaseX:
+	def __init__(self, f:bool):
+		bool self.flag = f
+		self.ob = None
+
+	#def get(self) ->BaseA:
+	#S	return self.ob
+
+class X( BaseX ): pass
+class Y( BaseX ): pass
+
+
+def main():
+	x = X(true)
+	y = Y(false)
+	b1 = B(1, x)
+	b2 = B(2, y)
+
+	x.ob = b2
+	y.ob = b1
+
+	print( b1.foo() )
\ No newline at end of file

From c4dc2626968381e39d2ad86b1610b05b11a9eecd Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Wed, 22 Oct 2014 16:15:54 -0700
Subject: [PATCH 53/58] fixed type assert an interface{} or struct pointer to
 some struct pointer type.

---
 pythonjs/pythonjs_to_go.py | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index 940fc8d..2f9543a 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -667,16 +667,21 @@ def visit_Return(self, node):
 				## and will not allow the alternate case.
 				## case struct pointer:  invalid type assertion: __unknown__.(*A) (non-interface type *A on left)
 				## case empty interface: cannot convert __unknown__ (type interface {}) to type B: need type assertion
+				#out = [
+				#	'__unknown__ := %s' %G['value'],
+				#	'switch reflect.TypeOf(__unknown__).Kind() {',
+				#	' case reflect.Interface:',
+				#	'    __addr := __unknown__.(*%s)' %type,
+				#	'    return __addr',
+				#	' case reflect.Ptr:',
+				#	'    __addr := %s(__unknown__)' %type,
+				#	'    return __addr',
+				#	'}'
+				#]
+
 				out = [
-					'__unknown__ := %s' %G['value'],
-					'switch reflect.TypeOf(__unknown__).Kind() {',
-					' case reflect.Interface:',
-					'    __addr := __unknown__.(*%s)' %type,
-					'    return __addr',
-					' case reflect.Ptr:',
-					'    __addr := %s(__unknown__)' %type,
-					'    return __addr',
-					'}'
+					'__addr := %s( %s )' %(type, G['value']),
+					'return __addr',
 				]
 
 				return '\n'.join(out)

From 14a7b1de8b9f25db7cff6849468a5ea8e3522498 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Thu, 6 Nov 2014 06:18:32 -0800
Subject: [PATCH 54/58] Generics: unpack an item from an array of subclasses,
 and generate switch in the caller to convert the item back to the correct
 subclass.

---
 pythonjs/pythonjs_to_go.py      | 103 ++++++++++++++++++++++----------
 pythonjs/runtime/go_builtins.py |   2 +
 regtests/go/array_of_objects.py |  38 ++++++++++--
 3 files changed, 106 insertions(+), 37 deletions(-)

diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index 2f9543a..d3fba82 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -73,6 +73,12 @@ def __init__(self, requirejs=False, insert_runtime=False):
 		self._scope_stack = list()
 
 		self.interfaces = dict()
+		self.uids = 0
+		self.unodes = dict()
+
+	def uid(self):
+		self.uids += 1
+		return self.uids
 
 	def visit_Is(self, node):
 		return '=='
@@ -289,8 +295,12 @@ def visit_ClassDef(self, node):
 			out.append('}')
 
 		else:
-			out.append( 'func __new__%s() *%s { return &%s{} }' %(node.name, node.name, node.name))
-
+			#out.append( 'func __new__%s() *%s { return &%s{} }' %(node.name, node.name, node.name))
+			out.append( 'func __new__%s() *%s {' %(node.name, node.name))
+			out.append( '  ob := %s{}' %node.name )
+			out.append( '  ob.__class__ = "%s"' %node.name)
+			out.append( '  return &ob')
+			out.append('}')
 
 
 
@@ -313,25 +323,25 @@ def _visit_call_special( self, node ):
 		return self._visit_call_helper(node, force_name=name)
 
 
-	def _visit_subscript_ellipsis(self, node):
-		name = self.visit(node.value)
-		#return '%s["$wrapped"]' %name
-		raise NotImplementedError
-
-
 	def visit_Subscript(self, node):
 		if isinstance(node.slice, ast.Ellipsis):
-			if self._glsl:
-				#return '%s[_id_]' % self.visit(node.value)
-				return '%s[matrix_index()]' % self.visit(node.value)
-			else:
-				return self._visit_subscript_ellipsis( node )
+			raise NotImplementedError( 'ellipsis')
 		else:
 			## deference pointer and then index
 			if isinstance(node.slice, ast.Slice):
-				return '&(*%s)[%s]' % (self.visit(node.value), self.visit(node.slice))
+				r = '&(*%s)[%s]' % (self.visit(node.value), self.visit(node.slice))
 			else:
-				return '(*%s)[%s]' % (self.visit(node.value), self.visit(node.slice))
+				r = '(*%s)[%s]' % (self.visit(node.value), self.visit(node.slice))
+
+			if isinstance(node.value, ast.Name) and node.value.id in self._known_arrays:
+				target = node.value.id
+				#value = self.visit( node.value )
+				cname = self._known_arrays[target]
+				#raise GenerateGenericSwitch( {'target':target, 'value':r, 'class':cname} )
+				raise GenerateGenericSwitch( {'value':r, 'class':cname} )
+
+			return r
+
 
 
 	def visit_Slice(self, node):
@@ -377,7 +387,7 @@ def visit_Module(self, node):
 		header = [
 			'package main',
 			'import "fmt"',
-			'import "reflect"'
+			#'import "reflect"'
 		]
 		lines = []
 
@@ -679,10 +689,23 @@ def visit_Return(self, node):
 				#	'}'
 				#]
 
-				out = [
-					'__addr := %s( %s )' %(type, G['value']),
-					'return __addr',
-				]
+				if not hasattr(node.value, 'uid'):
+					node.value.uid = self.uid()
+
+				id = '__magic__%s' % node.value.uid
+				if id not in self.unodes: self.unodes[ id ] = node.value
+
+				if hasattr(node.value, 'is_struct_pointer'):
+
+					out = [
+						'%s := %s( *%s )' %(id, type, G['value']),
+						'return &%s' %id,
+					]
+				else:
+					out = [
+						'%s := %s.( *%s )' %(id, G['value'], type),
+						'return %s' %id,
+					]
 
 				return '\n'.join(out)
 
@@ -983,8 +1006,14 @@ def generate_generic_branches(self, body, out, force_vars, force_used_vars):
 				#out.append('/*	stack len: %s*/' %len(self._scope_stack))
 				#out.append('/*	stack: %s*/' %self._scope_stack)
 
-
 				G = err[0]
+				if 'target' not in G:
+					if isinstance(b, ast.Assign):
+						G['target'] = self.visit(b.targets[0])
+				else:
+					raise SyntaxError('no target to generate generic switch')
+
+
 				out.append(self.indent()+'__subclass__ := %s' %G['value'])
 				out.append(self.indent()+'switch __subclass__.__class__ {')
 				self.push()
@@ -1193,20 +1222,30 @@ def main(script, insert_runtime=True):
 	if not os.path.isfile(exe):
 		raise RuntimeError('go not found in ~/go/bin/go')
 
-	## TODO - parse output of build, checking for `need type assertion`, 
-	## and swap interface logic with struct conversion logic in pass3.
+	## this hack runs the code generated in the second pass into the Go compiler to check for errors,
+	## where an interface could not be type asserted, because Go found that the variable was not an interface,
+	## parsing the errors from `go build` and matching the magic ids, in self.unodes on the node is set
+	## `is_struct_pointer`, this triggers different code to be generated in the 3rd pass.
+	## the Gython translator also has the same type information as Go, but it is simpler to use this hack.
+	import subprocess
+	pass2lines = pass2.splitlines()
 	path = '/tmp/pass2.go'
 	open(path, 'wb').write( pass2 )
-	import subprocess
-	subprocess.check_call([exe, 'build', path], cwd='/tmp')
-
-	return pass2
+	p = subprocess.Popen([exe, 'build', path], cwd='/tmp', stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+	errors = p.stderr.read().splitlines()
+	if len(errors):
+		for line in errors:
+			if 'invalid type assertion' in line:
+				if 'non-interface type' in line:
+					lineno = int( line.split(':')[1] )
+					src = pass2lines[ lineno-1 ]
+					assert '__magic__' in src
+					id = src.strip().split()[0]
+					g.unodes[id].is_struct_pointer = True
+				else:
+					raise SyntaxError(line)
 
-	#try:
-	#	return GoGenerator().visit(tree)
-	#except SyntaxError as err:
-	#	sys.stderr.write(script)
-	#	raise err
+	return g.visit(tree) ## pass3
 
 
 
diff --git a/pythonjs/runtime/go_builtins.py b/pythonjs/runtime/go_builtins.py
index 585f4a8..52c0758 100644
--- a/pythonjs/runtime/go_builtins.py
+++ b/pythonjs/runtime/go_builtins.py
@@ -18,6 +18,8 @@
 	return self.__class__
 }
 
+
+
 func ord(x string) int {
 	r := []rune(x)
 	return int(r[0])
diff --git a/regtests/go/array_of_objects.py b/regtests/go/array_of_objects.py
index c3fed7b..32cc8ac 100644
--- a/regtests/go/array_of_objects.py
+++ b/regtests/go/array_of_objects.py
@@ -1,7 +1,14 @@
 '''array of objects'''
-class A: pass
-class B(A): pass
-class C(A): pass
+class A:
+    def foo(self) -> string:
+        return 'xxxx'
+class B(A):
+    def foo(self) -> string:
+        return 'hello'
+class C(A):
+    def foo(self) -> string:
+        return 'world'
+
 
 def push( arr:[]int, x:int ):
     arr.append( x )
@@ -9,6 +16,10 @@ def push( arr:[]int, x:int ):
 def push2( arr:[]*A, x:*A ):
     arr.append( x )
 
+def my_generic( s:A ):
+    print( s.foo() )
+
+
 def main():
     arr = []int()
     arr.append(1)
@@ -26,9 +37,26 @@ def main():
 
     b1 = B()
     print(b1)
-    #obarr.append( b1 )  ## fails
+    #obarr.append( b1 )  ## fails because subclasses can not be cast to their base class
 
+    #################################################
     barr = []B( b1, )  ## todo single item array should not require `,`
     c1 = C()
     barr.append( c1 )
-    print(barr)
\ No newline at end of file
+    print(barr)
+
+    bb = barr[0]
+    print('bb:', bb)
+    print(bb.foo())
+
+    cc = barr[1]
+    print('cc:', cc)
+    print(cc.foo())
+
+    #ccc = go.type_assert( cc, C )
+    #print(ccc.foo())
+
+    print('testing generic')
+    for subclass in barr:
+        print('subclass in bar:', subclass)
+        my_generic(subclass)
\ No newline at end of file

From 5c8395d6a0e1c3cbc1833af3c40f411d709fc2d7 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Thu, 6 Nov 2014 07:18:42 -0800
Subject: [PATCH 55/58] Generics: only warn about failed return at runtime when
 the function actually returns something.

---
 pythonjs/pythonjs_to_go.py      | 6 ++++--
 regtests/go/array_of_objects.py | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index d3fba82..00db912 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -931,8 +931,10 @@ def _visit_function(self, node):
 				self.pull()
 			self.pull()
 			out.append(self.indent() + '}')
-			out.append(self.indent() + 'fmt.Println("Generics RuntimeError - failed to convert type to:", __type__, __gen__)')
-			#out.append('fmt.Println(__gen__)')
+
+			## this only helps with debugging when the generic function is expected to return something
+			if return_type:
+				out.append(self.indent() + 'fmt.Println("Generics RuntimeError - failed to convert type to:", __type__, __gen__)')
 
 			if return_type == 'int':
 				out.append(self.indent() + 'return 0')
diff --git a/regtests/go/array_of_objects.py b/regtests/go/array_of_objects.py
index 32cc8ac..08e247d 100644
--- a/regtests/go/array_of_objects.py
+++ b/regtests/go/array_of_objects.py
@@ -56,7 +56,7 @@ def main():
     #ccc = go.type_assert( cc, C )
     #print(ccc.foo())
 
-    print('testing generic')
+    print('----testing generic----')
     for subclass in barr:
         print('subclass in bar:', subclass)
         my_generic(subclass)
\ No newline at end of file

From 83f048badee5de65ee4fc7e5d487b28ed0bd1161 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Thu, 6 Nov 2014 09:38:25 -0800
Subject: [PATCH 56/58] Generics: fixed when the generic has been forced to be
 of some subclass, and infact its another subclass type, when passed to a
 generic function, if the first switch case that switches on the struct name
 fails, then fallback to using a `switch X.(type)` to convert to the struct
 type that the Go compiler thinks it is, and then force it to be of the
 subclass type that was known by the first switch (the embedded struct name)

---
 pythonjs/pythonjs_to_go.py | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index 00db912..0cf26c8 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -729,6 +729,7 @@ def _visit_function(self, node):
 		args_typedefs = {}
 		chan_args_typedefs = {}
 		return_type = None
+		generic_base_class = None
 		generics = set()
 		args_generics = dict()
 		returns_self = False
@@ -751,6 +752,7 @@ def _visit_function(self, node):
 							#self._class_stack[-1]._struct_def[ key.arg ] = 'interface{}'
 						else:
 							classname = args_typedefs[ key.arg ]
+							generic_base_class = classname
 							generics.add( classname ) # switch v.(type) for each
 							generics = generics.union( self._classes[classname]._subclasses )
 							args_typedefs[ key.arg ] = 'interface{}'
@@ -925,9 +927,39 @@ def _visit_function(self, node):
 
 						out.append( self.indent() + v )
 
-				out.append(self.indent() + '} else { fmt.Println("Generics RuntimeError - generic argument is not a pointer to a struct", %s); fmt.Println("struct: ",__gen__);}' %gname)
-
+				out.append(self.indent() + '} else {' )
+				if generic_base_class == gt:
+					out.append(' fmt.Println("Generics RuntimeError - generic argument is not a pointer to a struct", %s);' %gname)
+					out.append(' fmt.Println("struct: ",__gen__);' )
+				else:
+					# __gen__.(C).foo();
+					# this fails because the go compiler thinks that __gen__ is *B, when infact its *C
+					# panic: interface conversion: interface is *main.B, not *main.C,
+					# workaround: switch on type go thinks it is, and then recast to the real type.
+					# s := C( *__gen__.(*B) )
+					self.push()
+					out.append( self.indent() + 'switch __gen__.(type) {' )
+					self.push()
+					for gt2 in gsorted:
+						if gt2 != gt:
+							out.append(self.indent() + 'case *%s:' %gt2)
+							self.push()
+							if gt2 == generic_base_class:
+								## TODO panic here
+								out.append(' fmt.Println("Generics RuntimeError - can not cast base class to a subclass type", %s);' %gname)
+							else:
+								out.append(self.indent() + '%s := %s( *__gen__.(*%s) )' %(gname, gt, gt2) )
+								for b2 in node.body:
+									v = self.visit(b2)
+									if v:
+										out.append( self.indent() + v )
+
+							self.pull()
 
+					self.pull()
+					out.append(self.indent() + '}')
+					self.pull()
+				out.append(self.indent() + '}')
 				self.pull()
 			self.pull()
 			out.append(self.indent() + '}')

From 464bb8c696a05fb011305e1d243b23f2a280a3d9 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Thu, 6 Nov 2014 10:04:41 -0800
Subject: [PATCH 57/58] Generics: fixed when returning self.

---
 pythonjs/pythonjs_to_go.py      | 29 +++++++++++++++++------------
 regtests/go/generics_methods.py |  9 +++++++++
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
index 0cf26c8..3463001 100644
--- a/pythonjs/pythonjs_to_go.py
+++ b/pythonjs/pythonjs_to_go.py
@@ -916,19 +916,12 @@ def _visit_function(self, node):
 				for b in node.body:
 					v = self.visit(b)
 					if v:
-						## TODO - fix - this breaks easily
-						if v.strip().startswith('return ') and '*'+gt != return_type:
-							if gname in v and v.strip() != 'return self' and returns_self:
-								if '(' not in v:
-									v += '.(%s)' %return_type
-									#if v.split('return ')[-1].strip()==gname:
-									v = v.replace(gname, '__gen__')
-									self.method_returns_multiple_subclasses[ self._class_stack[-1].name ].add(node.name)
-
+						if returns_self:
+							v = self._hack_return(v, return_type, gname, gt, node)
 						out.append( self.indent() + v )
 
 				out.append(self.indent() + '} else {' )
-				if generic_base_class == gt:
+				if generic_base_class == gt or returns_self:
 					out.append(' fmt.Println("Generics RuntimeError - generic argument is not a pointer to a struct", %s);' %gname)
 					out.append(' fmt.Println("struct: ",__gen__);' )
 				else:
@@ -952,6 +945,8 @@ def _visit_function(self, node):
 								for b2 in node.body:
 									v = self.visit(b2)
 									if v:
+										#if returns_self:
+										#	v = self._hack_return(v, return_type, gname, gt, node)
 										out.append( self.indent() + v )
 
 							self.pull()
@@ -994,6 +989,16 @@ def _visit_function(self, node):
 		out.append( self.indent()+'}' )
 		return '\n'.join(out)
 
+	def _hack_return(self, v, return_type, gname, gt, node):
+		## TODO - fix - this breaks easily
+		if v.strip().startswith('return ') and '*'+gt != return_type:
+			if gname in v and v.strip() != 'return self':
+				if '(' not in v:
+					v += '.(%s)' %return_type
+					v = v.replace(gname, '__gen__')
+					self.method_returns_multiple_subclasses[ self._class_stack[-1].name ].add(node.name)
+		return v
+
 	def generate_generic_branches(self, body, out, force_vars, force_used_vars):
 		#out.append('/* GenerateGeneric */')
 		#out.append('/*vars: %s*/' %self._vars)
@@ -1044,8 +1049,8 @@ def generate_generic_branches(self, body, out, force_vars, force_used_vars):
 				if 'target' not in G:
 					if isinstance(b, ast.Assign):
 						G['target'] = self.visit(b.targets[0])
-				else:
-					raise SyntaxError('no target to generate generic switch')
+					else:
+						raise SyntaxError('no target to generate generic switch')
 
 
 				out.append(self.indent()+'__subclass__ := %s' %G['value'])
diff --git a/regtests/go/generics_methods.py b/regtests/go/generics_methods.py
index 62d8a95..b4616f6 100644
--- a/regtests/go/generics_methods.py
+++ b/regtests/go/generics_methods.py
@@ -1,24 +1,31 @@
 class G:
 	def method(self):
+		print 'calling G.method'
 		print 'hi'
 
 class H( G ):
 	def method(self):
+		print 'calling H.method'
 		print 'world'
 
 class A:
 	def __init__(self, a:G):
+		print 'A.__init__'
+		print(a)
 		self.x = a
 
 	def call(self):
+		print 'A.call'
 		self.f( self.x )
 
 	def f(self, a:G):
+		print 'A.f'
 		print(a)
 
 
 class B( A ):
 	def f(self, g:G):
+		print 'B.f'
 		g.method()
 
 
@@ -29,5 +36,7 @@ def main():
 	b1 = B( g )
 	b2 = B( h )
 
+	print('----------test1 b1 (g)')
 	b1.call()
+	print('----------test2 b2 (h)')
 	b2.call()
\ No newline at end of file

From 52f49260f29582dc3274da77a9aaead142cfae32 Mon Sep 17 00:00:00 2001
From: hartsantler <goatman.py@gmail.com>
Date: Fri, 21 Nov 2014 08:45:08 -0800
Subject: [PATCH 58/58] making sure bug 148 is fixed, `[0][0]`

---
 pythonjs/typedpython.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pythonjs/typedpython.py b/pythonjs/typedpython.py
index 3b3ad49..6739c0a 100644
--- a/pythonjs/typedpython.py
+++ b/pythonjs/typedpython.py
@@ -571,6 +571,10 @@ def mappass( a:map[string]int ):
 	"z":z
 }
 
+def f():
+    return [[0]]
+print f()[0][0]
+
 '''
 
 if __name__ == '__main__':