treetop 1.6.7 → 1.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55889da79805c465a6953a7675a8c3e43b5c1fc3
-  data.tar.gz: 18120ebea1f4c6f03da9b8122c8dc8a5174cff58
+  metadata.gz: f5cf78875bffce2e5a417f380e3c1b2e96ad9397
+  data.tar.gz: bf189a3e2bdd867b296e8872f33cd5b617e7c72a
 SHA512:
-  metadata.gz: 345067c98fe054a4b4f9a24269f9b2ce2a1c52fbd26a6438d75fa0d94a8f73b31c26a91a0bf2b025687ca2fcb5848f4ae73d10bf21197271a796daf909558486
-  data.tar.gz: c1a6ed80de69eb537b9c769a8052f1a1ca74759d367ce7f46a400469ffe61510cd71bc005249fe9d21162c8c96eaa61ccf01d54ba164c8d1fe4b377e2b3f21d3
+  metadata.gz: 148bdfbd93703196ce7ff227bf28af6cfdb62caa1f3f45bf59f69d9691e49709d7df2c1b088c8e01a933bd8012d38c5ad8678998e845048ccbf5650913086f55
+  data.tar.gz: c8bf7bd1b095ed2eee7c8cddb7872070be1c51cf37b448e10c7fd4d359c93e90afcc48a4cfd073f4aca9ad6189f6bb8cfa448cdf963a6c203315a7bd07b44b89

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/cjheath/treetop.svg)](https://travis-ci.org/cjheath/treetop)
+
 Support
 =======
 

data/doc/sitegen.rb

@@ -63,3 +63,16 @@ class Layout < Erector::Widget
     end
   end
 end
+
+class String
+  def underscore
+    camel_cased_word = self
+    return camel_cased_word unless camel_cased_word =~ /[A-Z-]|::/
+    word = camel_cased_word.to_s.gsub('::'.freeze, '/'.freeze)
+    word.gsub!(/([A-Z\d]+)([A-Z][a-z])/, '\1_\2'.freeze)
+    word.gsub!(/([a-z\d])([A-Z])/, '\1_\2'.freeze)
+    word.tr!("-".freeze, "_".freeze)
+    word.downcase!
+    word
+  end
+end

data/doc/syntactic_recognition.markdown

@@ -32,9 +32,9 @@ The main keywords are:
 
 * `rule` : This defines a parsing rule within the grammar. It is followed by a name by which this rule can be referenced within other rules. It is then followed by a parsing expression defining the rule.
 
-A grammar may be surrounded by one or more nested `module` statements, which provides a namespace for the generated Ruby parser.
+A grammar may be surrounded by one or more nested `module` or `class` statements, which provides a namespace for the generated Ruby parser. Note that you cannot specify a superclass for a class, so if your class has a superclass, it must be declared elsewhere and loaded first.
 
-Treetop will emit a module called `GrammarName` and a parser class called `GrammarNameParser` (in the module namespace, if specified).
+Treetop will emit a module called `GrammarName` and a parser class called `GrammarNameParser` (in the namespace, if specified).
 
 #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.

data/lib/treetop/compiler/grammar_compiler.rb

@@ -33,10 +33,13 @@ module Treetop
 
   # compile a treetop source file and load it
   def self.load(path)
-    adjusted_path = path =~ /\.(treetop|tt)\Z/ ? path : path + '.treetop'
-    File.open(adjusted_path) do |source_file|
+    unless path =~ Treetop::Polyglot::VALID_GRAMMAR_EXT_REGEXP
+      ext = Treetop::Polyglot::VALID_GRAMMAR_EXT.select {|ext| File.exist?(path+".#{ext}")}.shift
+      path += ".#{ext}" unless ext.nil?
+    end
+    File.open(path) do |source_file|
       source = source_file.read
-      source.gsub!(/\b__FILE__\b/, %Q{"#{adjusted_path}"})
+      source.gsub!(/\b__FILE__\b/, %Q{"#{path}"})
       load_from_string(source)
     end
   end

data/lib/treetop/compiler/metagrammar.rb

@@ -320,102 +320,122 @@ module Treetop
 
         i0, s0 = index, []
         i1, s1 = index, []
+        i2 = index
         if (match_len = has_terminal?('module', false, index))
-          r2 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+          r3 = instantiate_node(SyntaxNode,input, index...(index + match_len))
           @index += match_len
         else
           terminal_parse_failure('\'module\'')
-          r2 = nil
+          r3 = nil
+        end
+        if r3
+          r3 = SyntaxNode.new(input, (index-1)...index) if r3 == true
+          r2 = r3
+        else
+          if (match_len = has_terminal?('class', false, index))
+            r4 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+            @index += match_len
+          else
+            terminal_parse_failure('\'class\'')
+            r4 = nil
+          end
+          if r4
+            r4 = SyntaxNode.new(input, (index-1)...index) if r4 == true
+            r2 = r4
+          else
+            @index = i2
+            r2 = nil
+          end
         end
         s1 << r2
         if r2
-          r3 = _nt_space
-          s1 << r3
-          if r3
-            i4, s4 = index, []
+          r5 = _nt_space
+          s1 << r5
+          if r5
+            i6, s6 = index, []
             if has_terminal?(@regexps[gr = '\A[A-Z]'] ||= Regexp.new(gr), :regexp, index)
-              r5 = true
+              r7 = true
               @index += 1
             else
               terminal_parse_failure('[A-Z]')
-              r5 = nil
+              r7 = nil
             end
-            s4 << r5
-            if r5
-              s6, i6 = [], index
+            s6 << r7
+            if r7
+              s8, i8 = [], index
               loop do
-                r7 = _nt_alphanumeric_char
-                if r7
-                  s6 << r7
+                r9 = _nt_alphanumeric_char
+                if r9
+                  s8 << r9
                 else
                   break
                 end
               end
-              r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
-              s4 << r6
-              if r6
-                s8, i8 = [], index
+              r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
+              s6 << r8
+              if r8
+                s10, i10 = [], index
                 loop do
-                  i9, s9 = index, []
+                  i11, s11 = index, []
                   if (match_len = has_terminal?('::', false, index))
-                    r10 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                    r12 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                     @index += match_len
                   else
                     terminal_parse_failure('\'::\'')
-                    r10 = nil
+                    r12 = nil
                   end
-                  s9 << r10
-                  if r10
+                  s11 << r12
+                  if r12
                     if has_terminal?(@regexps[gr = '\A[A-Z]'] ||= Regexp.new(gr), :regexp, index)
-                      r11 = true
+                      r13 = true
                       @index += 1
                     else
                       terminal_parse_failure('[A-Z]')
-                      r11 = nil
+                      r13 = nil
                     end
-                    s9 << r11
-                    if r11
-                      s12, i12 = [], index
+                    s11 << r13
+                    if r13
+                      s14, i14 = [], index
                       loop do
-                        r13 = _nt_alphanumeric_char
-                        if r13
-                          s12 << r13
+                        r15 = _nt_alphanumeric_char
+                        if r15
+                          s14 << r15
                         else
                           break
                         end
                       end
-                      r12 = instantiate_node(SyntaxNode,input, i12...index, s12)
-                      s9 << r12
+                      r14 = instantiate_node(SyntaxNode,input, i14...index, s14)
+                      s11 << r14
                     end
                   end
-                  if s9.last
-                    r9 = instantiate_node(SyntaxNode,input, i9...index, s9)
-                    r9.extend(ModuleDeclaration0)
+                  if s11.last
+                    r11 = instantiate_node(SyntaxNode,input, i11...index, s11)
+                    r11.extend(ModuleDeclaration0)
                   else
-                    @index = i9
-                    r9 = nil
+                    @index = i11
+                    r11 = nil
                   end
-                  if r9
-                    s8 << r9
+                  if r11
+                    s10 << r11
                   else
                     break
                   end
                 end
-                r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
-                s4 << r8
+                r10 = instantiate_node(SyntaxNode,input, i10...index, s10)
+                s6 << r10
               end
             end
-            if s4.last
-              r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
-              r4.extend(ModuleDeclaration1)
+            if s6.last
+              r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
+              r6.extend(ModuleDeclaration1)
             else
-              @index = i4
-              r4 = nil
+              @index = i6
+              r6 = nil
             end
-            s1 << r4
-            if r4
-              r14 = _nt_space
-              s1 << r14
+            s1 << r6
+            if r6
+              r16 = _nt_space
+              s1 << r16
             end
           end
         end
@@ -428,44 +448,44 @@ module Treetop
         end
         s0 << r1
         if r1
-          i15 = index
-          r16 = _nt_module_declaration
-          if r16
-            r16 = SyntaxNode.new(input, (index-1)...index) if r16 == true
-            r15 = r16
+          i17 = index
+          r18 = _nt_module_declaration
+          if r18
+            r18 = SyntaxNode.new(input, (index-1)...index) if r18 == true
+            r17 = r18
           else
-            r17 = _nt_grammar
-            if r17
-              r17 = SyntaxNode.new(input, (index-1)...index) if r17 == true
-              r15 = r17
+            r19 = _nt_grammar
+            if r19
+              r19 = SyntaxNode.new(input, (index-1)...index) if r19 == true
+              r17 = r19
             else
-              @index = i15
-              r15 = nil
+              @index = i17
+              r17 = nil
             end
           end
-          s0 << r15
-          if r15
-            i18, s18 = index, []
-            r19 = _nt_space
-            s18 << r19
-            if r19
+          s0 << r17
+          if r17
+            i20, s20 = index, []
+            r21 = _nt_space
+            s20 << r21
+            if r21
               if (match_len = has_terminal?('end', false, index))
-                r20 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                r22 = instantiate_node(SyntaxNode,input, index...(index + match_len))
                 @index += match_len
               else
                 terminal_parse_failure('\'end\'')
-                r20 = nil
+                r22 = nil
               end
-              s18 << r20
+              s20 << r22
             end
-            if s18.last
-              r18 = instantiate_node(SyntaxNode,input, i18...index, s18)
-              r18.extend(ModuleDeclaration3)
+            if s20.last
+              r20 = instantiate_node(SyntaxNode,input, i20...index, s20)
+              r20.extend(ModuleDeclaration3)
             else
-              @index = i18
-              r18 = nil
+              @index = i20
+              r20 = nil
             end
-            s0 << r18
+            s0 << r20
           end
         end
         if s0.last

data/lib/treetop/compiler/metagrammar.treetop

@@ -18,7 +18,7 @@ module Treetop
       end
 
       rule module_declaration
-        module_prefix:('module' space name:([A-Z] alphanumeric_char* ('::' [A-Z] alphanumeric_char*)*) space) module_contents:(module_declaration / grammar) suffix:(space 'end') {
+        module_prefix:(('module'/'class') space name:([A-Z] alphanumeric_char* ('::' [A-Z] alphanumeric_char*)*) space) module_contents:(module_declaration / grammar) suffix:(space 'end') {
           def compile
             module_prefix.text_value + module_contents.compile + suffix.text_value
           end

data/lib/treetop/version.rb

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

data/spec/compiler/test_grammar.tt

@@ -1,7 +1,7 @@
-module Test
+class Test
   grammar Grammar
     rule foo
       'foo'
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: treetop
 version: !ruby/object:Gem::Version
-  version: 1.6.7
+  version: 1.6.8
 platform: ruby
 authors:
 - Nathan Sobo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-20 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyglot