Skip to content

Commit 92c91c6

Browse files
author
jan.nijtmans
committed
Eliminate most Tcl_AppendStringsToObj() usages
1 parent 74f004f commit 92c91c6

18 files changed

+134
-135
lines changed

‎generic/itcl2TclOO.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ Itcl_PublicObjectCmd(
243243
result = TclOOInvokeObject(interp, oPtr, clsPtr, PUBLIC_METHOD,
244244
objc, objv);
245245
} else {
246-
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
246+
Tcl_AppendResult(interp,
247247
"cannot access object-specific info without an object context",
248248
(char *)NULL);
249249
return TCL_ERROR;

‎generic/itclBuiltin.c‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -521,14 +521,14 @@ Itcl_BiIsaCmd2(
521521
}
522522

523523
if (contextIoPtr == NULL) {
524-
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
524+
Tcl_AppendResult(interp,
525525
"improper usage: should be \"object isa className\"",
526526
(char *)NULL);
527527
return TCL_ERROR;
528528
}
529529
if (objc != 2) {
530530
token = Tcl_GetString(objv[0]);
531-
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
531+
Tcl_AppendResult(interp,
532532
"wrong # args: should be \"object ", token, " className\"",
533533
(char *)NULL);
534534
return TCL_ERROR;
@@ -637,7 +637,7 @@ Itcl_BiConfigureCmd2(
637637
}
638638

639639
if (contextIoPtr == NULL) {
640-
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
640+
Tcl_AppendResult(interp,
641641
"improper usage: should be ",
642642
"\"object configure ?-option? ?value -option value...?\"",
643643
(char *)NULL);
@@ -701,7 +701,7 @@ Itcl_BiConfigureCmd2(
701701
if (unparsedObjc == 2) {
702702
token = Tcl_GetString(unparsedObjv[1]);
703703
if (*token != '-') {
704-
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
704+
Tcl_AppendResult(interp,
705705
"improper usage: should be ",
706706
"\"object configure ?-option? ?value -option value...?\"",
707707
(char *)NULL);
@@ -718,7 +718,7 @@ Itcl_BiConfigureCmd2(
718718
}
719719
}
720720
if (!vlookup) {
721-
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
721+
Tcl_AppendResult(interp,
722722
"unknown option \"", token, "\"",
723723
(char *)NULL);
724724
return TCL_ERROR;
@@ -897,7 +897,7 @@ Itcl_BiCgetCmd2(
897897
return TCL_ERROR;
898898
}
899899
if ((contextIoPtr == NULL) || objc != 2) {
900-
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
900+
Tcl_AppendResult(interp,
901901
"improper usage: should be \"object cget -option\"",
902902
(char *)NULL);
903903
return TCL_ERROR;
@@ -925,7 +925,7 @@ Itcl_BiCgetCmd2(
925925
}
926926

927927
if ((vlookup == NULL) || (vlookup->ivPtr->protection != ITCL_PUBLIC)) {
928-
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
928+
Tcl_AppendResult(interp,
929929
"unknown option \"", name, "\"",
930930
(char *)NULL);
931931
return TCL_ERROR;
@@ -1140,7 +1140,7 @@ NRBiChainCmd(
11401140
contextIclsPtr = NULL;
11411141
if (Itcl_GetContext(interp, &contextIclsPtr, &contextIoPtr) != TCL_OK) {
11421142
Tcl_ResetResult(interp);
1143-
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
1143+
Tcl_AppendResult(interp,
11441144
"cannot chain functions outside of a class context",
11451145
(char *)NULL);
11461146
return TCL_ERROR;
@@ -2020,7 +2020,7 @@ ItclExtendedConfigure(
20202020
}
20212021

20222022
if (contextIoPtr == NULL) {
2023-
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
2023+
Tcl_AppendResult(interp,
20242024
"improper usage: should be ",
20252025
"\"object configure ?-option? ?value -option value...?\"",
20262026
(char *)NULL);
@@ -2663,7 +2663,7 @@ ItclExtendedCget(
26632663
return TCL_ERROR;
26642664
}
26652665
if ((contextIoPtr == NULL) || objc != 2) {
2666-
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
2666+
Tcl_AppendResult(interp,
26672667
"improper usage: should be \"object cget -option\"",
26682668
(char *)NULL);
26692669
return TCL_ERROR;
@@ -2897,7 +2897,7 @@ ItclExtendedSetGet(
28972897

28982898
usageStr = "improper usage: should be \"object setget varName ?value?\"";
28992899
if (contextIoPtr == NULL) {
2900-
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
2900+
Tcl_AppendResult(interp,
29012901
usageStr, (char *)NULL);
29022902
return TCL_ERROR;
29032903
}
@@ -2915,7 +2915,7 @@ ItclExtendedSetGet(
29152915

29162916
hPtr = NULL;
29172917
if (objc < 2) {
2918-
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
2918+
Tcl_AppendResult(interp,
29192919
usageStr, (char *)NULL);
29202920
return TCL_ERROR;
29212921
}
@@ -3012,15 +3012,15 @@ Itcl_BiInstallComponentCmd(
30123012
}
30133013

30143014
if (contextIoPtr == NULL) {
3015-
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
3015+
Tcl_AppendResult(interp,
30163016
"improper usage: should be \"object installcomponent \"",
30173017
(char *)NULL);
30183018
return TCL_ERROR;
30193019
}
30203020
if (objc < 5) {
30213021
/* FIXME strip off the :: parts here properly*/
30223022
token = Tcl_GetString(objv[0])+2;
3023-
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
3023+
Tcl_AppendResult(interp,
30243024
"wrong # args: should be \"", token, " <componentName> using",
30253025
" <widgetClassName> <widgetPathName>",
30263026
" ?-option value -option value ...?\"",
@@ -3164,7 +3164,7 @@ Itcl_BiDestroyCmd(
31643164
return result;
31653165
}
31663166
if (objc != 1) {
3167-
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
3167+
Tcl_AppendResult(interp,
31683168
"wrong # args: should be \"", Tcl_GetString(objv[0]), (char *)NULL);
31693169
return TCL_ERROR;
31703170
}
@@ -3221,7 +3221,7 @@ Itcl_BiCallInstanceCmd(
32213221

32223222
if (objc < 2) {
32233223
token = Tcl_GetString(objv[0]);
3224-
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
3224+
Tcl_AppendResult(interp,
32253225
"wrong # args: should be \"", token, " <instanceName>",
32263226
(char *)NULL);
32273227
return TCL_ERROR;
@@ -3288,7 +3288,7 @@ Itcl_BiGetInstanceVarCmd(
32883288

32893289
if (objc < 2) {
32903290
token = Tcl_GetString(objv[0]);
3291-
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
3291+
Tcl_AppendResult(interp,
32923292
"wrong # args: should be \"", token, " <instanceName>",
32933293
(char *)NULL);
32943294
return TCL_ERROR;

‎generic/itclClass.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ Itcl_CreateClass(
221221
NULL, /* flags */ 0);
222222

223223
if (classNs != NULL && Itcl_IsClassNamespace(classNs)) {
224-
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
224+
Tcl_AppendResult(interp,
225225
"class \"", path, "\" already exists",
226226
(char *)NULL);
227227
return TCL_ERROR;
@@ -238,12 +238,12 @@ Itcl_CreateClass(
238238
NULL, /* flags */ TCL_NAMESPACE_ONLY);
239239

240240
if (cmd != NULL && !Itcl_IsStub(cmd)) {
241-
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
241+
Tcl_AppendResult(interp,
242242
"command \"", path, "\" already exists",
243243
(char *)NULL);
244244

245245
if (strstr(path,"::") == NULL) {
246-
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
246+
Tcl_AppendResult(interp,
247247
" in namespace \"",
248248
Tcl_GetCurrentNamespace(interp)->fullName, "\"",
249249
(char *)NULL);
@@ -260,7 +260,7 @@ Itcl_CreateClass(
260260
Itcl_ParseNamespPath(path, &buffer, &head, &tail);
261261

262262
if (strstr(tail,".")) {
263-
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
263+
Tcl_AppendResult(interp,
264264
"bad class name \"", tail, "\"",
265265
(char *)NULL);
266266
Tcl_DStringFree(&buffer);
@@ -1528,7 +1528,7 @@ ItclClassCreateObject(
15281528
* If this is not an old-style class, then return an error
15291529
* describing the syntax change.
15301530
*/
1531-
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
1531+
Tcl_AppendResult(interp,
15321532
"syntax \"class :: proc\" is an anachronism\n",
15331533
"[incr Tcl] no longer supports this syntax.\n",
15341534
"Instead, remove the spaces from your procedure invocations:\n",
@@ -2006,7 +2006,7 @@ Itcl_CreateVariable(
20062006
*/
20072007
hPtr = Tcl_CreateHashEntry(&iclsPtr->variables, (char *)namePtr, &newEntry);
20082008
if (!newEntry) {
2009-
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
2009+
Tcl_AppendResult(interp,
20102010
"variable name \"", Tcl_GetString(namePtr),
20112011
"\" already defined in class \"",
20122012
Tcl_GetString(iclsPtr->fullNamePtr), "\"",
@@ -2095,7 +2095,7 @@ Itcl_CreateOption(
20952095
hPtr = Tcl_CreateHashEntry(&iclsPtr->options,
20962096
(char *)ioptPtr->namePtr, &newEntry);
20972097
if (!newEntry) {
2098-
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
2098+
Tcl_AppendResult(interp,
20992099
"option name \"", Tcl_GetString(ioptPtr->namePtr),
21002100
"\" already defined in class \"",
21012101
Tcl_GetString(iclsPtr->fullNamePtr), "\"",
@@ -2149,7 +2149,7 @@ ItclCreateMethodVariable(
21492149
hPtr = Tcl_CreateHashEntry(&ivPtr->iclsPtr->methodVariables,
21502150
(char *)ivPtr->namePtr, &isNew);
21512151
if (!isNew) {
2152-
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
2152+
Tcl_AppendResult(interp,
21532153
"methdovariable name \"", Tcl_GetString(ivPtr->namePtr),
21542154
"\" already defined in class \"",
21552155
Tcl_GetString (ivPtr->iclsPtr->fullNamePtr), "\"",

‎generic/itclCmd.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ NRDelObjectCmd(
641641
}
642642

643643
if (contextIoPtr == NULL) {
644-
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
644+
Tcl_AppendResult(interp,
645645
"object \"", name, "\" not found",
646646
(char *)NULL);
647647
return TCL_ERROR;
@@ -799,7 +799,7 @@ Itcl_ScopeCmd2(
799799

800800
entry = ItclResolveVarEntry(contextIclsPtr, token);
801801
if (!entry) {
802-
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
802+
Tcl_AppendResult(interp,
803803
"variable \"", token, "\" not found in class \"",
804804
Tcl_GetString(contextIclsPtr->fullNamePtr), "\"",
805805
(char *)NULL);
@@ -844,7 +844,7 @@ Itcl_ScopeCmd2(
844844
}
845845
}
846846
if (contextIoPtr == NULL) {
847-
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
847+
Tcl_AppendResult(interp,
848848
"can't scope variable \"", token,
849849
"\": missing object context",
850850
(char *)NULL);
@@ -899,7 +899,7 @@ Itcl_ScopeCmd2(
899899
TCL_NAMESPACE_ONLY);
900900

901901
if (!var) {
902-
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
902+
Tcl_AppendResult(interp,
903903
"variable \"", token, "\" not found in namespace \"",
904904
contextNsPtr->fullName, "\"",
905905
(char *)NULL);
@@ -998,7 +998,7 @@ Itcl_CodeCmd2(
998998
pos++;
999999
break;
10001000
} else {
1001-
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
1001+
Tcl_AppendResult(interp,
10021002
"bad option \"", token, "\": should be -namespace or --",
10031003
(char *)NULL);
10041004
return TCL_ERROR;

0 commit comments

Comments
 (0)