treetop 1.6.5 → 1.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31803050a59c177ca4e26b9ba24396bfc169ec46
-  data.tar.gz: aa85232de5ed5dcb4368c9f8943dcb62b9068a97
+  metadata.gz: f6c63e11a7cd088f719f8fefa071cee15cceb8de
+  data.tar.gz: 4ab071ec035ca3d1e6348335643c2cb547c8426d
 SHA512:
-  metadata.gz: b11615a2b1020389b4c836d7bec5faa91b194a73d917ec14dd366c49330e13a1e1a14886f6e0c1042fa1752c97a5fa3b9e19d9687a54bdd01f932b9cbed594ca
-  data.tar.gz: 7bbe7339b97970098e054457f189e0504cabeeef1c1c1c1d8fbb03a99a517eb472221c02fd271b364fdefebfb25eb9da72c5ea63f77777edd0a0843dd7ca4b50
+  metadata.gz: 742cb0ea64d92e63f27c0742881eefb6098ec36f2c492828d2f4626ce11935fc9702c8f1a10e8adbc1dbd33149b912c97f2341a4d01678efb2f0efb62038c4ee
+  data.tar.gz: b06ab49b6d5ec07dfffbc7403036073d1cc6557343d53c025b43f5ea7986dd8ba888ed552de57296ef12b526e38968f2c16930a47251b558283fde5d2b19aadd

data/lib/treetop/compiler/metagrammar.rb

@@ -1078,6 +1078,10 @@ module Treetop
         def inline_modules
           (alternatives.map {|alt| alt.inline_modules }).flatten
         end
+
+        def inline_module
+	    nil
+	  end
       end
 
       def _nt_choice
@@ -1192,6 +1196,10 @@ module Treetop
           parent_modules
         end
 
+        def inline_module
+	    node_class_declarations.inline_module
+	  end
+
         def inline_module_name
           node_class_declarations.inline_module_name
         end
@@ -1435,6 +1443,10 @@ module Treetop
           atomic.inline_modules
         end
 
+        def inline_module
+	    atomic.inline_module
+	  end
+
         def inline_module_name
           nil
         end
@@ -1463,6 +1475,9 @@ module Treetop
         def inline_modules
           []
         end
+        def inline_module
+	    nil
+	  end
       end
 
       module Primary4
@@ -1481,7 +1496,9 @@ module Treetop
 
       module Primary5
         def compile(address, builder, parent_expression=nil)
-	    # STDERR.puts "Extraneous module ignored after suffix: #{input[interval].inspect}" if node_class_declarations.inline_modules.size > 0 && atomic.inline_modules.size > 0
+	    if node_class_declarations.inline_module && atomic.inline_module
+	      STDERR.puts "Extraneous module ignored after suffix: #{input[interval].inspect}"
+	    end
           suffix.compile(address, builder, self)
         end
 
@@ -1501,6 +1518,10 @@ module Treetop
           atomic.inline_modules + parent_modules
         end
 
+        def inline_module
+          node_class_declarations.inline_module
+	  end
+
         def inline_module_name
           node_class_declarations.inline_module_name
         end
@@ -1518,7 +1539,9 @@ module Treetop
 
       module Primary7
         def compile(address, builder, parent_expression=nil)
-	    STDERR.puts "Extraneous module ignored with nested atomic: #{input[interval].inspect}" if node_class_declarations.inline_modules.size > 0 && atomic.inline_modules.size > 0
+	    if node_class_declarations.inline_module && atomic.inline_module
+	      STDERR.puts "Extraneous module ignored with nested atomic: #{input[interval].inspect}"
+	    end
           atomic.compile(address, builder, self)
         end
 
@@ -1534,6 +1557,10 @@ module Treetop
           atomic.inline_modules + parent_modules
         end
 
+        def inline_module
+          node_class_declarations.inline_module
+	  end
+
         def inline_module_name
           node_class_declarations.inline_module_name
         end
@@ -2202,7 +2229,6 @@ module Treetop
           node_class_expression.node_class_name
         end
 
-# !!!! cjh !!!!!
         def inline_modules
           trailing_inline_module.inline_modules
         end
@@ -2496,6 +2522,9 @@ module Treetop
         def inline_modules
           parsing_expression.inline_modules
         end
+        def inline_module
+          parsing_expression.inline_module
+        end
       end
 
       def _nt_parenthesized_expression

data/lib/treetop/compiler/metagrammar.treetop

