treetop 1.5.3 → 1.6.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YjM5NTQzZTQ2YjVkZmJhMTIyMDUwM2U5YWY4MTcxNTQzMGYwZGM1Mg==
-  data.tar.gz: !binary |-
-    YTE1MTQyNWE0NDdkNTU1MmNiYWFiZWU2NDA3ZjJkYmUzNGU5ZmI3ZA==
+SHA1:
+  metadata.gz: 4c3093c759c685e5241eea8e6ca42dd46d2719bc
+  data.tar.gz: 35c028a9353519e0865b5c1a82cbae4a307abb45
 SHA512:
-  metadata.gz: !binary |-
-    ODQyMDUyODBkYzE0MzYxNzNkMmE1MjQ0NjY3MmJjN2NjMjJjOTMxYjFkMzYy
-    NTk1ZmIyMzMxZDczNWIxYTZhNDEyMjMxMzQ5OGIyYmM4MWE1NjY2MTRjOTg0
-    ZmE5MGJiYzZhZjRjOTAzZjc2YTVlMGQ5Y2U2ZGVlMGE5MjgxZTI=
-  data.tar.gz: !binary |-
-    M2MzNmM5ZjI0MDJhMmE3NDk5MTMzNjUyOTE4MDc0ZWZiNjBmZjE1ZTgxYzc4
-    MzA4NmVhZWQ0ZTliZjg3YWY1Mjc3ZGNiYmMyYTRmYzNjOGJiODM1Mzg1YjIz
-    NmU4YjYwMGJlNjgyNmM2MGNjYjY2MDU4MDIxNWMwOTA2Y2MxYWY=
+  metadata.gz: 698c86025e1979b76b0279d7f28b2897a04832e32fe40d5e4b7708fb573141cb9a1b0f8e159c3db2c74afb44932ae8deea4331838e60d32b5f58ba054d7bfcef
+  data.tar.gz: 921b6d4b7a5debb9fa9ed662f359f31ae511d5f4c83426ab07cff120d8b634660684a9fe43f6a0c13fd7362f95c5a0e59f50763edd073c73728ba8f5060fb343

data/Rakefile

@@ -54,9 +54,15 @@ end
 
 desc 'Upload website files'
 task :website_upload do
