aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez>2006-11-01 16:03:13 +0000
committerantirez <antirez>2006-11-01 16:03:13 +0000
commite02afbe819aee8a428889e92a40311247e9c7d2b (patch)
tree1749a0c2503e75b4f55ad07997eaafa4533198b3
parentcd16897a793c20ce5ef9e5181c47b05fe7041d75 (diff)
downloadjimtcl-e02afbe819aee8a428889e92a40311247e9c7d2b.zip
jimtcl-e02afbe819aee8a428889e92a40311247e9c7d2b.tar.gz
jimtcl-e02afbe819aee8a428889e92a40311247e9c7d2b.tar.bz2
Fixed error message when trying to access a non existing key in dictionary
-rw-r--r--ChangeLog11
-rw-r--r--jim.c8
2 files changed, 13 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index e5fef74..a73524f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-11-01 14:37 antirez
+
+ * jim.c, jim.h: Fix to expr parsing (now hex digits work as
+ literals). the exit command is now implemented as a special
+ return value of JIM_EXIT.
+
+2005-09-19 17:56 antirez
+
+ * ChangeLog, jim-eventloop.c: Fixed a bug reported by Craig Denson
+ about jim-eveloop.c and filemasks.
+
2005-09-19 17:47 antirez
* BUGS, ChangeLog, jim.c: Updated BUGS, fixed some minor problem
diff --git a/jim.c b/jim.c
index e9cd156..0297bf8 100644
--- a/jim.c
+++ b/jim.c
@@ -2,7 +2,7 @@
* Copyright 2005 Salvatore Sanfilippo <antirez@invece.org>
* Copyright 2005 Clemens Hintze <c.hintze@gmx.net>
*
- * $Id: jim.c,v 1.164 2006/11/01 13:37:05 antirez Exp $
+ * $Id: jim.c,v 1.165 2006/11/01 16:03:13 antirez Exp $
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -3522,10 +3522,6 @@ Jim_Obj *Jim_ExpandDictSugar(Jim_Interp *interp, Jim_Obj *objPtr)
if (Jim_DictKey(interp, dictObjPtr, substKeyObjPtr, &resObjPtr, JIM_ERRMSG)
!= JIM_OK) {
resObjPtr = NULL;
- Jim_SetResult(interp, Jim_NewEmptyStringObj(interp));
- Jim_AppendStrings(interp, Jim_GetResult(interp),
- "Variable '", Jim_GetString(varObjPtr, NULL),
- "' does not contain a valid dictionary", NULL);
goto err;
}
err:
@@ -11708,7 +11704,7 @@ int Jim_InteractivePrompt(Jim_Interp *interp)
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.164 2006/11/01 13:37:05 antirez Exp $\n");
+ printf("CVS ID: $Id: jim.c,v 1.165 2006/11/01 16:03:13 antirez Exp $\n");
Jim_SetVariableStrWithStr(interp, "jim_interactive", "1");
while (1) {
char buf[1024];