Index: generic/asm/nsfAsmAssemble.c =================================================================== diff -u -N -r9333bfa110291a29fa898b0ce554e8848db5d031 -r24571ae44c492c681d3efd2f2d2f5169ad7d6d57 --- generic/asm/nsfAsmAssemble.c (.../nsfAsmAssemble.c) (revision 9333bfa110291a29fa898b0ce554e8848db5d031) +++ generic/asm/nsfAsmAssemble.c (.../nsfAsmAssemble.c) (revision 24571ae44c492c681d3efd2f2d2f5169ad7d6d57) @@ -151,7 +151,7 @@ Tcl_Obj **ov; CONST char *procName; - assert(nameObj); + assert(nameObj != NULL); procName = ObjStr(nameObj); if (Tcl_ListObjGetElements(interp, asmObj, &oc, &ov) != TCL_OK) { @@ -325,29 +325,29 @@ case asmEvalIdx: inst = AsmInstructionNew(proc, asmEval, cArgs); - if (cArgs>0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} + if (cArgs > 0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} break; case asmDuplicateObjIdx: inst = AsmInstructionNew(proc, asmDuplicateObj, cArgs); - if (cArgs>0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} + if (cArgs > 0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} inst->clientData = proc; break; case asmIncrIntIdx: inst = AsmInstructionNew(proc, asmIncrInt, cArgs); - if (cArgs>0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} + if (cArgs > 0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} inst->clientData = proc; break; case asmIncrObjIdx: inst = AsmInstructionNew(proc, asmIncrObj, cArgs); - if (cArgs>0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} + if (cArgs > 0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} inst->clientData = proc; break; @@ -368,39 +368,39 @@ case asmJumpIdx: inst = AsmInstructionNew(proc, asmJump, cArgs); - if (cArgs>0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} + if (cArgs > 0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} inst->clientData = proc; break; case asmJumpTrueIdx: inst = AsmInstructionNew(proc, asmJumpTrue, cArgs); - if (cArgs>0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} + if (cArgs > 0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} inst->clientData = proc; break; case asmLeIntIdx: inst = AsmInstructionNew(proc, asmLeInt, cArgs); - if (cArgs>0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} + if (cArgs > 0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} inst->clientData = proc; break; case asmLeIntObjIdx: inst = AsmInstructionNew(proc, asmLeIntObj, cArgs); - if (cArgs>0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} + if (cArgs > 0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} inst->clientData = proc; break; case asmMethodDelegateDispatchIdx: inst = AsmInstructionNew(proc, asmMethodDelegateDispatch, cArgs); - if (cArgs>0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} + if (cArgs > 0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} { Tcl_Command cmd = NULL; NsfObject *object = NULL; AsmResolverInfo *resInfo; @@ -420,7 +420,7 @@ resInfo->object = object; inst->clientData = resInfo; AsmInstructionSetCmd(inst, asmMethodDelegateDispatch11); - } else if (cmd) { + } else if (cmd != 0) { inst->clientData = cmd; } else { inst->clientData = NULL; @@ -432,13 +432,13 @@ case asmMethodSelfDispatchIdx: inst = AsmInstructionNew(proc, asmMethodSelfDispatch, cArgs); - if (cArgs>0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} + if (cArgs > 0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} { Tcl_Command cmd = NULL; AsmResolverInfo *resInfo; if (strncmp(ObjStr(inst->argv[0]), "::nsf::methods::", 16) == 0) { cmd = Tcl_GetCommandFromObj(interp, inst->argv[0]); - if (cmd) { + if (cmd != 0) { //fprintf(stderr, "%s: asmMethodSelfCmdDispatch cmd '%s' => %p\n", procName, ObjStr(inst->argv[0]), cmd); AsmInstructionSetCmd(inst, asmMethodSelfCmdDispatch); } @@ -456,7 +456,7 @@ case asmNoopIdx: inst = AsmInstructionNew(proc, asmNoop, cArgs); - if (cArgs>0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} + if (cArgs > 0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} break; case asmObjIdx: @@ -471,55 +471,55 @@ case asmSelfIdx: inst = AsmInstructionNew(proc, asmSelf, cArgs); - if (cArgs>0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} + if (cArgs > 0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} inst->clientData = proc; break; case asmSetIntIdx: inst = AsmInstructionNew(proc, asmSetInt, cArgs); - if (cArgs>0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} + if (cArgs > 0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} inst->clientData = proc; break; case asmSetObjIdx: inst = AsmInstructionNew(proc, asmSetObj, cArgs); - if (cArgs>0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} + if (cArgs > 0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} inst->clientData = proc; break; case asmSetObjToResultIdx: inst = AsmInstructionNew(proc, asmSetObjToResult, cArgs); - if (cArgs>0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} + if (cArgs > 0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} inst->clientData = proc; break; case asmSetResultIdx: inst = AsmInstructionNew(proc, asmSetResult, cArgs); - if (cArgs>0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} + if (cArgs > 0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} inst->clientData = proc; break; case asmSetResultIntIdx: inst = AsmInstructionNew(proc, asmSetResultInt, cArgs); - if (cArgs>0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} + if (cArgs > 0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} inst->clientData = proc; break; case asmStoreResultIdx: inst = AsmInstructionNew(proc, asmStoreResult, cArgs); - if (cArgs>0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} + if (cArgs > 0) {AsmInstructionArgvSet(interp, offset, argc, 0, inst, proc, argv, 0);} codeIndex = -1; argvIndex = -1; for (j = offset; j < argc; j += 2) {