Changeset 812

Timestamp:

10/29/07 10:59:37 (6 years ago)

Author:

cho45

Message:

lang/ruby/Amalgam/plugins/debug_eval.rb,
lang/ruby/Amalgam/plugins/firefox.rb,
lang/ruby/Amalgam/AppController.rb:

どうも inspect でおちていたらしい。よくわからない

Location:

lang/ruby/Amalgam

Files:

• AppController.rb (modified) (3 diffs)
• plugins/debug_eval.rb (modified) (2 diffs)
• plugins/firefox.rb (modified) (1 diff)

lang/ruby/Amalgam/AppController.rb

@@ -127 +127 @@
 
         def reload
-                [plugins, default_plugins].each do |p|
-                        p.reload.first.each do |c|
+                reloaded = []
+                [self.plugins, self.default_plugins].each do |pl|
+                        pl.reload.first.each do |c|
+                                log c
+                                reloaded << c
                                 plugins[c].init(@controller)
                         end
                 end
+                reloaded
+        end
+
+        def inspect
+                "#<%s:%#08x>" % [self.class.to_s, self.object_id]
         end
 end
@@ -199 +207 @@
                         rescue Exception => e
                                 log e
+                                $stderr.puts e.backtrace
                                 alert("Error", e.inspect)
                         end
@@ -432 +441 @@
         end
 
-        def reload
-                @config.reload
-        end
-
-
-end
-
-
+end
+
+

lang/ruby/Amalgam/plugins/debug_eval.rb

@@ -18 +18 @@
                         ]
                 else
-                        # @config を評価すると SEGV するためコメントアウト
                         [
                                 "restart",
-                        #       "reload",
-                        #       "build_candidates",
+                                "@config.reload",
+                                "build_candidates",
                         ].map do |m|
                                 Candidate.new(m, m, NSApp.applicationIconImage) do
@@ -38 +37 @@
                 rescue Exception => e
                         result = e.inspect
+                        result << "\n#{e.backtrace.join("\n")}"
                 end
                 log result

lang/ruby/Amalgam/plugins/firefox.rb

@@ -35 +35 @@
                 telnet.cmd("") { |c| result << c }
                 eval(result.gsub(/repl> /, ""))
-        rescue
+        rescue Exception
                 log "Failed to get history... retry..."
                 sleep 10