Fixed issue #2

cesbit · Oct 25, 2016 · d33a84b · d33a84b
1 parent 7c9c537
commit d33a84b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2016.10.25, Version 1.1.4 (Stable)
+
+    - Fixed exporting Tokens to JavaScript and Python. (issue #2)
+
 2016.10.24, Version 1.1.3 (Stable)
 
     - Added export to Python method. This can be useful even if the source is

diff --git a/pyleri/__init__.py b/pyleri/__init__.py
@@ -34,4 +34,4 @@
 __author__ = 'Jeroen van der Heijden'
 __maintainer__ = 'Jeroen van der Heijden'
 __email__ = 'jeroen@transceptor.technology'
-__version__ = '1.1.3'
+__version__ = '1.1.4'
diff --git a/pyleri/tokens.py b/pyleri/tokens.py
@@ -27,10 +27,10 @@ def _get_node_result(self, root, tree, rule, s, node):
         return False, node.start
 
     def _run_export_js(self, js_identation, ident, classes):
-        return 'Tokens(\'{}\')'
+        return 'Tokens(\'{}\')'.format(' '.join(self._tokens))
 
     def _run_export_py(self, py_identation, ident, classes):
-        return 'Tokens(\'{}\')'
+        return 'Tokens(\'{}\')'.format(' '.join(self._tokens))
 
     @c_export
     def _run_export_c(self, c_identation, ident, enums, gid):

diff --git a/setup.py b/setup.py
@@ -1,6 +1,6 @@
 from distutils.core import setup
 
-VERSION = '1.1.3'
+VERSION = '1.1.4'
 
 setup(
     name='pyleri',