summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredman <redman>1999-07-23 23:40:28 (GMT)
committerredman <redman>1999-07-23 23:40:28 (GMT)
commitd9cfa1c06300e54878d865f0c4364bce493f82cf (patch)
treee872d066af5075dc8716330d1f805f1ccb5f106d
parentfb66aafc513b89db16b32c8a426c27dbec9ef78f (diff)
downloadtcl-d9cfa1c06300e54878d865f0c4364bce493f82cf.zip
tcl-d9cfa1c06300e54878d865f0c4364bce493f82cf.tar.gz
tcl-d9cfa1c06300e54878d865f0c4364bce493f82cf.tar.bz2
Removed patch for bug 2382, for info complete.
-rw-r--r--ChangeLog7
-rw-r--r--generic/tclParse.c5
-rw-r--r--tests/info.test8
3 files changed, 13 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 9f68bd1..0045e20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1999-07-23 <redman@scriptics.com>
+
+ * tests/info.test:
+ * generic/tclParse.c: Removed patch for info command, breaks test
+ cases on Unix. Patch was bad and needs to be redone
+ properly. [Bug: 2382]
+
1999-07-22 <redman@scriptics.com>
* Changed version to 8.2b2.
diff --git a/generic/tclParse.c b/generic/tclParse.c
index e3204cc..df5412f 100644
--- a/generic/tclParse.c
+++ b/generic/tclParse.c
@@ -14,7 +14,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclParse.c,v 1.9 1999/07/22 02:15:45 redman Exp $
+ * RCS: @(#) $Id: tclParse.c,v 1.10 1999/07/23 23:40:29 redman Exp $
*/
#include "tclInt.h"
@@ -607,8 +607,7 @@ ParseTokens(src, mask, parsePtr)
if (nested.tokenPtr != nested.staticTokens) {
ckfree((char *) nested.tokenPtr);
}
- if ((*nested.term != 0) && (src[-1] == ']')
- && !nested.incomplete) {
+ if ((src[-1] == ']') && !nested.incomplete) {
break;
}
if (src == parsePtr->end) {
diff --git a/tests/info.test b/tests/info.test
index d4fc961..012bdff 100644
--- a/tests/info.test
+++ b/tests/info.test
@@ -11,7 +11,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: info.test,v 1.9 1999/07/22 02:15:45 redman Exp $
+# RCS: @(#) $Id: info.test,v 1.10 1999/07/23 23:40:29 redman Exp $
if {[lsearch [namespace children] ::tcltest] == -1} {
package require tcltest
@@ -135,11 +135,11 @@ test info-5.3 {info complete option} {
info complete {# Comment should be complete command}
} 1
test info-5.4 {info complete option} {
- info complete {[a [b]}
-} 0
-test info-5.5 {info complete option} {
info complete {[a [b] }
} 0
+test info-5.5 {info complete option} {knownBug} {
+ info complete {[a [b]}
+} 0
test info-6.1 {info default option} {
proc t1 {a b {c d} {e "long default value"}} {}