summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2002-06-07 10:38:03 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2002-06-07 10:38:03 (GMT)
commit768ec653dd9513f2f86587e617b95c8017f76a9d (patch)
tree3d517265c3b611983c543493b98ff21819a6e731
parent92dd671c1f650d5619b47e4cbf82d13c78b8eab8 (diff)
downloadtcl-768ec653dd9513f2f86587e617b95c8017f76a9d.zip
tcl-768ec653dd9513f2f86587e617b95c8017f76a9d.tar.gz
tcl-768ec653dd9513f2f86587e617b95c8017f76a9d.tar.bz2
Cleaned up inclusion of float.h; that's really tcl<platform>Port.h's job
-rw-r--r--ChangeLog5
-rw-r--r--generic/tclExecute.c63
2 files changed, 43 insertions, 25 deletions
diff --git a/ChangeLog b/ChangeLog
index 0b7bf62..fd894db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2002-06-07 Donal K. Fellows <fellowsd@cs.man.ac.uk>
+ * generic/tclExecute.c: Tidied up headers in relation to float.h
+ to cut the cruft and ensure DBL_MAX is defined since doubles seem
+ to be the same size everywhere; if the assumption isn't true, the
+ variant platforms had better have run configure...
+
* unix/tclUnixPort.h (EOVERFLOW): Added code to define it if it
wasn't previously defined. Also some other general tidying and
adding of comments. [Tcl bugs 563122, 564595]
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 9a652b2..fa19db4 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -11,19 +11,14 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclExecute.c,v 1.59 2002/06/03 16:45:02 msofer Exp $
+ * RCS: @(#) $Id: tclExecute.c,v 1.60 2002/06/07 10:38:03 dkf Exp $
*/
#include "tclInt.h"
#include "tclCompile.h"
-#ifdef NO_FLOAT_H
-# include "../compat/float.h"
-#else
-# include <float.h>
-#endif
#ifndef TCL_NO_MATH
-#include "tclMath.h"
+# include "tclMath.h"
#endif
/*
@@ -33,18 +28,40 @@
*/
#ifndef TCL_GENERIC_ONLY
-#include "tclPort.h"
-#else
-#define NO_ERRNO_H
-#endif
+# include "tclPort.h"
+#else /* TCL_GENERIC_ONLY */
+# ifndef NO_FLOAT_H
+# include <float.h>
+# else /* NO_FLOAT_H */
+# ifndef NO_VALUES_H
+# include <values.h>
+# endif /* !NO_VALUES_H */
+# endif /* !NO_FLOAT_H */
+# define NO_ERRNO_H
+#endif /* !TCL_GENERIC_ONLY */
#ifdef NO_ERRNO_H
int errno;
-#define EDOM 33
-#define ERANGE 34
+# define EDOM 33
+# define ERANGE 34
#endif
/*
+ * Need DBL_MAX for IS_INF() macro...
+ */
+#ifndef DBL_MAX
+# ifdef MAXDOUBLE
+# define DBL_MAX MAXDOUBLE
+# else /* !MAXDOUBLE */
+/*
+ * This value is from the Solaris headers, but doubles seem to be the
+ * same size everywhere. Long doubles aren't, but we don't use those.
+ */
+# define DBL_MAX 1.79769313486231570e+308
+# endif /* MAXDOUBLE */
+#endif /* !DBL_MAX */
+
+/*
* Boolean flag indicating whether the Tcl bytecode interpreter has been
* initialized.
*/
@@ -108,11 +125,7 @@ long tclObjsShared[TCL_MAX_SHARED_OBJ_STATS] = { 0, 0, 0, 0, 0 };
*/
#define IS_NAN(v) ((v) != (v))
-#ifdef DBL_MAX
-# define IS_INF(v) (((v) > DBL_MAX) || ((v) < -DBL_MAX))
-#else
-# define IS_INF(v) 0
-#endif
+#define IS_INF(v) (((v) > DBL_MAX) || ((v) < -DBL_MAX))
/*
* Macro to adjust the program counter and restart the instruction execution
@@ -166,14 +179,14 @@ long tclObjsShared[TCL_MAX_SHARED_OBJ_STATS] = { 0, 0, 0, 0, 0 };
*/
#ifdef TCL_COMPILE_DEBUG
-#define TRACE(a) \
+# define TRACE(a) \
if (traceInstructions) { \
fprintf(stdout, "%2d: %2d (%u) %s ", iPtr->numLevels, stackTop, \
(unsigned int)(pc - codePtr->codeStart), \
GetOpcodeName(pc)); \
printf a; \
}
-#define TRACE_WITH_OBJ(a, objPtr) \
+# define TRACE_WITH_OBJ(a, objPtr) \
if (traceInstructions) { \
fprintf(stdout, "%2d: %2d (%u) %s ", iPtr->numLevels, stackTop, \
(unsigned int)(pc - codePtr->codeStart), \
@@ -182,12 +195,12 @@ long tclObjsShared[TCL_MAX_SHARED_OBJ_STATS] = { 0, 0, 0, 0, 0 };
TclPrintObject(stdout, objPtr, 30); \
fprintf(stdout, "\n"); \
}
-#define O2S(objPtr) \
+# define O2S(objPtr) \
(objPtr ? TclGetString(objPtr) : "")
-#else
-#define TRACE(a)
-#define TRACE_WITH_OBJ(a, objPtr)
-#define O2S(objPtr)
+#else /* !TCL_COMPILE_DEBUG */
+# define TRACE(a)
+# define TRACE_WITH_OBJ(a, objPtr)
+# define O2S(objPtr)
#endif /* TCL_COMPILE_DEBUG */