[Bug 2889593]: Make [expr round()] give the right error.

2 files changed, 42 insertions, 38 deletions

diff --git a/ChangeLog b/ChangeLog
index 7541880..31ab630 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,17 +1,22 @@
+2009-10-31  Donal K. Fellows  <dkf@users.sf.net>
+
+	* generic/tclBasic.c (ExprRoundFunc): [Bug 2889593]: Correctly report
+	the expected number of arguments when generating an error for round().
+
 2009-10-29  Don Porter  <dgp@users.sourceforge.net>
 
-	* generic/tcl.h:	Changed the typedef for the mp_digit type
-	from:
+	* generic/tcl.h:	[Bug 2800740]: Changed the typedef for the
+	mp_digit type from:
 		typedef unsigned long mp_digit;
 	to:
 		typedef unsigned int mp_digit;
 	For 32-bit builds where "long" and "int" are two names for the same
 	thing, this is no change at all.  For 64-bit builds, though, this
 	causes the dp[] array of an mp_int to be made up of 32-bit elements
-	instead of 64-bit elements.  This is a huge improvement because details
-	elsewhere in the mp_int implementation cause only 28 bits of each
-	element to be actually used storing number data.  Without this change
-	bignums are over 50% wasted space on 64-bit systems.  [Bug 2800740].
+	instead of 64-bit elements.  This is a huge improvement because
+	details elsewhere in the mp_int implementation cause only 28 bits of
+	each element to be actually used storing number data.  Without this
+	change bignums are over 50% wasted space on 64-bit systems.
 
 	***POTENTIAL INCOMPATIBILITY***
 	For 64-bit builds, callers of routines with (mp_digit) or (mp_digit *)
@@ -25,10 +30,10 @@
 2009-10-29  Kevin B. Kenny  <kennykb@acm.org>
 
 	* library/clock.tcl (LocalizeFormat):
-	* tests/clock.test (clock-67.1):
+	* tests/clock.test (clock-67.1): [Bug 2819334]:
 	Corrected a problem where '%%' followed by a letter in a format group
-	could expand recursively: %%R would turn into %%H:%M:%S. [Bug 2819334]	
-	
+	could expand recursively: %%R would turn into %%H:%M:%S.
+
 2009-10-28  Don Porter  <dgp@users.sourceforge.net>
 
 	* generic/tclLiteral.c:	Backport fix for [Bug 2888044].
@@ -39,29 +44,28 @@
 	hygiene (failure to save and restore the working directory) that
 	caused these two tests to fail on Windows (and [Bug 2806250]
 	to be reopened).
-	
+
 2009-10-27  Don Porter  <dgp@users.sourceforge.net>
 
-	* generic/tclPathObj.c:	Missing refcount on cached normalized path
-	caused crashes.  [Bug 2884203].
+	* generic/tclPathObj.c:	[Bug 2884203]: Missing refcount on cached
+	normalized path caused crashes.
 
 2009-10-27  Kevin B. Kenny  <kennykb@acm.org>
 
-	* library/clock.tcl (ParseClockScanFormat):
-	Corrected a problem where [clock scan] didn't load the timezone
-	soon enough when processing a time format that lacked a complete
-	date. [Bug 2886852]
+	* library/clock.tcl (ParseClockScanFormat): [Bug 2886852]:
+	Corrected a problem where [clock scan] didn't load the timezone soon
+	enough when processing a time format that lacked a complete date.
 	* tests/clock.test (clock-66.1):
 	Added a test case for the above bug.
 	* library/tzdata/America/Argentina/Buenos_Aires:
 	* library/tzdata/America/Argentina/Cordoba:
 	* library/tzdata/America/Argentina/San_Luis:
