From 866443470a279af39a6e5239e9a87c5d7b9716f6 Mon Sep 17 00:00:00 2001 From: William Joye Date: Tue, 31 May 2016 13:42:43 -0400 Subject: Rename bltNsUtil.C to tkbltNsUtil.C --- src/bltNsUtil.C | 129 ------------------------------------------------------ src/tkbltNsUtil.C | 129 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+), 129 deletions(-) delete mode 100644 src/bltNsUtil.C create mode 100644 src/tkbltNsUtil.C diff --git a/src/bltNsUtil.C b/src/bltNsUtil.C deleted file mode 100644 index e1bd9f6..0000000 --- a/src/bltNsUtil.C +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Smithsonian Astrophysical Observatory, Cambridge, MA, USA - * This code has been modified under the terms listed below and is made - * available under the same terms. - */ - -/* - * Copyright 1997-2008 George A Howlett. - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -#ifdef __CYGWIN__ -extern "C" { -#include -} -#else -#include -#endif - -#include "bltNsUtil.h" - -using namespace Blt; - -Tcl_Namespace* Blt::GetCommandNamespace(Tcl_Command cmdToken) -{ - Command* cmdPtr = (Command*)cmdToken; - return (Tcl_Namespace *)cmdPtr->nsPtr; -} - -int Blt::ParseObjectName(Tcl_Interp* interp, const char *path, - Blt_ObjectName *namePtr, unsigned int flags) -{ - namePtr->nsPtr = NULL; - namePtr->name = NULL; - char* colon = NULL; - - /* Find the last namespace separator in the qualified name. */ - char* last = (char *)(path + strlen(path)); - while (--last > path) { - if ((*last == ':') && (*(last - 1) == ':')) { - last++; /* just after the last "::" */ - colon = last - 2; - break; - } - } - if (colon == NULL) { - namePtr->name = path; - if ((flags & BLT_NO_DEFAULT_NS) == 0) { - namePtr->nsPtr = Tcl_GetCurrentNamespace(interp); - } - return 1; /* No namespace designated in name. */ - } - - /* Separate the namespace and the object name. */ - *colon = '\0'; - if (path[0] == '\0') { - namePtr->nsPtr = Tcl_GetGlobalNamespace(interp); - } else { - namePtr->nsPtr = Tcl_FindNamespace(interp, (char *)path, NULL, - (flags & BLT_NO_ERROR_MSG) ? 0 : TCL_LEAVE_ERR_MSG); - } - /* Repair the string. */ *colon = ':'; - - if (namePtr->nsPtr == NULL) { - return 0; /* Namespace doesn't exist. */ - } - namePtr->name =last; - return 1; -} - -char* Blt::MakeQualifiedName(Blt_ObjectName *namePtr, Tcl_DString *resultPtr) -{ - Tcl_DStringInit(resultPtr); - if ((namePtr->nsPtr->fullName[0] != ':') || - (namePtr->nsPtr->fullName[1] != ':') || - (namePtr->nsPtr->fullName[2] != '\0')) { - Tcl_DStringAppend(resultPtr, namePtr->nsPtr->fullName, -1); - } - Tcl_DStringAppend(resultPtr, "::", -1); - Tcl_DStringAppend(resultPtr, (char *)namePtr->name, -1); - return Tcl_DStringValue(resultPtr); -} - -static Tcl_Namespace* NamespaceOfVariable(Var *varPtr) -{ - if (varPtr->flags & VAR_IN_HASHTABLE) { - VarInHash *vhashPtr = (VarInHash *)varPtr; - TclVarHashTable *vtablePtr; - - vtablePtr = (TclVarHashTable *)vhashPtr->entry.tablePtr; - return (Tcl_Namespace*)(vtablePtr->nsPtr); - } - return NULL; -} - -Tcl_Namespace* Blt::GetVariableNamespace(Tcl_Interp* interp, const char *path) -{ - Blt_ObjectName objName; - if (!ParseObjectName(interp, path, &objName, BLT_NO_DEFAULT_NS)) - return NULL; - - if (objName.nsPtr == NULL) { - Var*varPtr = (Var*)Tcl_FindNamespaceVar(interp, (char *)path, - (Tcl_Namespace *)NULL, - TCL_GLOBAL_ONLY); - if (varPtr) - return NamespaceOfVariable(varPtr); - - } - return objName.nsPtr; -} diff --git a/src/tkbltNsUtil.C b/src/tkbltNsUtil.C new file mode 100644 index 0000000..e1bd9f6 --- /dev/null +++ b/src/tkbltNsUtil.C @@ -0,0 +1,129 @@ +/* + * Smithsonian Astrophysical Observatory, Cambridge, MA, USA + * This code has been modified under the terms listed below and is made + * available under the same terms. + */ + +/* + * Copyright 1997-2008 George A Howlett. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#ifdef __CYGWIN__ +extern "C" { +#include +} +#else +#include +#endif + +#include "bltNsUtil.h" + +using namespace Blt; + +Tcl_Namespace* Blt::GetCommandNamespace(Tcl_Command cmdToken) +{ + Command* cmdPtr = (Command*)cmdToken; + return (Tcl_Namespace *)cmdPtr->nsPtr; +} + +int Blt::ParseObjectName(Tcl_Interp* interp, const char *path, + Blt_ObjectName *namePtr, unsigned int flags) +{ + namePtr->nsPtr = NULL; + namePtr->name = NULL; + char* colon = NULL; + + /* Find the last namespace separator in the qualified name. */ + char* last = (char *)(path + strlen(path)); + while (--last > path) { + if ((*last == ':') && (*(last - 1) == ':')) { + last++; /* just after the last "::" */ + colon = last - 2; + break; + } + } + if (colon == NULL) { + namePtr->name = path; + if ((flags & BLT_NO_DEFAULT_NS) == 0) { + namePtr->nsPtr = Tcl_GetCurrentNamespace(interp); + } + return 1; /* No namespace designated in name. */ + } + + /* Separate the namespace and the object name. */ + *colon = '\0'; + if (path[0] == '\0') { + namePtr->nsPtr = Tcl_GetGlobalNamespace(interp); + } else { + namePtr->nsPtr = Tcl_FindNamespace(interp, (char *)path, NULL, + (flags & BLT_NO_ERROR_MSG) ? 0 : TCL_LEAVE_ERR_MSG); + } + /* Repair the string. */ *colon = ':'; + + if (namePtr->nsPtr == NULL) { + return 0; /* Namespace doesn't exist. */ + } + namePtr->name =last; + return 1; +} + +char* Blt::MakeQualifiedName(Blt_ObjectName *namePtr, Tcl_DString *resultPtr) +{ + Tcl_DStringInit(resultPtr); + if ((namePtr->nsPtr->fullName[0] != ':') || + (namePtr->nsPtr->fullName[1] != ':') || + (namePtr->nsPtr->fullName[2] != '\0')) { + Tcl_DStringAppend(resultPtr, namePtr->nsPtr->fullName, -1); + } + Tcl_DStringAppend(resultPtr, "::", -1); + Tcl_DStringAppend(resultPtr, (char *)namePtr->name, -1); + return Tcl_DStringValue(resultPtr); +} + +static Tcl_Namespace* NamespaceOfVariable(Var *varPtr) +{ + if (varPtr->flags & VAR_IN_HASHTABLE) { + VarInHash *vhashPtr = (VarInHash *)varPtr; + TclVarHashTable *vtablePtr; + + vtablePtr = (TclVarHashTable *)vhashPtr->entry.tablePtr; + return (Tcl_Namespace*)(vtablePtr->nsPtr); + } + return NULL; +} + +Tcl_Namespace* Blt::GetVariableNamespace(Tcl_Interp* interp, const char *path) +{ + Blt_ObjectName objName; + if (!ParseObjectName(interp, path, &objName, BLT_NO_DEFAULT_NS)) + return NULL; + + if (objName.nsPtr == NULL) { + Var*varPtr = (Var*)Tcl_FindNamespaceVar(interp, (char *)path, + (Tcl_Namespace *)NULL, + TCL_GLOBAL_ONLY); + if (varPtr) + return NamespaceOfVariable(varPtr); + + } + return objName.nsPtr; +} -- cgit v0.12