octave-nkf: src/input.cc comparison

comparison src/input.cc @ 3523:b80bbb43a1a9

[project @ 2000-02-02 10:25:52 by jwe]

author	jwe
date	Wed, 02 Feb 2000 10:26:25 +0000
parents	957d7d6ab0e0
children	096ad38d7ab5

comparison

equal deleted inserted replaced

-:bd422cf62f0c
+:b80bbb43a1a9
 #include "unwind-prot.h"
 #include "utils.h"
 #include "variables.h"
 // Primary prompt string.
-static string Vps1;
+static std::string Vps1;
 // Secondary prompt string.
-static string Vps2;
+static std::string Vps2;
 // String printed before echoed input (enabled by --echo-input).
-string Vps4;
+std::string Vps4;
 // Echo commands as they are executed?
 //
 //   1  ==>  echo commands read from script files
 //   2  ==>  echo commands from functions
 // Character to append after successful command-line completion attempts.
 static char Vcompletion_append_char;
 // Global pointer for eval().
-string current_eval_string;
+std::string current_eval_string;
 // TRUE means get input from current_eval_string.
 bool get_input_from_eval_string = false;
 // TRUE means we're parsing a function file.
 bool reading_fcn_file = false;
 // Simple name of function file we are reading.
-string curr_fcn_file_name;
+std::string curr_fcn_file_name;
 // Full name of file we are reading.
-string curr_fcn_file_full_name;
+std::string curr_fcn_file_full_name;
 // TRUE means we're parsing a script file.
 bool reading_script_file = false;
 // If we are reading from an M-file, this is it.
 // Should we issue a prompt?
 int promptflag = 1;
 // The current line of input, from wherever.
-string current_input_line;
+std::string current_input_line;
 // TRUE after a call to completion_matches().
 bool octave_completion_matches_called = false;
 static void
-do_input_echo (const string& input_string)
+do_input_echo (const std::string& input_string)
 {
 int do_echo = reading_script_file ?
 (Vecho_executing_commands & ECHO_SCRIPTS)
 : (Vecho_executing_commands & ECHO_CMD_LINE) && ! forced_interactive;
 	}
 }
 }
 string
-gnu_readline (const string& s, bool force_readline)
+gnu_readline (const std::string& s, bool force_readline)
 {
-string retval;
+std::string retval;
 if (line_editing || force_readline)
 {
 bool eof;
 }
 static string
 octave_gets (void)
 {
-string retval;
+std::string retval;
 Vlast_prompt_time.stamp ();
 if ((interactive || forced_interactive)
 && (! (reading_fcn_file || reading_script_file)))
 {
-string ps = (promptflag > 0) ? Vps1 : Vps2;
+std::string ps = (promptflag > 0) ? Vps1 : Vps2;
-string prompt = command_editor::decode_prompt_string (ps);
+std::string prompt = command_editor::decode_prompt_string (ps);
 pipe_handler_error_count = 0;
 flush_octave_stdout ();
 // Read a line from the input stream.
 static string
 get_user_input (void)
 {
-string retval;
+std::string retval;
 if (get_input_from_eval_string)
 {
 retval = current_eval_string;
 int
 octave_read (char *buf, unsigned max_size)
 {
 // XXX FIXME XXX -- is this a safe way to buffer the input?
-static string input_buf;
+static std::string input_buf;
 static const char *pos = 0;
 static size_t chars_left = 0;
 int status = 0;
 // Fix things up so that input can come from file `name', printing a
 // warning if the file doesn't exist.
 FILE *
-get_input_from_file (const string& name, int warn)
+get_input_from_file (const std::string& name, int warn)
 {
 FILE *instream = 0;
 if (name.length () > 0)
 instream = fopen (name.c_str (), "r");
 }
 // XXX FIXME XXX -- make this generate file names when appropriate.
 static string_vector
-generate_possible_completions (const string& text, string& prefix,
+generate_possible_completions (const std::string& text, std::string& prefix,
-			       string& hint)
+			       std::string& hint)
 {
 string_vector names;
 prefix = "";
 return names;
 }
 static string
-generate_completion (const string& text, int state)
+generate_completion (const std::string& text, int state)
 {
-string retval;
+std::string retval;
-static string prefix;
+static std::string prefix;
-static string hint;
+static std::string hint;
 static size_t prefix_len = 0;
 static size_t hint_len = 0;
 static int list_index = 0;
 if (name_list_len > 0 && matches > 0)
 {
 while (list_index < name_list_len)
 	{
-	  string name = name_list[list_index];
+	  std::string name = name_list[list_index];
 	  list_index++;
 	  if (! name.compare (hint, 0, hint_len))
 	    {
 command_editor::set_completion_function (generate_completion);
 }
 static bool
-match_sans_spaces (const string& standard, const string& test)
+match_sans_spaces (const std::string& standard, const std::string& test)
 {
 size_t beg = test.find_first_not_of (" \t");
 if (beg != NPOS)
 {
 int read_as_string = 0;
 if (nargin == 2)
 read_as_string++;
-string prompt ("debug> ");
+std::string prompt ("debug> ");
 if (nargin > 0)
 {
 prompt = args(0).string_value ();
 again:
 flush_octave_stdout ();
-string input_buf = gnu_readline (prompt.c_str (), true);
+std::string input_buf = gnu_readline (prompt.c_str (), true);
 if (! input_buf.empty ())
 {
 if (! input_from_startup_file)
 	command_history::add (input_buf);
 }
 break;
 case 2:
 {
-	string arg = argv[1];
+	std::string arg = argv[1];
 	if (arg == "on")
 	  bind_builtin_variable ("echo_executing_commands",
 				 static_cast<double> (ECHO_SCRIPTS));
 	else if (arg == "off")
 }
 break;
 case 3:
 {
-	string arg = argv[1];
+	std::string arg = argv[1];
 	if (arg == "on" && argv[2] == "all")
 	  {
 	    int tmp = (ECHO_SCRIPTS | ECHO_FUNCTIONS);
 	    bind_builtin_variable ("echo_executing_commands",
 int nargin = args.length ();
 if (nargin == 1)
 {
-string hint = args(0).string_value ();
+std::string hint = args(0).string_value ();
 if (! error_state)
 	{
 	  int n = 32;
 	  int k = 0;
 	  for (;;)
 	    {
-	      string cmd = generate_completion (hint, k);
+	      std::string cmd = generate_completion (hint, k);
 	      if (! cmd.empty ())
 		{
 		  if (k == n)
 		    {
 if (nargin == 0)
 command_editor::read_init_file ();
 else if (nargin == 1)
 {
-string file = file_ops::tilde_expand (args(0).string_value ());
+std::string file = file_ops::tilde_expand (args(0).string_value ());
 if (! error_state)
 	command_editor::read_init_file (file);
 }
 else
 print_usage ("read_readline_init_file");
 return retval;
 }
-static string hook_fcn;
+static std::string hook_fcn;
 static octave_value user_data;
 static void
 input_event_hook (void)
 {
 print_usage ("input_event_hook");
 else
 {
 octave_value tmp_user_data;
-string tmp_hook_fcn;
+std::string tmp_hook_fcn;
 if (nargin > 1)
 	tmp_user_data = args(1);
 if (nargin > 0)
 static int
 completion_append_char (void)
 {
 int status = 0;
-string s = builtin_string_variable ("completion_append_char");
+std::string s = builtin_string_variable ("completion_append_char");
 switch (s.length ())
 {
 case 1:
 Vcompletion_append_char = s[0];

Mercurial > hg > octave-nkf

comparison src/input.cc @ 3523:b80bbb43a1a9