[680503]: Ensure we make the shadow delegate even if there is no argument to the class constructor.

2 files changed, 23 insertions, 2 deletions

diff --git a/generic/tclOOBasic.c b/generic/tclOOBasic.c
index 5f21203..5fab092 100644
--- a/generic/tclOOBasic.c
+++ b/generic/tclOOBasic.c
@@ -89,13 +89,14 @@ TclOO_Class_Constructor(
 	Tcl_WrongNumArgs(interp, Tcl_ObjectContextSkippedArgs(context), objv,
 		"?definitionScript?");
 	return TCL_ERROR;
-    } else if (objc == Tcl_ObjectContextSkippedArgs(context)) {
-	return TCL_OK;
     }
 
     /*
      * Make the class definition delegate. This is special; it doesn't reenter
      * here (and the class definition delegate doesn't run any constructors).
+     * 
+     * This needs to be done before consideration of whether to pass the script
+     * argument to [oo::define]. [Bug 680503]
      */
 
     nameObj = Tcl_NewStringObj(oPtr->namespacePtr->fullName, -1);
@@ -105,6 +106,14 @@ TclOO_Class_Constructor(
     Tcl_DecrRefCount(nameObj);
 
     /*
+     * If there's nothing else to do, we're done.
+     */
+
+    if (objc == Tcl_ObjectContextSkippedArgs(context)) {
+	return TCL_OK;
+    }
+
+    /*
      * Delegate to [oo::define] to do the work.
      */
 
diff --git a/tests/ooUtil.test b/tests/ooUtil.test
index 9e1de8f..709089d 100644
--- a/tests/ooUtil.test
+++ b/tests/ooUtil.test
@@ -177,6 +177,18 @@ test ooUtil-1.9 {TIP 478: classmethod in safe child interp} -setup {
 } -cleanup {
     interp delete $safeinterp
 } -result {{::Table called with arguments: foo bar} {}}
+test ooUtil-1.10.1 {Bug 680503: classmethod shouldn't require create body} -body {
+    oo::class create C
+    oo::define C {classmethod cm {} {}}
+} -cleanup {
+    catch {C destroy}
+} -result {}
+test ooUtil-1.10.2 {Bug 680503: case that worked} -body {
+    oo::class create C {}
+    oo::define C {classmethod cm {} {}}
+} -cleanup {
+    catch {C destroy}
+} -result {}
 
 test ooUtil-2.1 {TIP 478: callback generation} -setup {
     oo::class create parent