Mercurial > octave-nkf

changeset 3177:d81db29f8b2b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1998-05-28 15:23:50 by jwe]
author jwe
date Thu, 28 May 1998 15:23:51 +0000
parents fccab8e7d35f
children 09a3064a3a17
files CHECKLIST ChangeLog configure.in install-octave.in liboctave/Array-idx.h liboctave/Array2-idx.h liboctave/ChangeLog test/ChangeLog test/Makefile.in test/octave.test/diffeq/diffeq.exp
diffstat 10 files changed, 105 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/CHECKLIST	Mon May 18 20:33:42 1998 +0000
+++ b/CHECKLIST	Thu May 28 15:23:51 1998 +0000
@@ -18,6 +18,3 @@
 
   * Update the NEWS and README.octave files in the anonymous ftp
     directory.
-
-  * Don't forget to use -static when linking the binaries for the
-    binary distributions.
--- a/ChangeLog	Mon May 18 20:33:42 1998 +0000
+++ b/ChangeLog	Thu May 28 15:23:51 1998 +0000
@@ -1,3 +1,9 @@
+Thu May 28 10:17:45 1998  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* configure.in: When checking for glob stuff, make sure that the
+	systsem header file has all the definitions that we need.  If not,
+	set up to use our replacement library.
+
 Mon May 18 11:33:45 1998  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* mkoctfile.in: Fix typos in case statement.
--- a/configure.in	Mon May 18 20:33:42 1998 +0000
+++ b/configure.in	Thu May 28 15:23:51 1998 +0000
@@ -21,7 +21,7 @@
 ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 ### 02111-1307, USA. 
 
-AC_REVISION($Revision: 1.305 $)
+AC_REVISION($Revision: 1.306 $)
 AC_PREREQ(2.9)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -696,20 +696,41 @@
   AC_MSG_ERROR([I couldn't find termios.h, termio.h, or sgtty.h!])
 fi
 
+
 GLOB_DIR=glob
 LIBGLOB='$(TOPDIR)/glob/libglob.$(LIBEXT)'
 GLOB_INCFLAGS='-I$(top_srcdir)/glob -I$(TOPDIR)/glob'
 if test "$ac_cv_header_fnmatch_h" = yes \
   && test "$ac_cv_header_glob_h" = yes; then
-  GLOB_DIR=
-  AC_CHECK_LIB(glob, glob)
-  AC_CHECK_FUNCS(fnmatch glob)
-  if test "$ac_cv_func_fnmatch" = yes \
-    && test "$ac_cv_func_glob" = yes; then
-    GLOB_DIR=
-    LIBGLOB=
-    GLOB_INCFLAGS=
-  fi
+  AC_EGREP_CPP(yes,
+    [#ifdef FNM_NOESCAPE
+     #ifdef FNM_FOOBAR_PATHNAME
+     #ifdef FNM_PERIOD
+       yes
+     #endif
+     #endif
+     #endif
+    ], [
+      GLOB_DIR=
+      AC_CHECK_LIB(glob, glob)
+      AC_CHECK_FUNCS(fnmatch glob)
+      if test "$ac_cv_func_fnmatch" = yes \
+	&& test "$ac_cv_func_glob" = yes; then
+	GLOB_DIR=
+	LIBGLOB=
+	GLOB_INCFLAGS=
+      fi
+    ], [
+### We provide replacements, so we should set these to "yes".
+    AC_CACHE_VAL(ac_cv_func_fnmatch, ac_cv_func_fnmatch=yes)
+    AC_CACHE_VAL(ac_cv_func_glob, ac_cv_func_glob=yes)
+    ])
+else
+### We provide replacements, so we should set these to "yes".
+  ac_cv_header_fnmatch_h=yes
+  ac_cv_header_glob_h=yes
+  AC_CACHE_VAL(ac_cv_func_fnmatch, ac_cv_func_fnmatch=yes)
+  AC_CACHE_VAL(ac_cv_func_glob, ac_cv_func_glob=yes)
 fi
 AC_SUBST(GLOB_DIR)
 AC_SUBST(LIBGLOB)
--- a/install-octave.in	Mon May 18 20:33:42 1998 +0000
+++ b/install-octave.in	Thu May 28 15:23:51 1998 +0000
@@ -248,8 +248,8 @@
     cp $f $octfiledir/$file
     chmod 755 $octfiledir/$file
   done
-  if test -f links-to-make; then
-    cat links-to-make | while read src dest
+  if test -f src/links-to-make; then
+    cat src/links-to-make | while read src dest
     do
       if test -n "$src" && test -n "$dest"; then
 	cd $octfiledir
--- a/liboctave/Array-idx.h	Mon May 18 20:33:42 1998 +0000
+++ b/liboctave/Array-idx.h	Thu May 28 15:23:51 1998 +0000
@@ -241,15 +241,12 @@
 	(*current_liboctave_error_handler)
 	  ("A(:) = X: A must be the same size as X");
     }
-  else
+  else if (! (rhs_len == 1 || rhs_len == 0))
     {
-      if (rhs_len != 0)
- 	{
-	  (*current_liboctave_error_handler)
-	    ("A([]) = X: X must also be an empty matrix");
-
-	  retval = 0;
-	}
+      (*current_liboctave_error_handler)
+	("A([]) = X: X must also be an empty matrix or a scalar");
+  
+      retval = 0;
     }
 
   lhs.clear_index ();
--- a/liboctave/Array2-idx.h	Mon May 18 20:33:42 1998 +0000
+++ b/liboctave/Array2-idx.h	Thu May 28 15:23:51 1998 +0000
@@ -442,6 +442,17 @@
 			}
 		    }
 		}
