Removed dependency to PLY

ereOn · Jan 16, 2016 · 3fe05bd · 3fe05bd
1 parent e690c95
commit 3fe05bd
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 214 deletions.
diff --git a/pygen/scope/__init__.py b/pygen/scope/__init__.py
@@ -2,8 +2,9 @@
 Scope manipulation.
 """
 
+import re
+
 from .exceptions import InvalidScope
-from .yacc import parser
 
 
 def parse_scope(value):
@@ -13,12 +14,10 @@ def parse_scope(value):
     :param value: The dotted path string.
     :returns: A `Scope` instance if `value` is a valid path.
     """
-    scope = parser.parse(value)
-
-    if scope is None:
+    if not re.match('^[\w\d_-]+(\.[\w\d_-]+)*$', value):
         raise InvalidScope(value)
 
-    return Scope(scope=scope)
+    return Scope(scope=value.split('.'))
 
 
 class Scope(object):
@@ -33,7 +32,6 @@ def __init__(self, scope=None):
         """
         self.scope = scope or []
 
-
     def __repr__(self):
         return 'Scope(%r)' % self.scope
 

diff --git a/pygen/scope/exceptions.py b/pygen/scope/exceptions.py
@@ -2,8 +2,10 @@
 Scope exceptions.
 """
 
+from voluptuous import Invalid
 
-class InvalidScope(ValueError):
+
+class InvalidScope(Invalid):
     """
     An invalid scope was specified.
     """

diff --git a/pygen/scope/lex.py b/pygen/scope/lex.py
diff --git a/pygen/scope/parser.out b/pygen/scope/parser.out
diff --git a/pygen/scope/parsetab.py b/pygen/scope/parsetab.py
diff --git a/pygen/scope/yacc.py b/pygen/scope/yacc.py
diff --git a/pygen/scripts.py b/pygen/scripts.py
@@ -58,7 +58,7 @@ def perror(msg, *args, **kwargs):
 )
 @click.argument('templates-root', type=click.Path(exists=True))
 @click.argument('definition-file', type=click.File())
-def gxgen(debug, output_root, targets, templates_root, definition_file):
+def pygen(debug, output_root, targets, templates_root, definition_file):
     if debug:
         pdebug(
             "Parsing definition file: {definition_file_name}.",
@@ -98,7 +98,7 @@ def gxgen(debug, output_root, targets, templates_root, definition_file):
         for index, target_name in enumerate(targets):
             progress = float(index) / len(targets)
             pinfo(
-                "[{progress:2d}%] Generating target `{target_name}`.",
+                "[{progress:3d}%] Generating target `{target_name}`.",
                 progress=int(progress * 100.0),
                 target_name=hl(target_name),
             )
@@ -119,6 +119,7 @@ def gxgen(debug, output_root, targets, templates_root, definition_file):
                 with open(output_file_name, 'w') as destination_file:
                     destination_file.write(content)
 
+        pinfo("[100%] Done.")
 
     except Exception as ex:
         if debug:

diff --git a/setup.py b/setup.py
@@ -26,7 +26,6 @@
         'click==6.2',
         'PyYAML==3.11',
         'voluptuous==0.8.8',
-        'ply==3.8',
     ],
     entry_points={
         'console_scripts': [