Changeset d143dd9 in tol for toltcl/generic/tolaccess.cpp

Timestamp:

Jan 23, 2009, 12:09:05 PM (18 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

117926d

Parents:

1f5af94

Message:

use FullName instead of Name

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@455 be4846ae-f051-483a-831f-b64e7d08527f

File:

• toltcl/generic/tolaccess.cpp (modified) (8 diffs)

toltcl/generic/tolaccess.cpp

@@ -67 +67 @@
 
 static
-const BText& GetObjectName(const BSyntaxObject * so)
-{
-  return so->HasName() ? so->Name() : so->LocalName();
+BText GetObjectName(const BSyntaxObject * so)
+{
+  return so->HasName() ? so->FullName() : so->LocalName();
 }
 
@@ -75 +75 @@
 void GetName( const BSyntaxObject * so, BText & res )
 {
-  res = so->Name();
+  res = so->FullName();
 }
 
@@ -304 +304 @@
     /* OBJECT NAME */
 //  btxt = so->Identify();
-    btxt = GetObjectName(so);
+    GetName( so, btxt );
     Tcl_ExternalToUtfDString(NULL,btxt,-1,&dstr);
     robjv[1] = Tcl_NewStringObj(Tcl_DStringValue(&dstr),-1);
@@ -920 +920 @@
     
     //btxt = syn_i->Identify();
-    btxt = GetObjectName(syn_i);
+    GetName( syn_i, btxt );
     Tcl_ExternalToUtfDString(NULL,btxt,-1,&dstr);
     if (Tcl_IsShared(datav[ARG_NAME])) {
@@ -1102 +1102 @@
   
   //items[IT_NAME] = Tcl_NewStringObj(tol_obj->Identify(),-1);
-  items[IT_NAME] = Tcl_NewStringObj(GetObjectName(tol_obj),-1);
+  BText tmp;
+  GetName( tol_obj, tmp );
+  items[IT_NAME] = Tcl_NewStringObj(tmp.Buffer(),-1);
   Rows = theMat.Rows();
   Cols = theMat.Columns();
@@ -1207 +1209 @@
 
   //tmp = tms->Identify();
-  tmp = GetObjectName(tms);
+  GetName(tms, tmp);
   obj_array[0] = Tcl_NewStringObj(tmp,-1);
   for ( int i = 1; i < length; i++ ) {
@@ -1558 +1560 @@
       // function name
       Tcl_DStringInit(&dstr);
-      Tcl_ExternalToUtfDString(NULL, opr->Name(), -1, &dstr); 
+      Tcl_ExternalToUtfDString(NULL, opr->FullName(), -1, &dstr); 
       Tcl_DStringAppend(&dstr_info, Tcl_DStringValue(&dstr), -1);
       Tcl_DStringFree(&dstr);
@@ -1728 +1730 @@
     
   /* NAME */
-  BText synname(GetObjectName(var));
+  BText synname;
+  
+  GetName(var, synname);
   Tcl_ExternalToUtfDString(NULL,synname,-1,&dstr);
   info[1] = Tcl_NewStringObj(Tcl_DStringValue(&dstr), -1);