aboutsummaryrefslogtreecommitdiff
path: root/jim-interactive.c
diff options
context:
space:
mode:
authorSteve Bennett <steveb@workware.net.au>2016-02-28 12:06:47 +1000
committerSteve Bennett <steveb@workware.net.au>2016-03-27 11:01:48 +1000
commitbd25a29a3766bcf9327c8c8d032d0bb773ca4e6a (patch)
tree5ca34c02498c6abe61a5365f5b9edcf56b8256f0 /jim-interactive.c
parent1df642942d9366d5f523567ddffae26018f57856 (diff)
downloadjimtcl-bd25a29a3766bcf9327c8c8d032d0bb773ca4e6a.zip
jimtcl-bd25a29a3766bcf9327c8c8d032d0bb773ca4e6a.tar.gz
jimtcl-bd25a29a3766bcf9327c8c8d032d0bb773ca4e6a.tar.bz2
jim: Jim_ScriptIsComplete() now takes an object
Rather than taking a string and a length, it is simpler and more efficient to take a Jim_Obj Signed-off-by: Steve Bennett <steveb@workware.net.au>
Diffstat (limited to 'jim-interactive.c')
-rw-r--r--jim-interactive.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/jim-interactive.c b/jim-interactive.c
index a3cf6a0..c80e451 100644
--- a/jim-interactive.c
+++ b/jim-interactive.c
@@ -96,7 +96,6 @@ int Jim_InteractivePrompt(Jim_Interp *interp)
const char *result;
int reslen;
char prompt[20];
- const char *str;
if (retcode != JIM_OK) {
const char *retcodestr = Jim_ReturnCode(retcode);
@@ -116,7 +115,6 @@ int Jim_InteractivePrompt(Jim_Interp *interp)
Jim_IncrRefCount(scriptObjPtr);
while (1) {
char state;
- int len;
char *line;
line = Jim_HistoryGetline(prompt);
@@ -134,14 +132,13 @@ int Jim_InteractivePrompt(Jim_Interp *interp)
}
Jim_AppendString(interp, scriptObjPtr, line, -1);
free(line);
- str = Jim_GetString(scriptObjPtr, &len);
- if (Jim_ScriptIsComplete(str, len, &state))
+ if (Jim_ScriptIsComplete(interp, scriptObjPtr, &state))
break;
snprintf(prompt, sizeof(prompt), "%c> ", state);
}
#ifdef USE_LINENOISE
- if (strcmp(str, "h") == 0) {
+ if (strcmp(Jim_String(scriptObjPtr), "h") == 0) {
/* built-in history command */
Jim_HistoryShow();
Jim_DecrRefCount(interp, scriptObjPtr);