summaryrefslogtreecommitdiffstats
path: root/generic/tclDisassemble.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2023-03-05 19:57:48 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2023-03-05 19:57:48 (GMT)
commite4e106233842d77095bf459f14bb82e953bc8c6f (patch)
treef51bc271d7aea5c9938d3d00a661ab7ac3307c07 /generic/tclDisassemble.c
parent0968aa6de7b67ed474049bb1f53a03b192f9c07c (diff)
downloadtcl-e4e106233842d77095bf459f14bb82e953bc8c6f.zip
tcl-e4e106233842d77095bf459f14bb82e953bc8c6f.tar.gz
tcl-e4e106233842d77095bf459f14bb82e953bc8c6f.tar.bz2
Another round of -1 -> TCL_INDEX_NONE
Diffstat (limited to 'generic/tclDisassemble.c')
-rw-r--r--generic/tclDisassemble.c108
1 files changed, 54 insertions, 54 deletions
diff --git a/generic/tclDisassemble.c b/generic/tclDisassemble.c
index 57adcf0..c06731f 100644
--- a/generic/tclDisassemble.c
+++ b/generic/tclDisassemble.c
@@ -280,7 +280,7 @@ DisassembleByteCodeObj(
Tcl_AppendPrintfToObj(bufferObj,
"ByteCode %p, refCt %" TCL_Z_MODIFIER "u, epoch %" TCL_Z_MODIFIER "u, interp %p (epoch %" TCL_Z_MODIFIER "u)\n",
codePtr, codePtr->refCount, codePtr->compileEpoch, iPtr, iPtr->compileEpoch);
- Tcl_AppendToObj(bufferObj, " Source ", -1);
+ Tcl_AppendToObj(bufferObj, " Source ", TCL_INDEX_NONE);
PrintSourceToObj(bufferObj, codePtr->source,
TclMin(codePtr->numSrcBytes, 55));
GetLocationInformation(codePtr->procPtr, &fileObj, &line);
@@ -339,7 +339,7 @@ DisassembleByteCodeObj(
(localPtr->flags & VAR_TEMPORARY) ? ", temp" : "",
(localPtr->flags & VAR_RESOLVED) ? ", resolved" : "");
if (TclIsVarTemporary(localPtr)) {
- Tcl_AppendToObj(bufferObj, "\n", -1);
+ Tcl_AppendToObj(bufferObj, "\n", TCL_INDEX_NONE);
} else {
Tcl_AppendPrintfToObj(bufferObj, ", \"%s\"\n",
localPtr->name);
@@ -389,7 +389,7 @@ DisassembleByteCodeObj(
if (numCmds == 0) {
pc = codeStart;
while (pc < codeLimit) {
- Tcl_AppendToObj(bufferObj, " ", -1);
+ Tcl_AppendToObj(bufferObj, " ", TCL_INDEX_NONE);
pc += FormatInstruction(codePtr, pc, bufferObj);
}
return bufferObj;
@@ -451,7 +451,7 @@ DisassembleByteCodeObj(
srcOffset, (srcOffset + srcLen - 1));
}
if (numCmds > 0) {
- Tcl_AppendToObj(bufferObj, "\n", -1);
+ Tcl_AppendToObj(bufferObj, "\n", TCL_INDEX_NONE);
}
/*
@@ -500,14 +500,14 @@ DisassembleByteCodeObj(
*/
while ((pc-codeStart) < codeOffset) {
- Tcl_AppendToObj(bufferObj, " ", -1);
+ Tcl_AppendToObj(bufferObj, " ", TCL_INDEX_NONE);
pc += FormatInstruction(codePtr, pc, bufferObj);
}
Tcl_AppendPrintfToObj(bufferObj, " Command %d: ", i+1);
PrintSourceToObj(bufferObj, (codePtr->source + srcOffset),
TclMin(srcLen, 55));
- Tcl_AppendToObj(bufferObj, "\n", -1);
+ Tcl_AppendToObj(bufferObj, "\n", TCL_INDEX_NONE);
}
if (pc < codeLimit) {
/*
@@ -515,7 +515,7 @@ DisassembleByteCodeObj(
*/
while (pc < codeLimit) {
- Tcl_AppendToObj(bufferObj, " ", -1);
+ Tcl_AppendToObj(bufferObj, " ", TCL_INDEX_NONE);
pc += FormatInstruction(codePtr, pc, bufferObj);
}
}
@@ -654,7 +654,7 @@ FormatInstruction(
const char *bytes;
size_t length;
- Tcl_AppendToObj(bufferObj, "\t# ", -1);
+ Tcl_AppendToObj(bufferObj, "\t# ", TCL_INDEX_NONE);
bytes = Tcl_GetStringFromObj(codePtr->objArrayPtr[opnd], &length);
PrintSourceToObj(bufferObj, bytes, TclMin(length, 40));
} else if (suffixBuffer[0]) {
@@ -663,12 +663,12 @@ FormatInstruction(
PrintSourceToObj(bufferObj, suffixSrc, 40);
}
}
- Tcl_AppendToObj(bufferObj, "\n", -1);
+ Tcl_AppendToObj(bufferObj, "\n", TCL_INDEX_NONE);
if (auxPtr && auxPtr->type->printProc) {
- Tcl_AppendToObj(bufferObj, "\t\t[", -1);
+ Tcl_AppendToObj(bufferObj, "\t\t[", TCL_INDEX_NONE);
auxPtr->type->printProc(auxPtr->clientData, bufferObj, codePtr,
pcOffset);
- Tcl_AppendToObj(bufferObj, "]\n", -1);
+ Tcl_AppendToObj(bufferObj, "]\n", TCL_INDEX_NONE);
}
return numBytes;
}
@@ -866,11 +866,11 @@ PrintSourceToObj(
size_t i = 0, len;
if (stringPtr == NULL) {
- Tcl_AppendToObj(appendObj, "\"\"", -1);
+ Tcl_AppendToObj(appendObj, "\"\"", TCL_INDEX_NONE);
return;
}
- Tcl_AppendToObj(appendObj, "\"", -1);
+ Tcl_AppendToObj(appendObj, "\"", TCL_INDEX_NONE);
p = stringPtr;
for (; (*p != '\0') && (i < maxChars); p+=len) {
int ucs4;
@@ -878,27 +878,27 @@ PrintSourceToObj(
len = TclUtfToUCS4(p, &ucs4);
switch (ucs4) {
case '"':
- Tcl_AppendToObj(appendObj, "\\\"", -1);
+ Tcl_AppendToObj(appendObj, "\\\"", TCL_INDEX_NONE);
i += 2;
continue;
case '\f':
- Tcl_AppendToObj(appendObj, "\\f", -1);
+ Tcl_AppendToObj(appendObj, "\\f", TCL_INDEX_NONE);
i += 2;
continue;
case '\n':
- Tcl_AppendToObj(appendObj, "\\n", -1);
+ Tcl_AppendToObj(appendObj, "\\n", TCL_INDEX_NONE);
i += 2;
continue;
case '\r':
- Tcl_AppendToObj(appendObj, "\\r", -1);
+ Tcl_AppendToObj(appendObj, "\\r", TCL_INDEX_NONE);
i += 2;
continue;
case '\t':
- Tcl_AppendToObj(appendObj, "\\t", -1);
+ Tcl_AppendToObj(appendObj, "\\t", TCL_INDEX_NONE);
i += 2;
continue;
case '\v':
- Tcl_AppendToObj(appendObj, "\\v", -1);
+ Tcl_AppendToObj(appendObj, "\\v", TCL_INDEX_NONE);
i += 2;
continue;
default:
@@ -916,9 +916,9 @@ PrintSourceToObj(
}
}
if (*p != '\0') {
- Tcl_AppendToObj(appendObj, "...", -1);
+ Tcl_AppendToObj(appendObj, "...", TCL_INDEX_NONE);
}
- Tcl_AppendToObj(appendObj, "\"", -1);
+ Tcl_AppendToObj(appendObj, "\"", TCL_INDEX_NONE);
}
/*
@@ -972,33 +972,33 @@ DisassembleByteCodeAsDicts(
TclNewObj(descriptor[0]);
if (!(localPtr->flags & (VAR_ARRAY|VAR_LINK))) {
Tcl_ListObjAppendElement(NULL, descriptor[0],
- Tcl_NewStringObj("scalar", -1));
+ Tcl_NewStringObj("scalar", TCL_INDEX_NONE));
}
if (localPtr->flags & VAR_ARRAY) {
Tcl_ListObjAppendElement(NULL, descriptor[0],
- Tcl_NewStringObj("array", -1));
+ Tcl_NewStringObj("array", TCL_INDEX_NONE));
}
if (localPtr->flags & VAR_LINK) {
Tcl_ListObjAppendElement(NULL, descriptor[0],
- Tcl_NewStringObj("link", -1));
+ Tcl_NewStringObj("link", TCL_INDEX_NONE));
}
if (localPtr->flags & VAR_ARGUMENT) {
Tcl_ListObjAppendElement(NULL, descriptor[0],
- Tcl_NewStringObj("arg", -1));
+ Tcl_NewStringObj("arg", TCL_INDEX_NONE));
}
if (localPtr->flags & VAR_TEMPORARY) {
Tcl_ListObjAppendElement(NULL, descriptor[0],
- Tcl_NewStringObj("temp", -1));
+ Tcl_NewStringObj("temp", TCL_INDEX_NONE));
}
if (localPtr->flags & VAR_RESOLVED) {
Tcl_ListObjAppendElement(NULL, descriptor[0],
- Tcl_NewStringObj("resolved", -1));
+ Tcl_NewStringObj("resolved", TCL_INDEX_NONE));
}
if (localPtr->flags & VAR_TEMPORARY) {
Tcl_ListObjAppendElement(NULL, variables,
Tcl_NewListObj(1, descriptor));
} else {
- descriptor[1] = Tcl_NewStringObj(localPtr->name, -1);
+ descriptor[1] = Tcl_NewStringObj(localPtr->name, TCL_INDEX_NONE);
Tcl_ListObjAppendElement(NULL, variables,
Tcl_NewListObj(2, descriptor));
}
@@ -1016,7 +1016,7 @@ DisassembleByteCodeAsDicts(
TclNewObj(inst);
Tcl_ListObjAppendElement(NULL, inst, Tcl_NewStringObj(
- instDesc->name, -1));
+ instDesc->name, TCL_INDEX_NONE));
opnd = pc + 1;
for (i=0 ; i<instDesc->numOperands ; i++) {
switch (instDesc->opTypes[i]) {
@@ -1082,7 +1082,7 @@ DisassembleByteCodeAsDicts(
".%d", val));
} else if (val == -2) {
Tcl_ListObjAppendElement(NULL, inst, Tcl_NewStringObj(
- ".end", -1));
+ ".end", TCL_INDEX_NONE));
} else {
Tcl_ListObjAppendElement(NULL, inst, Tcl_ObjPrintf(
".end-%d", -2-val));
@@ -1115,13 +1115,13 @@ DisassembleByteCodeAsDicts(
TclNewObj(aux);
for (i=0 ; i<(int)codePtr->numAuxDataItems ; i++) {
AuxData *auxData = &codePtr->auxDataArrayPtr[i];
- Tcl_Obj *auxDesc = Tcl_NewStringObj(auxData->type->name, -1);
+ Tcl_Obj *auxDesc = Tcl_NewStringObj(auxData->type->name, TCL_INDEX_NONE);
if (auxData->type->disassembleProc) {
Tcl_Obj *desc;
TclNewObj(desc);
- Tcl_DictObjPut(NULL, desc, Tcl_NewStringObj("name", -1), auxDesc);
+ Tcl_DictObjPut(NULL, desc, Tcl_NewStringObj("name", TCL_INDEX_NONE), auxDesc);
auxDesc = desc;
auxData->type->disassembleProc(auxData->clientData, auxDesc,
codePtr, 0);
@@ -1188,9 +1188,9 @@ DisassembleByteCodeAsDicts(
sourceOffset += Decode(srcOffPtr);
sourceLength = Decode(srcLenPtr);
TclNewObj(cmd);
- Tcl_DictObjPut(NULL, cmd, Tcl_NewStringObj("codefrom", -1),
+ Tcl_DictObjPut(NULL, cmd, Tcl_NewStringObj("codefrom", TCL_INDEX_NONE),
Tcl_NewWideIntObj(codeOffset));
- Tcl_DictObjPut(NULL, cmd, Tcl_NewStringObj("codeto", -1),
+ Tcl_DictObjPut(NULL, cmd, Tcl_NewStringObj("codeto", TCL_INDEX_NONE),
Tcl_NewWideIntObj(codeOffset + codeLength - 1));
/*
@@ -1198,13 +1198,13 @@ DisassembleByteCodeAsDicts(
* characters are present in the source!
*/
- Tcl_DictObjPut(NULL, cmd, Tcl_NewStringObj("scriptfrom", -1),
+ Tcl_DictObjPut(NULL, cmd, Tcl_NewStringObj("scriptfrom", TCL_INDEX_NONE),
Tcl_NewWideIntObj(Tcl_NumUtfChars(codePtr->source,
sourceOffset)));
- Tcl_DictObjPut(NULL, cmd, Tcl_NewStringObj("scriptto", -1),
+ Tcl_DictObjPut(NULL, cmd, Tcl_NewStringObj("scriptto", TCL_INDEX_NONE),
Tcl_NewWideIntObj(Tcl_NumUtfChars(codePtr->source,
sourceOffset + sourceLength - 1)));
- Tcl_DictObjPut(NULL, cmd, Tcl_NewStringObj("script", -1),
+ Tcl_DictObjPut(NULL, cmd, Tcl_NewStringObj("script", TCL_INDEX_NONE),
Tcl_NewStringObj(codePtr->source+sourceOffset, sourceLength));
Tcl_ListObjAppendElement(NULL, commands, cmd);
}
@@ -1223,32 +1223,32 @@ DisassembleByteCodeAsDicts(
*/
TclNewObj(description);
- Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("literals", -1),
+ Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("literals", TCL_INDEX_NONE),
literals);
- Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("variables", -1),
+ Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("variables", TCL_INDEX_NONE),
variables);
- Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("exception", -1), exn);
- Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("instructions", -1),
+ Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("exception", TCL_INDEX_NONE), exn);
+ Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("instructions", TCL_INDEX_NONE),
instructions);
- Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("auxiliary", -1), aux);
- Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("commands", -1),
+ Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("auxiliary", TCL_INDEX_NONE), aux);
+ Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("commands", TCL_INDEX_NONE),
commands);
- Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("script", -1),
+ Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("script", TCL_INDEX_NONE),
Tcl_NewStringObj(codePtr->source, codePtr->numSrcBytes));
- Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("namespace", -1),
- Tcl_NewStringObj(codePtr->nsPtr->fullName, -1));
- Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("stackdepth", -1),
+ Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("namespace", TCL_INDEX_NONE),
+ Tcl_NewStringObj(codePtr->nsPtr->fullName, TCL_INDEX_NONE));
+ Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("stackdepth", TCL_INDEX_NONE),
Tcl_NewWideIntObj(codePtr->maxStackDepth));
- Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("exceptdepth", -1),
+ Tcl_DictObjPut(NULL, description, Tcl_NewStringObj("exceptdepth", TCL_INDEX_NONE),
Tcl_NewWideIntObj(codePtr->maxExceptDepth));
if (line >= 0) {
Tcl_DictObjPut(NULL, description,
- Tcl_NewStringObj("initiallinenumber", -1),
+ Tcl_NewStringObj("initiallinenumber", TCL_INDEX_NONE),
Tcl_NewWideIntObj(line));
}
if (file) {
Tcl_DictObjPut(NULL, description,
- Tcl_NewStringObj("sourcefile", -1), file);
+ Tcl_NewStringObj("sourcefile", TCL_INDEX_NONE), file);
}
return description;
}
@@ -1410,7 +1410,7 @@ Tcl_DisassembleObjCmd(
procPtr = TclOOGetProcFromMethod(methodPtr);
if (procPtr == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
- "body not available for this kind of constructor", -1));
+ "body not available for this kind of constructor", TCL_INDEX_NONE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "DISASSEMBLE",
"METHODTYPE", NULL);
return TCL_ERROR;
@@ -1475,7 +1475,7 @@ Tcl_DisassembleObjCmd(
procPtr = TclOOGetProcFromMethod(methodPtr);
if (procPtr == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
- "body not available for this kind of destructor", -1));
+ "body not available for this kind of destructor", TCL_INDEX_NONE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "DISASSEMBLE",
"METHODTYPE", NULL);
return TCL_ERROR;
@@ -1565,7 +1565,7 @@ Tcl_DisassembleObjCmd(
procPtr = TclOOGetProcFromMethod((Method *)Tcl_GetHashValue(hPtr));
if (procPtr == NULL) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
- "body not available for this kind of method", -1));
+ "body not available for this kind of method", TCL_INDEX_NONE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "DISASSEMBLE",
"METHODTYPE", NULL);
return TCL_ERROR;
@@ -1602,7 +1602,7 @@ Tcl_DisassembleObjCmd(
if (codePtr->flags & TCL_BYTECODE_PRECOMPILED) {
Tcl_SetObjResult(interp, Tcl_NewStringObj(
- "may not disassemble prebuilt bytecode", -1));
+ "may not disassemble prebuilt bytecode", TCL_INDEX_NONE));
Tcl_SetErrorCode(interp, "TCL", "OPERATION", "DISASSEMBLE",
"BYTECODE", NULL);
return TCL_ERROR;