Mercurial > hg > octave-nkf

changeset 3548:ab7fa5a8f23f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2000-02-03 01:17:15 by jwe]
author jwe
date Thu, 03 Feb 2000 01:17:21 +0000
parents 975398bed659
children 03025e79d8b9
files src/ChangeLog src/DLD-FUNCTIONS/balance.cc src/DLD-FUNCTIONS/besselj.cc src/DLD-FUNCTIONS/chol.cc src/DLD-FUNCTIONS/det.cc src/DLD-FUNCTIONS/eig.cc src/DLD-FUNCTIONS/expm.cc src/DLD-FUNCTIONS/gammainc.cc src/DLD-FUNCTIONS/givens.cc src/DLD-FUNCTIONS/hess.cc src/DLD-FUNCTIONS/inv.cc src/DLD-FUNCTIONS/log.cc src/DLD-FUNCTIONS/lu.cc src/DLD-FUNCTIONS/qr.cc src/DLD-FUNCTIONS/schur.cc src/DLD-FUNCTIONS/svd.cc src/DLD-FUNCTIONS/syl.cc src/error.cc src/load-save.cc src/oct-stream.cc src/ov-fcn.cc src/ov-struct.cc src/pr-output.cc src/symtab.cc src/token.h src/variables.cc
diffstat 26 files changed, 67 insertions(+), 42 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,26 @@
 2000-02-02  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* variables.cc (F__dump_symbol_info__): Fix continuation char.
+	* DLD-FUNCTIONS/besselj.cc (Fairy, Fbesselj): Likewise.
+	* DLD-FUNCTIONS/chol.cc (Fchol): Likewise.
+	* DLD-FUNCTIONS/det.cc (Fdet): Likewise.
+	* DLD-FUNCTIONS/eig.cc (Feig): Likewise.
+	* DLD-FUNCTIONS/gammainc.cc (gammainc): Likewise.
+	* DLD-FUNCTIONS/givens.cc (givens): Likewise.
+	* DLD-FUNCTIONS/hess.cc (hess): Likewise.
+	* DLD-FUNCTIONS/inv.cc (inv): Likewise.
+	* DLD-FUNCTIONS/log.cc (logm): Likewise.
+	* DLD-FUNCTIONS/lu.cc (lu): Likewise.
+	* DLD-FUNCTIONS/qr.cc (qr): Likewise.
+	* DLD-FUNCTIONS/schur.cc (schur): Likewise.
+	* DLD-FUNCTIONS/balance.cc (balance): Likewise.
+	* DLD-FUNCTIONS/svd.cc (svd): Likewise.
+	* DLD-FUNCTIONS/syl.cc (syl): Likewise.
+	* DLD-FUNCTIONS/expm.cc (Fexpm): Likewise.
+
+	* token.h (token::token_type, token::end_tok_type,
+	token::plot_tok_type): Delete extraneous comma from enum decls.
+
 	* pt-idx.cc (tree_index_expression::tree_index_expression):
 	Delete default arg values.
 
