lua backend: improved list implementation, support for simple classes.

hartsantler · hartsantler · commit a6d3f52799d5 · 2014-02-06T23:43:51.000-08:00
diff --git a/pythonjs.js b/pythonjs.js
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
@@ -172,6 +172,7 @@ class PythonToPythonJS(NodeVisitor):
 	def __init__(self, source=None, module=None, module_path=None, dart=False, coffee=False, lua=False):
 		super(PythonToPythonJS, self).__init__()
 
+		self._with_ll = False   ## lowlevel
 		self._with_lua = lua
 		self._with_coffee = coffee
 		self._with_dart = dart
@@ -380,7 +381,7 @@ def visit_Dict(self, node):
 			v = self.visit( node.values[i] )
 			if self._with_js:
 				a.append( '[%s,%s]'%(k,v) )
-			elif self._with_dart:
+			elif self._with_dart or self._with_ll:
 				a.append( '%s:%s'%(k,v) )
 				#if isinstance(node.keys[i], ast.Str):
 				#	a.append( '%s:%s'%(k,v) )
@@ -392,7 +393,7 @@ def visit_Dict(self, node):
 		if self._with_js:
 			b = ','.join( a )
 			return '__jsdict( [%s] )' %b
-		elif self._with_dart:
+		elif self._with_dart or self._with_ll:
 			b = ','.join( a )
 			return '{%s}' %b
 		else:
@@ -411,6 +412,8 @@ def visit_Tuple(self, node):
 	def visit_List(self, node):
 		node.returns_type = 'list'
 		a = '[%s]' % ', '.join(map(self.visit, node.elts))
+		if self._with_lua:
+			a = '__get__(list, "__call__")({}, {pointer:%s, length:%s})'%(a, len(node.elts))
 		return a
 
 	def visit_GeneratorExp(self, node):
@@ -513,7 +516,35 @@ def visit_AugAssign(self, node):
 		op = '%s=' %self.visit( node.op )
 
 		typedef = self.get_typedef( node.target )
-		if typedef and op in typedef.operators:
+
+		if self._with_lua:
+			if op == '+=':
+				a = '__add__(%s,%s)' %(target, self.visit(node.value))
+			elif op == '-=':
+				a = '__sub__(%s,%s)' %(target, self.visit(node.value))
+			elif op == '*=':
+				a = '__mul__(%s,%s)' %(target, self.visit(node.value))
+			elif op == '/=':
+				a = '__div__(%s,%s)' %(target, self.visit(node.value))
+			elif op == '%=':
+				a = '__mod__(%s,%s)' %(target, self.visit(node.value))
+			elif op == '&=':
+				a = '__and__(%s,%s)' %(target, self.visit(node.value))
+			elif op == '|=':
+				a = '__or__(%s,%s)' %(target, self.visit(node.value))
+			elif op == '^=':
+				a = '__xor__(%s,%s)' %(target, self.visit(node.value))
+			elif op == '<<=':
+				a = '__lshift__(%s,%s)' %(target, self.visit(node.value))
+			elif op == '>>=':
+				a = '__rshift__(%s,%s)' %(target, self.visit(node.value))
+			else:
+				raise NotImplementedError
+
+			writer.write('%s=%s' %(target,a))
+
+
+		elif typedef and op in typedef.operators:
 			func = typedef.operators[ op ]
 			a = '%s( [%s, %s] )' %(func, target, self.visit(node.value))
 			writer.write( a )
@@ -793,13 +824,13 @@ def visit_ClassDef(self, node):
 				if item_name in self._decorator_properties:
 					pass
 				else:
-					writer.write('__%s_attrs["%s"] = %s' % (name, item_name, item.name))
+					writer.write('__%s_attrs.%s = %s' % (name, item_name, item.name))
 
 			elif isinstance(item, Assign) and isinstance(item.targets[0], Name):
 				item_name = item.targets[0].id
 				item.targets[0].id = '__%s_%s' % (name, item_name)
 				self.visit(item)  # this will output the code for the assign
-				writer.write('__%s_attrs["%s"] = %s' % (name, item_name, item.targets[0].id))
+				writer.write('__%s_attrs.%s = %s' % (name, item_name, item.targets[0].id))
 				self._class_attributes[ name ].add( item_name )  ## should this come before self.visit(item) ??
 			elif isinstance(item, Pass):
 				pass
@@ -813,7 +844,7 @@ def visit_ClassDef(self, node):
 						item_name = sub.targets[0].id
 						sub.targets[0].id = '__%s_%s' % (name, item_name)
 						self.visit(sub)  # this will output the code for the assign
-						writer.write('__%s_attrs["%s"] = %s' % (name, item_name, sub.targets[0].id))
+						writer.write('__%s_attrs.%s = %s' % (name, item_name, sub.targets[0].id))
 						self._class_attributes[ name ].add( item_name )  ## should this come before self.visit(item) ??
 					else:
 						raise NotImplementedError( sub )
