summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2007-10-24 12:52:50 (GMT)
committerdgp <dgp@users.sourceforge.net>2007-10-24 12:52:50 (GMT)
commit1873e3116183bc74ea836f71406de17420072399 (patch)
treee29316f0eea72d8b7d8fb35aa319d800e6bf2664
parent8954280ce7849f9bd776d6e1d398a4a937960b32 (diff)
downloadtcl-1873e3116183bc74ea836f71406de17420072399.zip
tcl-1873e3116183bc74ea836f71406de17420072399.tar.gz
tcl-1873e3116183bc74ea836f71406de17420072399.tar.bz2
merge updates from HEAD
-rw-r--r--ChangeLog5
-rw-r--r--generic/tclCompile.c6
-rw-r--r--generic/tclExecute.c4
3 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 06051ff..e3228d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-20 Miguel Sofer <msofer@users.sf.net>
+
+ * generic/tclCompile.c: Fix comments.
+ * generic/tclExecute.c:
+
2007-10-18 David Gravereaux <davygrvy@pobox.com>
* tools/mkdepend.tcl: sort the dep list for a more humanly
diff --git a/generic/tclCompile.c b/generic/tclCompile.c
index b233187..0e41432 100644
--- a/generic/tclCompile.c
+++ b/generic/tclCompile.c
@@ -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: tclCompile.c,v 1.117.2.11 2007/10/11 02:54:12 dgp Exp $
+ * RCS: @(#) $Id: tclCompile.c,v 1.117.2.12 2007/10/24 12:52:51 dgp Exp $
*/
#include "tclInt.h"
@@ -158,9 +158,9 @@ InstructionDesc tclInstructionTable[] = {
{"gt", 1, -1, 0, {OPERAND_NONE}},
/* Greater: push (stknext || stktop) */
{"le", 1, -1, 0, {OPERAND_NONE}},
- /* Logical or: push (stknext || stktop) */
+ /* Less or equal: push (stknext || stktop) */
{"ge", 1, -1, 0, {OPERAND_NONE}},
- /* Logical or: push (stknext || stktop) */
+ /* Greater or equal: push (stknext || stktop) */
{"lshift", 1, -1, 0, {OPERAND_NONE}},
/* Left shift: push (stknext << stktop) */
{"rshift", 1, -1, 0, {OPERAND_NONE}},
diff --git a/generic/tclExecute.c b/generic/tclExecute.c
index 78c3a82..60c166f 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -13,7 +13,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclExecute.c,v 1.285.2.20 2007/10/17 14:38:35 dgp Exp $
+ * RCS: @(#) $Id: tclExecute.c,v 1.285.2.21 2007/10/24 12:52:52 dgp Exp $
*/
#include "tclInt.h"
@@ -2400,7 +2400,7 @@ TclExecuteByteCode(
* Start of INST_LOAD instructions.
*
* WARNING: more 'goto' here than your doctor recommended! The different
- * instructions set the value of some variables and then jump to somme
+ * instructions set the value of some variables and then jump to some
* common execution code.
*/
{