Mercurial > octave
changeset 20835:14cd86258b3d
use 'invalid' instead of 'bogus' in source files
* tips.txi, ls-oct-text.cc, lex.ll, interp1.m, voronoi.m,
octave/TeXtranslator.java, test.m, build-sparse-tests.sh:
Use 'invalid' instead of 'bogus'.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 09 Dec 2015 16:35:12 -0500 |
| parents | 27b333c88c8e |
| children | ce8c465aa6a4 |
| files | doc/interpreter/tips.txi libinterp/corefcn/ls-oct-text.cc libinterp/parse-tree/lex.ll scripts/general/interp1.m scripts/geometry/voronoi.m scripts/java/org/octave/TeXtranslator.java scripts/testfun/test.m test/build-sparse-tests.sh |
| diffstat | 8 files changed, 12 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/interpreter/tips.txi Wed Dec 09 12:01:31 2015 -0800 +++ b/doc/interpreter/tips.txi Wed Dec 09 16:35:12 2015 -0500 @@ -189,8 +189,7 @@ This line should contain a single name/address as in the Author line, or an address only, or the string @samp{jwe}. If there is no maintainer line, the person(s) in the Author field are presumed to be the -maintainers. The example above is mildly bogus because the maintainer -line is redundant. +maintainers. The idea behind the @samp{Author} and @samp{Maintainer} lines is to make possible a function to ``send mail to the maintainer'' without
--- a/libinterp/corefcn/ls-oct-text.cc Wed Dec 09 12:01:31 2015 -0800 +++ b/libinterp/corefcn/ls-oct-text.cc Wed Dec 09 16:35:12 2015 -0500 @@ -251,7 +251,7 @@ if (! (name == ".nargin." || name == ".nargout." || name == CELL_ELT_TAG || valid_identifier (name))) - error ("load: bogus identifier '%s' found in file '%s'", + error ("load: invalid identifier '%s' found in file '%s'", name.c_str (), filename.c_str ()); // Look for type keyword.
--- a/libinterp/parse-tree/lex.ll Wed Dec 09 12:01:31 2015 -0800 +++ b/libinterp/parse-tree/lex.ll Wed Dec 09 16:35:12 2015 -0500 @@ -340,7 +340,7 @@ %% %{ -// Make script and function files start with a bogus token. This makes +// Make script and function files start with an invalid token. This makes // the parser go down a special path. %}
--- a/scripts/general/interp1.m Wed Dec 09 12:01:31 2015 -0800 +++ b/scripts/general/interp1.m Wed Dec 09 16:35:12 2015 -0500 @@ -793,5 +793,5 @@ %!error <discontinuities not supported> interp1 ([1 1],[1 2],1, "pchip") %!error <discontinuities not supported> interp1 ([1 1],[1 2],1, "cubic") %!error <discontinuities not supported> interp1 ([1 1],[1 2],1, "spline") -%!error <invalid method 'bogus'> interp1 (1:2,1:2,1, "bogus") +%!error <invalid method 'invalid'> interp1 (1:2,1:2,1, "invalid")
--- a/scripts/geometry/voronoi.m Wed Dec 09 12:01:31 2015 -0800 +++ b/scripts/geometry/voronoi.m Wed Dec 09 16:35:12 2015 -0500 @@ -209,7 +209,7 @@ ## Input validation tests %!error voronoi () %!error voronoi (ones (3,1)) -%!error voronoi (ones (3,1), ones (3,1), "bogus1", "bogus2", "bogus3") +%!error voronoi (ones (3,1), ones (3,1), "invalid1", "invalid2", "invalid3") %!error <HAX argument must be an axes object> voronoi (0, ones (3,1), ones (3,1)) %!error <X and Y must be vectors of the same length> voronoi (ones (3,1), ones (4,1)) %!error <minimum of 2 points needed> voronoi (2.5, 3.5)
--- a/scripts/java/org/octave/TeXtranslator.java Wed Dec 09 12:01:31 2015 -0800 +++ b/scripts/java/org/octave/TeXtranslator.java Wed Dec 09 16:35:12 2015 -0500 @@ -250,7 +250,7 @@ // 26 08 2010 MH // advance i to avoid deadlock in case of incorrect escape // sequences like \\\\alpha (double backslash) or - // \\bogus (unknown escape sequence) + // \\invalid (unknown escape sequence) i++; } }
--- a/scripts/testfun/test.m Wed Dec 09 12:01:31 2015 -0800 +++ b/scripts/testfun/test.m Wed Dec 09 16:35:12 2015 -0500 @@ -800,14 +800,14 @@ ## Test 'fail' keyword %!fail ("test", "Invalid call to test") # no args, generates usage() %!fail ("test (1,2,3,4)", "usage.*test") # too many args, generates usage() -%!fail ('test ("test", "bogus")', "unknown flag") # incorrect args +%!fail ('test ("test", "invalid")', "unknown flag") # incorrect args %!fail ('garbage','garbage.*undefined') # usage on nonexistent function should be ## Test 'error' keyword %!error test # no args, generates usage() %!error test (1,2,3,4) # too many args, generates usage() -%!error <unknown flag> test ("test", "bogus"); # incorrect args -%!error test ("test", "bogus"); # test without pattern +%!error <unknown flag> test ("test", "invalid"); # incorrect args +%!error test ("test", "invalid"); # test without pattern %!error <'garbage' undefined> garbage; # usage on nonexistent function is error ## Test 'warning' keyword @@ -873,7 +873,7 @@ %! " a=3 # single line demo blocks work too"); ## Test 'testif' keyword -%!testif HAVE_BOGUS_FEATURE +%!testif HAVE_INVALID_FEATURE %! error ("testif executed code despite not having feature"); ## Test 'xtest' keyword @@ -898,7 +898,7 @@ ## like to be presented with expected failures. I use '% !' to disable. % !test error("---------Failure tests. Use test('test','verbose',1)"); % !test assert([a,b,c],[1,3,6]); # variables have wrong values -% !bogus # unknown block type +% !invalid # unknown block type % !error toeplitz([1,2,3]); # correct usage % !test syntax errors) # syntax errors fail properly % !shared garbage in # variables must be comma separated
--- a/test/build-sparse-tests.sh Wed Dec 09 12:01:31 2015 -0800 +++ b/test/build-sparse-tests.sh Wed Dec 09 16:35:12 2015 -0500 @@ -184,7 +184,7 @@ %% error handling in constructor %!error sparse (1,[2,3],[1,2,3]) -%!error sparse ([1,1],[1,1],[1,2],3,3,"bogus") +%!error sparse ([1,1],[1,1],[1,2],3,3,"invalid") %!error sparse ([1,3],[1,-4],[3,5],2,2) %!error sparse ([1,3],[1,-4],[3,5i],2,2) %!error sparse (-1,-1,1)