luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove ancient #defines for AND OR NOT substitute with && || !

This commit is contained in:
rlar 2010-10-09 11:40:00 +00:00
parent 526a3fce6c
commit cf3514b9ae
11 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2010-10-09 Robert Larice
* src/frontend/terminal.c ,
* src/include/complex.h ,
* src/include/fteparse.h ,
* src/main.c ,
* src/maths/sparse/spbuild.c ,
* src/maths/sparse/spdefs.h ,
* src/misc/ivars.c ,
* src/spicelib/parser/ifnewuid.c ,
* src/spicelib/parser/inperror.c ,
* src/tclspice.c :
remove ancient #defines for AND OR NOT substitute with && || !
2010-10-09 Robert Larice
* src/include/profile.h :
remove obsolete #defines for BEGIN END LENGTH FORWARD

1
src/frontend/terminal.c
View File

@ -17,7 +17,6 @@ $Id$
#ifdef HAVE_ASPRINTF
#ifdef HAVE_LIBIBERTY_H /* asprintf */
#include <libiberty.h>
#undef AND /* obsolete macro in ansidecl.h */
#elif defined(__MINGW32__) || defined(__SUNPRO_C) /* we have asprintf, but not libiberty.h */
#include <stdarg.h>
extern int asprintf(char **out, const char *fmt, ...);

8
src/include/complex.h
View File

