lib/compiler-ng/context.rb @@ -15,7 +15,7 @@ class Autoload @name = name @scope = scope @original_path = path - @path, @rbc, @ext = Compiler::Utils.split_path(path) + @path, @rbc, @ext = Requirer::Utils.split_path(path) Autoload.add(self) end @@ -24,7 +24,7 @@ class Autoload # it calls this method on us def call self.class.remove @path - Compiler::Utils.unified_load path, @path, @rbc, @ext, true + Requirer::Utils.unified_load path, @path, @rbc, @ext, true scope.const_get @name end kernel/common/autoload.rb @@ -414,6 +414,8 @@ module Rubinius ## # Graphs the control flow of this method def graph_control(file, open_now=false) + raise "We're sorry, this is out of order. Check back soon." + require 'compiler/blocks' require 'compiler/blocks_graph' kernel/common/compiled_method.rb @@ -72,7 +72,7 @@ module Kernel raise ArgumentError, "unknown type of binding" end - context = Compiler::Context.new binding.variables, binding.code + context = Rubinius::CompilerNG::Context.new binding.variables, binding.code compiled_method = Rubinius::CompilerNG.compile_eval string, context, filename, lineno compiled_method.scope = binding.static_scope @@ -145,7 +145,7 @@ module Kernel Rubinius::CompiledMethod.of_sender, Rubinius::StaticScope.of_sender) - context = Compiler::Context.new binding.variables, binding.code + context = Rubinius::CompilerNG::Context.new binding.variables, binding.code compiled_method = Rubinius::CompilerNG.compile_eval string, context, filename, line compiled_method.scope = binding.static_scope.using_current_as(metaclass) @@ -222,7 +222,7 @@ class Module variables = Rubinius::VariableScope.of_sender method = Rubinius::CompiledMethod.of_sender - context = Compiler::Context.new variables, method + context = Rubinius::CompilerNG::Context.new variables, method string = StringValue(string) kernel/common/eval.rb @@ -690,7 +690,7 @@ module Kernel end end - Compiler::Utils.unified_load path, rb, rbc, ext, nil, opts + Requirer::Utils.unified_load path, rb, rbc, ext, nil, opts end module_function :load @@ -738,9 +738,9 @@ module Kernel # def require(path) path = StringValue(path) - rb, rbc, ext = Compiler::Utils.split_path path + rb, rbc, ext = Requirer::Utils.split_path path Autoload.remove(rb) - Compiler::Utils.unified_load path, rb, rbc, ext, true + Requirer::Utils.unified_load path, rb, rbc, ext, true end module_function :require kernel/common/kernel.rb @@ -13,41 +13,19 @@ end # Main entrace point to the Rubinius compiler. Handles loading and compiling # ruby code. -class Compiler +class Requirer # TODO: This is temporary until the compiler is refactored def self.version_number 42 # No question mark. This is fact. end - class Context - def initialize(variables, method) - @variables = variables - @method = method - end - - attr_accessor :variables - attr_accessor :method - - def dynamic_locals - @variables.dynamic_locals - end - - def set_eval_local(name, val) - dynamic_locals[name] = val - end - - def eval_local_defined?(name) - @variables.eval_local_defined?(name) - end - end - # TODO: This is temporary until the compiler is refactored module Utils @load_rbc_directly = false def self.compiler - return ::Compiler + return ::Requirer end def self.version_number @@ -104,10 +82,10 @@ class Compiler rb.slice! '~/' if rb rbc.slice! '~/' if rbc ext.slice! '~/' if ext - res = Compiler::Utils.single_load "#{ENV['HOME']}/", rb, rbc, ext, requiring, options + res = Requirer::Utils.single_load "#{ENV['HOME']}/", rb, rbc, ext, requiring, options else - res = Compiler::Utils.single_load '', rb, rbc, ext, requiring, options + res = Requirer::Utils.single_load '', rb, rbc, ext, requiring, options end return res unless res.nil? # false is valid @@ -149,7 +127,7 @@ class Compiler # Fall through end - res = Compiler::Utils.single_load "#{dir}/", rb, rbc, ext, requiring, options + res = Requirer::Utils.single_load "#{dir}/", rb, rbc, ext, requiring, options return res unless res.nil? # false is valid end end @@ -243,7 +221,7 @@ class Compiler end compile_feature(rb, requiring) do - cm = Compiler::Utils.compile_file(rb_path) + cm = Requirer::Utils.compile_file(rb_path) raise LoadError, "Unable to compile: #{rb_path}" unless cm end @@ -348,7 +326,7 @@ class Compiler end end - Compiler::Utils.single_load '', rb, rbc, ext, false, options + Requirer::Utils.single_load '', rb, rbc, ext, false, options end def self.split_path(path) @@ -375,4 +353,4 @@ class Compiler end end # module Utils -end # class Compiler +end # class Requirer kernel/delta/requirer.rb @@ -116,7 +116,7 @@ module Rubinius options.on "-", "Read and evaluate code from STDIN" do @run_irb = false $0 = "-" - Compiler::Utils.execute STDIN.read + Requirer::Utils.execute STDIN.read end options.on "--", "Stop processing command line arguments" do @@ -346,8 +346,8 @@ module Rubinius TOPLEVEL_BINDING.static_scope.script = CompiledMethod::Script.new TOPLEVEL_BINDING.static_scope.script.path = @script - Compiler::Utils.debug_script! if @debugging - Compiler::Utils.load_from_extension @script, + Requirer::Utils.debug_script! if @debugging + Requirer::Utils.load_from_extension @script, :no_rbc => @no_rbc, :root_script => true else if @script.suffix?(".rb") @@ -389,7 +389,7 @@ module Rubinius end else $0 = "(eval)" - Compiler::Utils.execute "p #{STDIN.read}" + Requirer::Utils.execute "p #{STDIN.read}" end end kernel/loader.rb @@ -6,6 +6,7 @@ require 'compiler-ng/locals' require 'compiler-ng/ast' require 'compiler-ng/generator' require 'compiler-ng/stack_calculator' +require 'compiler-ng/context' require 'compiler-ng/iseq' require 'compiler-ng/opcodes' require 'compiler-ng/compiled_file' lib/compiler-ng.rb 55175ce2abe9a0078133f2102398fea5e6e29ded Brian Ford bford@engineyard.com http://github.com/evanphx/rubinius/commit/be61c301f937abc1f1daef253cc716c23482b352 be61c301f937abc1f1daef253cc716c23482b352 2009-11-06T10:42:29-08:00 2009-11-06T10:31:57-08:00 More hacks but let's just avoid as much confusion as possible. Requirer needs to be completely rewritten, and it will be, soon. 8f88b2354049757cfb431d973679b0affbf52352 Brian Ford bford@engineyard.com