lib/nydp.rb in nydp-0.2.2 vs lib/nydp.rb in nydp-0.2.3

@@ -1,37 +1,11 @@
-module Nydp
-  PLUGINS = []
+require 'date'
+require 'set'
 
-  def self.plug_in plugin ; PLUGINS << plugin                   ; end
-  def self.load_rake_tasks; PLUGINS.each &:load_rake_tasks      ; end
-  def self.setup ns;        PLUGINS.each { |plg| plg.setup ns } ; end
-  def self.loadfiles;       PLUGINS.map(&:loadfiles).flatten    ; end
-  def self.testfiles;       PLUGINS.map(&:testfiles).flatten    ; end
-  def self.plugin_names   ; PLUGINS.map(&:name)                 ; end
-  def self.loadall ns, plugin, files
-    vm = VM.new(ns)
-    apply_function ns, :"script-run", :"plugin-start", plugin.name if plugin
-    files.each { |f|
-      script_name = f.gsub plugin.base_path, ""
-      reader = Nydp::StreamReader.new(File.new(f))
-      Nydp::Runner.new(vm, ns, reader, nil, (script_name || f)).run
-    }
-  ensure
-    apply_function ns, :"script-run", :"plugin-end", plugin.name if plugin
+module Nydp
+  class Namespace < Hash
   end
-
-  def self.build_nydp extra_files=nil
-    ns = { }
-    setup(ns)
-    PLUGINS.each { |plg|
-      loadall ns, plg, plg.loadfiles
-      loadall ns, plg, plg.testfiles
-    }
-    loadall ns, nil, extra_files if extra_files
-    ns
-  end
-
   def self.apply_function ns, function_name, *args
     function = r2n(function_name.to_sym, ns).value
     args     = r2n args, ns
     vm       = VM.new(ns)
 
@@ -41,28 +15,37 @@
 
   def self.reader                          txt ; Nydp::StringReader.new txt                                 ; end
   def self.eval_src      ns, src_txt, name=nil ; eval_with Nydp::Runner, ns, src_txt, name                  ; end
   def self.eval_src!     ns, src_txt, name=nil ; eval_with Nydp::ExplodeRunner, ns, src_txt, name           ; end
   def self.eval_with runner, ns, src_txt, name ; runner.new(VM.new(ns), ns, reader(src_txt), nil, name).run ; end
+  def self.ms                           t1, t0 ; ((t1 - t0) * 1000).to_i                                    ; end
 
-  def self.repl
+  def self.repl options={ }
+    launch_time = Time.now
+    last_script_time = Time.now
     puts "welcome to nydp"
-    puts "^D to exit"
     reader = Nydp::ReadlineReader.new $stdin, "nydp > "
-    ns     = build_nydp
+    ns     = build_nydp do |script|
+      this_script_time = Time.now
+      puts "script #{script} time #{ms this_script_time, last_script_time}ms" if options[:verbose]
+      last_script_time = this_script_time
+    end
+    load_time = Time.now
+    puts "repl ready in #{ms(load_time, launch_time)}ms"
+    puts "^D to exit"
     Nydp::Runner.new(VM.new(ns), ns, reader, $stdout, "<stdin>").run
   end
 
   def self.tests *options
     verbose = options.include?(:verbose) ? "t" : "nil"
     puts "welcome to nydp : running tests"
     reader = Nydp::StringReader.new "(run-all-tests #{verbose})"
     ns     = build_nydp
     Nydp::Runner.new(VM.new(ns), ns, reader, nil, "<test-runner>").run
   end
-
 end
 
+require "nydp/plugin"
 require "nydp/core"
 require "nydp/date"
 require "nydp/runner"
 require "nydp/error"
 require "nydp/truth"