@ -495,8 +495,8 @@ typedef struct {
/* Complex division: to = num / den */
#define CMPLX_DIV(to,num,den) \
{ realNumber r_, s_; \
if (((den).real >= (den).imag AND (den).real > -(den).imag) OR \
((den).real < (den).imag AND (den).real <= -(den).imag)) \
if (((den).real >= (den).imag && (den).real > -(den).imag) || \
((den).real < (den).imag && (den).real <= -(den).imag)) \
{ r_ = (den).imag / (den).real; \
s_ = (den).real + r_*(den).imag; \
(to).real = ((num).real + r_*(num).imag)/s_; \
@ -513,8 +513,8 @@ typedef struct {
/* Complex division and assignment: num /= den */
#define CMPLX_DIV_ASSIGN(num,den) \
{ realNumber r_, s_, t_; \
if (((den).real >= (den).imag AND (den).real > -(den).imag) OR \
((den).real < (den).imag AND (den).real <= -(den).imag)) \
if (((den).real >= (den).imag && (den).real > -(den).imag) || \
((den).real < (den).imag && (den).real <= -(den).imag)) \
{ r_ = (den).imag / (den).real; \
s_ = (den).real + r_*(den).imag; \
t_ = ((num).real + r_*(num).imag)/s_; \

2
src/include/fteparse.h
View File

@ -22,8 +22,6 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
#endif
#include "pnode.h"
#undef AND /* obsolete macro in ansidecl.h */
/* Operations. These should really be considered functions. */
struct op {

1
src/main.c
View File

@ -13,7 +13,6 @@
#ifdef HAVE_ASPRINTF
#ifdef HAVE_LIBIBERTY_H /* asprintf */
#include <libiberty.h>
#undef AND /* obsolete macro in ansidecl.h */
#elif defined(__MINGW32__) || defined(__SUNPRO_C) /* we have asprintf, but not libiberty.h */
#include <stdarg.h>
extern int asprintf(char **out, const char *fmt, ...);

10
src/maths/sparse/spbuild.c
View File

@ -187,9 +187,9 @@ MatrixPtr Matrix = eMatrix;
RealNumber *pElement;
/* Begin `spFindElement'. */
assert( IS_SPARSE( Matrix ) AND Row >= 0 AND Col >= 0 );
assert( IS_SPARSE( Matrix ) && Row >= 0 && Col >= 0 );
if ((Row == 0) OR (Col == 0))
if ((Row == 0) || (Col == 0))
return &Matrix->TrashCan.Real;
#if TRANSLATE
@ -197,8 +197,8 @@ RealNumber *pElement;
if (Matrix->Error == spNO_MEMORY) return NULL;
#endif
#if NOT TRANSLATE
assert(Row <= Matrix->Size AND Col <= Matrix->Size);
#if ! TRANSLATE
assert(Row <= Matrix->Size && Col <= Matrix->Size);
#endif
/*
@ -211,7 +211,7 @@ RealNumber *pElement;
* is the first record in the MatrixElement structure.
*/
if ((Row != Col) OR ((pElement = (RealNumber *)Matrix->Diag[Row]) == NULL))
if ((Row != Col) || ((pElement = (RealNumber *)Matrix->Diag[Row]) == NULL))
{
/*
* Element does not exist or does not reside along diagonal. Search

11
src/maths/sparse/spdefs.h
View File

@ -61,9 +61,6 @@
#define BOOLEAN int
#define NO 0
#define YES 1
#define NOT !
#define AND &&
#define OR ||
#define SPARSE_ID 0x772773 /* Arbitrary (is Sparse on phone). */
#define IS_SPARSE(matrix) ((matrix) != NULL && \
@ -312,8 +309,8 @@ typedef struct
/* Complex division: to = num / den */
#define CMPLX_DIV(to,num,den) \
{ RealNumber r_, s_; \
if (((den).Real >= (den).Imag AND (den).Real > -(den).Imag) OR \
((den).Real < (den).Imag AND (den).Real <= -(den).Imag)) \
if (((den).Real >= (den).Imag && (den).Real > -(den).Imag) || \
((den).Real < (den).Imag && (den).Real <= -(den).Imag)) \
{ r_ = (den).Imag / (den).Real; \
s_ = (den).Real + r_*(den).Imag; \
(to).Real = ((num).Real + r_*(num).Imag)/s_; \
@ -330,8 +327,8 @@ typedef struct
/* Complex division and assignment: num /= den */
#define CMPLX_DIV_ASSIGN(num,den) \
{ RealNumber r_, s_, t_; \
if (((den).Real >= (den).Imag AND (den).Real > -(den).Imag) OR \
((den).Real < (den).Imag AND (den).Real <= -(den).Imag)) \
if (((den).Real >= (den).Imag && (den).Real > -(den).Imag) || \
((den).Real < (den).Imag && (den).Real <= -(den).Imag)) \
{ r_ = (den).Imag / (den).Real; \
s_ = (den).Real + r_*(den).Imag; \
t_ = ((num).Real + r_*(num).Imag)/s_; \

1
src/misc/ivars.c
View File

@ -8,7 +8,6 @@ Copyright 1991 Regents of the University of California. All rights reserved.
#ifdef HAVE_ASPRINTF
#ifdef HAVE_LIBIBERTY_H /* asprintf */
#include <libiberty.h>
#undef AND /* obsolete macro in ansidecl.h */
#elif defined(__MINGW32__) || defined(__SUNPRO_C) /* we have asprintf, but not libiberty.h */
#include <stdarg.h>
extern int asprintf(char **out, const char *fmt, ...);

1
src/spicelib/parser/ifnewuid.c
View File

@ -8,7 +8,6 @@ Author: 1988 Thomas L. Quarles
#ifdef HAVE_ASPRINTF
#ifdef HAVE_LIBIBERTY_H /* asprintf */
#include <libiberty.h>
#undef AND /* obsolete macro in ansidecl.h */
#elif defined(__MINGW32__) || defined(__SUNPRO_C) /* we have asprintf, but not libiberty.h */
#include <stdarg.h>
extern int asprintf(char **out, const char *fmt, ...);

1
src/spicelib/parser/inperror.c
View File

@ -12,7 +12,6 @@ Author: 1985 Thomas L. Quarles
#ifdef HAVE_ASPRINTF
#ifdef HAVE_LIBIBERTY_H /* asprintf */
#include <libiberty.h>
#undef AND /* obsolete macro in ansidecl.h */
#elif defined(__MINGW32__) || defined(__SUNPRO_C) /* we have asprintf, but not libiberty.h */
#include <stdarg.h>
extern int asprintf(char **out, const char *fmt, ...);

1
src/tclspice.c
View File

@ -140,7 +140,6 @@ extern JMP_BUF jbuf;
#ifdef HAVE_ASPRINTF
#ifdef HAVE_LIBIBERTY_H /* asprintf */
#include <libiberty.h>
#undef AND /* obsolete macro in ansidecl.h */
#else /* we have asprintf, but not libiberty.h */
#include <stdarg.h>
extern int asprintf(char **out, const char *fmt, ...);