-  rubyforge_config_file = "#{ENV['HOME']}/.rubyforge/user-config.yml"
-  rubyforge_config = YAML.load_file(rubyforge_config_file)
-  `rsync -aCv doc/site/ #{rubyforge_config['username']}@rubyforge.org:/var/www/gforge-projects/treetop/`
+  # The website is now done using gh-pages
+  system <<-END
+    git checkout gh-pages
+    cp website/*.html .
+    git add *.html
+    git commit -m"Website update `date`"
+    git push
+    git checkout master
+  END
 end
 
 desc 'Generate and upload website files'

data/doc/pitfalls_and_advanced_techniques.markdown

@@ -30,7 +30,7 @@ Say I want to parse a diabolical wiki syntax in which the following interpretati
     end
     
     rule em
-      '**' (strong / !'*' . / '\*')+ '**'    
+      '*' (strong / !'*' . / '\*')+ '*'
     end
     
 Emphasized text is allowed within strong text by virtue of `em` being the first alternative. Since `em` will only successfully parse if a matching `*` is found, it is permitted, but other than that, no `*` characters are allowed unless they are escaped.

data/doc/sitegen.rb

@@ -41,7 +41,7 @@ class Layout < Erector::Widget
     end
 
     def site_dir
-      File.join(File.dirname(__FILE__), "site")
+      File.join(File.dirname(__FILE__), "../website")
     end
   end
 

data/doc/syntactic_recognition.markdown

@@ -39,6 +39,8 @@ Treetop will emit a module called `GrammarName` and a parser class called `Gramm
 #Parsing Expressions
 Each rule associates a name with a _parsing expression_. Parsing expressions are a generalization of vanilla regular expressions. Their key feature is the ability to reference other expressions in the grammar by name.
 
+Treetop parsers will try to match the first rule defined in the grammar, unless you pass an optional parameter to set a different top rule.
+
 ##Terminal Symbols
 ###Strings
 Strings are surrounded in double or single quotes and must be matched exactly.

data/doc/tt.1

@@ -80,4 +80,4 @@ tt \-o alterate_name.rb foo
 
 The treetop website:
 
-.B http://treetop.rubyforge.org
+.B http://cjheath.github.io/treetop/

data/lib/treetop/compiler/metagrammar.rb

@@ -21,7 +21,7 @@ module Treetop
           elements[0]
         end
 
-        def prefix
+        def spacing
           elements[1]
         end
 
@@ -36,7 +36,7 @@ module Treetop
 
       module TreetopFile2
         def compile
-          requires.text_value + prefix.text_value + module_or_grammar.compile + suffix.text_value
+          requires.text_value + spacing.text_value + module_or_grammar.compile + suffix.text_value
         end
       end
 
@@ -118,7 +118,7 @@ module Treetop
       end
 
       module RequireStatement0
-        def prefix
+        def spacing
           elements[0]
         end
 
@@ -159,6 +159,7 @@ module Treetop
                 r5 = true
                 @index += 1
               else
+                terminal_parse_failure('[ \\t]')
                 r5 = nil
               end
               if r5
@@ -181,6 +182,7 @@ module Treetop
                   r7 = true
                   @index += 1
                 else
+                  terminal_parse_failure('[^\\n\\r]')
                   r7 = nil
                 end
                 if r7
@@ -201,6 +203,7 @@ module Treetop
                   r8 = true
                   @index += 1
                 else
+                  terminal_parse_failure('[\\n\\r]')
                   r8 = nil
                 end
                 s0 << r8
@@ -281,7 +284,7 @@ module Treetop
       end
 
       module ModuleDeclaration4
-        def prefix
+        def module_prefix
           elements[0]
         end
 
@@ -296,11 +299,11 @@ module Treetop
 
       module ModuleDeclaration5
         def compile
-          prefix.text_value + module_contents.compile + suffix.text_value
+          module_prefix.text_value + module_contents.compile + suffix.text_value
         end
 
 	  def parser_name
-	    prefix.name.text_value+'::'+module_contents.parser_name
+	    module_prefix.name.text_value+'::'+module_contents.parser_name
 	  end
       end
 
@@ -334,6 +337,7 @@ module Treetop
               r5 = true
               @index += 1
             else
+              terminal_parse_failure('[A-Z]')
               r5 = nil
             end
             s4 << r5
@@ -366,6 +370,7 @@ module Treetop
                       r11 = true
                       @index += 1
                     else
+                      terminal_parse_failure('[A-Z]')
                       r11 = nil
                     end
                     s9 << r11
@@ -617,6 +622,7 @@ module Treetop
           r1 = true
           @index += 1
         else
+          terminal_parse_failure('[A-Z]')
           r1 = nil
         end
         s0 << r1
@@ -829,6 +835,7 @@ module Treetop
               r3 = true
               @index += 1
             else
+              terminal_parse_failure('[A-Z]')
               r3 = nil
             end
             s0 << r3
@@ -1064,6 +1071,10 @@ module Treetop
           super.elements.map {|elt| elt.alternative}
         end
 
+	  def parent_modules
+	    []
+	  end
+
         def inline_modules
           (alternatives.map {|alt| alt.inline_modules }).flatten
         end
@@ -1171,10 +1182,14 @@ module Treetop
           sequence_body.tail
         end
 
+	  def parent_modules
+	    node_class_declarations.inline_modules
+	  end
+
         def inline_modules
           (sequence_elements.map {|elt| elt.inline_modules}).flatten +
           [sequence_element_accessor_module] +
-          node_class_declarations.inline_modules
+          parent_modules
         end
 
         def inline_module_name
@@ -1411,6 +1426,10 @@ module Treetop
           atomic
         end
 
+	  def parent_modules
+	    []
+	  end
+
         def inline_modules
           atomic.inline_modules
         end
@@ -1425,7 +1444,7 @@ module Treetop
           elements[0]
         end
 
-        def predicate_block
+        def atomic
           elements[2]
         end
       end
@@ -1435,8 +1454,11 @@ module Treetop
           prefix.compile(address, builder, self)
         end
         def prefixed_expression
-          predicate_block
+          atomic
         end
+	  def parent_modules
+	    []
+	  end
         def inline_modules
           []
         end
@@ -1458,6 +1480,7 @@ module Treetop
 
       module Primary5
         def compile(address, builder, parent_expression=nil)
+	    # debugger if node_class_declarations.inline_modules.size > 0 && atomic.inline_modules.size > 0
           suffix.compile(address, builder, self)
         end
 
@@ -1469,8 +1492,12 @@ module Treetop
           node_class_declarations.node_class_name
         end
 
+	  def parent_modules
+	    node_class_declarations.inline_modules
+	  end
+
         def inline_modules
-          atomic.inline_modules + node_class_declarations.inline_modules
+          atomic.inline_modules + parent_modules
         end
 
         def inline_module_name
@@ -1490,6 +1517,7 @@ module Treetop
 
       module Primary7
         def compile(address, builder, parent_expression=nil)
+	    # debugger if node_class_declarations.inline_modules.size > 0 && atomic.inline_modules.size > 0
           atomic.compile(address, builder, self)
         end
 
@@ -1497,8 +1525,12 @@ module Treetop
           node_class_declarations.node_class_name
         end
 
+	  def parent_modules
+	    node_class_declarations.inline_modules
+	  end
+
         def inline_modules
-          atomic.inline_modules + node_class_declarations.inline_modules
+          atomic.inline_modules + parent_modules
         end
 
         def inline_module_name
@@ -1666,6 +1698,10 @@ module Treetop
           sequence_primary.compile(lexical_address, builder)
         end
 
+	  def parent_modules
+	    []
+	  end
+
         def inline_modules
           sequence_primary.inline_modules
         end
@@ -1722,6 +1758,10 @@ module Treetop
           sequence_primary.compile(lexical_address, builder)
         end
 
+	  def parent_modules
+	    []
+	  end
+
         def inline_modules
           sequence_primary.inline_modules
         end
@@ -1925,6 +1965,10 @@ module Treetop
           elements[1]
         end
 
+	  def parent_modules
+	    []
+	  end
+
         def inline_modules
           atomic.inline_modules
         end
@@ -1939,7 +1983,7 @@ module Treetop
           elements[0]
         end
 
-        def predicate_block
+        def atomic
           elements[2]
         end
       end
@@ -1949,8 +1993,11 @@ module Treetop
           prefix.compile(address, builder, self)
         end
         def prefixed_expression
-          predicate_block
+          atomic
         end
+	  def parent_modules
+	    []
+	  end
         def inline_modules
           []
         end
@@ -1975,6 +2022,10 @@ module Treetop
           nil
         end
 
+	  def parent_modules
+	    []
+	  end
+
         def inline_modules
           atomic.inline_modules
         end
@@ -2150,6 +2201,7 @@ module Treetop
           node_class_expression.node_class_name
         end
 
+# !!!! cjh !!!!!
         def inline_modules
           trailing_inline_module.inline_modules
         end
@@ -2281,6 +2333,7 @@ module Treetop
               r4 = true
               @index += 1
             else
+              terminal_parse_failure('[0-9]')
               r4 = nil
             end
             if r4
@@ -2307,6 +2360,7 @@ module Treetop
                   r7 = true
                   @index += 1
                 else
+                  terminal_parse_failure('[0-9]')
                   r7 = nil
                 end
                 if r7
@@ -2435,6 +2489,9 @@ module Treetop
       end
 
       module ParenthesizedExpression1
+	  def parent_modules
+	    []
+	  end
         def inline_modules
           parsing_expression.inline_modules
         end
@@ -2665,6 +2722,7 @@ module Treetop
               r5 = true
               @index += 1
             else
+              terminal_parse_failure('[ir]')
               r5 = nil
             end
             if r5
@@ -3536,6 +3594,9 @@ module Treetop
       end
 
       module TrailingInlineModule1
+	  def parent_modules
+	    []
+	  end
         def inline_modules
           [inline_module]
         end
@@ -3546,6 +3607,9 @@ module Treetop
       end
 
       module TrailingInlineModule2
+	  def parent_modules
+	    []
+	  end
         def inline_modules
           []
         end
@@ -3696,6 +3760,7 @@ module Treetop
                 r7 = true
                 @index += 1
               else
+                terminal_parse_failure('[{}]')
                 r7 = nil
               end
               if r7
@@ -3891,6 +3956,7 @@ module Treetop
           r0 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
+          terminal_parse_failure('[A-Za-z_]')
           r0 = nil
         end
 
@@ -3920,6 +3986,7 @@ module Treetop
             r2 = true
             @index += 1
           else
+            terminal_parse_failure('[0-9]')
             r2 = nil
           end
           if r2
@@ -4081,6 +4148,7 @@ module Treetop
           r0 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
+          terminal_parse_failure('[ \\t\\n\\r]')
           r0 = nil
         end
 

data/lib/treetop/compiler/metagrammar.treetop

@@ -2,15 +2,15 @@ module Treetop
   module Compiler
     grammar Metagrammar
       rule treetop_file
-        requires:(space? require_statement)* prefix:space? module_or_grammar suffix:space? {
+        requires:(space? require_statement)* spacing:space? module_or_grammar suffix:space? {
           def compile
-            requires.text_value + prefix.text_value + module_or_grammar.compile + suffix.text_value
+            requires.text_value + spacing.text_value + module_or_grammar.compile + suffix.text_value
           end
         }
       end
 
       rule require_statement
-        prefix:space? "require" [ \t]+ [^\n\r]+ [\n\r]
+        spacing:space? "require" [ \t]+ [^\n\r]+ [\n\r]
       end
 
       rule module_or_grammar
@@ -18,13 +18,13 @@ module Treetop
       end
 
       rule module_declaration
-        prefix:('module' space name:([A-Z] alphanumeric_char* ('::' [A-Z] alphanumeric_char*)*) space) module_contents:(module_declaration / grammar) suffix:(space 'end') {
+        module_prefix:('module' space name:([A-Z] alphanumeric_char* ('::' [A-Z] alphanumeric_char*)*) space) module_contents:(module_declaration / grammar) suffix:(space 'end') {
           def compile
-            prefix.text_value + module_contents.compile + suffix.text_value
+            module_prefix.text_value + module_contents.compile + suffix.text_value
           end
 
 	  def parser_name
-	    prefix.name.text_value+'::'+module_contents.parser_name
+	    module_prefix.name.text_value+'::'+module_contents.parser_name
 	  end
         }
       end
@@ -84,6 +84,10 @@ module Treetop
             super.elements.map {|elt| elt.alternative}
           end
 
+	  def parent_modules
+	    []
+	  end
+
           def inline_modules
             (alternatives.map {|alt| alt.inline_modules }).flatten
           end
@@ -100,10 +104,14 @@ module Treetop
             sequence_body.tail
           end
 
+	  def parent_modules
+	    node_class_declarations.inline_modules
+	  end
+
           def inline_modules
             (sequence_elements.map {|elt| elt.inline_modules}).flatten +
             [sequence_element_accessor_module] +
-            node_class_declarations.inline_modules
+            parent_modules
           end
 
           def inline_module_name
@@ -150,6 +158,10 @@ module Treetop
             atomic
           end
 
+	  def parent_modules
+	    []
+	  end
+
           def inline_modules
             atomic.inline_modules
           end
@@ -159,13 +171,16 @@ module Treetop
           end
         }
         /
-	prefix space? predicate_block {
+	prefix space? atomic:predicate_block {
           def compile(address, builder, parent_expression=nil)
             prefix.compile(address, builder, self)
           end
           def prefixed_expression
-            predicate_block
+            atomic
           end
+	  def parent_modules
+	    []
+	  end
           def inline_modules
             []
           end
@@ -173,6 +188,7 @@ module Treetop
         /
         atomic suffix node_class_declarations {
           def compile(address, builder, parent_expression=nil)
+	    raise "Extraneous module ignored after suffix: #{input[interval].inspect}" if node_class_declarations.inline_modules.size > 0 && atomic.inline_modules.size > 0
             suffix.compile(address, builder, self)
           end
 
@@ -184,8 +200,12 @@ module Treetop
             node_class_declarations.node_class_name
           end
 
+	  def parent_modules
+	    node_class_declarations.inline_modules
+	  end
+
           def inline_modules
-            atomic.inline_modules + node_class_declarations.inline_modules
+            atomic.inline_modules + parent_modules
           end
 
           def inline_module_name
@@ -195,6 +215,7 @@ module Treetop
         /
         atomic node_class_declarations {
           def compile(address, builder, parent_expression=nil)
+	    raise "Extraneous module ignored with nested atomic: #{input[interval].inspect}" if node_class_declarations.inline_modules.size > 0 && atomic.inline_modules.size > 0
             atomic.compile(address, builder, self)
           end
 
@@ -202,8 +223,12 @@ module Treetop
             node_class_declarations.node_class_name
           end
 
+	  def parent_modules
+	    node_class_declarations.inline_modules
+	  end
+
           def inline_modules
-            atomic.inline_modules + node_class_declarations.inline_modules
+            atomic.inline_modules + parent_modules
           end
 
           def inline_module_name
@@ -222,6 +247,10 @@ module Treetop
             sequence_primary.compile(lexical_address, builder)
           end
 
+	  def parent_modules
+	    []
+	  end
+
           def inline_modules
             sequence_primary.inline_modules
           end
@@ -238,6 +267,10 @@ module Treetop
             sequence_primary.compile(lexical_address, builder)
           end
 
+	  def parent_modules
+	    []
+	  end
+
           def inline_modules
             sequence_primary.inline_modules
           end
@@ -282,6 +315,10 @@ module Treetop
             elements[1]
           end
 
+	  def parent_modules
+	    []
+	  end
+
           def inline_modules
             atomic.inline_modules
           end
@@ -291,13 +328,16 @@ module Treetop
           end
         }
         /
-        prefix space? predicate_block {
+        prefix space? atomic:predicate_block {
           def compile(address, builder, parent_expression=nil)
             prefix.compile(address, builder, self)
           end
           def prefixed_expression
-            predicate_block
+            atomic
           end
+	  def parent_modules
+	    []
+	  end
           def inline_modules
             []
           end
@@ -312,6 +352,10 @@ module Treetop
             nil
           end
 
+	  def parent_modules
+	    []
+	  end
+
           def inline_modules
             atomic.inline_modules
           end
@@ -338,6 +382,7 @@ module Treetop
             node_class_expression.node_class_name
           end
 
+# !!!! cjh !!!!!
           def inline_modules
             trailing_inline_module.inline_modules
           end
@@ -374,6 +419,9 @@ module Treetop
 
       rule parenthesized_expression
         '(' space? parsing_expression space? ')' <ParenthesizedExpression> {
+	  def parent_modules
+	    []
+	  end
           def inline_modules
             parsing_expression.inline_modules
           end
@@ -439,6 +487,9 @@ module Treetop
 
       rule trailing_inline_module
         space inline_module {
+	  def parent_modules
+	    []
+	  end
           def inline_modules
             [inline_module]
           end
@@ -449,6 +500,9 @@ module Treetop
         }
         /
         '' {
+	  def parent_modules
+	    []
+	  end
           def inline_modules
             []
           end