fixed evaluation order a = False and (False or True)

hartsantler · hartsantler · commit 80e58b0a8437 · 2014-08-13T04:53:07.000-07:00
go backend: `range` builtin.
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
@@ -657,6 +657,11 @@ def visit_NotIn(self, node):
 		#return ' not in '
 		raise RuntimeError('"not in" is only allowed in if-test: see method - visit_Compare')
 
+	## TODO check if the default visit_Compare always works ##
+	#def visit_Compare(self, node):
+	#	raise NotImplementedError( node )
+
+
 	def visit_AugAssign(self, node):
 		self._in_assign_target = True
 		target = self.visit( node.target )
@@ -1169,7 +1174,8 @@ def visit_Or(self, node):
 
 	def visit_BoolOp(self, node):
 		op = self.visit(node.op)
-		return op.join( [self.visit(v) for v in node.values] )
+		#raise SyntaxError(op)
+		return '('+ op.join( [self.visit(v) for v in node.values] ) + ')'
 
 	def visit_If(self, node):
 		if self._with_dart and writer.is_at_global_level():
@@ -2103,7 +2109,8 @@ def visit_Expr(self, node):
 
 		line = self.visit(node.value)
 		if line:
-			writer.write(line)
+			#writer.write('('+line+')')
+			writer.write( line )
 		elif use_runtime_errors:
 			writer.write('pass')
 
diff --git a/pythonjs/pythonjs.py b/pythonjs/pythonjs.py
@@ -1082,7 +1082,7 @@ def visit_Or(self, node):
 
 	def visit_BoolOp(self, node):
 		op = self.visit(node.op)
-		return op.join( [self.visit(v) for v in node.values] )
+		return '('+ op.join( [self.visit(v) for v in node.values] ) +')'
 
 	def visit_If(self, node):
 		out = []
@@ -1282,6 +1282,7 @@ def main(source, requirejs=True, insert_runtime=True, webworker=False, function_
 
 	try:
 		tree = ast.parse( source )
+		#raise SyntaxError(source)
 	except SyntaxError:
 		import traceback
 		err = traceback.format_exc()
diff --git a/pythonjs/pythonjs_to_go.py b/pythonjs/pythonjs_to_go.py
@@ -184,13 +184,18 @@ def visit_For(self, node):
 
 
 	def _visit_call_helper(self, node):
+		fname = self.visit(node.func)
+		if fname=='__DOLLAR__': fname = '$'
+		elif fname == 'range':
+			assert len(node.args)
+			fname += str(len(node.args))
+
+
 		if node.args:
 			args = [self.visit(e) for e in node.args]
 			args = ', '.join([e for e in args if e])
 		else:
 			args = ''
-		fname = self.visit(node.func)
-		if fname=='__DOLLAR__': fname = '$'
 
 		if node.keywords:
 			if args: args += ','
diff --git a/pythonjs/runtime/go_builtins.py b/pythonjs/runtime/go_builtins.py
@@ -27,4 +27,31 @@
 
 	}
 }
+
+func range1( x int ) []int {
+	arr := make([]int, x)
+	for i := 0; i < x; i++ {
+		arr[i]=i
+	}
+	return arr
+}
+
+func range2( start int, stop int ) []int {
+	arr := make([]int, stop-start)
+	for i := start; i < stop; i++ {
+		arr[i]=i
+	}
+	return arr
+}
+
+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
+}
+
 """)
+
+
diff --git a/regtests/go/arrays.py b/regtests/go/arrays.py
@@ -10,4 +10,13 @@ def main():
 	TestError( b[1]==200 )
 
 	c = a[:2]
-	TestError( len(c)==2 )
+	TestError( len(c)==2 )
+
+	d = range(10)
+	TestError(len(d)==10)
+
+	#e = range(2,10)
+	#TestError(len(e)==8)
+
+	#f = range(2,10, 2)
+	#TestError(len(f)==4)
diff --git a/regtests/lang/eval_order.py b/regtests/lang/eval_order.py
@@ -0,0 +1,8 @@
+'''
+evaluation order
+'''
+# https://github.com/PythonJS/PythonJS/issues/131
+
+def main():
+	a = False and (False or True)
+	TestError( a==False )
