lib/nydp/runner.rb in nydp-0.3.0 vs lib/nydp/runner.rb in nydp-0.4.0

@@ -47,11 +47,11 @@
       @quote      = Symbol.mk(:quote, ns)
     end
 
     def compile_and_eval expr
       begin
-        vm.thread Pair.new(Compiler.compile(expr, Nydp::NIL), Nydp::NIL)
+        vm.thread_with_expr Pair.new(Compiler.compile(expr, Nydp::NIL), Nydp::NIL)
       rescue StandardError => e
         raise Nydp::Error, "failed to eval #{expr.inspect}"
       end
     end
 
@@ -66,11 +66,11 @@
 
   class Runner < Evaluator
     def initialize vm, ns, stream, printer=nil, name=nil
       super vm, ns, name
       @printer    = printer
-      @parser     = Nydp::Parser.new(ns)
-      @tokens     = Nydp::Tokeniser.new stream
+      @parser     = Nydp.new_parser(ns)
+      @tokens     = Nydp.new_tokeniser stream
     end
 
     def print val
       @printer.puts val.inspect if @printer
     end