Mercurial > hg > octave-nkf
changeset 15468:6437fa7263dd
use ' instead of ` in error messages, warnings and most comments
* qtinfo/parser.h, file-io.cc, graphics.in.h, lex.ll, version.in.h,
interp1.m, fminsearch.m, fix_depends.m, get_description.m:
Use ' instead of ` in error messages, warnings and most comments.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 01 Oct 2012 18:32:12 -0400 |
| parents | 049e8bbff782 |
| children | 72868cae7624 |
| files | libgui/src/qtinfo/parser.h libinterp/interpfcn/file-io.cc libinterp/interpfcn/graphics.in.h libinterp/parse-tree/lex.ll libinterp/version.in.h scripts/general/interp1.m scripts/optimization/fminsearch.m scripts/pkg/private/fix_depends.m scripts/pkg/private/get_description.m |
| diffstat | 9 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/qtinfo/parser.h +++ b/libgui/src/qtinfo/parser.h @@ -24,7 +24,7 @@ /** * \class parser - * This class gets nodes and searchs inside of `info files'. + * This class gets nodes and searchs inside of 'info files'. * <p>Each info file has nodes. Every node has the documentation. * Info files contains a map with position of each node.</p> * <p>What is position?
--- a/libinterp/interpfcn/file-io.cc +++ b/libinterp/interpfcn/file-io.cc @@ -1164,7 +1164,7 @@ catch (std::runtime_error) { // Display a warning if the specified locale is unknown - warning ("fscanf: invalid locale. Try `locale -a' for a list of supported values."); + warning ("fscanf: invalid locale. Try 'locale -a' for a list of supported values."); oldloc = std::locale::classic (); } retval = os.oscanf (args(1), who); @@ -1274,7 +1274,7 @@ catch (std::runtime_error) { // Display a warning if the specified locale is unknown - warning ("sscanf: invalid locale. Try `locale -a' for a list of supported values."); + warning ("sscanf: invalid locale. Try 'locale -a' for a list of supported values."); } retval = os.oscanf (args(1), who); }
--- a/libinterp/interpfcn/graphics.in.h +++ b/libinterp/interpfcn/graphics.in.h @@ -3250,7 +3250,7 @@ retval = factory_properties.lookup (name); if (retval.is_undefined ()) - error ("get: invalid default property `%s'", name.c_str ()); + error ("get: invalid default property '%s'", name.c_str ()); } return retval; @@ -3261,7 +3261,7 @@ octave_value retval = factory_properties.lookup (name); if (retval.is_undefined ()) - error ("get: invalid factory default property `%s'", name.c_str ()); + error ("get: invalid factory default property '%s'", name.c_str ()); return retval; }
--- a/libinterp/parse-tree/lex.ll +++ b/libinterp/parse-tree/lex.ll @@ -1506,12 +1506,12 @@ || reading_classdef_file) && ! curr_fcn_file_full_name.empty ()) warning_with_id ("Octave:deprecated-keyword", - "the `static' keyword is obsolete and will be removed from a future version of Octave; please use `persistent' instead; near line %d of file `%s'", + "the 'static' keyword is obsolete and will be removed from a future version of Octave; please use 'persistent' instead; near line %d of file '%s'", input_line_number, curr_fcn_file_full_name.c_str ()); else warning_with_id ("Octave:deprecated-keyword", - "the `static' keyword is obsolete and will be removed from a future version of Octave; please use `persistent' instead; near line %d", + "the 'static' keyword is obsolete and will be removed from a future version of Octave; please use 'persistent' instead; near line %d", input_line_number); // fall through ...
--- a/libinterp/version.in.h +++ b/libinterp/version.in.h @@ -87,6 +87,6 @@ #define OCTAVE_STARTUP_MESSAGE \ X_OCTAVE_NAME_VERSION_COPYRIGHT_COPYING_WARRANTY_AND_BUGS \ - (" For details, type `warranty'.") "\n\n" \ - "For information about changes from previous versions, type `news'." + (" For details, type 'warranty'.") "\n\n" \ + "For information about changes from previous versions, type 'news'." #endif
--- a/scripts/general/interp1.m +++ b/scripts/general/interp1.m @@ -205,7 +205,7 @@ error ("interp1: extra points in discontinuities"); endif else - error ("interp1: discontinuities not supported for method `%s'", method); + error ("interp1: discontinuities not supported for method '%s'", method); endif endif endif
--- a/scripts/optimization/fminsearch.m +++ b/scripts/optimization/fminsearch.m @@ -103,7 +103,7 @@ ## maximization.) Default is 1, maximization. ## set STOPIT(6)=-1 for minimization ## If a non-empty fourth parameter string SAVIT is present, then -## `SAVE SAVIT x fmax nf' is executed after each inner iteration. +## 'SAVE SAVIT x fmax nf' is executed after each inner iteration. ## NB: x0 can be a matrix. In the output argument, in SAVIT saves, ## and in function calls, x has the same shape as x0. ## NMSMAX(fun, x0, STOPIT, SAVIT, P1, P2,...) allows additional @@ -257,7 +257,7 @@ ## One step of the Nelder-Mead simplex algorithm ## NJH: Altered function calls and changed CNT to NF. - ## Changed each `fr < f(1)' type test to `>' for maximization + ## Changed each 'fr < f(1)' type test to '>' for maximization ## and re-ordered function values after sort. vbar = (sum (V(:,1:n)')/n)'; # Mean value
--- a/scripts/pkg/private/fix_depends.m +++ b/scripts/pkg/private/fix_depends.m @@ -41,7 +41,7 @@ sub = dep(lpar(1)+1:rpar(1)-1); parts = strsplit (sub, " ", true); if (length (parts) != 2) - error ("incorrect syntax for dependency `%s' in the DESCRIPTION file\n", + error ("incorrect syntax for dependency '%s' in the DESCRIPTION file\n", dep); endif operator = parts{1};
--- a/scripts/pkg/private/get_description.m +++ b/scripts/pkg/private/get_description.m @@ -51,7 +51,7 @@ value = strtrim (line (colon+1:end)); if (length (value) == 0) fclose (fid); - error ("The keyword `%s' of the package `%s' has an empty value", + error ("The keyword '%s' of the package '%s' has an empty value", keyword, desc.name); endif desc.(keyword) = value;