octave-lyh: src/parse.y comparison

comparison src/parse.y @ 3523:b80bbb43a1a9

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

author	jwe
date	Wed, 02 Feb 2000 10:26:25 +0000
parents	cbee5fbb696d
children	6cfa474c5b99

comparison

equal deleted inserted replaced

-:bd422cf62f0c
+:b80bbb43a1a9
 // The column of the current token.
 int current_input_column = 1;
 // Buffer for help text snagged from function files.
-string help_buf;
+std::string help_buf;
 // TRUE means we are using readline.
 // (--no-line-editing)
 bool line_editing = true;
 static tree_index_expression *
 make_index_expression (tree_expression *expr, tree_argument_list *args);
 // Make an indirect reference expression.
 static tree_indirect_ref *
-make_indirect_ref (tree_expression *expr, const string&);
+make_indirect_ref (tree_expression *expr, const std::string&);
 // Make a declaration command.
 static tree_decl_command *
 make_decl_command (int tok, token *tok_val, tree_decl_init_list *lst);
 static void
 yyerror (const char *s)
 {
 int err_col = current_input_column - 1;
-ostrstream output_buf;
+std::ostrstream output_buf;
 if (reading_fcn_file || reading_script_file)
 output_buf << "parse error near line " << input_line_number
 	       << " of file " << curr_fcn_file_full_name;
 else
 if (! (error_state || warning_state))
 	{
 	  tree_constant *tc_retval = new tree_constant (tmp);
-	  ostrstream buf;
+	  std::ostrstream buf;
 	  tree_print_code tpc (buf);
 	  e->accept (tpc);
 if (! (error_state || warning_state))
 	{
 	  tree_constant *tc_retval = new tree_constant (tmp);
-	  ostrstream buf;
+	  std::ostrstream buf;
 	  tree_print_code tpc (buf);
 	  e->accept (tpc);
 	      if (! (error_state || warning_state))
 		{
 		  tree_constant *tc_retval = new tree_constant (tmp);
-		  ostrstream buf;
+		  std::ostrstream buf;
 		  tree_print_code tpc (buf);
 		  e->accept (tpc);
 // Do most of the work for defining a function.
 static octave_user_function *
 frob_function (tree_identifier *id, octave_user_function *fcn)
 {
-string id_name = id->name ();
+std::string id_name = id->name ();
 // If input is coming from a file, issue a warning if the name of
 // the file does not match the name of the function stated in the
 // file.  Matlab doesn't provide a diagnostic (it ignores the stated
 // name).
 fcn->stash_fcn_file_time (now);
 fcn->mark_as_system_fcn_file ();
 if (Vwarn_future_time_stamp)
 	{
-	  string nm = fcn->fcn_file_name ();
+	  std::string nm = fcn->fcn_file_name ();
 	  file_stat fs (nm);
 	  if (fs && fs.is_newer (now))
 	    warning ("time stamp for `%s' is in the future", nm.c_str ());
 }
 // Make an indirect reference expression.
 static tree_indirect_ref *
-make_indirect_ref (tree_expression *expr, const string& elt)
+make_indirect_ref (tree_expression *expr, const std::string& elt)
 {
 tree_indirect_ref *retval = 0;
 int l = expr->line ();
 int c = expr->column ();
 if (! (error_state || warning_state))
 	{
 	  tree_constant *tc_retval = new tree_constant (tmp);
-	  ostrstream buf;
+	  std::ostrstream buf;
 	  tree_print_code tpc (buf);
 	  m->accept (tpc);
 if (f)
 fclose (static_cast<FILE *> (f));
 }
 void
-parse_and_execute (const string& s, bool verbose, const char *warn_for)
+parse_and_execute (const std::string& s, bool verbose, const char *warn_for)
 {
 unwind_protect::begin_frame ("parse_and_execute_2");
 unwind_protect_bool (reading_script_file);
 unwind_protect_str (curr_fcn_file_full_name);
 unwind_protect::run_frame ("parse_and_execute_2");
 }
 static bool
-looks_like_octave_copyright (const string& s)
+looks_like_octave_copyright (const std::string& s)
 {
 bool retval = false;
-string t = s.substr (0, 14);
+std::string t = s.substr (0, 14);
 if (t == "Copyright (C) ")
 {
 size_t pos = s.find ('\n');
 // code!
 static string
 gobble_leading_white_space (FILE *ffile, bool in_parts, bool update_pos)
 {
-string help_txt;
+std::string help_txt;
 bool first_comments_seen = false;
 bool begin_comment = false;
 bool have_help_text = false;
 bool in_comment = false;
 return help_txt;
 }
 string
-get_help_from_file (const string& path)
+get_help_from_file (const std::string& path)
 {
-string retval;
+std::string retval;
 if (! path.empty ())
 {
 FILE *fptr = fopen (path.c_str (), "r");
 {
 bind_builtin_variable ("current_script_file_name", octave_value ());
 }
 static bool
-parse_fcn_file (const string& ff, bool exec_script, bool force_script = false)
+parse_fcn_file (const std::string& ff, bool exec_script, bool force_script = false)
 {
 unwind_protect::begin_frame ("parse_fcn_file");
 int script_file_executed = false;
 bool
 load_fcn_from_file (symbol_record *sym_rec, bool exec_script)
 {
 bool script_file_executed = false;
-string nm = sym_rec->name ();
+std::string nm = sym_rec->name ();
 if (octave_dynamic_loader::load (nm))
 {
 force_link_to_function (nm);
 }
 else
 {
-string ff = fcn_file_in_path (nm);
+std::string ff = fcn_file_in_path (nm);
 // These are needed by yyparse.
 unwind_protect::begin_frame ("load_fcn_from_file");
 int nargin = args.length ();
 if (nargin == 1)
 {
-string file_name = args(0).string_value ();
+std::string file_name = args(0).string_value ();
 if (! error_state)
 	{
-	  string file_full_name = file_ops::tilde_expand (file_name);
+	  std::string file_full_name = file_ops::tilde_expand (file_name);
 	  unwind_protect::begin_frame ("Fsource");
 	  unwind_protect_str (curr_fcn_file_name);
 	  unwind_protect_str (curr_fcn_file_full_name);
 return retval;
 }
 octave_value_list
-feval (const string& name, const octave_value_list& args, int nargout)
+feval (const std::string& name, const octave_value_list& args, int nargout)
 {
 octave_value_list retval;
 octave_function *fcn = is_valid_function (name, "feval", 1);
 {
 octave_value_list retval;
 if (args.length () > 0)
 {
-string name = args(0).string_value ();
+std::string name = args(0).string_value ();
 if (! error_state)
 	{
 	  int tmp_nargin = args.length () - 1;
 return retval;
 }
 octave_value_list
-eval_string (const string& s, bool silent, int& parse_status, int nargout)
+eval_string (const std::string& s, bool silent, int& parse_status, int nargout)
 {
 unwind_protect::begin_frame ("eval_string");
 unwind_protect_bool (get_input_from_eval_string);
 unwind_protect_bool (input_from_command_line_file);
 return retval;
 }
 octave_value
-eval_string (const string& s, bool silent, int& parse_status)
+eval_string (const std::string& s, bool silent, int& parse_status)
 {
 octave_value retval;
 octave_value_list tmp = eval_string (s, silent, parse_status, 1);
 static octave_value_list
 eval_string (const octave_value& arg, bool silent, int& parse_status,
 	     int nargout)
 {
-string s = arg.string_value ();
+std::string s = arg.string_value ();
 if (error_state)
 {
-error ("eval: expecting string argument");
+error ("eval: expecting std::string argument");
 return -1.0;
 }
 return eval_string (s, silent, parse_status, nargout);
 }

Mercurial > hg > octave-lyh

comparison src/parse.y @ 3523:b80bbb43a1a9