Mercurial > octave
changeset 23876:b6e756d8f485
maint: eliminate TAB characters from source files
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 10 Aug 2017 18:03:58 -0400 |
| parents | 3c13a19d5fb7 |
| children | 95797733d539 |
| files | etc/NEWS.2 etc/NEWS.3 libinterp/parse-tree/pt-eval.cc m4/octave_blas_f77_func.m4 |
| diffstat | 4 files changed, 64 insertions(+), 64 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/NEWS.2 Thu Aug 10 18:03:36 2017 -0400 +++ b/etc/NEWS.2 Thu Aug 10 18:03:58 2017 -0400 @@ -12,16 +12,16 @@ ;; Set up the custom library. ;; taken from http://www.dina.kvl.dk/~abraham/custom/ (eval-and-compile - (condition-case () - (require 'custom) - (error nil)) - (if (and (featurep 'custom) (fboundp 'custom-declare-variable)) - nil ;; We've got what we needed - ;; We have the old custom-library, hack around it! - (defmacro defgroup (&rest args) - nil) - (defmacro defcustom (var value doc &rest args) - (` (defvar (, var) (, value) (, doc)))))) + (condition-case () + (require 'custom) + (error nil)) + (if (and (featurep 'custom) (fboundp 'custom-declare-variable)) + nil ;; We've got what we needed + ;; We have the old custom-library, hack around it! + (defmacro defgroup (&rest args) + nil) + (defmacro defcustom (var value doc &rest args) + (` (defvar (, var) (, value) (, doc)))))) * When `format +' is in effect, Octave uses the following symbols to provide more information about the values in a matrix:
--- a/etc/NEWS.3 Thu Aug 10 18:03:36 2017 -0400 +++ b/etc/NEWS.3 Thu Aug 10 18:03:58 2017 -0400 @@ -1548,7 +1548,7 @@ + You can control the width of lines using (for example): - line (x, y, "linewidth", 4, "color", [1, 0, 0.5]); + line (x, y, "linewidth", 4, "color", [1, 0, 0.5]); (this also shows the color feature). @@ -1569,11 +1569,11 @@ + The following plot commands are now considered obsolete and will be removed from a future version of Octave: - __gnuplot_set__ - __gnuplot_show__ - __gnuplot_plot__ - __gnuplot_splot__ - __gnuplot_replot__ + __gnuplot_set__ + __gnuplot_show__ + __gnuplot_plot__ + __gnuplot_splot__ + __gnuplot_replot__ Additionally, these functions no longer have any effect on plots created with the Matlab-style plot commands (plot, line, mesh,
--- a/libinterp/parse-tree/pt-eval.cc Thu Aug 10 18:03:36 2017 -0400 +++ b/libinterp/parse-tree/pt-eval.cc Thu Aug 10 18:03:58 2017 -0400 @@ -1452,7 +1452,7 @@ idx, nargout); beg = n; idx.clear (); - } + } catch (octave::index_exception& e) { final_index_error (e, expr);
--- a/m4/octave_blas_f77_func.m4 Thu Aug 10 18:03:36 2017 -0400 +++ b/m4/octave_blas_f77_func.m4 Thu Aug 10 18:03:58 2017 -0400 @@ -68,14 +68,14 @@ # F77 call-compatibility checks if test "$cross_compiling" = yes ; then - ifelse($3, ,$1,$3) + ifelse($3, ,$1,$3) elif test x"$ax_blas_ok" = xyes; then - save_ax_blas_f77_func_LIBS="$LIBS" - LIBS="$BLAS_LIBS $LIBS" - AC_LANG_PUSH(Fortran 77) + save_ax_blas_f77_func_LIBS="$LIBS" + LIBS="$BLAS_LIBS $LIBS" + AC_LANG_PUSH(Fortran 77) # LSAME check (LOGICAL return values) - AC_MSG_CHECKING([whether LSAME is called correctly from Fortran]) - AC_RUN_IFELSE(AC_LANG_PROGRAM(,[[ + AC_MSG_CHECKING([whether LSAME is called correctly from Fortran]) + AC_RUN_IFELSE(AC_LANG_PROGRAM(,[[ logical lsame,w external lsame character c1,c2 @@ -86,11 +86,11 @@ w = lsame(c1,c1) if (.not. w) stop 1 ]]),[ax_blas_lsame_fcall_ok=yes], - [ax_blas_lsame_fcall_ok=no]) - AC_MSG_RESULT([$ax_blas_lsame_fcall_ok]) + [ax_blas_lsame_fcall_ok=no]) + AC_MSG_RESULT([$ax_blas_lsame_fcall_ok]) # ISAMAX check (INTEGER return values) - AC_MSG_CHECKING([whether ISAMAX is called correctly from Fortran]) - AC_RUN_IFELSE(AC_LANG_PROGRAM(,[[ + AC_MSG_CHECKING([whether ISAMAX is called correctly from Fortran]) + AC_RUN_IFELSE(AC_LANG_PROGRAM(,[[ integer isamax,i external isamax real a(2) @@ -99,11 +99,11 @@ i = isamax(2,a,1) if (i.ne.2) stop 1 ]]),[ax_blas_isamax_fcall_ok=yes], - [ax_blas_isamax_fcall_ok=no]) - AC_MSG_RESULT([$ax_blas_isamax_fcall_ok]) + [ax_blas_isamax_fcall_ok=no]) + AC_MSG_RESULT([$ax_blas_isamax_fcall_ok]) # SDOT check (REAL return values) - AC_MSG_CHECKING([whether SDOT is called correctly from Fortran]) - AC_RUN_IFELSE(AC_LANG_PROGRAM(,[[ + AC_MSG_CHECKING([whether SDOT is called correctly from Fortran]) + AC_RUN_IFELSE(AC_LANG_PROGRAM(,[[ real sdot,a(1),b(1),w external sdot a(1) = 1e0 @@ -111,11 +111,11 @@ w = sdot(1,a,1,b,1) if (w .ne. a(1)*b(1)) stop 1 ]]),[ax_blas_sdot_fcall_ok=yes], - [ax_blas_sdot_fcall_ok=no]) - AC_MSG_RESULT([$ax_blas_sdot_fcall_ok]) + [ax_blas_sdot_fcall_ok=no]) + AC_MSG_RESULT([$ax_blas_sdot_fcall_ok]) # DDOT check (DOUBLE return values) - AC_MSG_CHECKING([whether DDOT is called correctly from Fortran]) - AC_RUN_IFELSE(AC_LANG_PROGRAM(,[[ + AC_MSG_CHECKING([whether DDOT is called correctly from Fortran]) + AC_RUN_IFELSE(AC_LANG_PROGRAM(,[[ double precision ddot,a(1),b(1),w external ddot a(1) = 1d0 @@ -123,11 +123,11 @@ w = ddot(1,a,1,b,1) if (w .ne. a(1)*b(1)) stop 1 ]]),[ax_blas_ddot_fcall_ok=yes], - [ax_blas_ddot_fcall_ok=no]) - AC_MSG_RESULT([$ax_blas_ddot_fcall_ok]) + [ax_blas_ddot_fcall_ok=no]) + AC_MSG_RESULT([$ax_blas_ddot_fcall_ok]) # CDOTU check (COMPLEX return values) - AC_MSG_CHECKING([whether CDOTU is called correctly from Fortran]) - AC_RUN_IFELSE(AC_LANG_PROGRAM(,[[ + AC_MSG_CHECKING([whether CDOTU is called correctly from Fortran]) + AC_RUN_IFELSE(AC_LANG_PROGRAM(,[[ complex cdotu,a(1),b(1),w external cdotu a(1) = cmplx(1e0,1e0) @@ -135,11 +135,11 @@ w = cdotu(1,a,1,b,1) if (w .ne. a(1)*b(1)) stop 1 ]]),[ax_blas_cdotu_fcall_ok=yes], - [ax_blas_cdotu_fcall_ok=no]) - AC_MSG_RESULT([$ax_blas_cdotu_fcall_ok]) + [ax_blas_cdotu_fcall_ok=no]) + AC_MSG_RESULT([$ax_blas_cdotu_fcall_ok]) # ZDOTU check (DOUBLE COMPLEX return values) - AC_MSG_CHECKING([whether ZDOTU is called correctly from Fortran]) - AC_RUN_IFELSE(AC_LANG_PROGRAM(,[[ + AC_MSG_CHECKING([whether ZDOTU is called correctly from Fortran]) + AC_RUN_IFELSE(AC_LANG_PROGRAM(,[[ double complex zdotu,a(1),b(1),w external zdotu a(1) = dcmplx(1d0,1d0) @@ -147,8 +147,8 @@ w = zdotu(1,a,1,b,1) if (w .ne. a(1)*b(1)) stop 1 ]]),[ax_blas_zdotu_fcall_ok=yes], - [ax_blas_zdotu_fcall_ok=no]) - AC_MSG_RESULT([$ax_blas_zdotu_fcall_ok]) + [ax_blas_zdotu_fcall_ok=no]) + AC_MSG_RESULT([$ax_blas_zdotu_fcall_ok]) # Check BLAS library integer size. If it does not appear to be # 8 bytes, we assume it is 4 bytes. # FIXME: this may fail with things like -ftrapping-math. @@ -175,24 +175,24 @@ s = sdot(n,a,1,b,1) if (s .ne. 0.0) stop 1 ]]),[ax_blas_integer_size=8], - [ax_blas_integer_size=4]) - AC_MSG_RESULT([$ax_blas_integer_size]) + [ax_blas_integer_size=4]) + AC_MSG_RESULT([$ax_blas_integer_size]) - AC_LANG_POP(Fortran 77) + AC_LANG_POP(Fortran 77) # if any of the tests failed, reject the BLAS library - if test $ax_blas_lsame_fcall_ok = yes \ - -a $ax_blas_sdot_fcall_ok = yes \ - -a $ax_blas_ddot_fcall_ok = yes \ - -a $ax_blas_cdotu_fcall_ok = yes \ - -a $ax_blas_zdotu_fcall_ok = yes ; then - ax_blas_f77_func_ok=yes; - $1 - else - ax_blas_f77_func_ok=no; - $2 - fi - LIBS="$save_ax_blas_f77_func_LIBS" + if test $ax_blas_lsame_fcall_ok = yes \ + -a $ax_blas_sdot_fcall_ok = yes \ + -a $ax_blas_ddot_fcall_ok = yes \ + -a $ax_blas_cdotu_fcall_ok = yes \ + -a $ax_blas_zdotu_fcall_ok = yes ; then + ax_blas_f77_func_ok=yes; + $1 + else + ax_blas_f77_func_ok=no; + $2 + fi + LIBS="$save_ax_blas_f77_func_LIBS" fi ])dnl AX_BLAS_F77_FUNC @@ -201,11 +201,11 @@ AC_PREREQ(2.50) AX_BLAS([# disable special action], []) if test x$ax_blas_ok = xyes ; then - OCTAVE_BLAS_F77_FUNC( - [ifelse([$1],,AC_DEFINE(HAVE_BLAS,1,[Define if you have a BLAS library.]),[$1])], - [ax_blas_ok=no; BLAS_LIBS=]) + OCTAVE_BLAS_F77_FUNC( + [ifelse([$1],,AC_DEFINE(HAVE_BLAS,1,[Define if you have a BLAS library.]),[$1])], + [ax_blas_ok=no; BLAS_LIBS=]) fi if test x$ax_blas_ok = xno ; then - $2 + $2 fi ])dnl AX_BLAS_WITH_F77_FUNC