lua backend: added dict.keys and dict.items, for x in list __contains__ for list, multiple target for loops for x,y in list. new regression tests.

hartsantler · hartsantler · commit 34784b253f91 · 2014-02-08T12:25:55.000-08:00
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
@@ -412,7 +412,9 @@ 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:
+		if self._with_ll:
+			pass
+		elif self._with_lua:
 			a = '__get__(list, "__call__")({}, {pointer:%s, length:%s})'%(a, len(node.elts))
 		return a
 
@@ -1819,7 +1821,7 @@ def visit_Call(self, node):
 			#		return '%s()' %name
 
 			## special method calls ##
-			if isinstance(node.func, ast.Attribute) and node.func.attr in ('get', 'keys', 'values', 'pop', 'items'):
+			if isinstance(node.func, ast.Attribute) and node.func.attr in ('get', 'keys', 'values', 'pop', 'items') and not self._with_lua:
 				anode = node.func
 				if anode.attr == 'get':
 					if args:
@@ -1845,7 +1847,7 @@ def visit_Call(self, node):
 				else:
 					return '%s(%s)' %( self.visit(node.func), args )
 
-			elif isinstance(node.func, ast.Attribute) and isinstance(node.func.value, Name) and node.func.value.id in self._func_typedefs:
+			elif not self._with_lua and not self._with_dart and isinstance(node.func, ast.Attribute) and isinstance(node.func.value, Name) and node.func.value.id in self._func_typedefs:
 				type = self._func_typedefs[ node.func.value.id ]
 				if type == 'list' and node.func.attr == 'append':
 					return '%s.push(%s)' %(node.func.value.id, self.visit(node.args[0]))
@@ -2454,7 +2456,10 @@ def visit_For(self, node):
 				if multi_target:
 					writer.write('__mtarget__ = __next__()')
 					for i,elt in enumerate(multi_target):
-						writer.write('%s = __mtarget__[%s]' %(elt,i))
+						if self._with_lua:
+							writer.write('%s = __mtarget__[...][%s]' %(elt,i+1))
+						else:
+							writer.write('%s = __mtarget__[%s]' %(elt,i))
 				else:
 					writer.write('%s = __next__()' % target.id)
 
diff --git a/pythonjs/pythonjs_to_lua.py b/pythonjs/pythonjs_to_lua.py
@@ -153,7 +153,14 @@ def visit_ClassDef(self, node):
 		raise NotImplementedError
 
 	def visit_For(self, node):
-		a = ['for __i,%s in pairs(%s) do' %(self.visit(node.target), self.visit(node.iter))]
+		if isinstance(node.target, ast.Name):
+			a = ['for __i,%s in pairs(%s) do' %(self.visit(node.target), self.visit(node.iter))]
+		elif isinstance(node.target, ast.List):
+			x = ','.join([self.visit(elt) for elt in node.target.elts])
+			a = ['for %s in %s do' %(x, self.visit(node.iter))]
+		else:
+			raise SyntaxError( node.target )
+
 		for n in node.body:
 			a.append( self.visit(n) )
 		a.append('end')
diff --git a/regtests/dict/keys.py b/regtests/dict/keys.py
@@ -0,0 +1,7 @@
+"""dict.keys()"""
+
+def main():
+	a = {'foo':'bar'}
+	keys = a.keys()
+	TestError( 'foo' in keys )
+
diff --git a/regtests/list/contains.py b/regtests/list/contains.py
@@ -0,0 +1,4 @@
+"""if x in list"""
+def main():
+	a = ['foo', 'bar']
+	TestError( 'foo' in a )
diff --git a/regtests/loop/for_loop.py b/regtests/loop/for_loop.py
@@ -14,12 +14,12 @@ def main():
 	arr = ['a', 'b', 'c']
 	for v in arr:
 		z += v
-
 	TestError( z == 'abc' )
 
 	b = False
 	if 'a' in arr:
 		b = True
+	TestError( b == True )
 
 	s = 'hello world'
 	z = ''
diff --git a/runtime/lua_builtins.py b/runtime/lua_builtins.py
@@ -209,6 +209,13 @@ def __init__(self, items, pointer=None, length=0):
 			else:
 				self[...] = {}
 
+	def __contains__(self, value):
+		with lowlevel:
+			for v in self[...]:
+				if v == value:
+					return True
+			return False
+
 	def __getitem__(self, index):
 		with lowlevel:
 			if index < 0:
@@ -259,6 +266,12 @@ def index(self, obj):
 			return string.sub(s, args[1]+1, args[1]+1)
 		end
 
+	elseif name == '__contains__' then
+		wrapper = function(args, kwargs)
+			if s:find( args[1] ) then return true
+			else return false end
+		end
+
 	elseif name == '__getslice__' then
 		wrapper = function(args, kwargs)
 			if args[1]==nil and args[2]==nil and args[3]==-1 then
@@ -297,6 +310,7 @@ def index(self, obj):
 end
 ''')
 
+
 class dict:
 	def __init__(self, object, pointer=None):
 		with lowlevel:
@@ -316,3 +330,25 @@ def __setitem__(self, key, value):
 		with lowlevel:
 			self[...][ key ] = value
 
+	def keys(self):
+		with lowlevel:
+			ptr = []
+			i = 1
+			for k,v in pairs(self[...]):
+				ptr[ i ] = k
+				i = i + 1
+		return list( pointer=ptr, length=i-1 )
+
+	def __iter__(self):
+		return self.keys().__iter__()
+
+	def items(self):
+		with lowlevel:
+			ptr = []
+			i = 1
+			for k,v in pairs(self[...]):
+				p = [k,v]
+				item = list.__call__([], {pointer:p, length:2})
+				ptr[ i ] = item
+				i = i + 1
+		return list( pointer=ptr, length=i-1 )
