* doc/DString.3: Eliminated use of identifier "string" in Tcl's

        * doc/Environment.3:    public C API to avoid conflict/confusion with
        * doc/Eval.3:           the std::string of C++.
        * doc/ExprLong.3, doc/ExprLongObj.3, doc/GetInt.3, doc/GetOpnFl.3:
        * doc/ParseCmd.3, doc/RegExp.3, doc/SetResult.3, doc/StrMatch.3:
        * doc/Utf.3, generic/tcl.decls, generic/tclBasic.c, generic/tclEnv.c:
        * generic/tclGet.c, generic/tclParse.c, generic/tclParseExpr.c:
        * generic/tclRegexp.c, generic/tclResult.c, generic/tclUtf.c:
        * generic/tclUtil.c, unix/tclUnixChan.c:

        * generic/tclDecls.h:   `make genstubs`

1 files changed, 11 insertions, 11 deletions

diff --git a/generic/tclParseExpr.c b/generic/tclParseExpr.c
index 2a1c151..61860f6 100644
--- a/generic/tclParseExpr.c
+++ b/generic/tclParseExpr.c
@@ -13,7 +13,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclParseExpr.c,v 1.23 2004/10/08 15:39:55 dkf Exp $
+ * RCS: @(#) $Id: tclParseExpr.c,v 1.24 2005/05/03 18:08:19 dgp Exp $
  */
 
 #include "tclInt.h"
@@ -205,7 +205,7 @@ static void		PrependSubExprTokens _ANSI_ARGS_((CONST char *op,
  *	Given a string, this procedure parses the first Tcl expression
  *	in the string and returns information about the structure of
  *	the expression. This procedure is the top-level interface to the
- *	the expression parsing module.  No more that numBytes bytes will
+ *	the expression parsing module.  No more than numBytes bytes will
  *	be scanned.
  *
  * Results:
@@ -226,9 +226,9 @@ static void		PrependSubExprTokens _ANSI_ARGS_((CONST char *op,
  */
 
 int
-Tcl_ParseExpr(interp, string, numBytes, parsePtr)
+Tcl_ParseExpr(interp, start, numBytes, parsePtr)
     Tcl_Interp *interp;		/* Used for error reporting. */
-    CONST char *string;		/* The source string to parse. */
+    CONST char *start;		/* Start of source string to parse. */
     int numBytes;		/* Number of bytes in string. If < 0, the
 				 * string consists of all bytes up to the
 				 * first null character. */
@@ -241,16 +241,16 @@ Tcl_ParseExpr(interp, string, numBytes, parsePtr)
     int code;
 
     if (numBytes < 0) {
-	numBytes = (string? strlen(string) : 0);
+	numBytes = (start? strlen(start) : 0);
     }
 #ifdef TCL_COMPILE_DEBUG
     if (traceParseExpr) {
 	fprintf(stderr, "Tcl_ParseExpr: string=\"%.*s\"\n",
-	        numBytes, string);
+	        numBytes, start);
     }
 #endif /* TCL_COMPILE_DEBUG */
     
-    TclParseInit(interp, string, numBytes, parsePtr);
+    TclParseInit(interp, start, numBytes, parsePtr);
 
     /*
      * Initialize the ParseInfo structure that holds state while parsing
@@ -261,10 +261,10 @@ Tcl_ParseExpr(interp, string, numBytes, parsePtr)
     info.lexeme = UNKNOWN;
     info.start = NULL;
     info.size = 0;
-    info.next = string;
-    info.prevEnd = string;
-    info.originalExpr = string;
-    info.lastChar = (string + numBytes); /* just after last char of expr */
+    info.next = start;
+    info.prevEnd = start;
+    info.originalExpr = start;
+    info.lastChar = (start + numBytes); /* just after last char of expr */
 
     /*
      * Get the first lexeme then parse the expression.