+	      else if (n == 0 && m == 0)
+		{
+		  if (! ((rhs_nr == 1 && rhs_nc == 1)
+			 || (rhs_nr == 0 && rhs_nc == 0)))
+		    {
+		      (*current_liboctave_error_handler)
+		("A([], []) = X: X must be an empty matrix or a scalar");
+
+		      retval = 0;
+		    }
+		}
 	      else
 		{
 		  (*current_liboctave_error_handler)
@@ -535,6 +546,13 @@
 			      lhs.d1 = lhs.length ();
 			      lhs.d2 = 1;
 			    }
+			  else if (idx_nr == 0 && idx_nc == 0)
+			    {
+			      if (! ((rhs.d1 == 1 && rhs.d2 == 1)
+				     || (rhs.d1 == 0 && rhs.d2 == 0)))
+				(*current_liboctave_error_handler)
+			  ("A([]) = X: X must be an empty matrix or scalar");
+			    }
 			  else
 			    (*current_liboctave_error_handler)
       ("A(I) = X: X must be a scalar or a matrix with the same size as I");
@@ -624,6 +642,13 @@
 			}
 		    }
 		}
+	      else if (len == 0)
+		{
+		  if (! ((rhs_nr == 1 && rhs_nc == 1)
+			 || (rhs_nr == 0 && rhs_nc == 0)))
+		    (*current_liboctave_error_handler)
+		      ("A([]) = X: X must be an empty matrix or scalar");
+		}
 	      else
 		{
 		  (*current_liboctave_error_handler)
--- a/liboctave/ChangeLog	Mon May 18 20:33:42 1998 +0000
+++ b/liboctave/ChangeLog	Thu May 28 15:23:51 1998 +0000
@@ -1,3 +1,9 @@
+Wed May 27 13:46:30 1998  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* Array2-idx.h (assign): Allow A([],[]) = scalar and, if
+	do_fortran_indexing is set, A([]) = scalar.
+	* Array-idx.h (assign): Allow A([]) = scalar.
+
 Thu May 14 11:50:24 1998  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* mx-op-defs.h (MDM_MULTIPLY_OP): Compute result if dm_nc > 0, not
--- a/test/ChangeLog	Mon May 18 20:33:42 1998 +0000
+++ b/test/ChangeLog	Thu May 28 15:23:51 1998 +0000
@@ -1,3 +1,12 @@
+Wed May 27 00:38:27 1998  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* octave.test/diffeq/dassl-1.m, octave.test/diffeq/dassl-2.m,
+	octave.test/diffeq/lsode-1.m: New tests, from David Billinghurst
+	<David.Billinghurst@riotinto.com.au>.
+
+	* octave.test/diffeq/lsode-2.m, octave.test/diffeq/lsode-3.m:
+ 	New tests, from Peter Hopfgartner <phopfgartner@memc.inet.it>.
+
 Thu Apr 23 01:45:16 1998  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* Makefile.in: If $(SHARED_LIBS), set LD_LIBRARY_PATH for running
--- a/test/Makefile.in	Mon May 18 20:33:42 1998 +0000
+++ b/test/Makefile.in	Thu May 28 15:23:51 1998 +0000
@@ -26,7 +26,7 @@
 
 ifeq ($(SHARED_LIBS), true)
   OCTAVE_LD_LIBRARY_PATH = `pwd`/../src:`pwd`/../liboctave:`pwd`/../libcruft
-  ifneq ($(LD_LIBRARY_PATH),)
+  ifeq ($(LD_LIBRARY_PATH),)
     XLD_LIBRARY_PATH = $(OCTAVE_LD_LIBRARY_PATH)
   else
     XLD_LIBRARY_PATH = $(OCTAVE_LD_LIBRARY_PATH):$(LD_LIBRARY_PATH)
--- a/test/octave.test/diffeq/diffeq.exp	Mon May 18 20:33:42 1998 +0000
+++ b/test/octave.test/diffeq/diffeq.exp	Thu May 28 15:23:51 1998 +0000
@@ -2,6 +2,18 @@
 
 # lsode
 
+set test lsode-1
+set prog_output "ans = 1"
+do_test lsode-1.m
+
+set test lsode-2
+set prog_output "ans = 1"
+do_test lsode-2.m
+
+set test lsode-3
+set prog_output "ans = 1"
+do_test lsode-3.m
+
 set test lsode_options-1
 set prog_output "ans = 1"
 do_test lsode_options-1.m
@@ -16,6 +28,14 @@
 
 # dassl
 
+set test dassl-1
+set prog_output "ans = 1"
+do_test dassl-1.m
+
+set test dassl-2
+set prog_output "ans = 1"
+do_test dassl-2.m
+
 set test dassl_options-1
 set prog_output "ans = 1"
 do_test dassl_options-1.m