--- a/src/DLD-FUNCTIONS/balance.cc
+++ b/src/DLD-FUNCTIONS/balance.cc
@@ -62,7 +62,7 @@
 }
 
 DEFUN_DLD (balance, args, nargout,
-  "-*- texinfo -*-
+  "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} {@var{aa} =} balance (@var{a}, @var{opt})\n\
 @deftypefnx {Loadable Function} {[@var{dd}, @var{aa}] =} balance (@var{a}, @var{opt})\n\
 @deftypefnx {Loadable Function} {[@var{cc}, @var{dd}, @var{aa}, @var{bb}] =} balance (@var{a}, @var{b}, @var{opt})\n\
--- a/src/DLD-FUNCTIONS/besselj.cc
+++ b/src/DLD-FUNCTIONS/besselj.cc
@@ -273,7 +273,7 @@
 \n\
 If requested, @var{ierr} contains the following status information\n\
 and is the same size as the result.\n\
-\n
+\n\
 @enumerate 0\n\
 @item\n\
 Normal return.\n\
@@ -390,7 +390,7 @@
 \n\
 If requested, @var{ierr} contains the following status information and\n\
 is the same size as the result.\n\
-\n
+\n\
 @enumerate 0\n\
 @item\n\
 Normal return.\n\
--- a/src/DLD-FUNCTIONS/chol.cc
+++ b/src/DLD-FUNCTIONS/chol.cc
@@ -34,7 +34,7 @@
 #include "utils.h"
 
 DEFUN_DLD (chol, args, nargout,
-  "-*- texinfo -*-
+  "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} {} chol (@var{a})\n\
 @cindex Cholesky factorization\n\
 Compute the Cholesky factor, @var{r}, of the symmetric positive definite\n\
--- a/src/DLD-FUNCTIONS/det.cc
+++ b/src/DLD-FUNCTIONS/det.cc
@@ -34,7 +34,7 @@
 #include "utils.h"
 
 DEFUN_DLD (det, args, ,
-  "-*- texinfo -*-
+  "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} {} det (@var{a})\n\
 Compute the determinant of @var{a} using @sc{Linpack}.\n\
 @end deftypefn")
--- a/src/DLD-FUNCTIONS/eig.cc
+++ b/src/DLD-FUNCTIONS/eig.cc
@@ -33,7 +33,7 @@
 #include "utils.h"
 
 DEFUN_DLD (eig, args, nargout,
-  "-*- texinfo -*-
+  "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} {@var{lambda} =} eig (@var{a})\n\
 @deftypefnx {Loadable Function} {[@var{v}, @var{lambda}] =} eig (@var{a})\n\
 The eigenvalues (and eigenvectors) of a matrix are computed in a several\n\
--- a/src/DLD-FUNCTIONS/expm.cc
+++ b/src/DLD-FUNCTIONS/expm.cc
@@ -33,7 +33,7 @@
 #include "utils.h"
 
 DEFUN_DLD (expm, args, ,
-  "-*- texinfo -*-
+  "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} {} expm (@var{a})\n\
 Return the exponential of a matrix, defined as the infinite Taylor\n\
 series\n\
--- a/src/DLD-FUNCTIONS/gammainc.cc
+++ b/src/DLD-FUNCTIONS/gammainc.cc
@@ -33,7 +33,7 @@
 #include "utils.h"
 
 DEFUN_DLD (gammainc, args, ,
-  "-*- texinfo -*-
+  "-*- texinfo -*-\n\
 @deftypefn {Mapping Function} {} gammainc (@var{x}, @var{a})\n\
 Computes the incomplete gamma function,\n\
 @iftex\n\
--- a/src/DLD-FUNCTIONS/givens.cc
+++ b/src/DLD-FUNCTIONS/givens.cc
@@ -31,7 +31,7 @@
 #include "oct-obj.h"
 
 DEFUN_DLD (givens, args, nargout,
-  "-*- texinfo -*-
+  "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} {@var{g} =} givens (@var{x}, @var{y})\n\
 @deftypefnx {Loadable Function} {[@var{c}, @var{s}] =} givens (@var{x}, @var{y})\n\
 @iftex\n\
--- a/src/DLD-FUNCTIONS/hess.cc
+++ b/src/DLD-FUNCTIONS/hess.cc
@@ -34,7 +34,7 @@
 #include "utils.h"
 
 DEFUN_DLD (hess, args, nargout,
-  "-*- texinfo -*-
+  "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} {@var{h} =} hess (@var{a})\n\
 @deftypefnx {Loadable Function} {[@var{p}, @var{h}] =} hess (@var{a})\n\
 @cindex Hessenberg decomposition\n\
--- a/src/DLD-FUNCTIONS/inv.cc
+++ b/src/DLD-FUNCTIONS/inv.cc
@@ -31,7 +31,7 @@
 #include "utils.h"
 
 DEFUN_DLD (inv, args, ,
-  "-*- texinfo -*-
+  "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} {} inv (@var{a})\n\
 @deftypefnx {Loadable Function} {} inverse (@var{a})\n\
 Compute the inverse of the square matrix @var{a}.\n\
--- a/src/DLD-FUNCTIONS/log.cc
+++ b/src/DLD-FUNCTIONS/log.cc
@@ -36,7 +36,7 @@
 // one...
 
 DEFUN_DLD (logm, args, ,
-  "-*- texinfo -*-
+  "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} {} logm (@var{a})\n\
 Compute the matrix logarithm of the square matrix @var{a}.  Note that\n\
 this is currently implemented in terms of an eigenvalue expansion and\n\
--- a/src/DLD-FUNCTIONS/lu.cc
+++ b/src/DLD-FUNCTIONS/lu.cc
@@ -34,7 +34,7 @@
 #include "utils.h"
 
 DEFUN_DLD (lu, args, nargout,
-  "-*- texinfo -*-
+  "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} {[@var{l}, @var{u}, @var{p}] =} lu (@var{a})\n\
 @cindex LU decomposition\n\
 Compute the LU decomposition of @var{a}, using subroutines from\n\
--- a/src/DLD-FUNCTIONS/qr.cc
+++ b/src/DLD-FUNCTIONS/qr.cc
@@ -53,7 +53,7 @@
 // that R = triu (qr (X))
 
 DEFUN_DLD (qr, args, nargout,
-  "-*- texinfo -*-
+  "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} {[@var{q}, @var{r}, @var{p}] =} qr (@var{a})\n\
 @cindex QR factorization\n\
 Compute the QR factorization of @var{a}, using standard @sc{Lapack}\n\
--- a/src/DLD-FUNCTIONS/schur.cc
+++ b/src/DLD-FUNCTIONS/schur.cc
@@ -36,7 +36,7 @@
 #include "utils.h"
 
 DEFUN_DLD (schur, args, nargout,
-  "-*- texinfo -*-
+  "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} {@var{s} =} schur (@var{a})\n\
 @deftypefnx {Loadable Function} {[@var{u}, @var{s}] =} schur (@var{a}, @var{opt})\n\
 @cindex Schur decomposition\n\
--- a/src/DLD-FUNCTIONS/svd.cc
+++ b/src/DLD-FUNCTIONS/svd.cc
@@ -35,7 +35,7 @@
 #include "utils.h"
 
 DEFUN_DLD (svd, args, nargout,
-  "-*- texinfo -*-
+  "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} {@var{s} =} svd (@var{a})\n\
 @deftypefnx {Loadable Function} {[@var{u}, @var{s}, @var{v}] =} svd (@var{a})\n\
 @cindex singular value decomposition\n\
--- a/src/DLD-FUNCTIONS/syl.cc
+++ b/src/DLD-FUNCTIONS/syl.cc
@@ -33,7 +33,7 @@
 #include "utils.h"
 
 DEFUN_DLD (syl, args, nargout,
-  "-*- texinfo -*-
+  "-*- texinfo -*-\n\
 @deftypefn {Loadable Function} {@var{x} =} syl (@var{a}, @var{b}, @var{c})\n\
 Solve the Sylvester equation\n\
 @iftex\n\
--- a/src/error.cc
+++ b/src/error.cc
@@ -103,7 +103,7 @@
 
       if (! error_message_buffer)
 	{
-	  error_message_buffer = new ostrstream;
+	  error_message_buffer = new std::ostrstream;
 
 	  // XXX FIXME XXX -- this is ugly, but it prevents
 	  //
--- a/src/load-save.cc
+++ b/src/load-save.cc
@@ -1631,11 +1631,11 @@
 			      << "====               ====   ====   ====\n";
 
 			  output_buf
-			    << setiosflags (std::ios::left)
-			    << setw (16) << tc.type_name () . c_str ()
-			    << setiosflags (std::ios::right)
-			    << setw (7) << tc.rows ()
-			    << setw (7) << tc.columns ()
+			    << std::setiosflags (std::ios::left)
+			    << std::setw (16) << tc.type_name () . c_str ()
+			    << std::setiosflags (std::ios::right)
+			    << std::setw (7) << tc.rows ()
+			    << std::setw (7) << tc.columns ()
 			    << "   ";
 			}
 		      output_buf << name << "\n";
--- a/src/oct-stream.cc
+++ b/src/oct-stream.cc
@@ -1130,7 +1130,7 @@
 	} \
       else \
 	{ \
-	  ostrstream buf; \
+	  std::ostrstream buf; \
  \
 	  int c = EOF; \
  \
@@ -1171,7 +1171,7 @@
 	} \
       else \
 	{ \
-	  ostrstream buf; \
+	  std::ostrstream buf; \
  \
 	  std::string char_class = elt->char_class; \
  \
--- a/src/ov-fcn.cc
+++ b/src/ov-fcn.cc
@@ -37,6 +37,7 @@
 octave_function::clone (void)
 {
   panic_impossible ();
+  return 0;
 }
 
 /*
--- a/src/ov-struct.cc
+++ b/src/ov-struct.cc
@@ -46,6 +46,7 @@
 				       bool silent)
 {
   // XXX DO_ME XXX
+  return octave_value ();
 }
 
 octave_value
--- a/src/pr-output.cc
+++ b/src/pr-output.cc
@@ -984,12 +984,12 @@
 	      || flt_fmt == oct_mach_info::unknown)
 	    {
 	      for (size_t i = 0; i < sizeof (double); i++)
-		os << setw (2) << static_cast<int> (tmp.i[i]);
+		os << std::setw (2) << static_cast<int> (tmp.i[i]);
 	    }
 	  else
 	    {
 	      for (int i = sizeof (double) - 1; i >= 0; i--)
-		os << setw (2) << static_cast<int> (tmp.i[i]);
+		os << std::setw (2) << static_cast<int> (tmp.i[i]);
 	    }
 
 	  os.fill (ofill);
@@ -1039,14 +1039,14 @@
 	    s = "Inf";
 
 	  if (fw > 0)
-	    os << setw (fw) << s;
+	    os << std::setw (fw) << s;
 	  else
 	    os << s;
 	}
       else if (xisnan (d))
 	{
 	  if (fw > 0)
-	    os << setw (fw) << "NaN";
+	    os << std::setw (fw) << "NaN";
 	  else
 	    os << "NaN";
 	}
@@ -1139,7 +1139,7 @@
 
       int num_cols = lim - col;
 
-      os << setw (extra_indent) << "";
+      os << std::setw (extra_indent) << "";
 
       if (num_cols == 1)
 	os << " Column " << col + 1 << ":\n";
@@ -1295,7 +1295,7 @@
 
 	      for (int i = 0; i < nr; i++)
 		{
-		  os << setw (extra_indent) << "";
+		  os << std::setw (extra_indent) << "";
 
 		  for (int j = col; j < lim; j++)
 		    {
@@ -1467,7 +1467,7 @@
 
 	      for (int i = 0; i < nr; i++)
 		{
-		  os << setw (extra_indent) << "";
+		  os << std::setw (extra_indent) << "";
 
 		  for (int j = col; j < lim; j++)
 		    {
@@ -1570,7 +1570,7 @@
 	      pr_col_num_header (os, total_width, max_width, lim, col,
 				 extra_indent);
 
-	      os << setw (extra_indent) << "";
+	      os << std::setw (extra_indent) << "";
 
 	      for (int i = col; i < lim; i++)
 		{
--- a/src/symtab.cc
+++ b/src/symtab.cc
@@ -453,9 +453,10 @@
      << (hides_fcn () ? "f" : (hides_builtin () ? "F" : "-"))
 #endif
      << "  "
-     << setiosflags (std::ios::left) << setw (24) << type_name () . c_str ();
+     << std::setiosflags (std::ios::left) << std::setw (24)
+     << type_name () . c_str ();
 
-  os << resetiosflags (std::ios::left);
+  os << std::resetiosflags (std::ios::left);
 
   int nr = rows ();
   int nc = columns ();
@@ -463,14 +464,14 @@
   if (nr < 0)
     os << "      -";
   else
-    os << setiosflags (std::ios::right) << setw (7) << nr;
+    os << std::setiosflags (std::ios::right) << std::setw (7) << nr;
 
   if (nc < 0)
     os << "      -";
   else
-    os << setiosflags (std::ios::right) << setw (7) << nc;
+    os << std::setiosflags (std::ios::right) << std::setw (7) << nc;
 
-  os << resetiosflags (std::ios::right);
+  os << std::resetiosflags (std::ios::right);
 
   os << "  " << name () << "\n";
 }
--- a/src/token.h
+++ b/src/token.h
@@ -35,6 +35,7 @@
 token
 {
 public:
+
   enum token_type
     {
       generic_token,
@@ -42,7 +43,7 @@
       double_token,
       ettype_token,
       pttype_token,
-      sym_rec_token,
+      sym_rec_token
     };
 
   enum end_tok_type
@@ -54,14 +55,14 @@
       switch_end,
       while_end,
       try_catch_end,
-      unwind_protect_end,
+      unwind_protect_end
     };
 
   enum plot_tok_type
     {
       replot = 1,
       two_dee = 2,
-      three_dee = 3,
+      three_dee = 3
     };
 
   token (int l = -1, int c = -1);
--- a/src/variables.cc
+++ b/src/variables.cc
@@ -1256,7 +1256,7 @@
 DEFUN (__dump_symbol_info__, args, ,
   "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} __dump_symbol_info__ (@var{name})\n\
-Print symbol table information for the symbol @var{name}.
+Print symbol table information for the symbol @var{name}.\n\
 @end deftypefn")
 {
   octave_value_list retval;