diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-06-02 08:12:38 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-06-02 08:12:38 (GMT) |
| commit | 21dfa74b037c4630be374887a1579c078fd99193 (patch) | |
| tree | 1601cdbe0f43c015bfcb743565108c36f488e67b /generic/tclEnsemble.c | |
| parent | 3f0e8d6265db0d5853ab55de2ead9a045c678b6e (diff) | |
| parent | 9220ca224bafcb35a09f48838501d36ab69762e9 (diff) | |
| download | tcl-21dfa74b037c4630be374887a1579c078fd99193.zip tcl-21dfa74b037c4630be374887a1579c078fd99193.tar.gz tcl-21dfa74b037c4630be374887a1579c078fd99193.tar.bz2 | |
Merge core-8-6-branch. This removes the work currently being done in "sebres-8-6-clock-speedup-cr1" branch, but that will be merged again as soon as the work is done.
All other changes in "trunk" since then (e.g. the INST_STR_CONCAT1 performance improvement, and the removal of SunOS-4) are retained.
Diffstat (limited to 'generic/tclEnsemble.c')
| -rw-r--r-- | generic/tclEnsemble.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c index 477aeee..f3e8187 100644 --- a/generic/tclEnsemble.c +++ b/generic/tclEnsemble.c @@ -55,12 +55,11 @@ enum EnsSubcmds { }; static const char *const ensembleCreateOptions[] = { - "-command", "-compile", "-map", "-parameters", "-prefixes", - "-subcommands", "-unknown", NULL + "-command", "-map", "-parameters", "-prefixes", "-subcommands", + "-unknown", NULL }; enum EnsCreateOpts { - CRT_CMD, CRT_COMPILE, CRT_MAP, CRT_PARAM, CRT_PREFIX, - CRT_SUBCMDS, CRT_UNKNOWN + CRT_CMD, CRT_MAP, CRT_PARAM, CRT_PREFIX, CRT_SUBCMDS, CRT_UNKNOWN }; static const char *const ensembleConfigOptions[] = { @@ -184,7 +183,6 @@ TclNamespaceEnsembleCmd( int permitPrefix = 1; Tcl_Obj *unknownObj = NULL; Tcl_Obj *paramObj = NULL; - int ensCompFlag = -1; /* * Check that we've got option-value pairs... [Bug 1558654] @@ -327,12 +325,6 @@ TclNamespaceEnsembleCmd( return TCL_ERROR; } continue; - case CRT_COMPILE: - if (Tcl_GetBooleanFromObj(interp, objv[1], - &ensCompFlag) != TCL_OK) { - return TCL_ERROR; - }; - continue; case CRT_UNKNOWN: if (TclListObjLength(interp, objv[1], &len) != TCL_OK) { if (allocatedMapFlag) { @@ -358,12 +350,6 @@ TclNamespaceEnsembleCmd( Tcl_SetEnsembleMappingDict(interp, token, mapObj); Tcl_SetEnsembleUnknownHandler(interp, token, unknownObj); Tcl_SetEnsembleParameterList(interp, token, paramObj); - /* - * Ensemble should be compiled if it has map (performance purposes) - */ - if (ensCompFlag > 0 && mapObj != NULL) { - Tcl_SetEnsembleFlags(interp, token, ENSEMBLE_COMPILE); - } /* * Tricky! Must ensure that the result is not shared (command delete |