treetop 1.6.12 → 1.6.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5717056d3dbb9b543f988059dcd86c2b5789eac8912591c366bb36db9803ce09
-  data.tar.gz: 143894fceb89a090a1a558733ebda88cd9af044c9fdcd37043ae2e7c80d018e3
+  metadata.gz: 3f4ebab3912da21994eae994e3e9e74a078e05ad3fac1b5ffbba33403061d86a
+  data.tar.gz: 51d7876c22c2edd8dac928cb482cf69383f3150df78bf04ab03b74009e597e3e
 SHA512:
-  metadata.gz: 67a3c52c5a7fd0203f927e3a2cea9e433a634dbe1c016afc6375a0e5ebd4b7005f11e85623334996fc0a6c3564e866c1bd47c4dbbe7ce5b0f18697caec05f198
-  data.tar.gz: ffec456f918bece9ea9ede24df590d6c87622ae93541f0189bf1fe26205f997a42b7268c3a466a11b5e4007fc53a4b34111e4c9a48fcf50152c76afd393ae6ed
+  metadata.gz: bc3abfe32ebd44518902c94d785886410ff2e53b45fbd4d1f420a7cfcc5bb513dc16fcd6b3e6e55708311e885967f897d32df8457714a707ec773ccefa28afd8
+  data.tar.gz: d009ad35387f28a9d8465562ccbf02498b7cf8743e5dcdc04ad160b48f8ab49a94fe1b6c91a81e85074a25409914fa6832992eff23e0bce2335c093f815bdf3c

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/cjheath/treetop.svg)](https://travis-ci.org/cjheath/treetop)
+[![build](https://github.com/cjheath/treetop/actions/workflows/ci.yml/badge.svg)](https://github.com/cjheath/treetop/actions/workflows/ci.yml)
 
 Support
 =======

data/lib/treetop/compiler/metagrammar.rb

@@ -799,13 +799,19 @@ module Treetop
           r1 = SyntaxNode.new(input, (index-1)...index) if r1 == true
           r0 = r1
         else
-          r2 = _nt_include_declaration
+          r2 = _nt_parsing_endless_rule
           if r2
             r2 = SyntaxNode.new(input, (index-1)...index) if r2 == true
             r0 = r2
           else
-            @index = i0
-            r0 = nil
+            r3 = _nt_include_declaration
+            if r3
+              r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
+              r0 = r3
+            else
+              @index = i0
+              r0 = nil
+            end
           end
         end
 
@@ -1028,6 +1034,172 @@ module Treetop
         r0
       end
 
+      module ParsingEndlessRule0
+        def nonterminal
+          elements[2]
+        end
+
+        def parsing_expression
+          elements[6]
+        end
+
+      end
+
+      def _nt_parsing_endless_rule
+        start_index = index
+        if node_cache[:parsing_endless_rule].has_key?(index)
+          cached = node_cache[:parsing_endless_rule][index]
+          if cached
+            node_cache[:parsing_endless_rule][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
+          return cached
+        end
+
+        i0, s0 = index, []
+        if (match_len = has_terminal?('rule', false, index))
+          r1 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          @index += match_len
+        else
+          terminal_parse_failure('\'rule\'')
+          r1 = nil
+        end
+        s0 << r1
+        if r1
+          s2, i2 = [], index
+          loop do
+            r3 = _nt_nbwhite
+            if r3
+              s2 << r3
+            else
+              break
+            end
+          end
+          if s2.empty?
+            @index = i2
+            r2 = nil
+          else
+            r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
+          end
+          s0 << r2
+          if r2
+            r4 = _nt_nonterminal
+            s0 << r4
+            if r4
+              s5, i5 = [], index
+              loop do
+                r6 = _nt_nbwhite
+                if r6
+                  s5 << r6
+                else
+                  break
+                end
+              end
+              r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+              s0 << r5
+              if r5
+                if (match_len = has_terminal?('=', false, index))
+                  r7 = true
+                  @index += match_len
+                else
+                  terminal_parse_failure('\'=\'')
+                  r7 = nil
+                end
+                s0 << r7
+                if r7
+                  s8, i8 = [], index
+                  loop do
+                    r9 = _nt_nbwhite
+                    if r9
+                      s8 << r9
+                    else
+                      break
+                    end
+                  end
+                  r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
+                  s0 << r8
+                  if r8
+                    r10 = _nt_parsing_expression
+                    s0 << r10
+                    if r10
+                      i11 = index
+                      r12 = lambda { |v| v.last.text_value !~ /[\n\r]/ }.call(s0)
+                      if !r12
+                        terminal_parse_failure("<semantic predicate>")
+                      end
+                      if r12
+                        @index = i11
+                        r11 = instantiate_node(SyntaxNode,input, index...index)
+                      else
+                        @index = i11
+                        r11 = nil
+                      end
+                      s0 << r11
+                      if r11
+                        s13, i13 = [], index
+                        loop do
+                          i14 = index
+                          r15 = _nt_nbwhite
+                          if r15
+                            r15 = SyntaxNode.new(input, (index-1)...index) if r15 == true
+                            r14 = r15
+                          else
+                            r16 = _nt_comment_to_eol
+                            if r16
+                              r16 = SyntaxNode.new(input, (index-1)...index) if r16 == true
+                              r14 = r16
+                            else
+                              @index = i14
+                              r14 = nil
+                            end
+                          end
+                          if r14
+                            s13 << r14
+                          else
+                            break
+                          end
+                        end
+                        r13 = instantiate_node(SyntaxNode,input, i13...index, s13)
+                        s0 << r13
+                        if r13
+                          s17, i17 = [], index
+                          loop do
+                            r18 = _nt_eol
+                            if r18
+                              s17 << r18
+                            else
+                              break
+                            end
+                          end
+                          if s17.empty?
+                            @index = i17
+                            r17 = nil
+                          else
+                            r17 = instantiate_node(SyntaxNode,input, i17...index, s17)
+                          end
+                          s0 << r17
+                        end
+                      end
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
+        if s0.last
+          r0 = instantiate_node(ParsingRule,input, i0...index, s0)
+          r0.extend(ParsingEndlessRule0)
+        else
+          @index = i0
+          r0 = nil
+        end
+
+        node_cache[:parsing_endless_rule][start_index] = r0
+
+        r0
+      end
+
       def _nt_parsing_expression
         start_index = index
         if node_cache[:parsing_expression].has_key?(index)
@@ -4207,6 +4379,54 @@ module Treetop
         r0
       end
 
+      def _nt_nbwhite
+        start_index = index
+        if node_cache[:nbwhite].has_key?(index)
+          cached = node_cache[:nbwhite][index]
+          if cached
+            node_cache[:nbwhite][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
+          return cached
+        end
+
+        if has_terminal?(@regexps[gr = '\A[ \\t]'] ||= Regexp.new(gr), :regexp, index)
+          r0 = instantiate_node(SyntaxNode,input, index...(index + 1))
+          @index += 1
+        else
+          terminal_parse_failure('[ \\t]')
+          r0 = nil
+        end
+
+        node_cache[:nbwhite][start_index] = r0
+
+        r0
+      end
+
+      def _nt_eol
+        start_index = index
+        if node_cache[:eol].has_key?(index)
+          cached = node_cache[:eol][index]
+          if cached
+            node_cache[:eol][index] = cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+            @index = cached.interval.end
+          end
+          return cached
+        end
+
+        if has_terminal?(@regexps[gr = '\A[\\n\\r]'] ||= Regexp.new(gr), :regexp, index)
+          r0 = instantiate_node(SyntaxNode,input, index...(index + 1))
+          @index += 1
+        else
+          terminal_parse_failure('[\\n\\r]')
+          r0 = nil
+        end
+
+        node_cache[:eol][start_index] = r0
+
+        r0
+      end
+
       def _nt_white
         start_index = index
         if node_cache[:white].has_key?(index)
@@ -4231,11 +4451,13 @@ module Treetop
         r0
       end
 
-    end
 
-    class MetagrammarParser < Treetop::Runtime::CompiledParser
-      include Metagrammar
+      class Parser < Treetop::Runtime::CompiledParser
+        include Metagrammar
+      end
     end
 
+    MetagrammarParser = Metagrammar::Parser
+
   end
 end

data/lib/treetop/compiler/metagrammar.treetop

@@ -55,7 +55,7 @@ module Treetop
       end
 
       rule declaration
-        parsing_rule / include_declaration
+        parsing_rule / parsing_endless_rule / include_declaration
       end
 
       rule include_declaration
@@ -70,6 +70,13 @@ module Treetop
         'rule' space nonterminal space ('do' space)? parsing_expression space 'end' <ParsingRule>
       end
 
+      rule parsing_endless_rule
+        'rule' nbwhite+ nonterminal nbwhite* '=' nbwhite*
+	  parsing_expression &{ |v| v.last.text_value !~ /[\n\r]/ } # Parsing expression must not break line
+	  (nbwhite / comment_to_eol)* eol+
+	  <ParsingRule>
+      end
+
       rule parsing_expression
         choice / sequence / primary
       end
@@ -578,6 +585,14 @@ module Treetop
         '#' (!"\n" .)*
       end
 
+      rule nbwhite
+        [ \t]
+      end
+
+      rule eol
+        [\n\r]
+      end
+
       rule white
         [ \t\n\r]
       end

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

@@ -3,26 +3,28 @@ module Treetop
     class Grammar < Runtime::SyntaxNode
       def compile
         builder = RubyBuilder.new
-        
+
         builder.module_declaration "#{grammar_name.text_value}" do
           builder.in(indent_level) # account for initial indentation of grammar declaration
           builder << "include Treetop::Runtime"
           builder.newline
           declaration_sequence.compile(builder)
+          builder.newline
+          builder.class_declaration "Parser < Treetop::Runtime::CompiledParser" do
+            builder << "include #{grammar_name.text_value}"
+          end
         end
         builder.newline
-        builder.class_declaration "#{parser_name} < Treetop::Runtime::CompiledParser" do
-          builder << "include #{grammar_name.text_value}"
-        end
+        builder << "#{parser_name} = #{grammar_name.text_value}::Parser"
       end
-      
+
       def indent_level
         input.column_of(interval.begin) - 1
       end
-      
+
       def parser_name
         grammar_name.text_value + 'Parser'
       end
     end
-  end 
+  end
 end

data/lib/treetop/version.rb

@@ -2,7 +2,7 @@ module Treetop #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 6
-    TINY  = 12
+    TINY  = 15
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/treetop.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.authors = ["Nathan Sobo", "Clifford Heath"]
 
   spec.email = "cliffordheath@gmail.com"
-  spec.date = Date.today.strftime("%F")
+  spec.date = Date.parse(`git show -s --format=%ci`)
   spec.summary = "A Ruby-based text parsing and interpretation DSL"
   spec.description = "A Parsing Expression Grammar (PEG) Parser generator DSL for Ruby"
   spec.homepage = "https://github.com/cjheath/treetop"
@@ -25,10 +25,10 @@ Gem::Specification.new do |spec|
   ]
 
   spec.add_runtime_dependency(%q<polyglot>, ["~> 0.3"])
-  spec.add_development_dependency(%q<activesupport>, [">= 4"])
+  spec.add_development_dependency(%q<activesupport>, ["~> 4"])
   spec.add_development_dependency(%q<i18n>, ["~> 1.0"])
   spec.add_development_dependency(%q<rr>, ["~> 3.0"])
   spec.add_development_dependency(%q<rspec>, ["~> 3"])
-  spec.add_development_dependency(%q<rake>, [">= 11"])
+  spec.add_development_dependency(%q<rake>, ["~> 11"])
 end
 

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: treetop
 version: !ruby/object:Gem::Version
-  version: 1.6.12
+  version: 1.6.15
 platform: ruby
 authors:
 - Nathan Sobo
 - Clifford Heath
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-25 00:00:00.000000000 Z
+date: 2025-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyglot
@@ -29,14 +28,14 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
@@ -85,14 +84,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '11'
 description: A Parsing Expression Grammar (PEG) Parser generator DSL for Ruby
@@ -183,7 +182,6 @@ homepage: https://github.com/cjheath/treetop
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -198,8 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A Ruby-based text parsing and interpretation DSL
 test_files: []