processor/command/eval.rb in trepanning-0.1.2 vs processor/command/eval.rb in trepanning-0.1.3

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2011 Rocky Bernstein <[e-mail]>
 require_relative './base/cmd'
+require_relative '../../app/util'
 
 class Trepan::Command::EvalCommand < Trepan::Command
 
   old_verbose = $VERBOSE  
   $VERBOSE    = nil
@@ -14,15 +15,27 @@
 
 The value of the expression is stored into a global variable so it
 may be used again easily. The name of the global variable is printed
 next to the inspect output of the value.
 
-If no string is given we run the string from the current source code
+If no string is given, we run the string from the current source code
 about to be run. If the command ends ? (via an alias) and no string is
-given we will also strip off any leading 'if', 'while', 'elseif',
-'return', 'case', 'unless', or 'until' in the string.
+given we will the following translations occur:
 
+   {if|elsif|unless} expr [then]  => expr
+   {until|while} expr [do]        => expr
+   return expr                    => expr
+   case expr                      => expr
+   def fn(params)                 => [params]
+   var = expr                     => expr
+
+The above is done via regular expression. No fancy parsing is done, say,
+to look to see if expr is split across a line or whether var an assigment
+might have multiple variables on the left-hand side.
+
+Examples:
+
 #{NAME} 1+2  # 3
 #{NAME} @v
 #{NAME}      # Run current source-code line
 #{NAME}?     # but strips off leading 'if', 'while', ..
              # from command 
@@ -35,25 +48,27 @@
   CATEGORY      = 'data'
   NEED_STACK    = true
   SHORT_HELP    = 'Run code in the current context'
   $VERBOSE      = old_verbose 
 
+  def complete(prefix)
+    if prefix.empty? 
+      if @proc.leading_str.start_with?('eval?')
+        Trepan::Util.extract_expression @proc.current_source_text
+      else
+        @proc.current_source_text 
+      end
+    else
+      prefix
+    end
+  end
+
   def run(args)
     if args.size == 1
       text  = @proc.current_source_text
       if  '?' == args[0][-1..-1] 
-        if text =~ /^\s*(?:if|elsif|unless)\s+/
-          text.gsub!(/^\s*(?:if|elsif|unless)\s+/,'') 
-          text.gsub!(/\s+then\s*$/, '')
-        elsif text =~ /^\s*(?:until|while)\s+/
-          text.gsub!(/^\s*(?:until|while)\s+/,'') 
-          text.gsub!(/\s+do\s*$/, '')
-        elsif text =~ /^\s*return\s+/
-          text.gsub!(/^\s*return\s+/,'')
-        elsif text =~ /^\s*case\s+/
-          text.gsub!(/^\s*case\s*/,'')
-        end
+        text = Trepan::Util::extract_expression(text)
         msg "eval: #{text}"
       end
     else
       text = @proc.cmd_argstr
     end
@@ -65,6 +80,12 @@
   require_relative '../mock'
   dbgr, cmd = MockDebugger::setup
   arg_str = '1 + 2'
   cmd.proc.instance_variable_set('@cmd_argstr', arg_str)
   puts "eval #{arg_str} is: #{cmd.run([cmd.name, arg_str])}"
+  arg_str = 'return "foo"'
+  # def cmd.proc.current_source_text
+  #   'return "foo"'
+  # end
+  # cmd.proc.instance_variable_set('@cmd_argstr', arg_str)
+  # puts "eval? #{arg_str} is: #{cmd.run([cmd.name + '?'])}"
 end