The interactive prompt can now used to type/paste multi line scripts.

Every line is appended to the previous until the script does not appear
to be complete (tested by Jim_IsScriptComplete()).

5 files changed, 66 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index 3f04614..dca7b08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-03-16 17:28  antirez
+
+	* ChangeLog, jim-aio.c, jim.c, jim.h: [env] modified to just be
+	  able to read a specified var name form the environment, i.e. to
+	  be ANSI-C.
+
+	  Minor fix to AIO extension to use the new DelProc API.
+
 2005-03-16 17:06  patthoyts
 
 	* jim.c, jim.h: Added interpreter pointer to the command delete
diff --git a/Makefile b/Makefile
index 8f0ebea..462ad4c 100644
--- a/Makefile
+++ b/Makefile
@@ -15,8 +15,9 @@
 
 SHELL   = /bin/sh
 RM      = rm -f
+OPT     = -O2
 LDFLAGS = $(PROFILE)
-CFLAGS  = -Wall -Wwrite-strings -W -O2 -g $(PROFILE)
+CFLAGS  = -Wall -Wwrite-strings -W $(OPT) -g $(PROFILE)
 AR      = /usr/bin/ar
 RANLIB  = /usr/bin/ranlib
 LIBPATH =-L.
@@ -92,6 +93,11 @@ commit:
 	cvs2cl
 	cvs commit
 
+bak:
+	cp -f jim.c jim.c.orig
+	cp -f jimsh.c jimsh.c.orig
+	cp -f jim.h jim.h.orig
+
 # Dependences
 jim-posix.o: jim-posix.c jim.h
 jim-win32com.o: jim-win32com.c jim.h
diff --git a/TODO b/TODO
index d6e83e3..a711291 100644
--- a/TODO
+++ b/TODO
@@ -62,3 +62,10 @@ REFERENCES SYSTEM
 API FUNCTIONS TO EXPORT
 
 - Jim_FormatString()
+
+
+RANDOM THINGS TO DO ASAP
+
+- .jimrc loading, using the ENV variable
+- [source]
+
diff --git a/jim.c b/jim.c
index fd0ff75..e0c9a0f 100644
--- a/jim.c
+++ b/jim.c
@@ -1,7 +1,7 @@
 /* Jim - A small embeddable Tcl interpreter
  * Copyright 2005 Salvatore Sanfilippo <antirez@invece.org>
  *
- * $Id: jim.c,v 1.113 2005/03/16 16:28:34 antirez Exp $
+ * $Id: jim.c,v 1.114 2005/03/17 07:22:03 antirez Exp $
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -471,10 +471,10 @@ void *Jim_Alloc(int size)
         Jim_Panic("Out of memory");
     return p;
 }
-#if 0
-#define Jim_Alloc(n) \
-    (printf("%d in %s:%d\n", n, __FILE__, __LINE__),_Jim_Alloc(n))
-#endif
+
+void Jim_Free(void *ptr) {
+    free(ptr);
+}
 
 void *Jim_Realloc(void *ptr, int size)
 {
@@ -1552,8 +1552,12 @@ char *JimParserGetToken(struct JimParserCtx *pc,
  * open and not completed. This is useful for interactive shells
  * implementation and for [info complete].
  *
+ * If 'stateCharPtr' != NULL, the function stores ' ' on complete script,
+ * '{' on scripts incomplete missing one or more '}' to be balanced.
+ * '"' on scripts incomplete missing a '"' char.
+ *
  * If the script is complete, 1 is returned, otherwise 0. */
-int Jim_ScriptIsComplete(const char *s, int len)
+int Jim_ScriptIsComplete(const char *s, int len, char *stateCharPtr)
 {
     int level = 0;
     int state = ' ';
@@ -1590,6 +1594,8 @@ int Jim_ScriptIsComplete(const char *s, int len)
         s++;
         len--;
     }
+    if (stateCharPtr)
+        *stateCharPtr = state;
     return state == ' ';
 }
 
@@ -7448,6 +7454,7 @@ void JimRegisterCoreApi(Jim_Interp *interp)
 {
   interp->getApiFuncPtr = Jim_GetApi;
   JIM_REGISTER_API(Alloc);
+  JIM_REGISTER_API(Free);
   JIM_REGISTER_API(Eval);
   JIM_REGISTER_API(EvalGlobal);
   JIM_REGISTER_API(EvalFile);
@@ -9796,7 +9803,7 @@ static int Jim_InfoCoreCommand(Jim_Interp *interp, int argc,
         }
         s = Jim_GetString(argv[2], &len);
         Jim_SetResult(interp,
-                Jim_NewIntObj(interp, Jim_ScriptIsComplete(s, len)));
+                Jim_NewIntObj(interp, Jim_ScriptIsComplete(s, len, NULL)));
     }
     return result;
 }
