summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoye <joye>2013-09-04 18:28:15 (GMT)
committerjoye <joye>2013-09-04 18:28:15 (GMT)
commit8b45f884c04f2a015825407c50d43666e2ab0a7b (patch)
tree292b2631f5f2e3307952e19b69defb00b09404df
parent510debfd19de0039ff310ff7d75e5b1b3cc22ac7 (diff)
downloadblt-8b45f884c04f2a015825407c50d43666e2ab0a7b.zip
blt-8b45f884c04f2a015825407c50d43666e2ab0a7b.tar.gz
blt-8b45f884c04f2a015825407c50d43666e2ab0a7b.tar.bz2
*** empty log message ***
-rw-r--r--src/bltParse.C59
-rw-r--r--src/bltParse.h11
2 files changed, 8 insertions, 62 deletions
diff --git a/src/bltParse.C b/src/bltParse.C
index d3e5fb0..a2a7ea7 100644
--- a/src/bltParse.C
+++ b/src/bltParse.C
@@ -22,25 +22,10 @@
* include them. In fact, the byte-compiled versions would be slower
* since the compiled code typically runs only one time.
*/
-#if 0
-#define TIME_WITH_SYS_TIME 0
-#define HAVE_SYS_TIME_H 1
-#define STDC_HEADERS 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_STDINT_H 1
-#define HAVE_UNISTD_H 1
-#include <tclPort.h>
-#include <tclInt.h>
-#endif
#include <bltInt.h>
-
#include "bltParse.h"
-#define TCL_BRACKET_TERM 1
-
/*
* A table used to classify input characters to assist in parsing
* TCL commands. The table should be indexed with a signed character
@@ -218,8 +203,7 @@ static unsigned char tclTypeTable[] =
*
*---------------------------------------------------------------------------
*/
-int
-Blt_ParseNestedCmd(
+int Blt_ParseNestedCmd(
Tcl_Interp *interp, /* Interpreter to use for nested command
* evaluations and error messages. */
const char *string, /* Character just after opening bracket. */
@@ -230,38 +214,6 @@ Blt_ParseNestedCmd(
* result of command. */
{
return TCL_ERROR;
-#if 0
- int result, length, shortfall;
- Interp *iPtr = (Interp *)interp;
-
- iPtr->evalFlags = flags | TCL_BRACKET_TERM;
- result = Tcl_Eval(interp, string);
- *termPtr = (string + iPtr->unused1);
- if (result != TCL_OK) {
- /*
- * The increment below results in slightly cleaner message in
- * the errorInfo variable (the close-bracket will appear).
- */
-
- if (**termPtr == ']') {
- *termPtr += 1;
- }
- return result;
- }
- (*termPtr) += 1;
- length = (int)strlen(iPtr->result);
- shortfall = length + 1 - (parsePtr->end - parsePtr->next);
- if (shortfall > 0) {
- (*parsePtr->expandProc) (parsePtr, shortfall);
- }
- strcpy(parsePtr->next, iPtr->result);
- parsePtr->next += length;
-
- Tcl_FreeResult(interp);
- iPtr->result = iPtr->resultSpace;
- iPtr->resultSpace[0] = '\0';
- return TCL_OK;
-#endif
}
/*
@@ -290,8 +242,7 @@ Blt_ParseNestedCmd(
*---------------------------------------------------------------------------
*/
-int
-Blt_ParseBraces(
+int Blt_ParseBraces(
Tcl_Interp *interp, /* Interpreter to use for nested command
* evaluations and error messages. */
const char *string, /* Character just after opening bracket. */
@@ -399,8 +350,7 @@ Blt_ParseBraces(
*
*---------------------------------------------------------------------------
*/
-void
-Blt_ExpandParseValue(
+void Blt_ExpandParseValue(
ParseValue *parsePtr, /* Information about buffer that
* must be expanded. If the clientData
* in the structure is non-zero, it
@@ -468,8 +418,7 @@ Blt_ExpandParseValue(
*
*---------------------------------------------------------------------------
*/
-int
-Blt_ParseQuotes(
+int Blt_ParseQuotes(
Tcl_Interp *interp, /* Interpreter to use for nested command
* evaluations and error messages. */
const char *string, /* Character just after opening double-
diff --git a/src/bltParse.h b/src/bltParse.h
index e5a21ce..bdb1ed6 100644
--- a/src/bltParse.h
+++ b/src/bltParse.h
@@ -36,15 +36,12 @@ struct _ParseValue {
ClientData clientData;
};
-BLT_EXTERN int Blt_ParseBraces(Tcl_Interp *interp, const char *string,
+int Blt_ParseBraces(Tcl_Interp *interp, const char *string,
const char **termPtr, ParseValue *pvPtr);
-
-BLT_EXTERN int Blt_ParseNestedCmd(Tcl_Interp *interp, const char *string,
+int Blt_ParseNestedCmd(Tcl_Interp *interp, const char *string,
int flags, const char **termPtr, ParseValue *pvPtr);
-
-BLT_EXTERN int Blt_ParseQuotes(Tcl_Interp *interp, const char *string,
+int Blt_ParseQuotes(Tcl_Interp *interp, const char *string,
int termChar, int flags, const char **termPtr, ParseValue * pvPtr);
-
-BLT_EXTERN void Blt_ExpandParseValue(ParseValue *pvPtr, int needed);
+void Blt_ExpandParseValue(ParseValue *pvPtr, int needed);
#endif