support multiple inline functions as keyword args in function call.

hartsantler · hartsantler · commit 86da02ebc0be · 2014-07-22T06:26:13.000-07:00
diff --git a/README.md b/README.md
@@ -106,15 +106,27 @@ and not have to write `a.some_method.bind(a)`
 	b.set_callback( a->some_method )
 ```
 
-. in a function call, as a keyword argument, define callbacks inline with def
+. in a function call, inline functions can be given as keyword arguments
 ```
-a.func( callback=def (x,y,z):
-	x += y
-	return x - z
-
+a.func(
+	callback1=def (x,y,z):
+		x += y
+		return x - z,
+	callback2= def (x, y):
+		return x * y
 )
 ```
 
+. inline functions can be used inside a dict literal
+```
+a = {
+	'cb1' : def (x):
+		return x,
+	'cb2' : def (y):
+		return y
+}
+```
+
 Speed
 ---------------
 PythonJS gives you the option to optimize your program for speed with a new syntax for static typing, in some cases this results in code that is 20X faster.
diff --git a/pythonjs/typedpython.py b/pythonjs/typedpython.py
@@ -62,6 +62,13 @@ def transform_source( source, strip=False ):
 		if cs.startswith('var '):
 			c = c.replace('var ', '')
 
+		if '= function(' in c:
+			k = '= function('
+			a,b = c.split(k)
+			output.append( '@func_expression(%s)' %a.strip())
+			c = 'def __NAMELESS__(' + b
+
+
 		if '=\t\t\t\tdef ' in c:
 			x, c = c.split('=\t\t\t\tdef ')
 			indent = []
@@ -114,13 +121,27 @@ def transform_source( source, strip=False ):
 			if 'def (' in c:
 				c = c.replace('def (', 'def __NAMELESS__(')
 			c, tail = c.split(d)
-			#name = c.split(d)[-1].split('(')[0]
+
+			#if d.startswith('='):
+			#	if '(' in c:
+			#		c += '=lambda __INLINE_FUNCTION__: %s )' %tail.strip().split(':')[0]
+			#	else:
+			#		c += '=lambda __INLINE_FUNCTION__: %s' %tail.strip().split(':')[0]
+			#	output_post = 'def %s'%tail
+
 			if d.startswith('='):
-				if '(' in c:
-					c += '=lambda __INLINE_FUNCTION__: %s )' %tail.strip().split(':')[0]
-				else:
-					c += '=lambda __INLINE_FUNCTION__: %s' %tail.strip().split(':')[0]
-				output_post = 'def %s'%tail
+				c += '=lambda __INLINE_FUNCTION__: %s' %tail.strip().split(':')[0]
+
+				if output_post:
+					if output_post[-1][-1]==',':
+						output_post[-1] = output_post[-1][:-1]
+						output[-1] += ','
+				else: output_post = list()
+
+				output.append( c )
+
+				c = 'def %s'%tail
+
 			else:
 				c += ':lambda __INLINE_FUNCTION__: %s,' %tail.strip().split(':')[0]
 				output.append( c )
@@ -148,7 +169,7 @@ def transform_source( source, strip=False ):
 		else:
 			output.append( c )
 
-		if type(output_post) is str:
+		if type(output_post) is str:  ## DEPRECATED
 			indent = 0
 			for u in output[-1]:
 				if u == ' ' or u == '\t':
@@ -157,14 +178,14 @@ def transform_source( source, strip=False ):
 					break
 			output.append( ('\t'*indent)+output_post)
 			output_post = True
-		elif output_post == True:
+		elif output_post == True:  ## DEPRECATED
 			if output[-1].strip()==')':
 				output.pop()
 				output_post = None
+
 		elif type(output_post) is list:
-			if output_post[-1].strip().endswith('}'):
+			if output_post[-1].strip().endswith( ('}',')') ):
 				output.append( output_post.pop() )
-				#output.extend( output_post )
 				indent = 0
 				for u in output[-1]:
 					if u == ' ' or u == '\t':
@@ -211,9 +232,16 @@ def xxx():
 			return x+y
 	}
 
-c = def (x,y):
+X.func( cb1=def ():
+		return 1,
+	cb2=def ():
+		return 2
+)
+
+c = function(x,y):
 	return x+y
 
+
 '''
 
 if __name__ == '__main__':
diff --git a/regtests/calling/inline_def.py b/regtests/calling/inline_def.py
@@ -1,11 +1,14 @@
 """inline def"""
 
-def test( callback=None ):
-	return callback
+def test( callback1=None, callback2=None ):
+	return {'cb1', callback1, 'cb2': callback2 }
 
 def main():
-	f = test( callback=def (x,y):
-		return x+y
+	o = test( callback1=def (x,y):
+		return x+y,
+		callback2 = def (x):
+			return x*2
 	)
-	TestError( f(1,2) == 3 )
+	TestError( o['cb1'](1,2) == 3 )
+	TestError( o['cb2'](100) == 200 )
 
