lib/xen/grammar.treetop lib/xen/grammar_node_classes.rb @@ -2,12 +2,12 @@ require 'rubygems' require 'treetop' require File.dirname(__FILE__) + '/xen/ast' -Treetop.load File.dirname(__FILE__) + '/xen/xen_config_file_you_shouldnt_use' -require File.dirname(__FILE__) + '/xen/xen_config_file_you_shouldnt_use_node_classes' +Treetop.load File.dirname(__FILE__) + '/xen/grammar' +require File.dirname(__FILE__) + '/xen/grammar_node_classes' module XenConfigFile class Parser < Treetop::Runtime::CompiledParser - include XenConfigFileYouShouldntUse + include XenConfigFile::Grammar def simple_parse(io) parsed = parse(io) lib/dot_xen.rb @@ -12,7 +12,7 @@ describe XenConfigFile::Parser, "parsing" do @result.should_not be_nil end it "should return a kind of XenConfigFileYouShouldntUse::ConfigFileNode" do - @result.should be_a_kind_of(XenConfigFileYouShouldntUse::ConfigFileNode) + @result.should be_a_kind_of(XenConfigFile::Grammar::ConfigFileNode) end describe "evaluated output" do spec/integrations/xen_spec.rb @@ -15,7 +15,7 @@ describe XenConfigFile::Parser, "parsing" do @result.should_not be_nil end it "should return a kind of XenConfigFileYouShouldntUse::ConfigFileNode" do - @result.should be_a_kind_of(XenConfigFileYouShouldntUse::ConfigFileNode) + @result.should be_a_kind_of(XenConfigFile::Grammar::ConfigFileNode) end describe "evaluated output" do spec/integrations/xen_writer_spec.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../spec_helper' -describe XenConfigFileYouShouldntUse::AssignmentNode do +describe XenConfigFile::Grammar::AssignmentNode do before(:all) do @parser = XenConfigFile::Parser.new end @@ -16,7 +16,7 @@ describe XenConfigFileYouShouldntUse::AssignmentNode do @result.should_not be_nil end it "should return an assignment node you shouldn't use" do - @result.should be_a_kind_of(XenConfigFileYouShouldntUse::ConfigFileNode) + @result.should be_a_kind_of(XenConfigFile::Grammar::ConfigFileNode) end describe " calling .eval" do before(:all) do @@ -41,7 +41,7 @@ describe XenConfigFileYouShouldntUse::AssignmentNode do @result.should_not be_nil end it "should return an assignment node you shouldn't use" do - @result.should be_a_kind_of(XenConfigFileYouShouldntUse::ConfigFileNode) + @result.should be_a_kind_of(XenConfigFile::Grammar::ConfigFileNode) end describe " calling .eval" do before(:all) do spec/units/array_spec.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../spec_helper' -describe XenConfigFileYouShouldntUse::CommentNode do +describe XenConfigFile::Grammar::CommentNode do before(:all) do @parser = XenConfigFile::Parser.new end @@ -16,7 +16,7 @@ describe XenConfigFileYouShouldntUse::CommentNode do @result.should_not be_nil end it "should return a comment node you shouldn't use" do - @result.should be_a_kind_of(XenConfigFileYouShouldntUse::ConfigFileNode) + @result.should be_a_kind_of(XenConfigFile::Grammar::ConfigFileNode) end describe " calling .eval" do before(:all) do spec/units/comment_spec.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../spec_helper' -describe XenConfigFileYouShouldntUse::AssignmentNode do +describe XenConfigFile::Grammar::AssignmentNode do before(:all) do @parser = XenConfigFile::Parser.new end @@ -16,7 +16,7 @@ describe XenConfigFileYouShouldntUse::AssignmentNode do @result.should_not be_nil end it "should return an assignment node you shouldn't use" do - @result.should be_a_kind_of(XenConfigFileYouShouldntUse::ConfigFileNode) + @result.should be_a_kind_of(XenConfigFile::Grammar::ConfigFileNode) end describe " calling .eval" do before(:all) do spec/units/number_assignment_spec.rb @@ -1,6 +1,6 @@ require File.dirname(__FILE__) + '/../spec_helper' -describe XenConfigFileYouShouldntUse::AssignmentNode do +describe XenConfigFile::Grammar::AssignmentNode do before(:all) do @parser = XenConfigFile::Parser.new end @@ -16,7 +16,7 @@ describe XenConfigFileYouShouldntUse::AssignmentNode do @result.should_not be_nil end it "should return an assignment node you shouldn't use" do - @result.should be_a_kind_of(XenConfigFileYouShouldntUse::ConfigFileNode) + @result.should be_a_kind_of(XenConfigFile::Grammar::ConfigFileNode) end describe " calling .eval" do before(:all) do @@ -38,7 +38,7 @@ describe XenConfigFileYouShouldntUse::AssignmentNode do @result.should_not be_nil end it "should return an assignment node you shouldn't use" do - @result.should be_a_kind_of(XenConfigFileYouShouldntUse::ConfigFileNode) + @result.should be_a_kind_of(XenConfigFile::Grammar::ConfigFileNode) end describe " calling .eval" do before(:all) do spec/units/string_assignment_spec.rb lib/xen/xen_config_file_you_shouldnt_use.treetop lib/xen/xen_config_file_you_shouldnt_use_node_classes.rb f0282a92333b2147a4fe3914732016d7bee03342 atmos atmos@atmos.org http://github.com/atmos/dot_xen/commit/acb7f5564c50796ce6d36868df37a0cf01436f47 acb7f5564c50796ce6d36868df37a0cf01436f47 2008-10-14T17:35:01-07:00 2008-10-14T17:35:01-07:00 shuffle a bunch of code so we no longer have the YouShouldntUse shit 6beac6f76ad4f3cf84a29dddf06e82a6863f219b atmos atmos@atmos.org