@@ -9949,7 +9956,7 @@ static int Jim_EnvCoreCommand(Jim_Interp *interp, int argc,
     char *val;
 
     if (argc != 2) {
-        Jim_WrongNumArgs(interp, 1, argv, "env varName");
+        Jim_WrongNumArgs(interp, 1, argv, "varName");
         return JIM_ERR;
     }
     key = Jim_GetString(argv[1], NULL);
@@ -10134,13 +10141,14 @@ void Jim_PrintErrorMessage(Jim_Interp *interp)
 int Jim_InteractivePrompt(Jim_Interp *interp)
 {
     int retcode = JIM_OK;
+    Jim_Obj *scriptObjPtr;
 
     printf("Welcome to Jim version %d.%d, "
            "Copyright (c) 2005 Salvatore Sanfilippo\n",
            JIM_VERSION / 100, JIM_VERSION % 100);
-    printf("CVS ID: $Id: jim.c,v 1.113 2005/03/16 16:28:34 antirez Exp $\n");
+    printf("CVS ID: $Id: jim.c,v 1.114 2005/03/17 07:22:03 antirez Exp $\n");
     while (1) {
-        char prg[1024];
+        char buf[1024];
         const char *result;
         const char *retcodestr[] = {
             "ok", "error", "return", "break", "continue"
@@ -10155,8 +10163,26 @@ int Jim_InteractivePrompt(Jim_Interp *interp)
         } else
             printf(". ");
         fflush(stdout);
-        if (fgets(prg, 1024, stdin) == NULL) break;
-        retcode = Jim_Eval(interp, prg);
+        scriptObjPtr = Jim_NewStringObj(interp, "", 0);
+        Jim_IncrRefCount(scriptObjPtr);
+        while(1) {
+            const char *str;
+            char state;
+            int len;
+
+            if (fgets(buf, 1024, stdin) == NULL) {
+                Jim_DecrRefCount(interp, scriptObjPtr);
+                goto out;
+            }
+            Jim_AppendString(interp, scriptObjPtr, buf, -1);
+            str = Jim_GetString(scriptObjPtr, &len);
+            if (Jim_ScriptIsComplete(str, len, &state))
+                break;
+            printf("%c> ", state);
+            fflush(stdout);
+        }
+        retcode = Jim_EvalObj(interp, scriptObjPtr);
+        Jim_DecrRefCount(interp, scriptObjPtr);
         result = Jim_GetString(Jim_GetResult(interp), &reslen);
         if (retcode == JIM_ERR) {
             Jim_PrintErrorMessage(interp);
@@ -10167,5 +10193,6 @@ int Jim_InteractivePrompt(Jim_Interp *interp)
             }
         }
     }
+out:
     return 0;
 }
diff --git a/jim.h b/jim.h
index d07c700..8b2bc07 100644
--- a/jim.h
+++ b/jim.h
@@ -1,7 +1,7 @@
 /* Jim - A small embeddable Tcl interpreter
  * Copyright 2005 Salvatore Sanfilippo <antirez@invece.org>
  *
- * $Id: jim.h,v 1.57 2005/03/16 16:28:34 antirez Exp $
+ * $Id: jim.h,v 1.58 2005/03/17 07:22:04 antirez Exp $
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -497,7 +497,6 @@ typedef struct Jim_Reference {
  * versions of Jim (as long as the API is still compatible.) */
 
 /* Macros are common for core and extensions */
-#define Jim_Free free
 #define Jim_FreeHashTableIterator(iter) Jim_Free(iter)
 
 #ifndef __JIM_CORE__
@@ -515,6 +514,7 @@ typedef struct Jim_Reference {
 
 /* Memory allocation */
 JIM_STATIC void * JIM_API(Jim_Alloc) (int size);
+JIM_STATIC void JIM_API(Jim_Free) (void *ptr);
 JIM_STATIC char * JIM_API(Jim_StrDup) (const char *s);
 
 /* evaluation */
@@ -708,7 +708,8 @@ JIM_STATIC void JIM_API(Jim_WrongNumArgs) (Jim_Interp *interp, int argc,
         Jim_Obj *const *argv, const char *msg);
 JIM_STATIC int JIM_API(Jim_GetEnum) (Jim_Interp *interp, Jim_Obj *objPtr,
         const char **tablePtr, int *indexPtr, const char *name, int flags);
-JIM_STATIC int JIM_API(Jim_ScriptIsComplete) (const char *s, int len);
+JIM_STATIC int JIM_API(Jim_ScriptIsComplete) (const char *s, int len,
+        char *stateCharPtr);
 
 /* package utilities */
 typedef void (Jim_InterpDeleteProc)(Jim_Interp *interp, void *data);
@@ -742,8 +743,8 @@ static void Jim_InitExtension(Jim_Interp *interp, const char *version)
 {
   Jim_GetApi = interp->getApiFuncPtr;
 
-  // Jim_Alloc = Jim_GetApi(interp, "Jim_Alloc");
   JIM_GET_API(Alloc);
+  JIM_GET_API(Free);
   JIM_GET_API(Eval);
   JIM_GET_API(EvalGlobal);
   JIM_GET_API(EvalFile);