From: ueno <ueno>
Date: Fri, 12 Aug 2005 04:41:34 +0000 (+0000)
Subject: Use singleton method for preparing empty environment.
X-Git-Tag: channel-coding-branchpoint~129
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=36f97b692be425911655932b701941de18655ae3;p=elisp%2Friece.git

Use singleton method for preparing empty environment.
---

diff --git a/lisp/server.rb b/lisp/server.rb
index 0fbb7a7..05220b8 100644
--- a/lisp/server.rb
+++ b/lisp/server.rb
@@ -98,25 +98,9 @@ class Server
     send_line("S name #{name}\r\n")
     send_line("OK\r\n")
     Thread.current[:rubyserv_name] = name
-    out, log = @out, @log
-    env = Module.new
-    env.module_eval do
-      @out, @log = out, log
-
-      def send_line(line)
-	@out.puts(line)
-	@log.puts(line) if @log
-      end
-      module_function :send_line
-
-      def output(s)
-	send_line("# output #{Thread.current[:rubyserv_name]} #{s}\r\n")
-      end
-      module_function :output
-    end
     begin
       Thread.current[:rubyserv_error] = false
-      Thread.current[:rubyserv_response] = eval(r, env.module_eval {binding()})
+      Thread.current[:rubyserv_response] = eval(r, exec_env.empty_binding)
     rescue Exception => e
       Thread.current[:rubyserv_error] = true
       Thread.current[:rubyserv_response] = e.to_s.sub(/\A.*?\n/, '')
@@ -186,6 +170,23 @@ class Server
     @out.puts(line)
     @log.puts(line) if @log
   end
+
+  def exec_env
+    env = Object.new
+    def env.empty_binding
+      binding
+    end
+    out, log = @out, @log
+    env.instance_eval {@out, @log = out, log}
+    def env.send_line(line)
+      @out.puts(line)
+      @log.puts(line) if @log
+    end
+    def env.output(s)
+      send_line("# output #{Thread.current[:rubyserv_name]} #{s}\r\n")
+    end
+    env
+  end
 end
 
 if $0 == __FILE__