ignore doc strings in function definitions

hartsantler · hartsantler · commit 6d7af795607b · 2013-10-02T19:04:50.000-07:00
diff --git a/pythonscript/python_to_pythonjs.py b/pythonscript/python_to_pythonjs.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 import sys
+from types import GeneratorType
 
 from ast import Str
 from ast import Call
@@ -433,7 +434,7 @@ def visit_FunctionDef(self, node):
             if node.args.kwarg:
                 keywords.append(keyword(Name('varkwarg', None), Str(node.args.kwarg)))
 
-            prebody = list()  ## NOT USED?
+            #prebody = list()  ## NOT USED?
 
             # create a JS Object to store the value of each parameter
             signature = ', '.join(map(lambda x: '%s=%s' % (self.visit(x.arg), self.visit(x.value)), keywords))
@@ -454,7 +455,18 @@ def visit_FunctionDef(self, node):
                 expr = expr % (node.args.kwarg, node.args.kwarg)
                 writer.write(expr)
 
-        map(self.visit, node.body)
+        #map(self.visit, node.body)
+        for child in node.body:
+            # simple test to drop triple quote comments
+            if hasattr(child, 'value'):
+                if isinstance(child.value, Str):
+                    continue
+            if isinstance(child, GeneratorType):
+                for sub in child:
+                    self.visit(sub)
+            else:
+                self.visit(child)
+
         writer.pull()
 
         # apply decorators
diff --git a/tests/server.py b/tests/server.py
@@ -24,6 +24,7 @@
 )
 
 
+
 def python_to_pythonjs( src ):
 	p = subprocess.Popen(
 		['python2', os.path.join( PATHS['pythonscript'], 'python_to_pythonjs.py')],
@@ -49,14 +50,15 @@ def pythonjs_to_javascript( src, closure_compiler=False ):
 			'java', '-jar', PATHS['closure'], 
 			'--compilation_level', 'ADVANCED_OPTIMIZATIONS', 
 			'--js', x, '--js_output_file', y,
+			'--formatting', 'PRETTY_PRINT',
 			#'--create_name_map_files', 
 		])
 		f = open(y, 'rb'); a = f.read().decode('utf-8'); f.close()
 
 	return a
 
 def python_to_javascript( src, closure_compiler=False ):
-	a = python_to_pythonjs( src )
+	a = python_to_pythonjs( src ); print(a)
 	return pythonjs_to_javascript( a, closure_compiler=closure_compiler )
 
 
@@ -154,8 +156,30 @@ def get(self, path=None):
 				self.write('Hello World')
 
 
+LIBS = dict(
+	three = {'three.min.js' : os.path.expanduser( '~/three.js/build/three.min.js')},
+	tween = {'tween' : os.path.expanduser( '~/tween.js/build/tween.min.js')},
+)
+
+class LibsHandler( tornado.web.RequestHandler ):
+	def get(self, path=None):
+		print('path', path)
+		module, name = path.split('/')
+		assert module in LIBS
+		assert name in LIBS[ module ]
+		if os.path.isfile( LIBS[module][name] ):
+			data = open( LIBS[module][name], 'rb').read()
+		else:
+			raise tornado.web.HTTPError(404)
+
+		self.set_header("Content-Type", "text/javascript; charset=utf-8")
+		self.set_header("Content-Length", len(data))
+		self.write( data )
+
+
 Handlers = [
-	(r'/(.*)', MainHandler)
+	(r'/libs/(.*)', LibsHandler),
+	(r'/(.*)', MainHandler),  ## order is important, this comes last.
 ]
 
 
diff --git a/tests/test_threejs.html b/tests/test_threejs.html
@@ -0,0 +1,24 @@
+<html>
+<head>
+<script src="libs/three/three.min.js"></script>
+<script src="bindings/three.py"></script>
+<script src="pythonscript.js"></script>
+
+<script type="text/python" closure="true">
+def inline_me():
+	return 1
+
+def test():
+	i = 0
+	while i < 10:
+		i += inline_me()
+
+	print 'hello world', i
+
+</script>
+</head>
+
+<body>
+<button onclick="test()">click me</button>
+</body>
+</html>