-	* library/tzdata/America/Argentina/Tucuman: 
+	* library/tzdata/America/Argentina/Tucuman:
 	New DST rules for Argentina. (Olson's tzdata2009p.)
-	
+
 2009-10-24  Kevin B. Kenny  <kennykb@acm.org>
 
-	* library/clock.tcl (ProcessPosixTimeZone): 
+	* library/clock.tcl (ProcessPosixTimeZone):
 	Corrected a regression in the fix to [Bug 2207436] that caused
 	[clock] to apply EU daylight saving time rules in the US.  Thanks
 	to Karl Lehenbauer for reporting this regression.
@@ -70,7 +74,7 @@
 	* library/tzdata/Asia/Dhaka:
 	* library/tzdata/Asia/Karachi:
 	New DST rules for Bangladesh and Pakistan. (Olson's tzdata2009o.)
-	
+
 2009-10-23  Andreas Kupries  <andreask@activestate.com>
 
 	* generic/tclIO.c (FlushChannel): Skip OutputProc for low-level
@@ -99,7 +103,7 @@
 	or more of the target threads has exited prior to the attempt to send
 	it an asynchronous exit command.
 
-	* doc/memory.n: [Bug 988703]: Add mechanism for discovering what Tcl_Objs
+	* doc/memory.n: [Bug 988703]: Add mechanism for finding what Tcl_Objs
 	* generic/tclCkalloc.c (MemoryCmd): are allocated when built for memory
 	* generic/tclInt.decls: debugging.  This was previously backported from
 	* generic/tclInt.h: Tcl 8.6 with the corrections to fix [Bug 2871908].
@@ -110,7 +114,7 @@
 2009-10-17  Donal K. Fellows  <dkf@users.sf.net>
 
 	* generic/tclVar.c (TclDeleteCompiledLocalVars, UnsetVarStruct)
-	(TclDeleteNamespaceVars): 
+	(TclDeleteNamespaceVars):
 	* generic/tclTrace.c (Tcl_UntraceVar2): [Bug 2629338]: Stop traces
 	that are deleted part way through (a feature used by tdom) from
 	causing freed memory to be accessed.
@@ -155,7 +159,7 @@
 	* library/tzdata/Asia/Gaza:
 	* library/tzdata/Asia/Karachi:
 	* library/tzdata/Pacific/Apia:	Olson's tzdata2009n.
-	
+
 2009-09-29  Don Porter  <dgp@users.sourceforge.net>
 
 	* generic/tclAlloc.c:           Cleaned up various routines in the
@@ -282,9 +286,9 @@
 
 2009-07-21  Kevin B. Kenny  <kennykb@acm.org>
 
-	* library/tzdata/Asia/Dhaka: 
+	* library/tzdata/Asia/Dhaka:
 	* library/tzdata/Indian/Mauritius: Olson's tzdata2009k.
-	
+
 2009-07-20  Donal K. Fellows  <dkf@users.sf.net>
 
 	* generic/tclCmdMZ.c (StringIsCmd): Reorganize so that [string is] is
@@ -304,7 +308,7 @@
 
 	* generic/tclStrToD.c:	[Bug 2819200]: Set floating point control
 	register on MIPS systems so that the gradual underflow expected by Tcl
-	is in effect.  
+	is in effect.
 
 2009-07-14  Andreas Kupries  <andreask@activestate.com>
 
@@ -312,7 +316,7 @@
 	(TclArgumentBCRelease, TclArgumentGet):
 	* generic/tclCompile.c (EnterCmdWordIndex, TclCleanupByteCode,
 	(TclInitCompileEnv, TclCompileScript):
-	* generic/tclCompile.h (ExtCmdLoc): 
+	* generic/tclCompile.h (ExtCmdLoc):
 	* generic/tclExecute.c (TclExecuteByteCode):
 	* generic/tclInt.h (ExtIndex, CFWordBC):
 	* tests/info.test (info-39.0):
@@ -321,7 +325,7 @@
 	sharing better. The code here is much simpler (trimmed down) compared
 	to the head as the 8.5 branch is not bytecode compiling whole files,
 	and doesn't compile eval'd code either.
-	
+
 	Reworked the handling of literal command arguments in bytecode to be
 	saved (compiler) and used (execution) per command (see the
 	TCL_INVOKE_STK* instructions), and not per the whole bytecode.  This
@@ -372,7 +376,7 @@
 	                        to the Tcl caller in the event of a syntax
 	                        error, so did so.
 	* generic/tclDate.c: bison 2.3
-	
+
 2006-06-08  Kevin B. Kenny  <kennykb@acm.org>
 
 	* library/tzdata/Asia/Dhaka: New DST rule for Bangladesh.
@@ -396,7 +400,7 @@
 
 	* library/tzdata/Africa/Cairo:
 	* library/tzdata/Asia/Amman: Olson's tzdata2009h.
-	
+
 2009-05-29  Andreas Kupries  <andreask@activestate.com>
 
 	* library/platform/platform.tcl: Fixed handling of cpu ia64,
@@ -409,7 +413,7 @@
 	* generic/tclObj.c (Tcl_GetCommandFromObj): fix for bug [2785893],
 	insure that a command in a deleted namespace cannot be found
 	through a cached name.
-	
+
 2009-05-06  Don Porter  <dgp@users.sourceforge.net>
 
 	* generic/tclCmdMZ.c:   Improve overflow error message from
@@ -456,7 +460,7 @@
 	* unix/tcl.m4:	Removed -Wno-implicit-int from CFLAGS_WARNING.
 
 2008-04-14  Kevin B. Kenny  <kennykb@acm.org>
-	
+
 	* library/tzdata/Asia/Karachi: Updated rules for Pakistan Summer
 				       Time (Olson's tzdata2009f)
 
@@ -496,7 +500,7 @@
 					want to run the tcl event loop via
 					Tcl_ServiceModeHook(TCL_SERVICE_ALL).
 
-	* macosx/tclMacOSXNotify.c:	add CFRunLoop based Tcl_Sleep() and 
+	* macosx/tclMacOSXNotify.c:	add CFRunLoop based Tcl_Sleep() and
 	* unix/tclUnixChan.c:		TclUnixWaitForFile() implementations
 	* unix/tclUnixEvent.c:		and disable select() based ones in
 					CoreFoundation builds.
@@ -521,7 +525,7 @@
 
 	* tools/tclZIC.tcl:	Always emit Unix-style line terminators.
 	* library/tzdata:	Olson's tzdata2009e.
-	
+
 2009-04-09  Don Porter  <dgp@users.sourceforge.net>
 
 	* library/http/http.tcl:	Backport http 2.7.3 from HEAD for
@@ -625,7 +629,7 @@
 	* unix/tcl.m4: Corrected a typo ($(SHLIB_VERSION) should be
 	${SHLIB_VERSION}).
 	* unix/configure: Autoconf 2.59
-	
+
 2009-01-21  Andreas Kupries  <andreask@activestate.com>
 
 	* generic/tclIORChan.c (ReflectClose): Fix for [Bug 2458202].
@@ -642,7 +646,7 @@
 	packagers to customize SHLIB_VERSION on BSD-derived systems.
 	Thanks to Stuart Cassoff for [Patch 907924].
 	* unix/configure: Autoconf 2.59
-	
+
 2009-01-09  Don Porter  <dgp@users.sourceforge.net>
 
 	* generic/tclStringObj.c (STRING_SIZE):	Corrected failure to limit
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 77e9a31..90b6c21 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.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: tclBasic.c,v 1.295.2.13 2009/08/25 21:01:05 andreas_kupries Exp $
+ * RCS: @(#) $Id: tclBasic.c,v 1.295.2.14 2009/10/31 20:25:32 dkf Exp $
  */
 
 #include "tclInt.h"
@@ -6800,7 +6800,7 @@ ExprRoundFunc(
     int type;
 
     if (objc != 2) {
-	MathFuncWrongNumArgs(interp, 1, objc, objv);
+	MathFuncWrongNumArgs(interp, 2, objc, objv);
 	return TCL_ERROR;
     }