summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
Diffstat (limited to 'generic')
-rw-r--r--generic/tclBasic.c4
-rw-r--r--generic/tclCompExpr.c9
-rw-r--r--generic/tclCompile.h4
3 files changed, 8 insertions, 9 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 93db6c6..bd2305c 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -14,7 +14,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclBasic.c,v 1.289 2007/12/13 15:23:14 dgp Exp $
+ * RCS: @(#) $Id: tclBasic.c,v 1.290 2008/01/15 11:59:26 msofer Exp $
*/
#include "tclInt.h"
@@ -738,7 +738,7 @@ Tcl_CreateInterp(void)
TclOpCmdClientData *occdPtr = (TclOpCmdClientData *)
ckalloc(sizeof(TclOpCmdClientData));
- occdPtr->operator = opcmdInfoPtr->name;
+ occdPtr->op = opcmdInfoPtr->name;
occdPtr->i.numArgs = opcmdInfoPtr->i.numArgs;
occdPtr->expected = opcmdInfoPtr->expected;
strcpy(mathFuncName + MATH_OP_PREFIX_LEN, opcmdInfoPtr->name);
diff --git a/generic/tclCompExpr.c b/generic/tclCompExpr.c
index ead436e..19f30bd 100644
--- a/generic/tclCompExpr.c
+++ b/generic/tclCompExpr.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclCompExpr.c,v 1.90 2007/12/13 15:23:15 dgp Exp $
+ * RCS: @(#) $Id: tclCompExpr.c,v 1.91 2008/01/15 11:59:27 msofer Exp $
*/
#include "tclInt.h"
@@ -2411,7 +2411,7 @@ TclSingleOpCmd(
return TCL_ERROR;
}
- ParseLexeme(occdPtr->operator, strlen(occdPtr->operator), &lexeme, NULL);
+ ParseLexeme(occdPtr->op, strlen(occdPtr->op), &lexeme, NULL);
nodes[0].lexeme = START;
nodes[0].mark = MARK_RIGHT;
nodes[0].right = 1;
@@ -2467,8 +2467,7 @@ TclSortingOpCmd(
int i, lastAnd = 1;
Tcl_Obj *const *litObjPtrPtr = litObjv;
- ParseLexeme(occdPtr->operator, strlen(occdPtr->operator),
- &lexeme, NULL);
+ ParseLexeme(occdPtr->op, strlen(occdPtr->op), &lexeme, NULL);
litObjv[0] = objv[1];
nodes[0].lexeme = START;
@@ -2544,7 +2543,7 @@ TclVariadicOpCmd(
return TCL_OK;
}
- ParseLexeme(occdPtr->operator, strlen(occdPtr->operator), &lexeme, NULL);
+ ParseLexeme(occdPtr->op, strlen(occdPtr->op), &lexeme, NULL);
lexeme |= BINARY;
if (objc == 2) {
diff --git a/generic/tclCompile.h b/generic/tclCompile.h
index c6cc9e3..f9eec91 100644
--- a/generic/tclCompile.h
+++ b/generic/tclCompile.h
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclCompile.h,v 1.86 2007/12/13 15:23:16 dgp Exp $
+ * RCS: @(#) $Id: tclCompile.h,v 1.87 2008/01/15 11:59:28 msofer Exp $
*/
#ifndef _TCLCOMPILATION
@@ -817,7 +817,7 @@ MODULE_SCOPE AuxDataType tclDictUpdateInfoType;
*/
typedef struct {
- const char *operator;
+ const char *op; /* Do not call it 'operator': C++ reserved */
const char *expected;
union {
int numArgs;