Merge branch 'custom_labels'

Author: Allen Short

bin/move_stage

@@ -0,0 +1,44 @@
+#!/usr/bin/env python
+# -*- mode: python -*-
+import os
+import shutil
+
+
+def main():
+
+    bin_dir = os.path.dirname(os.path.realpath(__file__))
+    parsley_dir = os.path.split(bin_dir)[0]
+    stage_dir = os.path.join(parsley_dir, 'stage')
+    if not os.path.exists(stage_dir):
+        raise Exception('Stage dir does not exist')
+
+    move_pkg_gen(parsley_dir, stage_dir, 'ometa')
+    move_pkg_gen(parsley_dir, stage_dir, 'terml')
+
+
+def move_pkg_gen(parsley_dir, stage_dir, pkg):
+    print "\nMoving " + pkg
+    stage_gen_dir = os.path.join(stage_dir, pkg, '_generated')
+    gen_dir = os.path.join(parsley_dir, pkg, '_generated')
+
+    if os.path.exists(gen_dir):
+        print "Removing " + os.path.relpath(gen_dir, parsley_dir)
+        shutil.rmtree(gen_dir)
+
+    print 'Copying ' + os.path.relpath(stage_gen_dir, parsley_dir) + ' to ' + os.path.relpath(gen_dir, parsley_dir)
+    shutil.copytree(stage_gen_dir, gen_dir)
+
+
+if __name__ == '__main__':
+    main()
+
+
+
+
+
+
+
+
+
+
+

bin/remove_stage

@@ -0,0 +1,28 @@
+#!/usr/bin/env python
+# -*- mode: python -*-
+import os
+import shutil
+
+
+def main():
+
+    bin_dir = os.path.dirname(os.path.realpath(__file__))
+    parsley_dir = os.path.split(bin_dir)[0]
+    stage_dir = os.path.join(parsley_dir, 'stage')
+    if os.path.exists(stage_dir):
+        print 'Removing stage dir'
+        shutil.rmtree(stage_dir)
+
+if __name__ == '__main__':
+    main()
+
+
+
+
+
+
+
+
+
+
+

bin/stage

@@ -1,32 +1,52 @@
 #!/usr/bin/env python
 # -*- mode: python -*-
-import sys; sys.path.append(".")
-import os, glob, shutil, sys
+import sys
+import os
+import glob
+import shutil
 from ometa.runtime import ParseError
 from ometa.grammar import OMeta
 from ometa.builder import writePython
 
 
+def main():
+    bin_dir = os.path.dirname(os.path.realpath(__file__))
+    parsley_dir = os.path.split(bin_dir)[0]
+    stage_dir = os.path.join(parsley_dir, 'stage')
+    sys.path.append(parsley_dir)
 
