# HG changeset patch # User John W. Eaton # Date 1389118828 18000 # Node ID 3cad99b56fa7015b83e128c7477f6e2c3ce67759 # Parent 1af5ee5f30762ef01e7a5f4899058d7f7987c681# Parent 18e50356e5e3c08e088749e94f18070691056b30 maint: Periodic merge of gui-release to default. diff -r 1af5ee5f3076 -r 3cad99b56fa7 build-aux/common.mk --- a/build-aux/common.mk Mon Jan 06 14:34:56 2014 -0500 +++ b/build-aux/common.mk Tue Jan 07 13:20:28 2014 -0500 @@ -22,7 +22,9 @@ DESKTOP_FILE_INSTALL = @DESKTOP_FILE_INSTALL@ OCTAVE_VERSION = @OCTAVE_VERSION@ -OCTAVE_API_VERSION_NUMBER = @OCTAVE_API_VERSION_NUMBER@ +OCTAVE_MAJOR_VERSION = @OCTAVE_MAJOR_VERSION@ +OCTAVE_MINOR_VERSION = @OCTAVE_MINOR_VERSION@ +OCTAVE_PATCH_VERSION = @OCTAVE_PATCH_VERSION@ OCTAVE_API_VERSION = @OCTAVE_API_VERSION@ OCTAVE_RELEASE_DATE = @OCTAVE_RELEASE_DATE@ OCTAVE_COPYRIGHT = @OCTAVE_COPYRIGHT@ diff -r 1af5ee5f3076 -r 3cad99b56fa7 configure.ac --- a/configure.ac Mon Jan 06 14:34:56 2014 -0500 +++ b/configure.ac Tue Jan 07 13:20:28 2014 -0500 @@ -21,17 +21,41 @@ AC_PREREQ([2.62]) AC_INIT([GNU Octave], [4.1.0+], [http://octave.org/bugs.html], [octave]) +dnl Note that the version number is duplicated here and in AC_INIT +dnl because AC_INIT requires it to be static, not computed from +dnl shell variables. +OCTAVE_MAJOR_VERSION=3 +OCTAVE_MINOR_VERSION=8 +OCTAVE_PATCH_VERSION=0 + dnl PACKAGE_VERSION is set by the AC_INIT VERSION arg OCTAVE_VERSION="$PACKAGE_VERSION" -OCTAVE_API_VERSION_NUMBER="49" -OCTAVE_API_VERSION="api-v$OCTAVE_API_VERSION_NUMBER+" + +OCTAVE_COPYRIGHT="Copyright (C) 2013 John W. Eaton and others." + OCTAVE_RELEASE_DATE="2013-12-27" -OCTAVE_COPYRIGHT="Copyright (C) 2013 John W. Eaton and others." + +## The "API version" is used as a way of checking that interfaces in the +## liboctave and libinterp libraries haven't changed in a backwardly +## incompatible way when loading .oct files. A better way to do that is +## with library versioning, but not all systems support that. +## NOTE: This macro will be removed in a future version of Octave. If +## you insist on checking for features using a version number, use the +## OCTAVE_MAJOR_VERSION, OCTAVE_MINOR_VERSION, and +## OCTAVE_PATCH_VERSION macros instead. +## FIXME: Since we also set libtool versions for liboctave and +## libinterp, perhaps we should be computing the "api version" from +## those versions numbers in some way instead of setting it +## independently here. +OCTAVE_API_VERSION="api-v49+" + +AC_SUBST(OCTAVE_MAJOR_VERSION) +AC_SUBST(OCTAVE_MINOR_VERSION) +AC_SUBST(OCTAVE_PATCH_VERSION) AC_SUBST(OCTAVE_VERSION) -AC_SUBST(OCTAVE_API_VERSION_NUMBER) +AC_SUBST(OCTAVE_COPYRIGHT) +AC_SUBST(OCTAVE_RELEASE_DATE) AC_SUBST(OCTAVE_API_VERSION) -AC_SUBST(OCTAVE_RELEASE_DATE) -AC_SUBST(OCTAVE_COPYRIGHT) dnl FIXME: We should auto-insert the Mercurial changeset ID into the dnl AC_REVISION field whenever configure.ac is modified. diff -r 1af5ee5f3076 -r 3cad99b56fa7 doc/interpreter/stmt.txi --- a/doc/interpreter/stmt.txi Mon Jan 06 14:34:56 2014 -0500 +++ b/doc/interpreter/stmt.txi Tue Jan 07 13:20:28 2014 -0500 @@ -846,7 +846,7 @@ If an error does occur during the execution of @var{body}, @var{cleanup} can use the functions @code{lasterr} or @code{lasterror} to access the text of the message that would have been printed, as well as its -identifier. The alternative form, +identifier. The alternative form, @example @group @@ -860,7 +860,7 @@ @noindent will automatically store the output of @code{lasterror} in the structure -@var{err}. @xref{Errors and Warnings} for more information about the +@var{err}. @xref{Errors and Warnings}, for more information about the @code{lasterr} and @code{lasterror} functions. diff -r 1af5ee5f3076 -r 3cad99b56fa7 libinterp/Makefile.am --- a/libinterp/Makefile.am Mon Jan 06 14:34:56 2014 -0500 +++ b/libinterp/Makefile.am Tue Jan 07 13:20:28 2014 -0500 @@ -271,9 +271,11 @@ version.h: version.in.h Makefile $(SED) < $< \ -e "s|%NO_EDIT_WARNING%|DO NOT EDIT! Generated automatically from $( $@-t mv $@-t $@ diff -r 1af5ee5f3076 -r 3cad99b56fa7 libinterp/corefcn/help.cc --- a/libinterp/corefcn/help.cc Mon Jan 06 14:34:56 2014 -0500 +++ b/libinterp/corefcn/help.cc Tue Jan 07 13:20:28 2014 -0500 @@ -452,8 +452,9 @@ pair_type ("case", "-*- texinfo -*-\n\ -@deftypefn {Keyword} {} case @{@var{value}@}\n\ -A case statement in an switch. Octave cases are exclusive and do not\n\ +@deftypefn {Keyword} {} case @var{value}\n\ +@deftypefnx {Keyword} {} case @{@var{value}, @dots{}@}\n\ +A case statement in a switch. Octave cases are exclusive and do not\n\ fall-through as do C-language cases. A switch statement must have at least\n\ one case. See @code{switch} for an example.\n\ @seealso{switch}\n\ @@ -461,7 +462,8 @@ pair_type ("catch", "-*- texinfo -*-\n\ -@deftypefn {Keyword} {} catch\n\ +@deftypefn {Keyword} {} catch\n\ +@deftypefnx {Keyword} {} catch @var{value}\n\ Begin the cleanup part of a try-catch block.\n\ @seealso{try}\n\ @end deftypefn"), @@ -507,9 +509,10 @@ pair_type ("end", "-*- texinfo -*-\n\ @deftypefn {Keyword} {} end\n\ -Mark the end of any @code{for}, @code{if}, @code{do}, @code{while}, or\n\ -@code{function} block.\n\ -@seealso{for, parfor, if, do, while, function}\n\ +Mark the end of any @code{for}, @code{parfor}, @code{if}, @code{do},\n\ +@code{while}, @code{function}, @code{switch}, @code{try}, or\n\ +@code{unwind_protect} block.\n\ +@seealso{for, parfor, if, do, while, function, switch, try, unwind_protect}\n\ @end deftypefn"), pair_type ("end_try_catch", @@ -595,7 +598,7 @@ pair_type ("global", "-*- texinfo -*-\n\ -@deftypefn {Keyword} {} global\n\ +@deftypefn {Keyword} {} global @var{var}\n\ Declare variables to have global scope.\n\ \n\ @example\n\ @@ -676,7 +679,7 @@ pair_type ("static", "-*- texinfo -*-\n\ @deftypefn {Keyword} {} static\n\ -This function has been deprecated in favor of persistent.\n\ +This statement has been deprecated in favor of @code{persistent}.\n\ @seealso{persistent}\n\ @end deftypefn"), @@ -716,7 +719,7 @@ pair_type ("until", "-*- texinfo -*-\n\ -@deftypefn {Keyword} {} until\n\ +@deftypefn {Keyword} {} until (@var{cond})\n\ End a do-until loop. See @code{do} for an example.\n\ @seealso{do}\n\ @end deftypefn"), diff -r 1af5ee5f3076 -r 3cad99b56fa7 libinterp/parse-tree/lex.ll --- a/libinterp/parse-tree/lex.ll Mon Jan 06 14:34:56 2014 -0500 +++ b/libinterp/parse-tree/lex.ll Tue Jan 07 13:20:28 2014 -0500 @@ -422,8 +422,8 @@ // Everything else is slurped into the command arguments. %} -([\.]|[^#% \t\r\n\,\;\"\'\(\[\{\}\]\)]+) { - curr_lexer->lexer_debug ("[^#% \\t\\r\\n\\.\\,\\;\\\"\\'\\(\\[\\{\\}\\]\\)]+"); +(\.|[^#% \t\r\n\.\,\;\"\'\(\[\{\}\]\)]+) { + curr_lexer->lexer_debug ("(\\.|[^#% \\t\\r\\n\\.\\,\\;\\\"\\'\\(\\[\\{\\}\\]\\)]+)"); curr_lexer->string_text += yytext; curr_lexer->current_input_column += yyleng; diff -r 1af5ee5f3076 -r 3cad99b56fa7 libinterp/version.in.h --- a/libinterp/version.in.h Mon Jan 06 14:34:56 2014 -0500 +++ b/libinterp/version.in.h Tue Jan 07 13:20:28 2014 -0500 @@ -26,6 +26,20 @@ #define OCTAVE_VERSION %OCTAVE_VERSION% +#define OCTAVE_MAJOR_VERSION %OCTAVE_MAJOR_VERSION% + +#define OCTAVE_MINOR_VERSION %OCTAVE_MINOR_VERSION% + +#define OCTAVE_PATCH_VERSION %OCTAVE_PATCH_VERSION% + +// The "API version" is used as a way of checking that interfaces in the +// liboctave and libinterp libraries haven't changed in a backwardly +// incompatible way when loading .oct files. A better way to do that is +// with library versioning, but not all systems support that. +// NOTE: This macro will be removed in a future version of Octave. If +// you insist on checking for features using a version number, use the +// OCTAVE_MAJOR_VERSION, OCTAVE_MINOR_VERSION, and +// OCTAVE_PATCH_VERSION macros instead. #define OCTAVE_API_VERSION %OCTAVE_API_VERSION% #define OCTAVE_RELEASE_DATE %OCTAVE_RELEASE_DATE%