diff options
author | Kevin B Kenny <kennykb@acm.org> | 2005-04-25 21:37:17 (GMT) |
---|---|---|
committer | Kevin B Kenny <kennykb@acm.org> | 2005-04-25 21:37:17 (GMT) |
commit | fee601196f3a3d37e48ca7a5ea763cd132e49cd6 (patch) | |
tree | 132b0442d0fa8a33d0b625e1de318963e109bb78 /generic/tclGet.c | |
parent | 6cf83d45073c586faca9948b305311770bcc49ca (diff) | |
download | tcl-fee601196f3a3d37e48ca7a5ea763cd132e49cd6.zip tcl-fee601196f3a3d37e48ca7a5ea763cd132e49cd6.tar.gz tcl-fee601196f3a3d37e48ca7a5ea763cd132e49cd6.tar.bz2 |
Merged with HEAD.
Diffstat (limited to 'generic/tclGet.c')
-rw-r--r-- | generic/tclGet.c | 244 |
1 files changed, 55 insertions, 189 deletions
diff --git a/generic/tclGet.c b/generic/tclGet.c index b410ba1..0be4b7e 100644 --- a/generic/tclGet.c +++ b/generic/tclGet.c @@ -11,11 +11,10 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclGet.c,v 1.9.2.2 2005/03/04 20:43:46 kennykb Exp $ + * RCS: @(#) $Id: tclGet.c,v 1.9.2.3 2005/04/25 21:37:20 kennykb Exp $ */ #include "tclInt.h" -#include <math.h> /* @@ -38,76 +37,25 @@ */ int -Tcl_GetInt(interp, string, intPtr) +Tcl_GetInt(interp, str, intPtr) Tcl_Interp *interp; /* Interpreter to use for error reporting. */ - CONST char *string; /* String containing a (possibly signed) - * integer in a form acceptable to strtol. */ + CONST char *str; /* String containing a (possibly signed) + * integer in a form acceptable to strtoul. */ int *intPtr; /* Place to store converted result. */ { - char *end; - CONST char *p = string; - long i; - - /* - * Note: use strtoul instead of strtol for integer conversions - * to allow full-size unsigned numbers, but don't depend on strtoul - * to handle sign characters; it won't in some implementations. - */ - - errno = 0; -#ifdef TCL_STRTOUL_SIGN_CHECK - /* - * This special sign check actually causes bad numbers to be allowed - * when strtoul. I can't find a strtoul that doesn't validly handle - * signed characters, and the C standard implies that this is all - * unnecessary. [Bug #634856] - */ - for ( ; isspace(UCHAR(*p)); p++) { /* INTL: ISO space. */ - /* Empty loop body. */ - } - if (*p == '-') { - p++; - i = -((long)strtoul(p, &end, 0)); /* INTL: Tcl source. */ - } else if (*p == '+') { - p++; - i = strtoul(p, &end, 0); /* INTL: Tcl source. */ - } else -#else - i = strtoul(p, &end, 0); /* INTL: Tcl source. */ -#endif - if (end == p) { - badInteger: - if (interp != (Tcl_Interp *) NULL) { - Tcl_AppendResult(interp, "expected integer but got \"", string, - "\"", (char *) NULL); - TclCheckBadOctal(interp, string); - } - return TCL_ERROR; - } - - /* - * The second test below is needed on platforms where "long" is - * larger than "int" to detect values that fit in a long but not in - * an int. - */ - - if ((errno == ERANGE) || (((long)(int) i) != i)) { - if (interp != (Tcl_Interp *) NULL) { - Tcl_SetResult(interp, "integer value too large to represent", - TCL_STATIC); - Tcl_SetErrorCode(interp, "ARITH", "IOVERFLOW", - Tcl_GetStringResult(interp), (char *) NULL); - } - return TCL_ERROR; - } - while ((*end != '\0') && isspace(UCHAR(*end))) { /* INTL: ISO space. */ - end++; - } - if (*end != 0) { - goto badInteger; + Tcl_Obj obj; + int code; + + obj.refCount = 1; + obj.bytes = (char *) str; + obj.length = strlen(str); + obj.typePtr = NULL; + + code = Tcl_GetIntFromObj(interp, &obj, intPtr); + if (obj.refCount > 1) { + Tcl_Panic("invalid sharing of Tcl_Obj on C stack"); } - *intPtr = (int) i; - return TCL_OK; + return code; } /* @@ -133,64 +81,27 @@ Tcl_GetInt(interp, string, intPtr) */ int -TclGetLong(interp, string, longPtr) +TclGetLong(interp, str, longPtr) Tcl_Interp *interp; /* Interpreter used for error reporting * if not NULL. */ - CONST char *string; /* String containing a (possibly signed) + CONST char *str; /* String containing a (possibly signed) * long integer in a form acceptable to * strtoul. */ long *longPtr; /* Place to store converted long result. */ { - char *end; - CONST char *p = string; - long i; + Tcl_Obj obj; + int code; - /* - * Note: don't depend on strtoul to handle sign characters; it won't - * in some implementations. - */ + obj.refCount = 1; + obj.bytes = (char *) str; + obj.length = strlen(str); + obj.typePtr = NULL; - errno = 0; -#ifdef TCL_STRTOUL_SIGN_CHECK - for ( ; isspace(UCHAR(*p)); p++) { /* INTL: ISO space. */ - /* Empty loop body. */ + code = Tcl_GetLongFromObj(interp, &obj, longPtr); + if (obj.refCount > 1) { + Tcl_Panic("invalid sharing of Tcl_Obj on C stack"); } - if (*p == '-') { - p++; - i = -(int)strtoul(p, &end, 0); /* INTL: Tcl source. */ - } else if (*p == '+') { - p++; - i = strtoul(p, &end, 0); /* INTL: Tcl source. */ - } else -#else - i = strtoul(p, &end, 0); /* INTL: Tcl source. */ -#endif - if (end == p) { - badInteger: - if (interp != (Tcl_Interp *) NULL) { - Tcl_AppendResult(interp, "expected integer but got \"", string, - "\"", (char *) NULL); - TclCheckBadOctal(interp, string); - } - return TCL_ERROR; - } - if (errno == ERANGE) { - if (interp != (Tcl_Interp *) NULL) { - Tcl_SetResult(interp, "integer value too large to represent", - TCL_STATIC); - Tcl_SetErrorCode(interp, "ARITH", "IOVERFLOW", - Tcl_GetStringResult(interp), (char *) NULL); - } - return TCL_ERROR; - } - while ((*end != '\0') && isspace(UCHAR(*end))) { /* INTL: ISO space. */ - end++; - } - if (*end != 0) { - goto badInteger; - } - *longPtr = i; - return TCL_OK; + return code; } /* @@ -214,34 +125,25 @@ TclGetLong(interp, string, longPtr) */ int -Tcl_GetDouble(interp, string, doublePtr) +Tcl_GetDouble(interp, str, doublePtr) Tcl_Interp *interp; /* Interpreter used for error reporting. */ - CONST char *string; /* String containing a floating-point number + CONST char *str; /* String containing a floating-point number * in a form acceptable to strtod. */ double *doublePtr; /* Place to store converted result. */ { - CONST char *end; - double d; + Tcl_Obj obj; + int code; - errno = 0; - d = TclStrToD(string, &end); /* INTL: Tcl source. */ - if (end == string) { - badDouble: - if (interp != (Tcl_Interp *) NULL) { - Tcl_AppendResult(interp, - "expected floating-point number but got \"", - string, "\"", (char *) NULL); - } - return TCL_ERROR; - } - while ((*end != 0) && isspace(UCHAR(*end))) { /* INTL: ISO space. */ - end++; - } - if (*end != 0) { - goto badDouble; + obj.refCount = 1; + obj.bytes = (char *) str; + obj.length = strlen(str); + obj.typePtr = NULL; + + code = Tcl_GetDoubleFromObj(interp, &obj, doublePtr); + if (obj.refCount > 1) { + Tcl_Panic("invalid sharing of Tcl_Obj on C stack"); } - *doublePtr = d; - return TCL_OK; + return code; } /* @@ -265,64 +167,28 @@ Tcl_GetDouble(interp, string, doublePtr) */ int -Tcl_GetBoolean(interp, string, boolPtr) +Tcl_GetBoolean(interp, str, boolPtr) Tcl_Interp *interp; /* Interpreter used for error reporting. */ - CONST char *string; /* String containing a boolean number + CONST char *str; /* String containing a boolean number * specified either as 1/0 or true/false or * yes/no. */ int *boolPtr; /* Place to store converted result, which * will be 0 or 1. */ { - int i; - char lowerCase[10], c; - size_t length; + Tcl_Obj obj; + int code; - /* - * Convert the input string to all lower-case. - * INTL: This code will work on UTF strings. - */ + obj.refCount = 1; + obj.bytes = (char *) str; + obj.length = strlen(str); + obj.typePtr = NULL; - for (i = 0; i < 9; i++) { - c = string[i]; - if (c == 0) { - break; - } - if ((c >= 'A') && (c <= 'Z')) { - c += (char) ('a' - 'A'); - } - lowerCase[i] = c; + code = Tcl_ConvertToType(interp, &obj, &tclBooleanType); + if (obj.refCount > 1) { + Tcl_Panic("invalid sharing of Tcl_Obj on C stack"); } - lowerCase[i] = 0; - - length = strlen(lowerCase); - c = lowerCase[0]; - if ((c == '0') && (lowerCase[1] == '\0')) { - *boolPtr = 0; - } else if ((c == '1') && (lowerCase[1] == '\0')) { - *boolPtr = 1; - } else if ((c == 'y') && (strncmp(lowerCase, "yes", length) == 0)) { - *boolPtr = 1; - } else if ((c == 'n') && (strncmp(lowerCase, "no", length) == 0)) { - *boolPtr = 0; - } else if ((c == 't') && (strncmp(lowerCase, "true", length) == 0)) { - *boolPtr = 1; - } else if ((c == 'f') && (strncmp(lowerCase, "false", length) == 0)) { - *boolPtr = 0; - } else if ((c == 'o') && (length >= 2)) { - if (strncmp(lowerCase, "on", length) == 0) { - *boolPtr = 1; - } else if (strncmp(lowerCase, "off", length) == 0) { - *boolPtr = 0; - } else { - goto badBoolean; - } - } else { - badBoolean: - if (interp != (Tcl_Interp *) NULL) { - Tcl_AppendResult(interp, "expected boolean value but got \"", - string, "\"", (char *) NULL); - } - return TCL_ERROR; + if (code == TCL_OK) { + *boolPtr = obj.internalRep.longValue; } - return TCL_OK; + return code; } |