Mercurial > hg > octave-lyh
changeset 3536:e8fbc8c3d6d9
[project @ 2000-02-02 12:01:00 by jwe]
| author | jwe |
|---|---|
| date | Wed, 02 Feb 2000 12:01:08 +0000 |
| parents | c5ebcd5d25a9 |
| children | 0985659e78d3 |
| files | src/TEMPLATE-INST/SLStack-str.cc src/dynamic-ld.cc src/help.cc src/input.cc src/lex.l src/load-save.cc src/oct-hist.cc src/oct-stream.cc src/ov-base.cc src/ov-dld-fcn.cc src/ov-str-mat.cc src/ov.cc src/pager.cc src/parse.y src/pt-assign.cc src/pt-binop.cc src/pt-exp.cc src/pt-id.cc src/pt-idx.cc src/pt-indir.cc src/pt-plot.cc src/pt-unop.cc src/pt.cc src/symtab.cc src/token.cc src/utils.cc |
| diffstat | 26 files changed, 60 insertions(+), 60 deletions(-) [+] |
line wrap: on
line diff
--- a/src/TEMPLATE-INST/SLStack-str.cc +++ b/src/TEMPLATE-INST/SLStack-str.cc @@ -37,12 +37,12 @@ #include <string> -template class SLNode<std:string>; -template class SLList<std:string>; +template class SLNode<std::string>; +template class SLList<std::string>; -template class Stack<std:string>; +template class Stack<std::string>; -template class SLStack<std:string>; +template class SLStack<std::string>; /* ;;; Local Variables: ***
--- a/src/dynamic-ld.cc +++ b/src/dynamic-ld.cc @@ -308,7 +308,7 @@ return (instance_ok ()) ? instance->do_remove (fcn_name, shl) : false; } -std:string +std::string octave_dynamic_loader::mangle_name (const std::string& name) { #if defined (CXX_PREPENDS_UNDERSCORE)
--- a/src/help.cc +++ b/src/help.cc @@ -920,7 +920,7 @@ return retval; } -static string +static std::string do_which (const std::string& name) { std::string retval;
--- a/src/input.cc +++ b/src/input.cc @@ -156,7 +156,7 @@ } } -std:string +std::string gnu_readline (const std::string& s, bool force_readline) { std::string retval; @@ -191,7 +191,7 @@ return retval; } -static string +static std::string octave_gets (void) { std::string retval; @@ -241,7 +241,7 @@ // Read a line from the input stream. -static string +static std::string get_user_input (void) { std::string retval; @@ -389,7 +389,7 @@ return names; } -static string +static std::string generate_completion (const std::string& text, int state) { std::string retval;
--- a/src/lex.l +++ b/src/lex.l @@ -850,7 +850,7 @@ // Check to see if a character string matches any of the possible line // styles for plots. -static string +static std::string plot_style_token (const std::string& s) { std::string retval; @@ -896,7 +896,7 @@ // Check to see if a character string matches any of the possible axes // tags for plots. -static string +static std::string plot_axes_token (const std::string& s) { std::string retval; @@ -1444,7 +1444,7 @@ // Used to delete trailing white space from tokens. -static string +static std::string strip_trailing_whitespace (char *s) { std::string retval = s;
--- a/src/load-save.cc +++ b/src/load-save.cc @@ -945,7 +945,7 @@ return name; } -static string +static std::string get_mat_data_input_line (std::istream& is) { std::string retval;
--- a/src/oct-hist.cc +++ b/src/oct-hist.cc @@ -105,7 +105,7 @@ return size; } -std:string +std::string default_history_file (void) { std::string file; @@ -330,7 +330,7 @@ } } -static string +static std::string mk_tmp_hist_file (int argc, const string_vector& argv, int insert_curr, const char *warn_for) {
--- a/src/oct-stream.cc +++ b/src/oct-stream.cc @@ -878,7 +878,7 @@ // Functions that are defined for all input streams (input streams // are those that define is). -std:string +std::string octave_base_stream::do_gets (int max_len, bool& err, bool strip_newline, const char *fcn) { @@ -951,13 +951,13 @@ return retval; } -std:string +std::string octave_base_stream::getl (int max_len, bool& err) { return do_gets (max_len, err, true, "fgetl"); } -std:string +std::string octave_base_stream::gets (int max_len, bool& err) { return do_gets (max_len, err, false, "fgets"); @@ -2072,7 +2072,7 @@ return retval; } -std:string +std::string printf_value_cache::string_value (void) { std::string retval; @@ -2372,7 +2372,7 @@ // Return current error message for this stream. -std:string +std::string octave_base_stream::error (bool clear_err, int& err_num) { err_num = fail ? -1 : 0; @@ -2442,7 +2442,7 @@ return retval; } -std:string +std::string octave_stream::getl (int max_len, bool& err) { std::string retval; @@ -2453,7 +2453,7 @@ return retval; } -std:string +std::string octave_stream::getl (const octave_value& tc_max_len, bool& err) { std::string retval; @@ -2475,7 +2475,7 @@ return retval; } -std:string +std::string octave_stream::gets (int max_len, bool& err) { std::string retval; @@ -2486,7 +2486,7 @@ return retval; } -std:string +std::string octave_stream::gets (const octave_value& tc_max_len, bool& err) { std::string retval; @@ -2713,7 +2713,7 @@ return retval; } -std:string +std::string octave_stream::error (bool clear, int& err_num) { std::string retval; @@ -2724,7 +2724,7 @@ return retval; } -std:string +std::string octave_stream::name (void) const { std::string retval; @@ -2757,7 +2757,7 @@ return retval; } -std:string +std::string octave_stream::mode_as_string (int mode) { std::string retval = "???"; @@ -2896,7 +2896,7 @@ return (instance_ok ()) ? instance->do_get_info (fid) : string_vector (); } -std:string +std::string octave_stream_list::list_open_files (void) { return (instance_ok ()) ? instance->do_list_open_files () : std::string (); @@ -3080,7 +3080,7 @@ return retval; } -std:string +std::string octave_stream_list::do_list_open_files (void) const { std::string retval;
--- a/src/ov-base.cc +++ b/src/ov-base.cc @@ -247,7 +247,7 @@ return retval; } -std:string +std::string octave_base_value::string_value (void) const { std::string retval;
--- a/src/ov-dld-fcn.cc +++ b/src/ov-dld-fcn.cc @@ -62,7 +62,7 @@ octave_dynamic_loader::remove (my_name, sh_lib); } -std:string +std::string octave_dld_function::fcn_file_name (void) const { return sh_lib.file_name ();
--- a/src/ov-str-mat.cc +++ b/src/ov-str-mat.cc @@ -182,7 +182,7 @@ return retval; } -std:string +std::string octave_char_matrix_str::string_value (void) const { return matrix.row_as_string (0); // XXX FIXME??? XXX
--- a/src/ov.cc +++ b/src/ov.cc @@ -121,7 +121,7 @@ // Octave's value type. -std:string +std::string octave_value::unary_op_as_string (unary_op op) { std::string retval; @@ -159,7 +159,7 @@ return retval; } -std:string +std::string octave_value::binary_op_as_string (binary_op op) { std::string retval; @@ -257,7 +257,7 @@ return retval; } -std:string +std::string octave_value::assign_op_as_string (assign_op op) { std::string retval;
--- a/src/pager.cc +++ b/src/pager.cc @@ -493,7 +493,7 @@ return retval; } -static string +static std::string default_pager (void) { std::string pager_binary = octave_env::getenv ("PAGER");
--- a/src/parse.y +++ b/src/parse.y @@ -2790,7 +2790,7 @@ // XXX FIXME XXX -- grab_help_text() in lex.l duplicates some of this // code! -static string +static std::string gobble_leading_white_space (FILE *ffile, bool in_parts, bool update_pos) { std::string help_txt; @@ -2903,7 +2903,7 @@ return help_txt; } -std:string +std::string get_help_from_file (const std::string& path) { std::string retval;
--- a/src/pt-assign.cc +++ b/src/pt-assign.cc @@ -160,7 +160,7 @@ } } -std:string +std::string tree_simple_assignment::oper (void) const { return octave_value::assign_op_as_string (etype); @@ -309,7 +309,7 @@ } } -std:string +std::string tree_multi_assignment::oper (void) const { return octave_value::assign_op_as_string (etype);
--- a/src/pt-binop.cc +++ b/src/pt-binop.cc @@ -100,7 +100,7 @@ oper () . c_str (), line (), column ()); } -std:string +std::string tree_binary_expression::oper (void) const { return octave_value::binary_op_as_string (etype); @@ -196,7 +196,7 @@ return retval; } -std:string +std::string tree_boolean_expression::oper (void) const { std::string retval = "<unknown>";
--- a/src/pt-exp.cc +++ b/src/pt-exp.cc @@ -82,7 +82,7 @@ return octave_lvalue (); } -std:string +std::string tree_expression::original_text (void) const { return std::string ();
--- a/src/pt-id.cc +++ b/src/pt-id.cc @@ -41,7 +41,7 @@ // Symbols from the symbol table. -std:string +std::string tree_identifier::name (void) const { std::string retval;
--- a/src/pt-idx.cc +++ b/src/pt-idx.cc @@ -53,7 +53,7 @@ // This is useful for printing the name of the variable in an indexed // assignment. -std:string +std::string tree_index_expression::name (void) const { return expr->name ();
--- a/src/pt-indir.cc +++ b/src/pt-indir.cc @@ -46,7 +46,7 @@ delete expr; } -std:string +std::string tree_indirect_ref::name (void) const { // ??? FIXME ???
--- a/src/pt-plot.cc +++ b/src/pt-plot.cc @@ -855,7 +855,7 @@ tw.visit_subplot_list (*this); } -std:string +std::string save_in_tmp_file (octave_value& t, int ndim, bool parametric) { std::string name = file_ops::tempnam ("", "oct-");
--- a/src/pt-unop.cc +++ b/src/pt-unop.cc @@ -37,7 +37,7 @@ // Unary expressions. -std:string +std::string tree_unary_expression::oper (void) const { return octave_value::unary_op_as_string (etype);
--- a/src/pt.cc +++ b/src/pt.cc @@ -38,7 +38,7 @@ // Hide the details of the string buffer so that we are less likely to // create a memory leak. -std:string +std::string tree::str_print_code (void) { std::ostrstream buf;
--- a/src/symtab.cc +++ b/src/symtab.cc @@ -58,7 +58,7 @@ #define SYMBOL_DEF symbol_record::symbol_def -std:string +std::string SYMBOL_DEF::type_as_string (void) const { std::string retval = "<unknown type>"; @@ -137,7 +137,7 @@ os << name << " is a " << type_as_string () << "\n"; } -std:string +std::string SYMBOL_DEF::which (const std::string& name) { std::string retval;
--- a/src/token.cc +++ b/src/token.cc @@ -90,7 +90,7 @@ delete str; } -std:string +std::string token::text (void) { assert (type_tag == string_token); @@ -125,7 +125,7 @@ return sr; } -std:string +std::string token::text_rep (void) { return orig_text;
--- a/src/utils.cc +++ b/src/utils.cc @@ -228,7 +228,7 @@ // See if the given file is in the path. -std:string +std::string search_path_for_file (const std::string& path, const std::string& name) { dir_path p (path); @@ -303,7 +303,7 @@ return retval; } -std:string +std::string file_in_path (const std::string& name, const std::string& suffix) { std::string nm = name; @@ -318,7 +318,7 @@ // See if there is an function file in the path. If so, return the // full path to the file. -std:string +std::string fcn_file_in_path (const std::string& name) { std::string retval; @@ -339,7 +339,7 @@ // See if there is an octave file in the path. If so, return the // full path to the file. -std:string +std::string oct_file_in_path (const std::string& name) { std::string retval; @@ -360,7 +360,7 @@ // Replace backslash escapes in a string with the real values. -std:string +std::string do_string_escapes (const std::string& s) { std::string retval; @@ -506,7 +506,7 @@ } } -std:string +std::string undo_string_escapes (const std::string& s) { std::string retval;