@@ -91,6 +91,10 @@ module Treetop
           def inline_modules
             (alternatives.map {|alt| alt.inline_modules }).flatten
           end
+
+          def inline_module
+	    nil
+	  end
         }
       end
 
@@ -114,6 +118,10 @@ module Treetop
             parent_modules
           end
 
+          def inline_module
+	    node_class_declarations.inline_module
+	  end
+
           def inline_module_name
             node_class_declarations.inline_module_name
           end
@@ -166,6 +174,10 @@ module Treetop
             atomic.inline_modules
           end
 
+          def inline_module
+	    atomic.inline_module
+	  end
+
           def inline_module_name
             nil
           end
@@ -184,11 +196,16 @@ module Treetop
           def inline_modules
             []
           end
+          def inline_module
+	    nil
+	  end
         }
         /
         atomic suffix node_class_declarations {
           def compile(address, builder, parent_expression=nil)
-	    # STDERR.puts "Extraneous module ignored after suffix: #{input[interval].inspect}" if node_class_declarations.inline_modules.size > 0 && atomic.inline_modules.size > 0
+	    if node_class_declarations.inline_module && atomic.inline_module
+	      STDERR.puts "Extraneous module ignored after suffix: #{input[interval].inspect}"
+	    end
             suffix.compile(address, builder, self)
           end
 
@@ -208,6 +225,10 @@ module Treetop
             atomic.inline_modules + parent_modules
           end
 
+          def inline_module
+            node_class_declarations.inline_module
+	  end
+
           def inline_module_name
             node_class_declarations.inline_module_name
           end
@@ -215,7 +236,9 @@ module Treetop
         /
         atomic node_class_declarations {
           def compile(address, builder, parent_expression=nil)
-	    STDERR.puts "Extraneous module ignored with nested atomic: #{input[interval].inspect}" if node_class_declarations.inline_modules.size > 0 && atomic.inline_modules.size > 0
+	    if node_class_declarations.inline_module && atomic.inline_module
+	      STDERR.puts "Extraneous module ignored with nested atomic: #{input[interval].inspect}"
+	    end
             atomic.compile(address, builder, self)
           end
 
@@ -231,6 +254,10 @@ module Treetop
             atomic.inline_modules + parent_modules
           end
 
+          def inline_module
+            node_class_declarations.inline_module
+	  end
+
           def inline_module_name
             node_class_declarations.inline_module_name
           end
@@ -382,7 +409,6 @@ module Treetop
             node_class_expression.node_class_name
           end
 
-# !!!! cjh !!!!!
           def inline_modules
             trailing_inline_module.inline_modules
           end
@@ -425,6 +451,9 @@ module Treetop
           def inline_modules
             parsing_expression.inline_modules
           end
+          def inline_module
+            parsing_expression.inline_module
+          end
         }
       end
 

data/lib/treetop/compiler/node_classes/anything_symbol.rb

@@ -5,8 +5,8 @@ module Treetop
         super
         builder.if__ "index < input_length" do
           if address == 0 || decorated?
-	    assign_result "instantiate_node(#{node_class_name},input, index...(index + 1))"
-	    extend_result_with_inline_module parent_expression
+            assign_result "instantiate_node(#{node_class_name},input, index...(index + 1))"
+            extend_result_with_inline_module parent_expression
           else
             assign_lazily_instantiated_node
           end
@@ -19,7 +19,11 @@ module Treetop
       end
 
       def expected
-	'"any character"'
+        '"any character"'
+      end
+
+      def inline_module
+        nil
       end
     end
   end

data/lib/treetop/compiler/node_classes/atomic_expression.rb

@@ -6,8 +6,8 @@ module Treetop
       end
       
       def single_quote(string)
-	# Double any backslashes, then backslash any single-quotes:
-	"'#{string.gsub(/\\/) { '\\\\' }.gsub(/'/) { "\\'"}}'"
+        # Double any backslashes, then backslash any single-quotes:
+        "'#{string.gsub(/\\/) { '\\\\' }.gsub(/'/) { "\\'"}}'"
       end
     end
   end

data/lib/treetop/compiler/node_classes/character_class.rb

@@ -20,7 +20,11 @@ module Treetop
       end
 
       def expected
-	single_quote('['+characters+']')
+        single_quote('['+characters+']')
+      end
+
+      def inline_module
+        nil
       end
 
       def grounded_regexp(string)

data/lib/treetop/compiler/node_classes/choice.rb

@@ -13,8 +13,8 @@ module Treetop
         obtain_new_subexpression_address
         alternatives.first.compile(subexpression_address, builder)
         builder.if__ subexpression_success? do
-	  # Undo lazy instantiation:
-	  builder << "#{subexpression_result_var} = SyntaxNode.new(input, (index-1)...index) if #{subexpression_result_var} == true"
+          # Undo lazy instantiation:
+          builder << "#{subexpression_result_var} = SyntaxNode.new(input, (index-1)...index) if #{subexpression_result_var} == true"
           assign_result subexpression_result_var
           extend_result_with_declared_module
           extend_result_with_inline_module parent_expression
@@ -30,7 +30,7 @@ module Treetop
       end
 
       def expected
-	'"(any alternative)"'
+        '"(any alternative)"'
       end
     end
   end

data/lib/treetop/compiler/node_classes/nonterminal.rb

@@ -8,6 +8,10 @@ module Treetop
         extend_result_with_declared_module
         extend_result_with_inline_module parent_expression
       end
+
+      def inline_module
+        nil
+      end
     end
   end
 end

data/lib/treetop/compiler/node_classes/parenthesized_expression.rb

@@ -6,7 +6,7 @@ module Treetop
       end
 
       def expected
-	elements[2].expected
+        elements[2].expected
       end
     end
   end

data/lib/treetop/compiler/node_classes/parsing_expression.rb

@@ -79,13 +79,12 @@ module Treetop
       end
       
       def extend_result_with_inline_module parent_expression = nil
-	# debugger if parent_expression && !parent_expression.respond_to?(:parent_modules)
-	if parent_expression && parent_expression.parent_modules.size > 0
-	  parent_expression.parent_modules.each do |inline|
-	    extend_result inline.module_name
-	  end
-	end
-	extend_result inline_module_name if inline_module_name
+        if parent_expression && parent_expression.parent_modules.size > 0
+          parent_expression.parent_modules.each do |inline|
+            extend_result inline.module_name
+          end
+        end
+        extend_result inline_module_name if inline_module_name
       end
     
       def reset_index
@@ -149,7 +148,7 @@ module Treetop
       end
 
       def expected
-	nil # Overridden for terminal parse failures
+        nil # Overridden for terminal parse failures
       end
     end
   end

data/lib/treetop/compiler/node_classes/parsing_rule.rb

@@ -33,7 +33,7 @@ module Treetop
       
       def generate_cache_lookup(builder)
         builder.if_ "node_cache[:#{name}].has_key?(index)" do
-	  cache_address = "node_cache[:#{name}][index]"
+          cache_address = "node_cache[:#{name}][index]"
           builder.assign 'cached', cache_address
           builder.if_ "cached" do
             # Handle lazily instantiated nodes:

data/lib/treetop/compiler/node_classes/predicate.rb

@@ -36,15 +36,15 @@ module Treetop
     class NotPredicate < Predicate
       def when_success
         assign_failure
-	if (e = parent.atomic.expected)
-	  builder << "terminal_parse_failure(#{e}, true)"
-	end
+        if (e = parent.atomic.expected)
+          builder << "terminal_parse_failure(#{e}, true)"
+        end
       end
       
       def when_failure
-	if (e = parent.atomic.expected)
-	  builder << "@terminal_failures.pop"
-	end
+        if (e = parent.atomic.expected)
+          builder << "@terminal_failures.pop"
+        end
         assign_success
       end
     end

data/lib/treetop/compiler/node_classes/predicate_block.rb

@@ -16,7 +16,7 @@ module Treetop
       end
 
       def expected
-	'"<semantic predicate>"'  # Should I include (some of) the text_value here?
+        '"<semantic predicate>"'  # Should I include (some of) the text_value here?
       end
     end
   end

data/lib/treetop/compiler/node_classes/repetition.rb

@@ -65,7 +65,7 @@ module Treetop
       end
 
       def expected
-	parent_expression.atomic.expected && '"at least one "+'+parent_expression.atomic.expected
+        parent_expression.atomic.expected && '"at least one "+'+parent_expression.atomic.expected
       end
     end
 
@@ -78,30 +78,30 @@ module Treetop
           builder.if__ "#{accumulator_var}.size < #{min.text_value}" do
             reset_index
             assign_failure start_index_var
-	  end
+          end
           builder.else_ do
-	    clean_unsaturated
-	    assign_and_extend_result parent_expression
-	  end
+            clean_unsaturated
+            assign_and_extend_result parent_expression
+          end
         else
-	  clean_unsaturated
-	  assign_and_extend_result parent_expression
-	end
+          clean_unsaturated
+          assign_and_extend_result parent_expression
+        end
 
         end_comment(parent_expression)
       end
 
       # remove the last terminal_failure if we merely failed to reach the maximum
       def clean_unsaturated
-	if !max.empty? && max.text_value.to_i > 0
-	  builder.if_ "#{accumulator_var}.size < #{max.text_value}" do
-	    builder << '@terminal_failures.pop'  # Ignore the last failure.
-	  end
-	end
+        if !max.empty? && max.text_value.to_i > 0
+          builder.if_ "#{accumulator_var}.size < #{max.text_value}" do
+            builder << '@terminal_failures.pop'  # Ignore the last failure.
+          end
+        end
       end
 
       def expected
-	parent_expression.atomic.expected && "at least #{min.text_value} "+parent_expression.atomic.expected
+        parent_expression.atomic.expected && "at least #{min.text_value} "+parent_expression.atomic.expected
       end
     end
 

data/lib/treetop/compiler/node_classes/sequence.rb

@@ -42,7 +42,7 @@ module Treetop
       end
 
       def expected
-	'"<a sequence>"'
+        '"<a sequence>"'
       end
     end
     

data/lib/treetop/compiler/node_classes/terminal.rb

@@ -3,38 +3,38 @@ module Treetop
     class Terminal < AtomicExpression
       def compile(address, builder, parent_expression = nil)
         super
-	# Handle modifiers:
-	insensitive = modifiers.text_value.include? 'i'
-	re = modifiers.text_value.include? 'r'
-	if re
-	  grounded_regexp = "#{('\A'+eval(string)).inspect}"
-	  cache_key = "'__#{modifiers.text_value}__'+(gr = #{grounded_regexp})"
-	  re_modifiers = "#{insensitive ? 'Regexp::IGNORECASE' : 0}"
-	  str = "@regexps[#{cache_key}] ||= Regexp.new(gr, #{re_modifiers})"
-	  mode = ':regexp'
-	elsif insensitive
-	  str = string.downcase
-	  string_length = eval(str).length
-	  mode = ':insens'
-	else
-	  str = string
-	  string_length = eval(str).length
-	  mode = 'false'
-	end
+        # Handle modifiers:
+        insensitive = modifiers.text_value.include? 'i'
+        re = modifiers.text_value.include? 'r'
+        if re
+          grounded_regexp = "#{('\A'+eval(string)).inspect}"
+          cache_key = "'__#{modifiers.text_value}__'+(gr = #{grounded_regexp})"
+          re_modifiers = "#{insensitive ? 'Regexp::IGNORECASE' : 0}"
+          str = "@regexps[#{cache_key}] ||= Regexp.new(gr, #{re_modifiers})"
+          mode = ':regexp'
+        elsif insensitive
+          str = string.downcase
+          string_length = eval(str).length
+          mode = ':insens'
+        else
+          str = string
+          string_length = eval(str).length
+          mode = 'false'
+        end
 
         builder.if__ "(match_len = has_terminal?(#{str}, #{mode}, index))" do
           if address == 0 || decorated? || mode != 'false' || string_length > 1
-	    assign_result "instantiate_node(#{node_class_name},input, index...(index + match_len))"
-	    # debugger if parent_expression and parent_expression.inline_modules.size > 0
-	    # extend_result_with_inline_module parent_expression
-	    if parent_expression
-	      parent_expression.inline_modules.each do |inline|
-		extend_result inline.module_name
-	      end
-	    end
+            assign_result "instantiate_node(#{node_class_name},input, index...(index + match_len))"
+            # debugger if parent_expression and parent_expression.inline_modules.size > 0
+            # extend_result_with_inline_module parent_expression
+            if parent_expression
+              parent_expression.inline_modules.each do |inline|
+                extend_result inline.module_name
+              end
+            end
           else
             assign_lazily_instantiated_node
-	  end
+          end
           builder << "@index += match_len"
         end
         builder.else_ do
@@ -44,7 +44,11 @@ module Treetop
       end
 
       def expected
-	single_quote(string)
+        single_quote(string)
+      end
+
+      def inline_module
+        nil
       end
     end
   end