coffee backend now passes all regression tests.

hartsantler · hartsantler · commit 665c82cd100b · 2014-01-29T00:08:57.000-08:00
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
@@ -766,8 +766,8 @@ def visit_ClassDef(self, node):
 		self._catch_attributes = set()
 		self._instance_attributes[ name ] = self._catch_attributes
 
-
-		writer.write('var(%s, __%s_attrs, __%s_parents)' % (name, name, name))
+		if not self._with_coffee:
+			writer.write('var(%s, __%s_attrs, __%s_parents)' % (name, name, name))
 		writer.write('__%s_attrs = JSObject()' % name)
 		writer.write('__%s_parents = JSArray()' % name)
 		writer.write('__%s_properties = JSObject()' % name)
@@ -2322,7 +2322,8 @@ def visit_For(self, node):
 				self._instances[ target.id ] = list( self._global_typed_lists[ iter.id ] )[0]
 
 			vars.append('__iterator__')  ## TODO - test nested for loops - this should be __iterator__N
-			writer.write('var(%s)' % ','.join(vars))
+			if not self._with_coffee:
+				writer.write('var(%s)' % ','.join(vars))
 
 
 			is_range = False
@@ -2344,7 +2345,8 @@ def visit_For(self, node):
 
 			if is_generator:
 				iter_name = self.visit(target)
-				writer.write('var(%s, __generator__)' %iter_name)
+				if not self._with_coffee:
+					writer.write('var(%s, __generator__)' %iter_name)
 				writer.write('__generator__ = %s' %self.visit(iter))
 				writer.write('while __generator__.__done__ != 1:')
 				writer.push()
@@ -2355,7 +2357,8 @@ def visit_For(self, node):
 
 			elif is_range:
 				iter_name = target.id
-				writer.write('var(%s)' %iter_name)
+				if not self._with_coffee:
+					writer.write('var(%s)' %iter_name)
 				writer.write('%s = %s' %(iter_name, iter_start))
 				writer.write('while %s < %s:' %(iter_name, iter_end))
 				writer.push()
@@ -2367,7 +2370,8 @@ def visit_For(self, node):
 
 				writer.pull()
 			else:
-				writer.write('var(__next__)')
+				if not self._with_coffee:
+					writer.write('var(__next__)')
 				writer.write('__next__ = __get__(__iterator__, "next_fast")')
 				writer.write('while __iterator__.index < __iterator__.length:')
 
diff --git a/pythonjs/pythonjs_to_coffee.py b/pythonjs/pythonjs_to_coffee.py
@@ -46,6 +46,14 @@ def _inline_code_helper(self, s):
 				s = s.replace(' and ', ' && ')
 		return '`' + s + '`'  ## enclose with backticks to inline javascript in coffeescript
 
+	def visit_While(self, node):
+		body = [ 'while %s' %self.visit(node.test)]
+		self.push()
+		for line in list( map(self.visit, node.body) ):
+			body.append( self.indent()+line )
+		self.pull()
+		return '\n'.join( body )
+
 	def _visit_subscript_ellipsis(self, node):
 		name = self.visit(node.value)
 		return '%s.$wrapped' %name
@@ -368,6 +376,9 @@ def _visit_function(self, node):
 			else:
 				body.append( self.indent() + self.visit(child) )
 
+		if not isinstance(node.body[-1], ast.Return):
+			body.append( self.indent() + '0' )
+
 		buffer += '\n'.join(body)
 		self.pull()
 		return buffer
diff --git a/regtests/run.py b/regtests/run.py
@@ -228,7 +228,8 @@ def translate_js(filename, javascript=False, dart=False, coffee=False):
             if serr:
                 return ''
             elif sout:
-                open('/tmp/coffee-output.js', 'wb').write( sout.encode('utf-8') )
+                builtins = read(os.path.join("..", "pythonjs.js"))
+                open('/tmp/coffee-output.js', 'wb').write( (builtins+'\n'+sout).encode('utf-8') )
                 return sout
             else:
                 return ''
