diff options
| author | Steve Bennett <steveb@workware.net.au> | 2010-10-11 10:30:22 +1000 |
|---|---|---|
| committer | Steve Bennett <steveb@workware.net.au> | 2010-10-15 11:02:57 +1000 |
| commit | 7f0bcc46a3c9fcfa42f01898330858181838e41f (patch) | |
| tree | 00eaaf240f252c57846b8812ea0c483bee10deca /jim-interactive.c | |
| parent | 3cfb6f5e312305d7641340917a251606efdf4611 (diff) | |
| download | jimtcl-7f0bcc46a3c9fcfa42f01898330858181838e41f.zip jimtcl-7f0bcc46a3c9fcfa42f01898330858181838e41f.tar.gz jimtcl-7f0bcc46a3c9fcfa42f01898330858181838e41f.tar.bz2 | |
Remove dependence of jim core on stderr
Remove Jim_PrintErrorMessage() and create Jim_MakeErrorMessage() instead.
Move errorInfo to stdlib since it is now required.
Also move lassign from tclcompat to stdlib as a core command.
Signed-off-by: Steve Bennett <steveb@workware.net.au>
Diffstat (limited to 'jim-interactive.c')
| -rw-r--r-- | jim-interactive.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/jim-interactive.c b/jim-interactive.c index 4aa2923..15b4cba 100644 --- a/jim-interactive.c +++ b/jim-interactive.c @@ -53,18 +53,16 @@ int Jim_InteractivePrompt(Jim_Interp *interp) } retcode = Jim_EvalObj(interp, scriptObjPtr); Jim_DecrRefCount(interp, scriptObjPtr); - result = Jim_GetString(Jim_GetResult(interp), &reslen); - if (retcode == JIM_ERR) { - Jim_PrintErrorMessage(interp); - } - else if (retcode == JIM_EXIT) { + if (retcode == JIM_EXIT) { Jim_Free(buf); exit(Jim_GetExitCode(interp)); } - else { - if (reslen) { - printf("%s\n", result); - } + if (retcode == JIM_ERR) { + Jim_MakeErrorMessage(interp); + } + result = Jim_GetString(Jim_GetResult(interp), &reslen); + if (reslen) { + printf("%s\n", result); } } out: |