Tcl Source Code

Artifact 9b2c92895b611d5c94c259d3b0891235bca308ab:

Attachment "operator.diff" to ticket [1855644fff] added by msofer 2008-01-11 20:46:18.

---

Index: generic/tclBasic.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclBasic.c,v
retrieving revision 1.289
diff -u -r1.289 tclBasic.c
--- generic/tclBasic.c	13 Dec 2007 15:23:14 -0000	1.289
+++ generic/tclBasic.c	11 Jan 2008 13:44:43 -0000
@@ -738,7 +738,7 @@
 	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);
Index: generic/tclCompExpr.c
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclCompExpr.c,v
retrieving revision 1.90
diff -u -r1.90 tclCompExpr.c
--- generic/tclCompExpr.c	13 Dec 2007 15:23:15 -0000	1.90
+++ generic/tclCompExpr.c	11 Jan 2008 13:44:43 -0000
@@ -2411,7 +2411,7 @@
 	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 @@
 	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 @@
 	return TCL_OK;
     }
 
-    ParseLexeme(occdPtr->operator, strlen(occdPtr->operator), &lexeme, NULL);
+    ParseLexeme(occdPtr->op, strlen(occdPtr->op), &lexeme, NULL);
     lexeme |= BINARY;
 
     if (objc == 2) {
Index: generic/tclCompile.h
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclCompile.h,v
retrieving revision 1.86
diff -u -r1.86 tclCompile.h
--- generic/tclCompile.h	13 Dec 2007 15:23:16 -0000	1.86
+++ generic/tclCompile.h	11 Jan 2008 13:44:43 -0000
@@ -817,7 +817,7 @@
  */
 
 typedef struct {
-    const char *operator;
+    const char *op;   /* Do not call it 'operator': C++ reserved */
     const char *expected;
     union {
 	int numArgs;
Index: unix/tclUnixThrd.c
===================================================================
RCS file: /cvsroot/tcl/tcl/unix/tclUnixThrd.c,v
retrieving revision 1.57
diff -u -r1.57 tclUnixThrd.c
--- unix/tclUnixThrd.c	11 Jan 2008 11:53:02 -0000	1.57
+++ unix/tclUnixThrd.c	11 Jan 2008 13:44:43 -0000
@@ -257,10 +257,11 @@
     } else {
 #else
     {
-#endif
+
 	if (pthread_attr_init(&threadAttr) != 0) {
 	    return -1;
 	}
+#endif
 	if (TclpPthreadGetAttrs(pthread_self(), &threadAttr) != 0) {
 	    pthread_attr_destroy(&threadAttr);
 	    return (size_t)-1;