rattler 0.5.0 → 0.6.0

data/spec/rattler/{back_end → compiler}/parser_generator/back_reference_generator_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
-include Rattler::BackEnd::ParserGenerator
+include Rattler::Compiler::ParserGenerator
 include Rattler::Parsers
 
 describe BackReferenceGenerator do
@@ -9,7 +9,8 @@ describe BackReferenceGenerator do
 
   let(:ref) { BackReference[:a] }
 
-  let(:scope) { {:a => 'r0_2'} }
+  let(:scope) { ParserScope.new(bindings) }
+  let(:bindings) { {:a => 'r0_2'} }
 
   describe '#gen_basic' do
 
@@ -62,60 +63,6 @@ describe BackReferenceGenerator do
     end
   end
 
-  describe '#gen_dispatch_action' do
-
-    let(:code) { NodeCode.new('Word', 'parsed') }
-
-    context 'when nested' do
-      it 'generates nested regex matching code with a dispatch action' do
-        nested_code {|g| g.gen_dispatch_action ref, code, scope }.
-          should == (<<-CODE).strip
-begin
-  (r = @scanner.scan(/\#{r0_2}/)) &&
-  Word.parsed([r], :labeled => {:a => r0_2})
-end
-          CODE
-      end
-    end
-
-    context 'when top-level' do
-      it 'generates top level regex matching code with a dispatch action' do
-        top_level_code {|g| g.gen_dispatch_action ref, code, scope }.
-          should == (<<-CODE).strip
-(r = @scanner.scan(/\#{r0_2}/)) &&
-Word.parsed([r], :labeled => {:a => r0_2})
-          CODE
-      end
-    end
-  end
-
-  describe '#gen_direct_action' do
-
-    let(:code) { ActionCode.new('|_| _.to_sym') }
-
-    context 'when nested' do
-      it 'generates nested regex matching code with a direct action' do
-        nested_code {|g| g.gen_direct_action ref, code, scope }.
-          should == (<<-CODE).strip
-begin
-  (r = @scanner.scan(/\#{r0_2}/)) &&
-  (r.to_sym)
-end
-          CODE
-      end
-    end
-
-    context 'when top-level' do
-      it 'generates top level regex matching code with a direct action' do
-        top_level_code {|g| g.gen_direct_action ref, code, scope }.
-          should == (<<-CODE).strip
-(r = @scanner.scan(/\#{r0_2}/)) &&
-(r.to_sym)
-          CODE
-      end
-    end
-  end
-
   describe '#gen_token' do
 
     context 'when nested' do

data/spec/rattler/{back_end → compiler}/parser_generator/choice_generator_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
-include Rattler::BackEnd::ParserGenerator
+include Rattler::Compiler::ParserGenerator
 include Rattler::Parsers
 
 describe ChoiceGenerator do
@@ -88,68 +88,6 @@ end
     end
   end
 
-  describe '#gen_dispatch_action' do
-
-    let(:code) { NodeCode.new('Atom', 'parsed') }
-
-    context 'when nested' do
-      it 'generates nested choice matching code with a dispatch action' do
-        nested_code(:choice_level => 2) {|g| g.gen_dispatch_action choice, code }.
-          should == (<<-CODE).strip
-begin
-  (r = begin
-    @scanner.scan(/[[:alpha:]]+/) ||
-    @scanner.scan(/[[:digit:]]+/)
-  end) && Atom.parsed([r])
-end
-          CODE
-      end
-    end
-
-    context 'when top-level' do
-      it 'generates top-level choice matching code with a dispatch action' do
-        top_level_code(:choice_level => 0) {|g| g.gen_dispatch_action choice, code }.
-          should == (<<-CODE).strip
-(r = begin
-  @scanner.scan(/[[:alpha:]]+/) ||
-  @scanner.scan(/[[:digit:]]+/)
-end) && Atom.parsed([r])
-          CODE
-      end
-    end
-  end
-
-  describe '#gen_direct_action' do
-
-    let(:code) { ActionCode.new('|_| _.size') }
-
-    context 'when nested' do
-      it 'generates nested choice matching code with a direct action' do
-        nested_code(:choice_level => 2) {|g| g.gen_direct_action choice, code }.
-          should == (<<-CODE).strip
-begin
-  (r = begin
-    @scanner.scan(/[[:alpha:]]+/) ||
-    @scanner.scan(/[[:digit:]]+/)
-  end) && (r.size)
-end
-          CODE
-      end
-    end
-
-    context 'when top-level' do
-      it 'generates nested choice matching code with a direct action' do
-        top_level_code(:choice_level => 0) {|g| g.gen_direct_action choice, code }.
-          should == (<<-CODE).strip
-(r = begin
-  @scanner.scan(/[[:alpha:]]+/) ||
-  @scanner.scan(/[[:digit:]]+/)
-end) && (r.size)
-          CODE
-      end
-    end
-  end
-
   describe '#gen_token' do
 
     context 'when nested' do

data/spec/rattler/{back_end → compiler}/parser_generator/disallow_generator_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
-include Rattler::BackEnd::ParserGenerator
+include Rattler::Compiler::ParserGenerator
 include Rattler::Parsers
 
 describe DisallowGenerator do
@@ -58,60 +58,6 @@ describe DisallowGenerator do
     end
   end
 
-  describe '#gen_dispatch_action' do
-
-    let(:code) { NodeCode.new('Word', 'parsed') }
-
-    context 'when nested' do
-      it 'generates nested negative lookahead code with a dispatch action' do
-        nested_code {|g| g.gen_dispatch_action disallow, code }.
-          should == (<<-CODE).strip
-begin
-  @scanner.skip(/(?!\\d)/) &&
-  Word.parsed([])
-end
-          CODE
-      end
-    end
-
-    context 'when top-level' do
-      it 'generates top level negative lookahead code with a dispatch action' do
-        top_level_code {|g| g.gen_dispatch_action disallow, code }.
-          should == (<<-CODE).strip
-@scanner.skip(/(?!\\d)/) &&
-Word.parsed([])
-          CODE
-      end
-    end
-  end
-
-  describe '#gen_direct_action' do
-
-    let(:code) { ActionCode.new(':t') }
-
-    context 'when nested' do
-      it 'generates nested negative lookahead code with a direct action' do
-        nested_code {|g| g.gen_direct_action disallow, code }.
-          should == (<<-CODE).strip
-begin
-  @scanner.skip(/(?!\\d)/) &&
-  (:t)
-end
-          CODE
-      end
-    end
-
-    context 'when top-level' do
-      it 'generates top level negative lookahead code with a direct action' do
-        top_level_code {|g| g.gen_direct_action disallow, code }.
-          should == (<<-CODE).strip
-@scanner.skip(/(?!\\d)/) &&
-(:t)
-          CODE
-      end
-    end
-  end
-
   describe '#gen_token' do
 
     context 'when nested' do

data/spec/rattler/{back_end → compiler}/parser_generator/e_symbol_generator_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
-include Rattler::BackEnd::ParserGenerator
+include Rattler::Compiler::ParserGenerator
 include Rattler::Parsers
 
 describe ESymbolGenerator do
@@ -52,44 +52,6 @@ describe ESymbolGenerator do
     end
   end
 
-  describe '#gen_dispatch_action' do
-
-    let(:code) { NodeCode.new('Word', 'parsed') }
-
-    context 'when nested' do
-      it 'generates nested eof matching code with a dispatch action' do
-        nested_code {|g| g.gen_dispatch_action ESymbol[], code }.
-          should == 'Word.parsed([])'
-      end
-    end
-
-    context 'when top-level' do
-      it 'generates top level eof matching code with a dispatch action' do
-        top_level_code {|g| g.gen_dispatch_action ESymbol[], code }.
-          should == 'Word.parsed([])'
-      end
-    end
-  end
-
-  describe '#gen_direct_action' do
-
-    let(:code) { ActionCode.new(':foo') }
-
-    context 'when nested' do
-      it 'generates nested eof matching code with a direct action' do
-        nested_code {|g| g.gen_direct_action ESymbol[], code }.
-          should == '(:foo)'
-      end
-    end
-
-    context 'when top-level' do
-      it 'generates top level eof matching code with a direct action' do
-        top_level_code {|g| g.gen_direct_action ESymbol[], code }.
-          should == ':foo'
-      end
-    end
-  end
-
   describe '#gen_token' do
 
     context 'when nested' do

data/spec/rattler/{back_end → compiler}/parser_generator/eof_generator_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
-include Rattler::BackEnd::ParserGenerator
+include Rattler::Compiler::ParserGenerator
 include Rattler::Parsers
 
 describe EofGenerator do
@@ -52,44 +52,6 @@ describe EofGenerator do
     end
   end
 
-  describe '#gen_dispatch_action' do
-
-    let(:code) { NodeCode.new('Word', 'parsed') }
-
-    context 'when nested' do
-      it 'generates nested eof matching code with a dispatch action' do
-        nested_code {|g| g.gen_dispatch_action Eof[], code }.
-          should == '(Word.parsed([]) if @scanner.eos?)'
-      end
-    end
-
-    context 'when top-level' do
-      it 'generates top level eof matching code with a dispatch action' do
-        top_level_code {|g| g.gen_dispatch_action Eof[], code }.
-          should == 'Word.parsed([]) if @scanner.eos?'
-      end
-    end
-  end
-
-  describe '#gen_direct_action' do
-
-    let(:code) { ActionCode.new(':eof') }
-
-    context 'when nested' do
-      it 'generates nested eof matching code with a direct action' do
-        nested_code {|g| g.gen_direct_action Eof[], code }.
-          should == '((:eof) if @scanner.eos?)'
-      end
-    end
-
-    context 'when top-level' do
-      it 'generates top level eof matching code with a direct action' do
-        top_level_code {|g| g.gen_direct_action Eof[], code }.
-          should == '(:eof) if @scanner.eos?'
-      end
-    end
-  end
-
   describe '#gen_token' do
 
     context 'when nested' do

data/spec/rattler/{back_end → compiler}/parser_generator/fail_generator_spec.rb

@@ -2,27 +2,27 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
 include Rattler::Parsers
 
-describe Rattler::BackEnd::ParserGenerator::FailGenerator do
-  
+describe Rattler::Compiler::ParserGenerator::FailGenerator do
+
   include ParserGeneratorSpecHelper
-  
+
   describe '#gen_basic' do
-    
+
     context 'when nested' do
       context 'and fail type is :expr' do
-        
+
         let(:fail) { Fail[:expr, 'operator expected'] }
-        
+
         it 'generates a nested fail expression' do
           nested_code {|g| g.gen_basic fail }.
           should == '(fail! { "operator expected" })'
         end
       end
-      
+
       context 'and fail type is :rule' do
-        
+
         let(:fail) { Fail[:rule, 'identifier expected'] }
-        
+
         it 'generates a nested return statement returning a fail expression' do
           nested_code {|g| g.gen_basic fail }.
           should == (<<-CODE).strip
@@ -31,50 +31,121 @@ false
           CODE
         end
       end
-      
+
       context 'and fail type is :parse' do
-        
+
         let(:fail) { Fail[:parse, 'unexpected operator'] }
-        
+
         it 'generates a nested fail_parse statement' do
           nested_code {|g| g.gen_basic fail }.
           should == '(fail_parse { "unexpected operator" })'
         end
       end
     end
-    
+
     context 'when top-level' do
       context 'and fail type is :expr' do
-        
+
         let(:fail) { Fail[:expr, 'operator expected'] }
-        
+
         it 'generates a top-level fail expression' do
           top_level_code {|g| g.gen_basic fail }.
           should == 'fail! { "operator expected" }'
         end
       end
-      
+
       context 'and fail type is :rule' do
-        
+
         let(:fail) { Fail[:rule, 'identifier expected'] }
-        
+
         it 'generates a return statement returning a fail expression' do
           top_level_code {|g| g.gen_basic fail }.
           should == 'return(fail! { "identifier expected" })'
         end
       end
-      
+
       context 'and fail type is :parse' do
-        
+
         let(:fail) { Fail[:parse, 'unexpected operator'] }
-        
+
         it 'generates a top-level fail_parse statement' do
           top_level_code {|g| g.gen_basic fail }.
           should == 'fail_parse { "unexpected operator" }'
         end
       end
     end
-    
+
+  end
+
+  describe '#gen_skip' do
+
+    context 'when nested' do
+      context 'and fail type is :expr' do
+
+        let(:fail) { Fail[:expr, 'operator expected'] }
+
+        it 'generates a nested fail expression' do
+          nested_code {|g| g.gen_skip fail }.
+          should == '(fail! { "operator expected" })'
+        end
+      end
+
+      context 'and fail type is :rule' do
+
+        let(:fail) { Fail[:rule, 'identifier expected'] }
+
+        it 'generates a nested return statement returning a fail expression' do
+          nested_code {|g| g.gen_skip fail }.
+          should == (<<-CODE).strip
+return(fail! { "identifier expected" })
+false
+          CODE
+        end
+      end
+
+      context 'and fail type is :parse' do
+
+        let(:fail) { Fail[:parse, 'unexpected operator'] }
+
+        it 'generates a nested fail_parse statement' do
+          nested_code {|g| g.gen_skip fail }.
+          should == '(fail_parse { "unexpected operator" })'
+        end
+      end
+    end
+
+    context 'when top-level' do
+      context 'and fail type is :expr' do
+
+        let(:fail) { Fail[:expr, 'operator expected'] }
+
+        it 'generates a top-level fail expression' do
+          top_level_code {|g| g.gen_skip fail }.
+          should == 'fail! { "operator expected" }'
+        end
+      end
+
+      context 'and fail type is :rule' do
+
+        let(:fail) { Fail[:rule, 'identifier expected'] }
+
+        it 'generates a return statement returning a fail expression' do
+          top_level_code {|g| g.gen_skip fail }.
+          should == 'return(fail! { "identifier expected" })'
+        end
+      end
+
+      context 'and fail type is :parse' do
+
+        let(:fail) { Fail[:parse, 'unexpected operator'] }
+
+        it 'generates a top-level fail_parse statement' do
+          top_level_code {|g| g.gen_skip fail }.
+          should == 'fail_parse { "unexpected operator" }'
+        end
+      end
+    end
+
   end
-  
+
 end