@@ -836,7 +867,7 @@ def visit_ClassDef(self, node):
 		self._instances.pop('self')
 		self._in_class = False
 
-		writer.write('%s = create_class("%s", __%s_parents, __%s_attrs, __%s_properties)' % (name, name, name, name, name))
+		writer.write('%s = __create_class__("%s", __%s_parents, __%s_attrs, __%s_properties)' % (name, name, name, name, name))
 		if 'init' in self._injector:
 			writer.write('%s.init_callbacks = JSArray()' %name)
 		self._injector = []
@@ -1194,7 +1225,7 @@ def visit_Subscript(self, node):
 			#return '%s["$wrapped"]' %name
 			return '%s[...]' %name
 
-		elif self._with_lua:
+		elif self._with_ll:
 			return '%s[ %s ]' %(name, self.visit(node.slice))
 
 		elif self._with_js or self._with_dart:
@@ -1271,7 +1302,7 @@ def _visit_assign_helper(self, node, target):
 				#code = '%s["$wrapped"] = %s' %(self.visit(target.value), self.visit(node.value))
 				code = '%s[...] = %s' %(self.visit(target.value), self.visit(node.value))
 
-			elif self._with_dart:
+			elif self._with_dart or self._with_ll:
 				code = '%s[ %s ] = %s'
 				code = code % (self.visit(target.value), self.visit(target.slice.value), self.visit(node.value))
 
@@ -1320,8 +1351,8 @@ def _visit_assign_helper(self, node, target):
 					setter = parent_prop.properties[target.attr]['set']
 					writer.write( '%s( [%s, %s], JSObject() )' %(setter, target_value, self.visit(node.value)) )
 
-				elif parent_classattr:  ## TODO fix get/set class attributes
-					writer.write( "__%s_attrs['%s'] = %s" %(parent_classattr.name, target.attr, self.visit(node.value)) )
+				elif parent_classattr:
+					writer.write( "__%s_attrs.%s = %s" %(parent_classattr.name, target.attr, self.visit(node.value)) )
 
 				elif parent_setattr:
 					func = parent_setattr.get_pythonjs_function_name( '__setattr__' )
@@ -2024,8 +2055,6 @@ def visit_FunctionDef(self, node):
 		#####################################################################
 		if self._with_dart:
 			pass
-		#elif self._with_coffee:
-		#	pass
 
 		elif self._with_js or javascript:
 			if node.args.defaults:
@@ -2057,7 +2086,7 @@ def visit_FunctionDef(self, node):
 					default_value = self.visit( node.args.defaults[dindex] )
 					writer.write("%s = kwargs.%s or %s" % (arg.id, arg.id, default_value))
 				else:
-					writer.write( "%s = args[ %s ]" %(arg.id, i) )
+					writer.write( "%s = args[ %s ]" %(arg.id, i+1) )
 
 		elif len(node.args.defaults) or len(node.args.args) or node.args.vararg or node.args.kwarg:
 			# First check the arguments are well formed 
@@ -2442,7 +2471,11 @@ def visit_While(self, node):
 		writer.pull()
 
 	def visit_With(self, node):
-		if isinstance( node.context_expr, Name ) and node.context_expr.id == 'javascript':
+		if isinstance( node.context_expr, Name ) and node.context_expr.id == 'lowlevel':
+			self._with_ll = True
+			map(self.visit, node.body)
+			self._with_ll = False
+		elif isinstance( node.context_expr, Name ) and node.context_expr.id == 'javascript':
 			self._with_js = True
 			writer.with_javascript = True
 			map(self.visit, node.body)
diff --git a/pythonjs/pythonjs_to_lua.py b/pythonjs/pythonjs_to_lua.py
@@ -31,6 +31,10 @@ class LuaGenerator( pythonjs.JSGenerator ):
 	_classes = dict()
 	_class_props = dict()
 
+	def _visit_subscript_ellipsis(self, node):
+		name = self.visit(node.value)
+		return '%s.__wrapped__' %name
+
 	def visit_Name(self, node):
 		if node.id == 'None':
 			return 'nil'
@@ -53,7 +57,7 @@ def visit_Subscript(self, node):
 		if isinstance(node.slice, ast.Ellipsis):
 			return self._visit_subscript_ellipsis( node )
 		else:
-			return '%s[%s+1]' % (self.visit(node.value), self.visit(node.slice))
+			return '%s[%s]' % (self.visit(node.value), self.visit(node.slice))
 
 	def _visit_call_helper_JSObject(self, node):
 		if node.keywords:
@@ -103,9 +107,7 @@ def visit_While(self, node):
 		self.pull()
 		return '\n'.join( body )
 
-	def _visit_subscript_ellipsis(self, node):
-		name = self.visit(node.value)
-		return '%s.$wrapped' %name
+
 
 	def visit_Pass(self, node):
 		return '###pass###'
diff --git a/regtests/list/index.py b/regtests/list/index.py
@@ -0,0 +1,7 @@
+"""list indices"""
+def main():
+	a = [1,2,3,4]
+	idx = 1
+	TestError( a[0]==1 )
+	TestError( a[idx]==2 )
+	TestError( a.index(3)==2 )
diff --git a/regtests/list/setitem.py b/regtests/list/setitem.py
@@ -0,0 +1,14 @@
+"""setitem and append"""
+def main():
+	a = [1,2,3,4]
+	idx = 1
+	TestError( a[0]==1 )
+	TestError( a[idx]==2 )
+
+	a[ 0 ] = 'hello'
+	a[ 1 ] = 'world'
+	TestError( a[0]=='hello' )
+	TestError( a[1]=='world' )
+
+	a.append( 'xxx' )
+	TestError( a[4]=='xxx' )
diff --git a/runtime/builtins.py b/runtime/builtins.py
@@ -188,7 +188,7 @@ def __sprintf(fmt, args):
 				arr.append( Object.prototype.toString.call(item) )
 		return ''.join(arr)
 
-	def create_class(class_name, parents, attrs, props):
+	def __create_class__(class_name, parents, attrs, props):
 		"""Create a PythonScript class"""
 		if attrs.__metaclass__:
 			metaclass = attrs.__metaclass__
diff --git a/runtime/lua_builtins.py b/runtime/lua_builtins.py
@@ -1,12 +1,84 @@
 JS("""
 __NULL_OBJECT__ = {}
 
+__concat_tables_array = function(t1, t2)
+	for i=1,#t2 do
+		t1[ #t1+1 ] = t2[i]
+	end
+	return t1
+end
+
+__concat_tables = function(t1, t2)
+	for k,v in pairs(t2) do
+		t1[k] = v
+	end
+	return t1
+end
+
+__test_if_true__ = function( x )
+	if x == 0 then
+		return false
+	elseif x == nil then
+		return false
+	else
+		return true
+	end
+end
+
 __get__ = function(ob, name)
 	if name == '__call__' then
-		return ob
+		if type(ob)=='function' then
+			return ob
+		else
+			return ob.__call__
+		end
+	elseif name == '__iter__' then
+		local iter = {
+			index = 1,
+			length = #ob,
+			object = ob,
+			next_fast = function(self)
+				local x = self.object[ self.index ]
+				self.index = self.index + 1
+				return x
+			end
+		}
+		return iter
+	else
+		return ob[ name ]
 	end
 end
 
+__create_class__ = function(class_name, parents, attrs, props)
+	local class = {
+		__bases__ = parents,
+		__name__ = class_name,
+		__properties__ = props,
+		__attributes__ = attrs
+	}
+	function class.__call__( args, kwargs )
+		object = {
+			__class__ = class,
+			__dict__ = 'TODO'
+		}
+		for k,v in pairs(attrs) do
+			if type(v)=='function' then
+				object[ k ] = function(_args, _kwargs)
+					a = {object}
+					return v(__concat_tables_array(a, _args), _kwargs)
+				end
+			else
+				object[ k ] = v
+			end
+		end
+		a = {object}
+		attrs.__init__( __concat_tables_array(a, args), kwargs )
+		return object
+	end
+	return class
+end
+
+
 __add_op = function(a,b)
 	if type(a) == 'string' then
 		return a .. b
@@ -15,6 +87,14 @@
 	end
 end
 
+__add__ = function(a,b)
+	if type(a) == 'string' then
+		return a .. b
+	else
+		return a + b
+	end
+end
+
 """)
 
 def str(ob):
@@ -25,3 +105,52 @@ def int(ob):
 
 def float(ob):
 	return tonumber(ob)
+
+class list:
+	'''
+	Array length in Lua must be manually tracked, because a normal for loop will not
+	properly loop over a sparse Array with nil holes.
+	'''
+	def __init__(self, items, pointer=None, length=0):
+		with lowlevel:
+			self.length = length
+			if pointer:
+				self[...] = pointer
+			else:
+				self[...] = {}
+
+	def __getitem__(self, index):
+		with lowlevel:
+			if index < 0:
+				index = self.length + index
+			return self[...][index+1]
+
+	def __setitem__(self, index, value):
+		with lowlevel:
+			if index < 0:
+				index = self.length + index
+			self[...][index+1] = value
+
+	def __getslice__(self, start, stop, step):
+		if stop == null and step == null:
+			return self[...].sublist( start )
+		elif stop < 0:
+			stop = self[...].length + stop
+			return self[...].sublist(start, stop)
+
+	def __add__(self, other):
+		for item in other:
+			self.append( item )
+
+	def append(self, item):
+		with lowlevel:
+			self.length += 1
+			self[...][ self.length ] = item
+
+	def index(self, obj):
+		with lowlevel:
+			i = 1
+			while i < self.length:
+				if self[...][i] == obj:
+					return i
+				i += 1
