Browse files

Merge branch 'master' into hipe

  • Loading branch information...
2 parents bc554fd + fa5aebb commit d6d1eb65bc00602d6f553616fdf8d0e04b8d2d69 @cjheath cjheath committed Dec 15, 2010
Showing with 2 additions and 2 deletions.
  1. +1 −1 doc/semantic_interpretation.markdown
  2. +1 −1 doc/syntactic_recognition.markdown
@@ -128,7 +128,7 @@ Subexpressions can be given an explicit label to have an element accessor method
rule labels
first_letter:[a-z] rest_letters:(', ' letter:[a-z])* {
def letters
- [first_letter] + do |comma_and_letter|
+ [first_letter] + do |comma_and_letter|
@@ -172,7 +172,7 @@ Here's the easiest way to handle C-style comments:
Sometimes you must execute Ruby code during parsing in order to decide how to proceed.
This is an advanced feature, and must be used with great care, because it can change the
way a Treetop parser backtracks in a way that breaks the parsing algorithm. See the
-notes on below on how to use this feature safely.
+notes below on how to use this feature safely.
The code block is the body of a Ruby lambda block, and should return true or false, to cause this
parse rule to continue or fail (for positive sempreds), fail or continue (for negative sempreds).

0 comments on commit d6d1eb6

Please sign in to comment.