lua backend: added try/except. fixed try/except for coffeescript backend.

hartsantler · hartsantler · commit 1b29838ea65c · 2014-02-08T14:21:29.000-08:00
diff --git a/pythonjs/pythonjs_to_coffee.py b/pythonjs/pythonjs_to_coffee.py
@@ -404,6 +404,18 @@ def _visit_call_helper_instanceof(self, node):
 		else:
 			raise SyntaxError( args )
 
+	def visit_TryExcept(self, node):
+		out = ['try']
+		self.push()
+		for n in node.body:
+			out.append( self.indent() + self.visit(n) )
+		self.pull()
+		out.append( self.indent() + 'catch error' )
+		self.push()
+		for n in node.handlers:
+			out.append( self.indent() + self.visit(n) )
+		self.pull()
+		return '\n'.join( out )
 
 
 def main(script):
diff --git a/pythonjs/pythonjs_to_lua.py b/pythonjs/pythonjs_to_lua.py
@@ -241,6 +241,8 @@ def _visit_function(self, node):
 		for child in node.body:
 			if isinstance(child, ast.Str):
 				continue
+			elif isinstance(child, ast.Expr) and isinstance(child.value, ast.Str):
+				continue
 			else:
 				body.append( self.indent() + self.visit(child) )
 
@@ -264,7 +266,25 @@ def _visit_call_helper_instanceof(self, node):
 		else:
 			raise SyntaxError( args )
 
+	def visit_TryExcept(self, node):
+		out = ['__try__ = function()']
+		self.push()
+		for n in node.body:
+			out.append( self.indent() + self.visit(n) )
+		self.pull()
+		out.append( 'end' )
 
+		out.append( self.indent() + 'if pcall(__try__) then' )
+		self.push()
+		out.append('--no errors--')
+		self.pull()
+		out.append( self.indent() + 'else' )
+		self.push()
+		for n in node.handlers:
+			out.append( self.indent() + self.visit(n) )
+		self.pull()
+		out.append( self.indent() + 'end' )
+		return '\n'.join( out )
 
 def main(script):
 	tree = ast.parse(script)
diff --git a/regtests/lang/try_except.py b/regtests/lang/try_except.py
@@ -0,0 +1,14 @@
+'''
+try except
+'''
+
+def main():
+	a = [1,2,3]
+	b = False
+	try:
+		a.no_such_method()
+		b = 'this should not happen'
+	except:
+		b = True
+	TestError( b == True )
+
diff --git a/regtests/run.py b/regtests/run.py
@@ -41,7 +41,10 @@ def runnable(command):
 dart2js = os.path.expanduser( '~/dart/dart-sdk/bin/dart2js')
 dart2js_runnable = runnable( dart2js )
 coffee_runnable = runnable( "coffee -v" )
-lua_runnable = runnable( "lua -v" )
+lua_runnable = luajit_runnable = runnable( "luajit -v" )
+if not luajit_runnable:
+    lua_runnable = runnable( "lua -v" )
+
 assert rhino_runnable or node_runnable
 
 if show_details:
@@ -328,7 +331,10 @@ def run_lua_lua(content):
     """Run Lua using Lua"""
     builtins = '' #read('../runtime/builtins.lua')
     write("%s.lua" % tmpname, builtins + '\n' + content)
-    return run_command("lua %s.lua" % tmpname)
+    if luajit_runnable:
+        return run_command("luajit %s.lua" % tmpname)
+    else:
+        return run_command("lua %s.lua" % tmpname)
 
 
 table_header = "%-12.12s %-28.28s"
@@ -407,7 +413,10 @@ def run():
                 headers.append("Dart\nNode")
             if coffee_runnable:
                 headers.append("Coffee\nNode")
-        if lua_runnable:
+
+        if luajit_runnable:
+            headers.append("Lua\nJIT")
+        elif lua_runnable:
             headers.append("Lua\nLua")
         
         print(table_header % ("", "Regtest run on")
diff --git a/runtime/lua_builtins.py b/runtime/lua_builtins.py
@@ -24,6 +24,9 @@
 	elseif x.__class__ and x.__class__.__name__ == 'list' then
 		if x.length > 0 then return true
 		else return false end
+	elseif x.__class__ and x.__class__.__name__ == 'dict' then
+		if x.keys().length > 0 then return true
+		else return false end
 	else
 		return true
 	end
