re-generate tclOOScript.h, and fix testcase

3 files changed, 18 insertions, 18 deletions

diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c
index 6b57e6c..1e9b182 100644
--- a/generic/tclNamesp.c
+++ b/generic/tclNamesp.c
@@ -2376,7 +2376,7 @@ TclGetNamespaceForQualName(
 		    Tcl_Panic("Could not create namespace '%s'", nsName);
 		}
 	    } else {
-		/* 
+		/*
 		 * Namespace not found and was not created.
 		 * Remember last found namespace for TCL_FIND_IF_NOT_SIMPLE.
 		 */
@@ -2414,7 +2414,7 @@ TclGetNamespaceForQualName(
 
 	if ((nsPtr == NULL) && (altNsPtr == NULL)) {
 	    if (flags & TCL_FIND_IF_NOT_SIMPLE) {
-		/* 
+		/*
 		 * return last found NS, regardless simple name or not,
 		 * e. g. ::A::B::C::D -> ::A::B and C::D, if namespace C
 		 * cannot be found in ::A::B
diff --git a/generic/tclOOScript.h b/generic/tclOOScript.h
index eb6a96e..a763092 100644
--- a/generic/tclOOScript.h
+++ b/generic/tclOOScript.h
@@ -64,7 +64,7 @@ static const char *tclOOSetupScript =
 "\t\t\t\t\tlassign $link src\n"
 "\t\t\t\t\tset dst $src\n"
 "\t\t\t\t} else {\n"
-"\t\t\t\t\treturn -code error -errorcode {TCLOO CMDLINK FORMAT} \\\n"
+"\t\t\t\t\treturn -code error -errorcode {TCL OO CMDLINK_FORMAT} \\\n"
 "\t\t\t\t\t\t\"bad link description; must only have one or two elements\"\n"
 "\t\t\t\t}\n"
 "\t\t\t\tif {![string match ::* $src]} {\n"
@@ -142,10 +142,10 @@ static const char *tclOOSetupScript =
 "\t}\n"
 "\tdefine Slot {\n"
 "\t\tmethod Get -unexport {} {\n"
-"\t\t\treturn -code error -errorcode {TCLOO ABSTRACT_SLOT} \"unimplemented\"\n"
+"\t\t\treturn -code error -errorcode {TCL OO ABSTRACT_SLOT} \"unimplemented\"\n"
 "\t\t}\n"
 "\t\tmethod Set -unexport list {\n"
-"\t\t\treturn -code error -errorcode {TCLOO ABSTRACT_SLOT} \"unimplemented\"\n"
+"\t\t\treturn -code error -errorcode {TCL OO ABSTRACT_SLOT} \"unimplemented\"\n"
 "\t\t}\n"
 "\t\tmethod Resolve -unexport list {\n"
 "\t\t\treturn $list\n"
@@ -242,11 +242,11 @@ static const char *tclOOSetupScript =
 "\t\t\t\tset object [next {*}$args]\n"
 "\t\t\t\t::oo::objdefine $object {\n"
 "\t\t\t\t\tmethod destroy {} {\n"
-"\t\t\t\t\t\t::return -code error -errorcode {TCLOO SINGLETON} \\\n"
+"\t\t\t\t\t\t::return -code error -errorcode {TCL OO SINGLETON} \\\n"
 "\t\t\t\t\t\t\t\"may not destroy a singleton object\"\n"
 "\t\t\t\t\t}\n"
 "\t\t\t\t\tmethod <cloned> -unexport {originObject} {\n"
-"\t\t\t\t\t\t::return -code error -errorcode {TCLOO SINGLETON} \\\n"
+"\t\t\t\t\t\t::return -code error -errorcode {TCL OO SINGLETON} \\\n"
 "\t\t\t\t\t\t\t\"may not clone a singleton object\"\n"
 "\t\t\t\t\t}\n"
 "\t\t\t\t}\n"
@@ -265,22 +265,22 @@ static const char *tclOOSetupScript =
 "\t\t\t\tset prop [lindex $args $i]\n"
 "\t\t\t\tif {[string match \"-*\" $prop]} {\n"
 "\t\t\t\t\treturn -code error -level 2 \\\n"
-"\t\t\t\t\t\t-errorcode {TCLOO PROPERTY_FORMAT} \\\n"
+"\t\t\t\t\t\t-errorcode {TCL OO PROPERTY_FORMAT} \\\n"
 "\t\t\t\t\t\t\"bad property name \\\"$prop\\\": must not begin with -\"\n"
 "\t\t\t\t}\n"
 "\t\t\t\tif {$prop ne [list $prop]} {\n"
 "\t\t\t\t\treturn -code error -level 2 \\\n"
-"\t\t\t\t\t\t-errorcode {TCLOO PROPERTY_FORMAT} \\\n"
+"\t\t\t\t\t\t-errorcode {TCL OO PROPERTY_FORMAT} \\\n"
 "\t\t\t\t\t\t\"bad property name \\\"$prop\\\": must be a simple word\"\n"
 "\t\t\t\t}\n"
 "\t\t\t\tif {[string first \"::\" $prop] != -1} {\n"
 "\t\t\t\t\treturn -code error -level 2 \\\n"
-"\t\t\t\t\t\t-errorcode {TCLOO PROPERTY_FORMAT} \\\n"
+"\t\t\t\t\t\t-errorcode {TCL OO PROPERTY_FORMAT} \\\n"
 "\t\t\t\t\t\t\"bad property name \\\"$prop\\\": must not contain namespace separators\"\n"
 "\t\t\t\t}\n"
 "\t\t\t\tif {[string match {*[()]*} $prop]} {\n"
 "\t\t\t\t\treturn -code error -level 2 \\\n"
-"\t\t\t\t\t\t-errorcode {TCLOO PROPERTY_FORMAT} \\\n"
+"\t\t\t\t\t\t-errorcode {TCL OO PROPERTY_FORMAT} \\\n"
 "\t\t\t\t\t\t\"bad property name \\\"$prop\\\": must not contain parentheses\"\n"
 "\t\t\t\t}\n"
 "\t\t\t\tset realprop [string cat \"-\" $prop]\n"
@@ -376,10 +376,10 @@ static const char *tclOOSetupScript =
 "\t\t\t\t\tdict incr opt -level 2\n"
 "\t\t\t\t\treturn -options $opt $msg\n"
 "\t\t\t\t} on break {} {\n"
-"\t\t\t\t\treturn -code error -level 2 -errorcode {TCLOO SHENANIGANS} \\\n"
+"\t\t\t\t\treturn -code error -level 2 -errorcode {TCL OO SHENANIGANS} \\\n"
 "\t\t\t\t\t\t\"property getter for $prop did a break\"\n"
 "\t\t\t\t} on continue {} {\n"
-"\t\t\t\t\treturn -code error -level 2 -errorcode {TCLOO SHENANIGANS} \\\n"
+"\t\t\t\t\treturn -code error -level 2 -errorcode {TCL OO SHENANIGANS} \\\n"
 "\t\t\t\t\t\t\"property getter for $prop did a continue\"\n"
 "\t\t\t\t}\n"
 "\t\t\t}\n"
@@ -407,10 +407,10 @@ static const char *tclOOSetupScript =
 "\t\t\t\tdict incr opt -level 2\n"
 "\t\t\t\treturn -options $opt $msg\n"
 "\t\t\t} on break {} {\n"
-"\t\t\t\treturn -code error -level 2 -errorcode {TCLOO SHENANIGANS} \\\n"
+"\t\t\t\treturn -code error -level 2 -errorcode {TCL OO SHENANIGANS} \\\n"
 "\t\t\t\t\t\"property getter for $prop did a break\"\n"
 "\t\t\t} on continue {} {\n"
-"\t\t\t\treturn -code error -level 2 -errorcode {TCLOO SHENANIGANS} \\\n"
+"\t\t\t\treturn -code error -level 2 -errorcode {TCL OO SHENANIGANS} \\\n"
 "\t\t\t\t\t\"property getter for $prop did a continue\"\n"
 "\t\t\t}\n"
 "\t\t\treturn $value\n"
@@ -438,10 +438,10 @@ static const char *tclOOSetupScript =
 "\t\t\t\t\tdict incr opt -level 2\n"
 "\t\t\t\t\treturn -options $opt $msg\n"
 "\t\t\t\t} on break {} {\n"
-"\t\t\t\t\treturn -code error -level 2 -errorcode {TCLOO SHENANIGANS} \\\n"
+"\t\t\t\t\treturn -code error -level 2 -errorcode {TCL OO SHENANIGANS} \\\n"
 "\t\t\t\t\t\t\"property setter for $prop did a break\"\n"
 "\t\t\t\t} on continue {} {\n"
-"\t\t\t\t\treturn -code error -level 2 -errorcode {TCLOO SHENANIGANS} \\\n"
+"\t\t\t\t\treturn -code error -level 2 -errorcode {TCL OO SHENANIGANS} \\\n"
 "\t\t\t\t\t\t\"property setter for $prop did a continue\"\n"
 "\t\t\t\t}\n"
 "\t\t\t}\n"
diff --git a/tests/ooProp.test b/tests/ooProp.test
index 8120f88..fa3b1e7 100644
--- a/tests/ooProp.test
+++ b/tests/ooProp.test
@@ -768,7 +768,7 @@ test ooProp-4.1 {TIP 558: properties: error details} -setup {
 "property -x"
     (in definition script for class "::Point" line 1)
     invoked from within
-"oo::define Point {property -x}"} {TCLOO PROPERTY_FORMAT}}
+"oo::define Point {property -x}"} {TCL OO PROPERTY_FORMAT}}
 test ooProp-4.2 {TIP 558: properties: error details} -setup {
     oo::class create parent
     unset -nocomplain msg opt