0
@@ -9,11 +9,11 @@ module Treetop
0
 
0
       # compile a treetop file into ruby
0
       def ruby_source(source_path)
0
-        ruby_source_string(File.read(source_path))
0
+        ruby_source_from_string(File.read(source_path))
0
       end
0
 
0
       # compile a string containing treetop source into ruby
0
-      def ruby_source_string(s)
0
+      def ruby_source_from_string(s)
0
         parser = MetagrammarParser.new
0
         result = parser.parse(s)
0
         unless result
0
@@ -28,13 +28,13 @@ module Treetop
0
   def self.load(path)
0
     adjusted_path = path =~ /\.(treetop|tt)\Z/ ? path : path + '.treetop'
0
     File.open(adjusted_path) do |source_file|
0
-      load_string(source_file.read)
0
+      load_from_string(source_file.read)
0
     end
0
   end
0
 
0
   # compile a treetop source string and load it
0
-  def self.load_string(s)
0
+  def self.load_from_string(s)
0
     compiler = Treetop::Compiler::GrammarCompiler.new
0
-    Object.class_eval(compiler.ruby_source_string(s))
0
+    Object.class_eval(compiler.ruby_source_from_string(s))
0
   end
0
 end

0
@@ -40,12 +40,12 @@ describe Compiler::GrammarCompiler do
0
     compiler.ruby_source(source_path_with_treetop_extension).should_not be_nil
0
   end
0
   
0
-  specify "ruby_source_string compiles a grammar stored in string" do
0
-    compiler.ruby_source_string(File.read(source_path_with_treetop_extension)).should_not be_nil
0
+  specify "ruby_source_from_string compiles a grammar stored in string" do
0
+    compiler.ruby_source_from_string(File.read(source_path_with_treetop_extension)).should_not be_nil
0
   end
0
 
0
-  specify "Treetop.load_string compiles and evaluates a source grammar stored in string" do
0
-    Treetop.load_string File.read(source_path_with_treetop_extension)
0
+  specify "Treetop.load_from_string compiles and evaluates a source grammar stored in string" do
0
+    Treetop.load_from_string File.read(source_path_with_treetop_extension)
0
     Test::GrammarParser.new.parse('foo').should_not be_nil
0
   end
0