From f5e1fb5e0c37a7c1137a1f14b0063ba0b6c017bf Mon Sep 17 00:00:00 2001 From: Jan Lelis Date: Wed, 17 Nov 2010 16:19:04 +0100 Subject: [PATCH] be compatible with 0.2.3 --- lib/ripl/multi_line.rb | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/lib/ripl/multi_line.rb b/lib/ripl/multi_line.rb index 0e6acd0..3034799 100644 --- a/lib/ripl/multi_line.rb +++ b/lib/ripl/multi_line.rb @@ -12,12 +12,12 @@ def prompt @buffer ? config[:multi_line_prompt] : super end - def loop_once - catch(:multiline) do - super - @buffer = nil - end - end + #def loop_once + # catch(:multiline) do + # super + # @buffer = nil + # end + #end def print_eval_error(e) if e.is_a?(SyntaxError) && e.message =~ /unexpected \$end|unterminated string meets end of file/ @@ -28,10 +28,27 @@ def print_eval_error(e) end end + #def eval_input(input) + # super(@buffer ? @buffer + input : input) + #end + end + + # non-plugin api hack + class Shell + alias loop_once_without_multiline loop_once + def loop_once + catch(:multiline) do + loop_once_without_multiline + @buffer = nil + end + end + + alias eval_input_without_multiline eval_input def eval_input(input) - super(@buffer ? @buffer + input : input) + eval_input_without_multiline(@buffer ? @buffer + input : input) end end + end Ripl::Shell.send :include, Ripl::MultiLine if defined? Ripl::Shell