Merge branch 'master' of https://github.com/PythonJS/PythonJS

hartsantler · hartsantler · commit 6f856dcb4747 · 2014-06-26T03:54:48.000-07:00
diff --git a/README.md b/README.md
@@ -1,10 +1,34 @@
 Introduction
 ------------
-PythonJS is a transpiler written in Python that converts Python into fast JavaScript.  It can be run with regular Python, or fully self-hosted within NodeJS using Empythoned.  PythonJS has been designed with speed and easy integration with existing JavaScript code in mind.
+PythonJS is a transpiler written in Python that converts Python into fast
+JavaScript.  It can be run with regular Python, or fully self-hosted within
+NodeJS using Empythoned.  PythonJS has been designed with speed and easy
+integration with existing JavaScript code in mind.
+
+
+Using translator.py Without Installing
+--------------------------------------
+To simply convert your python script into javascript, git clone this repo, and
+use translator.py located in the "pythonjs" directory.  You can give it a list
+of python files to translate at once.  It will output the translation to
+stdout.  The default output type is JavaScript.
+
+Usage::
+
+	translator.py [--dart|--coffee|--lua] file.py
+
+Example::
+
+	cd pythonjs
+	./translator.py myscript.py > myscript.js
+
+
 
 Installing
 -------------
-	npm install python-js
+```
+npm install python-js
+```
 
 NodeJS Quick Example
 --------------
@@ -71,20 +95,6 @@ A Python typed subset can be translated to a GLSL fragment shader to speed up ma
 
 
 
-translator.py
-------------
-To simply convert your python script into javascript, git clone this repo, and use translator.py located in the "pythonjs" directory.  You can give it a list of python files to translate at once.  It will output the translation to stdout.  The default output type is JavaScript.
-
-Usage::
-
-	translator.py [--dart|--coffee|--lua] file.py
-
-Example::
-
-	cd PythonJS/pythonjs
-	./translator.py myscript.py > myscript.js
-
-
 Supported Features
 ================
 
diff --git a/pythonjs/python_to_pythonjs.py b/pythonjs/python_to_pythonjs.py
@@ -125,7 +125,12 @@ def format_error(self, node):
 		if self._line_number+1 < len(self._source):
 			lines.append( self._source[self._line_number+1] )
 
-		return 'line %s\n%s\n%s' %(self._line_number, '\n'.join(lines), node)
+		msg = 'line %s\n%s\n%s\n' %(self._line_number, '\n'.join(lines), node)
+		msg += 'Depth Stack:\n'
+		for l, n in enumerate(self._stack):
+			#msg += str(dir(n))
+			msg += '%s%s line:%s col:%s\n' % (' '*(l+1)*2, n.__class__.__name__, n.lineno, n.col_offset)
+                return msg
 
 	def __init__(self, source=None, module=None, module_path=None, dart=False, coffee=False, lua=False):
 
@@ -136,6 +141,7 @@ def __init__(self, source=None, module=None, module_path=None, dart=False, coffe
 
 		self._line = None
 		self._line_number = 0
+		self._stack = []        ## current path to the root
 
 		self._direct_operators = set()  ## optimize "+" and "*" operator
 		self._with_ll = False   ## lowlevel
@@ -247,6 +253,16 @@ def __init__(self, source=None, module=None, module_path=None, dart=False, coffe
 			else:
 				self.visit(node)
 
+        def visit(self, node):
+		"""Visit a node."""
+		## modified code of visit() method from Python 2.7 stdlib
+		self._stack.append(node)
+		method = 'visit_' + node.__class__.__name__
+		visitor = getattr(self, method, self.generic_visit)
+		res = visitor(node)
+		self._stack.pop()
+		return res
+
 	def has_webworkers(self):
 		return len(self._webworker_functions.keys())
 
diff --git a/pythonjs/translator.py b/pythonjs/translator.py
@@ -8,6 +8,10 @@
 from pythonjs_to_lua import main as pythonjs_to_lua
 from pythonjs_to_luajs import main as pythonjs_to_luajs
 
+cmdhelp = """\
+usage: translator.py [--dart|--coffee|--lua] file.py
+       translator.py --visjs file.py\
+"""
 
 def main(script):
     if '--visjs' in sys.argv:
@@ -50,6 +54,10 @@ def main(script):
         return code
 
 def command():
+    if '-h' in sys.argv or '--help' in sys.argv:
+        print(cmdhelp)
+        return
+
     scripts = []
     if len(sys.argv) > 1:
         for arg in sys.argv[1:]:
