octave: src/input.cc comparison

comparison src/input.cc @ 10315:57a59eae83cc

untabify src C++ source files

author	John W. Eaton <jwe@octave.org>
date	Thu, 11 Feb 2010 12:41:46 -0500
parents	095a1e670e68
children	479cc8a0a846

comparison

equal deleted inserted replaced

-:07ebe522dac2
+:57a59eae83cc
 : (Vecho_executing_commands & ECHO_CMD_LINE) && ! forced_interactive;
 if (do_echo)
 {
 if (forced_interactive)
-	{
+{
-	  if (promptflag > 0)
+if (promptflag > 0)
-	    octave_stdout << command_editor::decode_prompt_string (VPS1);
+octave_stdout << command_editor::decode_prompt_string (VPS1);
-	  else
+else
-	    octave_stdout << command_editor::decode_prompt_string (VPS2);
+octave_stdout << command_editor::decode_prompt_string (VPS2);
-	}
+}
 else
-	octave_stdout << command_editor::decode_prompt_string (VPS4);
+octave_stdout << command_editor::decode_prompt_string (VPS4);
 if (! input_string.empty ())
-	{
+{
-	  octave_stdout << input_string;
+octave_stdout << input_string;
-	  if (input_string[input_string.length () - 1] != '\n')
+if (input_string[input_string.length () - 1] != '\n')
-	    octave_stdout << "\n";
+octave_stdout << "\n";
-	}
+}
 }
 }
 std::string
 gnu_readline (const std::string& s, bool force_readline)
 bool eof;
 retval = command_editor::readline (s, eof);
 if (! eof && retval.empty ())
-	retval = "\n";
+retval = "\n";
 }
 else
 {
 if (! s.empty () && (interactive || forced_interactive))
-	{
+{
-	  FILE *stream = command_editor::get_output_stream ();
+FILE *stream = command_editor::get_output_stream ();
-	  fputs (s.c_str (), stream);
+fputs (s.c_str (), stream);
-	  fflush (stream);
+fflush (stream);
-	}
+}
 FILE *curr_stream = command_editor::get_input_stream ();
 if (reading_fcn_file || reading_script_file || reading_classdef_file)
-	curr_stream = ff_instream;
+curr_stream = ff_instream;
 retval = octave_fgets (curr_stream);
 }
 return retval;
 // in drawnow so that the error doesn't reappear at every prompt.
 Vdrawnow_requested = false;
 if (error_state)
-	return "\n";
+return "\n";
 }
 return gnu_readline (s, force_readline);
 }
 bool history_skip_auto_repeated_debugging_command = false;
 if ((interactive || forced_interactive)
 && (! (reading_fcn_file
-	     || reading_classdef_file
+|| reading_classdef_file
-	     || reading_script_file
+|| reading_script_file
-	     || get_input_from_eval_string
+|| get_input_from_eval_string
-	     || input_from_startup_file
+|| input_from_startup_file
-	     || input_from_command_line_file)))
+|| input_from_command_line_file)))
 {
 std::string ps = (promptflag > 0) ? VPS1 : VPS2;
 std::string prompt = command_editor::decode_prompt_string (ps);
 retval = interactive_input (prompt);
 // There is no need to update the load_path cache if there is no
 // user input.
 if (! retval.empty ()
-	  && retval.find_first_not_of (" \t\n\r") != std::string::npos)
+&& retval.find_first_not_of (" \t\n\r") != std::string::npos)
-	{
+{
-	  load_path::update ();
+load_path::update ();
-	  if (Vdebugging)
+if (Vdebugging)
-	    last_debugging_command = retval;
+last_debugging_command = retval;
-	  else
+else
-	    last_debugging_command = std::string ();
+last_debugging_command = std::string ();
-	}
+}
 else if (Vdebugging)
-	{
+{
-	  retval = last_debugging_command;
+retval = last_debugging_command;
-	  history_skip_auto_repeated_debugging_command = true;
+history_skip_auto_repeated_debugging_command = true;
-	}
+}
 }
 else
 retval = gnu_readline ("");
 current_input_line = retval;
 if (! current_input_line.empty ())
 {
 if (! (input_from_startup_file || input_from_command_line_file
-	     || history_skip_auto_repeated_debugging_command))
+|| history_skip_auto_repeated_debugging_command))
-	command_history::add (current_input_line);
+command_history::add (current_input_line);
 if (! (reading_fcn_file || reading_script_file || reading_classdef_file))
-	{
+{
-	  octave_diary << current_input_line;
+octave_diary << current_input_line;
-	  if (current_input_line[current_input_line.length () - 1] != '\n')
+if (current_input_line[current_input_line.length () - 1] != '\n')
-	    octave_diary << "\n";
+octave_diary << "\n";
-	}
+}
 do_input_echo (current_input_line);
 }
 else if (! (reading_fcn_file || reading_script_file || reading_classdef_file))
 octave_diary << "\n";
 std::string retval;
 if (get_input_from_eval_string)
 {
 if (input_from_eval_string_pending)
-	{
+{
-	  input_from_eval_string_pending = false;
+input_from_eval_string_pending = false;
-	  retval = current_eval_string;
+retval = current_eval_string;
-	  size_t len = retval.length ();
+size_t len = retval.length ();
-	  if (len > 0 && retval[len-1] != '\n')
+if (len > 0 && retval[len-1] != '\n')
-	    retval.append ("\n");
+retval.append ("\n");
-	}
+}
 }
 else
 retval = octave_gets ();
 current_input_line = retval;
 chars_left -= len;
 pos += len;
 // Make sure input ends with a new line character.
 if (chars_left == 0 && buf[len-1] != '\n')
-	{
+{
-	  if (len < max_size)
+if (len < max_size)
-	    {
+{
-	      // There is enough room to plug the newline character in
+// There is enough room to plug the newline character in
-	      // the buffer.
+// the buffer.
-	      buf[len++] = '\n';
+buf[len++] = '\n';
-	    }
+}
-	  else
+else
-	    {
+{
-	      // There isn't enough room to plug the newline character
+// There isn't enough room to plug the newline character
-	      // in the buffer so make sure it is returned on the next
+// in the buffer so make sure it is returned on the next
-	      // octave_read call.
+// octave_read call.
-	      pos = eol;
+pos = eol;
-	      chars_left = 1;
+chars_left = 1;
-	    }
+}
-	}
+}
 status = len;
 }
 else if (chars_left == 0)
 // FIXME -- make this generate file names when appropriate.
 static string_vector
 generate_possible_completions (const std::string& text, std::string& prefix,
-			       std::string& hint)
+std::string& hint)
 {
 string_vector names;
 prefix = "";
 for (size_t i = 0; i < dirfns_commands_length; i++)
 {
 int index = line.find (dirfns_commands[i] + " ");
 if (index == 0)
-	{
+{
-	  retval = true;
+retval = true;
-	  break;
+break;
-	}
+}
 }
 return retval;
 }
 // No reason to display symbols while completing a
 // file/directory operation.
 if (is_completing_dirfns ())
-	name_list = string_vector ();
+name_list = string_vector ();
 else
 name_list = generate_possible_completions (text, prefix, hint);
 name_list_len = name_list.length ();
 hint_len = hint.length ();
 matches = 0;
 for (int i = 0; i < name_list_len; i++)
-	if (hint == name_list[i].substr (0, hint_len))
+if (hint == name_list[i].substr (0, hint_len))
-	  matches++;
+matches++;
 }
 if (name_list_total_len > 0 && matches > 0)
 {
 while (list_index < name_list_total_len)
-	{
+{
-	  std::string name = name_list[list_index];
+std::string name = name_list[list_index];
-	  list_index++;
+list_index++;
-	  if (hint == name.substr (0, hint_len))
+if (hint == name.substr (0, hint_len))
-	    {
+{
-	      if (list_index <= name_list_len && ! prefix.empty ())
+if (list_index <= name_list_len && ! prefix.empty ())
-		retval = prefix + "." + name;
+retval = prefix + "." + name;
-	      else
+else
-		retval = name;
+retval = name;
-	      // FIXME -- looks_like_struct is broken for now,
+// FIXME -- looks_like_struct is broken for now,
-	      // so it always returns false.
+// so it always returns false.
-	      if (matches == 1 && looks_like_struct (retval))
+if (matches == 1 && looks_like_struct (retval))
-		{
+{
-		  // Don't append anything, since we don't know
+// Don't append anything, since we don't know
-		  // whether it should be '(' or '.'.
+// whether it should be '(' or '.'.
-		  command_editor::set_completion_append_character ('\0');
+command_editor::set_completion_append_character ('\0');
-		}
+}
-	      else
+else
-		command_editor::set_completion_append_character
+command_editor::set_completion_append_character
-		  (Vcompletion_append_char);
+(Vcompletion_append_char);
-	      break;
+break;
-	    }
+}
-	}
+}
 }
 return retval;
 }
 if (caller)
 {
 nm = caller->fcn_file_name ();
 if (nm.empty ())
-	nm = caller->name ();
+nm = caller->name ();
 else
-	have_file = true;
+have_file = true;
 }
 else
 curr_debug_line = -1;
 std::ostringstream buf;
 if (! nm.empty ())
 {
 if (Vgud_mode)
-	{
+{
-	  static char ctrl_z = 'Z' & 0x1f;
+static char ctrl_z = 'Z' & 0x1f;
-	  buf << ctrl_z << ctrl_z << nm << ":" << curr_debug_line;
+buf << ctrl_z << ctrl_z << nm << ":" << curr_debug_line;
-	}
+}
 else
-	{
+{
-	  // FIXME -- we should come up with a clean way to detect
+// FIXME -- we should come up with a clean way to detect
-	  // that we are stopped on the no-op command that marks the
+// that we are stopped on the no-op command that marks the
-	  // end of a function or script.
+// end of a function or script.
-	  buf << "stopped in " << nm;
+buf << "stopped in " << nm;
-	  if (curr_debug_line > 0)
+if (curr_debug_line > 0)
-	    buf << " at line " << curr_debug_line;
+buf << " at line " << curr_debug_line;
-	  if (have_file)
+if (have_file)
-	    {
+{
-	      std::string line_buf
+std::string line_buf
-		= get_file_line (nm, curr_debug_line);
+= get_file_line (nm, curr_debug_line);
-	      if (! line_buf.empty ())
+if (! line_buf.empty ())
-		buf << "\n" << curr_debug_line << ": " << line_buf;
+buf << "\n" << curr_debug_line << ": " << line_buf;
-	    }
+}
-	}
+}
 }
 std::string msg = buf.str ();
 if (! msg.empty ())
 std::string input_buf = interactive_input (prompt.c_str (), true);
 if (! (error_state || input_buf.empty ()))
 {
 if (! input_from_startup_file)
-	command_history::add (input_buf);
+command_history::add (input_buf);
 size_t len = input_buf.length ();
 octave_diary << input_buf;
 if (input_buf[len - 1] != '\n')
-	octave_diary << "\n";
+octave_diary << "\n";
 if (len < 1)
-	return read_as_string ? octave_value ("") : octave_value (Matrix ());
+return read_as_string ? octave_value ("") : octave_value (Matrix ());
 if (read_as_string)
-	{
+{
-	  // FIXME -- fix gnu_readline and octave_gets instead!
+// FIXME -- fix gnu_readline and octave_gets instead!
-	  if (input_buf.length () == 1 && input_buf[0] == '\n')
+if (input_buf.length () == 1 && input_buf[0] == '\n')
-	    retval(0) = "";
+retval(0) = "";
-	  else
+else
-	    retval(0) = input_buf;
+retval(0) = input_buf;
-	}
+}
 else
-	{
+{
-	  int parse_status = 0;
+int parse_status = 0;
-	  retval = eval_string (input_buf, true, parse_status, nargout);
+retval = eval_string (input_buf, true, parse_status, nargout);
-	  if (! Vdebugging && retval.length () == 0)
+if (! Vdebugging && retval.length () == 0)
-	    retval(0) = Matrix ();
+retval(0) = Matrix ();
-	}
+}
 }
 else
 error ("input: reading user-input failed!");
 return retval;
 while (1)
 {
 std::string input_buf = interactive_input (prompt_string, true);
 if (input_buf == "yes")
-	return true;
+return true;
 else if (input_buf == "no")
-	return false;
+return false;
 else
-	message (0, "Please answer yes or no.");
+message (0, "Please answer yes or no.");
 }
 }
 DEFUN (yes_or_no, args, ,
 "-*- texinfo -*-\n\
 if (nargin == 0 || nargin == 1)
 {
 std::string prompt;
 if (nargin == 1)
-	{
+{
-	  prompt = args(0).string_value ();
+prompt = args(0).string_value ();
-	  if (error_state)
+if (error_state)
-	    {
+{
-	      error ("yes_or_no: expecting argument to be character string");
+error ("yes_or_no: expecting argument to be character string");
-	      return retval;
+return retval;
-	    }
+}
-	}
+}
 retval = octave_yes_or_no (prompt);
 }
 else
 print_usage ();
 switch (argc)
 {
 case 1:
 {
-	if ((Vecho_executing_commands & ECHO_SCRIPTS)
+if ((Vecho_executing_commands & ECHO_SCRIPTS)
-	    || (Vecho_executing_commands & ECHO_FUNCTIONS))
+|| (Vecho_executing_commands & ECHO_FUNCTIONS))
-	  Vecho_executing_commands = ECHO_OFF;
+Vecho_executing_commands = ECHO_OFF;
-	else
+else
-	  Vecho_executing_commands = ECHO_SCRIPTS;
+Vecho_executing_commands = ECHO_SCRIPTS;
 }
 break;
 case 2:
 {
-	std::string arg = argv[1];
+std::string arg = argv[1];
-	if (arg == "on")
+if (arg == "on")
-	  Vecho_executing_commands = ECHO_SCRIPTS;
+Vecho_executing_commands = ECHO_SCRIPTS;
-	else if (arg == "off")
+else if (arg == "off")
-	  Vecho_executing_commands = ECHO_OFF;
+Vecho_executing_commands = ECHO_OFF;
-	else
+else
-	  print_usage ();
+print_usage ();
 }
 break;
 case 3:
 {
-	std::string arg = argv[1];
+std::string arg = argv[1];
-	if (arg == "on" && argv[2] == "all")
+if (arg == "on" && argv[2] == "all")
-	  {
+{
-	    int tmp = (ECHO_SCRIPTS | ECHO_FUNCTIONS);
+int tmp = (ECHO_SCRIPTS | ECHO_FUNCTIONS);
-	    Vecho_executing_commands = tmp;
+Vecho_executing_commands = tmp;
-	  }
+}
-	else if (arg == "off" && argv[2] == "all")
+else if (arg == "off" && argv[2] == "all")
-	  Vecho_executing_commands = ECHO_OFF;
+Vecho_executing_commands = ECHO_OFF;
-	else
+else
-	  print_usage ();
+print_usage ();
 }
 break;
 default:
 print_usage ();
 if (nargin == 1)
 {
 std::string hint = args(0).string_value ();
 if (! error_state)
-	{
+{
-	  int n = 32;
+int n = 32;
-	  string_vector list (n);
+string_vector list (n);
-	  int k = 0;
+int k = 0;
-	  for (;;)
+for (;;)
-	    {
+{
-	      std::string cmd = generate_completion (hint, k);
+std::string cmd = generate_completion (hint, k);
-	      if (! cmd.empty ())
+if (! cmd.empty ())
-		{
+{
-		  if (k == n)
+if (k == n)
-		    {
+{
-		      n *= 2;
+n *= 2;
-		      list.resize (n);
+list.resize (n);
-		    }
+}
-		  list[k++] = cmd;
+list[k++] = cmd;
-		}
+}
-	      else
+else
-		{
+{
-		  list.resize (k);
+list.resize (k);
-		  break;
+break;
-		}
+}
-	    }
+}
-	  if (nargout > 0)
+if (nargout > 0)
-	    {
+{
-	      if (! list.empty ())
+if (! list.empty ())
-		retval = list;
+retval = list;
-	      else
+else
-		retval = "";
+retval = "";
-	    }
+}
-	  else
+else
-	    {
+{
-	      // We don't use string_vector::list_in_columns here
+// We don't use string_vector::list_in_columns here
-	      // because it will be easier for Emacs if the names
+// because it will be easier for Emacs if the names
-	      // appear in a single column.
+// appear in a single column.
-	      int len = list.length ();
+int len = list.length ();
-	      for (int i = 0; i < len; i++)
+for (int i = 0; i < len; i++)
-		octave_stdout << list[i] << "\n";
+octave_stdout << list[i] << "\n";
-	    }
+}
-	  octave_completion_matches_called = true;
+octave_completion_matches_called = true;
-	}
+}
 }
 else
 print_usage ();
 return retval;
 else if (nargin == 1)
 {
 std::string file = args(0).string_value ();
 if (! error_state)
-	command_editor::read_init_file (file);
+command_editor::read_init_file (file);
 }
 else
 print_usage ();
 return retval;
 octave_value user_data = p->second;
 p++;
 if (is_valid_function (hook_fcn))
-	{
+{
-	  if (user_data.is_defined ())
+if (user_data.is_defined ())
-	    feval (hook_fcn, user_data, 0);
+feval (hook_fcn, user_data, 0);
-	  else
+else
-	    feval (hook_fcn, octave_value_list (), 0);
+feval (hook_fcn, octave_value_list (), 0);
-	}
+}
 else
-	hook_fcn_map.erase (p);
+hook_fcn_map.erase (p);
 }
 if (hook_fcn_map.empty ())
 command_editor::remove_event_hook (input_event_hook);
 if (nargin == 1 || nargin == 2)
 {
 octave_value user_data;
 if (nargin == 2)
-	user_data = args(1);
+user_data = args(1);
 std::string hook_fcn = args(0).string_value ();
 if (! error_state)
-	{
+{
-	  if (hook_fcn_map.empty ())
+if (hook_fcn_map.empty ())
-	    command_editor::add_event_hook (input_event_hook);
+command_editor::add_event_hook (input_event_hook);
-	  hook_fcn_map[hook_fcn] = user_data;
+hook_fcn_map[hook_fcn] = user_data;
-	}
+}
 else
-	error ("add_input_event_hook: expecting string as first arg");
+error ("add_input_event_hook: expecting string as first arg");
 }
 else
 print_usage ();
 return retval;
 if (nargin == 1)
 {
 std::string hook_fcn = args(0).string_value ();
 if (! error_state)
-	{
+{
-	  hook_fcn_map_type::iterator p = hook_fcn_map.find (hook_fcn);
+hook_fcn_map_type::iterator p = hook_fcn_map.find (hook_fcn);
-	  if (p != hook_fcn_map.end ())
+if (p != hook_fcn_map.end ())
-	    hook_fcn_map.erase (p);
+hook_fcn_map.erase (p);
-	  else
+else
-	    error ("remove_input_event_hook: %s not found in list",
+error ("remove_input_event_hook: %s not found in list",
-		   hook_fcn.c_str ());
+hook_fcn.c_str ());
-	  if (hook_fcn_map.empty ())
+if (hook_fcn_map.empty ())
-	    command_editor::remove_event_hook (input_event_hook);
+command_editor::remove_event_hook (input_event_hook);
-	}
+}
 else
-	error ("remove_input_event_hook: expecting string as first arg");
+error ("remove_input_event_hook: expecting string as first arg");
 }
 else
 print_usage ();
 return retval;

Mercurial > octave

comparison src/input.cc @ 10315:57a59eae83cc