Mercurial > hg > octave-terminal
changeset 453:393e95f46b51
[project @ 1994-06-06 00:05:20 by jwe]
author | jwe |
---|---|
date | Mon, 06 Jun 1994 00:14:55 +0000 |
parents | 565206294f5a |
children | 94cc7b5fc789 |
files | liboctave/idx-vector.cc liboctave/idx-vector.h src/balance.cc src/chol.cc src/det.cc src/expm.cc src/fft.cc src/fsqp.cc src/givens.cc src/hess.cc src/ifft.cc src/inv.cc src/lu.cc src/pr-output.cc src/procstream.cc src/procstream.h src/qr.cc src/qzval.cc src/schur.cc src/svd.cc src/syl.cc src/symtab.cc src/symtab.h src/token.cc src/token.h src/unwind-prot.cc src/unwind-prot.h src/xdiv.cc src/xpow.cc |
diffstat | 29 files changed, 143 insertions(+), 68 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/idx-vector.cc +++ b/liboctave/idx-vector.cc @@ -25,10 +25,14 @@ #include "config.h" #endif +#if defined (__GNUG__) +#pragma implementation +#endif + #include <iostream.h> #include <stdlib.h> -#include "Matrix.h" +#include "dMatrix.h" #include "Range.h" #include "idx-vector.h" #include "user-prefs.h"
--- a/liboctave/idx-vector.h +++ b/liboctave/idx-vector.h @@ -24,11 +24,16 @@ #if !defined (octave_idx_vector_h) #define octave_idx_vector_h 1 +#if defined (__GNUG__) +#pragma interface +#endif + class ostream; class Matrix; class Range; -class idx_vector +class +idx_vector { public: idx_vector (void);
--- a/src/balance.cc +++ b/src/balance.cc @@ -1,7 +1,7 @@ // tc-balance.cc -*- C++ -*- /* -Copyright (C) 1993 John W. Eaton +Copyright (C) 1993, 1994 John W. Eaton This file is part of Octave. @@ -27,7 +27,13 @@ #include "config.h" #endif -#include "Matrix.h" +#include "dMatrix.h" +#include "CMatrix.h" +#include "dbleAEPBAL.h" +#include "CmplxAEPBAL.h" +#include "dbleAEPBAL.h" +#include "CmplxAEPBAL.h" +#include "dbleGEPBAL.h" #include "tree-const.h" #include "user-prefs.h"
--- a/src/chol.cc +++ b/src/chol.cc @@ -1,7 +1,7 @@ // f-chol.cc -*- C++ -*- /* -Copyright (C) 1993 John W. Eaton +Copyright (C) 1993, 1994 John W. Eaton This file is part of Octave. @@ -25,7 +25,8 @@ #include "config.h" #endif -#include "Matrix.h" +#include "dbleCHOL.h" +#include "CmplxCHOL.h" #include "tree-const.h" #include "user-prefs.h"
--- a/src/det.cc +++ b/src/det.cc @@ -1,7 +1,7 @@ // f-det.cc -*- C++ -*- /* -Copyright (C) 1993 John W. Eaton +Copyright (C) 1993, 1994 John W. Eaton This file is part of Octave. @@ -25,7 +25,8 @@ #include "config.h" #endif -#include "Matrix.h" +#include "dbleDET.h" +#include "CmplxDET.h" #include "tree-const.h" #include "user-prefs.h"
--- a/src/expm.cc +++ b/src/expm.cc @@ -1,7 +1,7 @@ // tc-expm.cc -*- C++ -*- /* -Copyright (C) 1993 John W. Eaton +Copyright (C) 1993, 1994 John W. Eaton This file is part of Octave. @@ -29,7 +29,11 @@ #include <math.h> -#include "Matrix.h" +#include "dMatrix.h" +#include "CMatrix.h" +#include "CColVector.h" +#include "dbleAEPBAL.h" +#include "CmplxAEPBAL.h" #include "f77-uscore.h" #include "tree-const.h"
--- a/src/fft.cc +++ b/src/fft.cc @@ -1,7 +1,7 @@ // f-fft.cc -*- C++ -*- /* -Copyright (C) 1993 John W. Eaton +Copyright (C) 1993, 1994 John W. Eaton This file is part of Octave. @@ -25,7 +25,8 @@ #include "config.h" #endif -#include "Matrix.h" +#include "dMatrix.h" +#include "CMatrix.h" #include "tree-const.h" #include "user-prefs.h"
--- a/src/fsqp.cc +++ b/src/fsqp.cc @@ -1,7 +1,7 @@ // f-fsqp.cc -*- C++ -*- /* -Copyright (C) 1993 John W. Eaton +Copyright (C) 1993, 1994 John W. Eaton This file is part of Octave. @@ -34,8 +34,8 @@ #include "f-fsqp.h" // Global pointers for user defined functions required by fsqp. -static tree *fsqp_objective; -static tree *fsqp_constraints; +// static tree *fsqp_objective; +// static tree *fsqp_constraints; #ifdef WITH_DLD tree_constant *
--- a/src/givens.cc +++ b/src/givens.cc @@ -1,7 +1,7 @@ // tc-givens.cc -*- C++ -*- /* -Copyright (C) 1993 John W. Eaton +Copyright (C) 1993, 1994 John W. Eaton This file is part of Octave. @@ -27,7 +27,8 @@ #include "config.h" #endif -#include "Matrix.h" +#include "dMatrix.h" +#include "CMatrix.h" #include "f77-uscore.h" #include "tree-const.h"
--- a/src/hess.cc +++ b/src/hess.cc @@ -1,7 +1,7 @@ // f-hess.cc -*- C++ -*- /* -Copyright (C) 1993 John W. Eaton +Copyright (C) 1993, 1994 John W. Eaton This file is part of Octave. @@ -25,7 +25,8 @@ #include "config.h" #endif -#include "Matrix.h" +#include "dbleHESS.h" +#include "CmplxHESS.h" #include "tree-const.h" #include "user-prefs.h"
--- a/src/ifft.cc +++ b/src/ifft.cc @@ -1,7 +1,7 @@ // f-ifft.cc -*- C++ -*- /* -Copyright (C) 1993 John W. Eaton +Copyright (C) 1993, 1994 John W. Eaton This file is part of Octave. @@ -25,7 +25,8 @@ #include "config.h" #endif -#include "Matrix.h" +#include "dMatrix.h" +#include "CMatrix.h" #include "tree-const.h" #include "user-prefs.h" @@ -93,7 +94,6 @@ return retval; } - /* ;;; Local Variables: *** ;;; mode: C++ ***
--- a/src/inv.cc +++ b/src/inv.cc @@ -25,7 +25,8 @@ #include "config.h" #endif -#include "Matrix.h" +#include "dMatrix.h" +#include "CMatrix.h" #include "tree-const.h" #include "user-prefs.h"
--- a/src/lu.cc +++ b/src/lu.cc @@ -1,7 +1,7 @@ // f-lu.cc -*- C++ -*- /* -Copyright (C) 1993 John W. Eaton +Copyright (C) 1993, 1994 John W. Eaton This file is part of Octave. @@ -25,7 +25,8 @@ #include "config.h" #endif -#include "Matrix.h" +#include "dbleLU.h" +#include "CmplxLU.h" #include "tree-const.h" #include "user-prefs.h"
--- a/src/pr-output.cc +++ b/src/pr-output.cc @@ -33,8 +33,9 @@ #include <float.h> #include <Complex.h> +#include "dMatrix.h" +#include "CMatrix.h" #include "Range.h" -#include "Matrix.h" #include "tree-const.h" #include "variables.h"
--- a/src/procstream.cc +++ b/src/procstream.cc @@ -1,7 +1,7 @@ // procstream.cc -*- C++ -*- /* -Copyright (C) 1992, 1993 John W. Eaton +Copyright (C) 1992, 1993, 1994 John W. Eaton This file is part of Octave. @@ -25,6 +25,10 @@ #include "config.h" #endif +#if defined (__GNUG__) +#pragma implementation +#endif + #include "procstream.h" procstreambase::procstreambase (void)
--- a/src/procstream.h +++ b/src/procstream.h @@ -24,6 +24,10 @@ #if !defined (octave_procstream_h) #define octave_procstream_h 1 +#if defined (__GNUG__) +#pragma interface +#endif + #include <iostream.h> #include <procbuf.h>
--- a/src/qr.cc +++ b/src/qr.cc @@ -1,7 +1,7 @@ // f-qr.cc -*- C++ -*- /* -Copyright (C) 1993 John W. Eaton +Copyright (C) 1993, 1994 John W. Eaton This file is part of Octave. @@ -25,7 +25,8 @@ #include "config.h" #endif -#include "Matrix.h" +#include "dbleQR.h" +#include "CmplxQR.h" #include "tree-const.h" #include "user-prefs.h"
--- a/src/qzval.cc +++ b/src/qzval.cc @@ -1,7 +1,7 @@ // tc-qzval.cc -*- C++ -*- /* -Copyright (C) 1993 John W. Eaton +Copyright (C) 1993, 1994 John W. Eaton This file is part of Octave. @@ -29,7 +29,9 @@ #include <float.h> -#include "Matrix.h" +#include "dMatrix.h" +#include "dColVector.h" +#include "CColVector.h" #include "f77-uscore.h" #include "tree-const.h"
--- a/src/schur.cc +++ b/src/schur.cc @@ -1,7 +1,7 @@ // f-schur.cc -*- C++ -*- /* -Copyright (C) 1993 John W. Eaton +Copyright (C) 1993, 1994 John W. Eaton This file is part of Octave. @@ -25,7 +25,8 @@ #include "config.h" #endif -#include "Matrix.h" +#include "dbleSCHUR.h" +#include "CmplxSCHUR.h" #include "tree-const.h" #include "user-prefs.h"
--- a/src/svd.cc +++ b/src/svd.cc @@ -1,7 +1,7 @@ // f-svd.cc -*- C++ -*- /* -Copyright (C) 1993 John W. Eaton +Copyright (C) 1993, 1994 John W. Eaton This file is part of Octave. @@ -25,7 +25,8 @@ #include "config.h" #endif -#include "Matrix.h" +#include "dbleSVD.h" +#include "CmplxSVD.h" #include "tree-const.h" #include "user-prefs.h"
--- a/src/syl.cc +++ b/src/syl.cc @@ -1,7 +1,7 @@ // tc-syl.cc -*- C++ -*- /* -Copyright (C) 1993 John W. Eaton +Copyright (C) 1993, 1994 John W. Eaton This file is part of Octave. @@ -27,7 +27,10 @@ #include "config.h" #endif -#include "Matrix.h" +#include "dMatrix.h" +#include "CMatrix.h" +#include "dbleSCHUR.h" +#include "CmplxSCHUR.h" #include "f77-uscore.h" #include "tree-const.h"
--- a/src/symtab.cc +++ b/src/symtab.cc @@ -27,6 +27,10 @@ #include "config.h" #endif +#if defined (__GNUG__) +#pragma implementation +#endif + #include "symtab.h" #include "error.h" #include "variables.h"
--- a/src/symtab.h +++ b/src/symtab.h @@ -24,6 +24,10 @@ #if !defined (octave_symtab_h) #define octave_symtab_h 1 +#if defined (__GNUG__) +#pragma interface +#endif + #include <stdlib.h> #include <string.h> #include <iostream.h>
--- a/src/token.cc +++ b/src/token.cc @@ -1,7 +1,7 @@ // token.cc -*- C++ -*- /* -Copyright (C) 1992, 1993 John W. Eaton +Copyright (C) 1992, 1993, 1994 John W. Eaton This file is part of Octave. @@ -25,6 +25,10 @@ #include "config.h" #endif +#if defined (__GNUG__) +#pragma implementation +#endif + #include <assert.h> #include "token.h"
--- a/src/token.h +++ b/src/token.h @@ -24,9 +24,14 @@ #if !defined (octave_token_h) #define octave_token_h 1 +#if defined (__GNUG__) +#pragma interface +#endif + class symbol_record; -class token +class +token { public: enum token_type
--- a/src/unwind-prot.cc +++ b/src/unwind-prot.cc @@ -1,7 +1,7 @@ // unwind-prot.cc -*- C++ -*- /* -Copyright (C) 1992, 1993 John W. Eaton +Copyright (C) 1992, 1993, 1994 John W. Eaton This file is part of Octave. @@ -25,11 +25,15 @@ #include "config.h" #endif +#if defined (__GNUG__) +#pragma implementation +#endif + #include <stddef.h> #include "SLStack.h" -#include "Matrix.h" +#include "CMatrix.h" #include "unwind-prot.h" #include "error.h" @@ -37,43 +41,43 @@ unwind_elem::unwind_elem (void) { - _tag = (char *) NULL; - _fptr = (cleanup_func) NULL; - _ptr = (void *) NULL; + unwind_elem_tag = (char *) NULL; + unwind_elem_fptr = (cleanup_func) NULL; + unwind_elem_ptr = (void *) NULL; } unwind_elem::unwind_elem (char *t) { - _tag = strsave (t); - _fptr = (cleanup_func) NULL; - _ptr = (void *) NULL; + unwind_elem_tag = strsave (t); + unwind_elem_fptr = (cleanup_func) NULL; + unwind_elem_ptr = (void *) NULL; } unwind_elem::unwind_elem (cleanup_func f, void *p) { - _tag = (char *) NULL; - _fptr = f; - _ptr = p; + unwind_elem_tag = (char *) NULL; + unwind_elem_fptr = f; + unwind_elem_ptr = p; } unwind_elem::unwind_elem (const unwind_elem& el) { - _tag = strsave (el._tag); - _fptr = el._fptr; - _ptr = el._ptr; + unwind_elem_tag = strsave (el.unwind_elem_tag); + unwind_elem_fptr = el.unwind_elem_fptr; + unwind_elem_ptr = el.unwind_elem_ptr; } unwind_elem::~unwind_elem (void) { - delete [] _tag; + delete [] unwind_elem_tag; } unwind_elem& unwind_elem::operator = (const unwind_elem& el) { - _tag = strsave (el._tag); - _fptr = el._fptr; - _ptr = el._ptr; + unwind_elem_tag = strsave (el.unwind_elem_tag); + unwind_elem_fptr = el.unwind_elem_fptr; + unwind_elem_ptr = el.unwind_elem_ptr; return *this; } @@ -81,19 +85,19 @@ char * unwind_elem::tag (void) { - return _tag; + return unwind_elem_tag; } cleanup_func unwind_elem::fptr (void) { - return _fptr; + return unwind_elem_fptr; } void * unwind_elem::ptr (void) { - return _ptr; + return unwind_elem_ptr; } static SLStack <unwind_elem> unwind_protect_list;
--- a/src/unwind-prot.h +++ b/src/unwind-prot.h @@ -24,6 +24,10 @@ #if !defined (octave_unwind_prot_h) #define octave_unwind_prot_h 1 +#if defined (__GNUG__) +#pragma interface +#endif + typedef void (*cleanup_func)(void *ptr); void add_unwind_protect (cleanup_func fptr, void *ptr); @@ -51,7 +55,8 @@ #define unwind_protect_var(i) \ unwind_protect_var_internal ((void *) &(i), (void *) &(i), sizeof (int)) -class unwind_elem +class +unwind_elem { public: unwind_elem (void); @@ -67,9 +72,9 @@ void *ptr (void); private: - char *_tag; - cleanup_func _fptr; - void *_ptr; + char *unwind_elem_tag; + cleanup_func unwind_elem_fptr; + void *unwind_elem_ptr; }; #endif
--- a/src/xdiv.cc +++ b/src/xdiv.cc @@ -1,7 +1,7 @@ // xdiv.cc -*- C++ -*- /* -Copyright (C) 1992, 1993 John W. Eaton +Copyright (C) 1992, 1993, 1994 John W. Eaton This file is part of Octave. @@ -29,7 +29,8 @@ #include <Complex.h> #include "xdiv.h" -#include "Matrix.h" +#include "dMatrix.h" +#include "CMatrix.h" #include "tree-const.h" #include "error.h"
--- a/src/xpow.cc +++ b/src/xpow.cc @@ -1,7 +1,7 @@ // xpow.cc -*- C++ -*- /* -Copyright (C) 1992, 1993 John W. Eaton +Copyright (C) 1992, 1993, 1994 John W. Eaton This file is part of Octave. @@ -29,7 +29,12 @@ #include <Complex.h> #include "xpow.h" -#include "Matrix.h" +#include "dMatrix.h" +#include "CMatrix.h" +#include "dDiagMatrix.h" +#include "CDiagMatrix.h" +#include "CColVector.h" +#include "EIG.h" #include "tree-const.h" #include "error.h"