-def stage_pkg(pkg):
-    print "Copying", pkg
-    shutil.copytree(pkg, 'stage/' + pkg,
+    if os.path.exists(stage_dir):
+        print "Removing stage dir"
+        shutil.rmtree(stage_dir)
+
+    os.mkdir(stage_dir)
+    stage_pkg(parsley_dir, stage_dir, 'ometa')
+    stage_pkg(parsley_dir, stage_dir, 'terml')
+
+
+def stage_pkg(parsley_dir, stage_dir, pkg):
+    print "\nCopying", pkg
+    stage_pkg_dir = os.path.join(stage_dir, pkg)
+    stage_gen_dir = os.path.join(stage_pkg_dir, '_generated')
+    pkg_dir = os.path.join(parsley_dir, pkg)
+
+    shutil.copytree(pkg_dir, stage_pkg_dir,
                     ignore=lambda src, names: [n for n in names if n.endswith('pyc')])
-    for fn in glob.glob(pkg + "/*.parsley"):
-        grammar = open(fn).read()
-        grammarname = fn.split('/')[1].split('.')[0]
-        pyfn = "stage/%s/_generated/%s.py" % (pkg, grammarname)
-        print "%s => %s" % (fn, pyfn)
+    for filename in glob.glob(pkg_dir + "/*.parsley"):
+        grammar = open(filename).read()
+        grammarname = os.path.split(filename)[1].split('.')[0]
+        pyfn = os.path.join(stage_gen_dir, grammarname + '.py')
+        print "{src:38} => {dst}".format(src=os.path.relpath(filename, parsley_dir),
+                                         dst=os.path.relpath(pyfn, parsley_dir))
         g = OMeta(grammar)
         tree = g.parseGrammar(grammarname)
         source = writePython(tree)
         pythonFile = open(pyfn, 'w')
         pythonFile.write(source)
 
 
-os.mkdir('stage')
-stage_pkg('ometa')
-stage_pkg('terml')
+if __name__ == '__main__':
+    main()
 
 
 

doc/reference.rst

@@ -59,6 +59,11 @@ Basic syntax
 ``?(pythonExpression)``:
   Fail if the Python expression is false, Returns True otherwise.
 
+``expr ^(CustomLabel)``:
+  If the expr fails, the exception raised will contain CustomLabel.
+  Good for providing more context when a rule is broken.
+  CustomLabel can contain any character other than "(" and ")".
+
 Comments like Python comments are supported as well, starting with #
 and extending to the end of the line.
 

examples/exceptions.py

@@ -0,0 +1,30 @@
+"""
+A grammar for parsing a tiny HTML-like language, plus a transformer for it.
+"""
+from parsley import makeGrammar, term, termMaker as t, unwrapGrammar
+from itertools import chain
+
+tinyHTMLGrammar = r"""
+
+name = <letterOrDigit+>
+
+tag = ((('<' spaces name:n spaces attribute*:attrs '>')
+         html:c
+         ('<' '/' token(n) spaces '>')
+             -> t.Element(n.lower(), dict(attrs), c))) ^ (valid tag)
+
+html = (text | tag)*
+
+text = <(~('<') anything)+>
+
+attribute = spaces name:k token('=') quotedString:v -> (k, v)
+
+quotedString = ((('"' | '\''):q <(~exactly(q) anything)*>:xs exactly(q))
+                     -> xs)
+
+"""
+TinyHTML = makeGrammar(tinyHTMLGrammar, globals(), name="TinyHTML")
+
+testSource = "<html<title>Yes</title><body><h1>Man, HTML is <i>great</i>.</h1><p>How could you even <b>think</b> otherwise?</p><img src='HIPPO.JPG'></img><a href='http://twistedmatrix.com'>A Good Website</a></body></html>"
+
+print unwrapGrammar(TinyHTML)(testSource).apply('tag')

examples/minml.py

@@ -1,10 +1,10 @@
 """
 A grammar for parsing a tiny HTML-like language, plus a transformer for it.
 """
-from parsley import makeGrammar, term, makeTerm as t
+from parsley import makeGrammar, term, termMaker as t
 from itertools import chain
 
-tinyHTMLGrammar = """
+tinyHTMLGrammar = r"""
 
 name = <letterOrDigit+>
 
@@ -19,10 +19,12 @@
 
 attribute = spaces name:k token('=') quotedString:v -> (k, v)
 
-quotedString = (('"' | '\''):q <(~exactly(q) anything)*>:xs exactly(q)
+quotedString = (('"' | '\''):q <(~exactly(q) anything)*>:xs exactly(q))
                      -> xs
 
 """
 TinyHTML = makeGrammar(tinyHTMLGrammar, globals(), name="TinyHTML")
 
 testSource = "<html><title>Yes</title><body><h1>Man, HTML is <i>great</i>.</h1><p>How could you even <b>think</b> otherwise?</p><img src='HIPPO.JPG'></img><a href='http://twistedmatrix.com'>A Good Website</a></body></html>"
+
+print TinyHTML(testSource).html()