From 353282b3ef0626b6f6d56c234363ba096f1519c2 Mon Sep 17 00:00:00 2001 From: arno Date: Sat, 13 May 2000 16:22:16 +0000 Subject: [PATCH] * src/frontend/diff.c src/frontend/diff.h src/frontend/evaluate.c src/frontend/evaluate.h src/frontend/parse.c src/frontend/parse.h: Trimmed down the amount of included files. * src/include/macros.h: Removed complex functionality duplicated from src/include/complex.h src/include/Makefile.am src/include/ftecmath.h: Removed header file and adjusted Makefile.am --- src/frontend/diff.c | 10 ++++------ src/frontend/diff.h | 8 ++++---- src/frontend/evaluate.c | 11 +++++------ src/frontend/evaluate.h | 7 +++++-- src/frontend/parse.c | 13 ++++++------- src/frontend/parse.h | 7 +++++-- src/include/Makefile.am | 1 - src/include/ftecmath.h | 41 ----------------------------------------- src/include/macros.h | 6 ------ 9 files changed, 29 insertions(+), 75 deletions(-) delete mode 100644 src/include/ftecmath.h diff --git a/src/frontend/diff.c b/src/frontend/diff.c index 1f99d46f1..3f5309978 100644 --- a/src/frontend/diff.c +++ b/src/frontend/diff.c @@ -7,12 +7,10 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group * Do a 'diff' of two plots. */ -#include "ngspice.h" -#include "cpdefs.h" -#include "ftedefs.h" -#include "dvec.h" -#include "ftecmath.h" -#include "sim.h" +#include +#include +#include +#include #include "diff.h" diff --git a/src/frontend/diff.h b/src/frontend/diff.h index 63b2557b1..053d13629 100644 --- a/src/frontend/diff.h +++ b/src/frontend/diff.h @@ -3,12 +3,12 @@ * 1999 E. Rouat ************/ -#ifndef DIFF_H_INCLUDED -#define DIFF_H_INCLUDED - -void com_diff(wordlist *wl); +#ifndef _DIFF_H +#define _DIFF_H +#include +void com_diff(wordlist *wl); #endif diff --git a/src/frontend/evaluate.c b/src/frontend/evaluate.c index e4a42b0bd..0eb38769b 100644 --- a/src/frontend/evaluate.c +++ b/src/frontend/evaluate.c @@ -7,14 +7,13 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group * Convert a parse tree to a list of data vectors. */ -#include "ngspice.h" -#include "cpdefs.h" -#include "ftedefs.h" -#include "dvec.h" -#include "fteparse.h" -#include "ftecmath.h" #include #include + +#include +#include +#include + #include "evaluate.h" diff --git a/src/frontend/evaluate.h b/src/frontend/evaluate.h index 155805142..950389ca8 100644 --- a/src/frontend/evaluate.h +++ b/src/frontend/evaluate.h @@ -3,8 +3,11 @@ * 1999 E. Rouat ************/ -#ifndef EVALUATE_H_INCLUDED -#define EVALUATE_H_INCLUDED +#ifndef _EVALUATE_H +#define _EVALUATE_H + +#include +#include struct dvec * ft_evaluate(struct pnode *node); struct dvec * op_plus(struct pnode *arg1, struct pnode *arg2); diff --git a/src/frontend/parse.c b/src/frontend/parse.c index d59b1ae24..3080ea30f 100644 --- a/src/frontend/parse.c +++ b/src/frontend/parse.c @@ -8,14 +8,13 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group * This also handles relational and logical expressions. */ -#include "ngspice.h" -#include "cpdefs.h" -#include "ftedefs.h" -#include "fteparse.h" -#include "dvec.h" -#include "ftecmath.h" +#include +#include +#include +#include +#include + #include "parse.h" -#include "sim.h" /* static declarations */ diff --git a/src/frontend/parse.h b/src/frontend/parse.h index 46d8bbe61..390f9afb5 100644 --- a/src/frontend/parse.h +++ b/src/frontend/parse.h @@ -3,8 +3,11 @@ * 1999 E. Rouat ************/ -#ifndef PARSE_H_INCLUDED -#define PARSE_H_INCLUDED +#ifndef _PARSE_H +#define _PARSE_H + +#include +#include struct pnode * ft_getpnames(wordlist *wl, bool check); void free_pnode(struct pnode *t); diff --git a/src/include/Makefile.am b/src/include/Makefile.am index df1fa692d..83985a922 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -14,7 +14,6 @@ noinst_HEADERS = \ dgen.h \ distodef.h \ dvec.h \ - ftecmath.h \ fteconst.h \ ftedata.h \ ftedbgra.h \ diff --git a/src/include/ftecmath.h b/src/include/ftecmath.h deleted file mode 100644 index 1584fd704..000000000 --- a/src/include/ftecmath.h +++ /dev/null @@ -1,41 +0,0 @@ -/********** -Copyright 1990 Regents of the University of California. All rights reserved. -Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group -**********/ - -/* - * Macros for complex mathematical functions. - */ - -/* Some defines used mainly in cmath.c. */ -#define alloc_c(len) ((complex *) tmalloc((len) * sizeof (complex))) -#define alloc_d(len) ((double *) tmalloc((len) * sizeof (double))) -#define FTEcabs(d) (((d) < 0.0) ? - (d) : (d)) -#define cph(c) (atan2(imagpart(c), (realpart(c)))) -#define cmag(c) (sqrt(imagpart(c) * imagpart(c) + realpart(c) * realpart(c))) -#define radtodeg(c) (cx_degrees ? ((c) / 3.14159265358979323846 * 180) : (c)) -#define degtorad(c) (cx_degrees ? ((c) * 3.14159265358979323846 / 180) : (c)) -#define rcheck(cond, name) if (!(cond)) { \ - fprintf(cp_err, "Error: argument out of range for %s\n", name); \ - return (NULL); } - - -#define cdiv(r1, i1, r2, i2, r3, i3) \ -{ \ - double r, s; \ - if (FTEcabs(r2) > FTEcabs(i2)) { \ - r = (i2) / (r2); \ - s = (r2) + r * (i2); \ - (r3) = ((r1) + r * (i1)) / s; \ - (i3) = ((i1) - r * (r1)) / s; \ - } else { \ - r = (r2) / (i2); \ - s = (i2) + r * (r2); \ - (r3) = (r * (r1) + (i1)) / s; \ - (i3) = (r * (i1) - (r1)) / s; \ - } \ -} - - - - diff --git a/src/include/macros.h b/src/include/macros.h index 486df0741..b9377eeab 100644 --- a/src/include/macros.h +++ b/src/include/macros.h @@ -105,10 +105,4 @@ #define DEBUGMSG(testargs) #endif - -#define realpart(cval) ((struct _complex *) (cval))->cx_real -#define imagpart(cval) ((struct _complex *) (cval))->cx_imag - - - #endif /* _MACROS_H_ */