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

Timestamp:

Feb 24, 2012, 3:51:30 PM (15 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

578c841

Parents:

aedc343

Message:

refs #1449, including name of struct or class if the object is a Set or NameBlock, for (3.2)

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

File:

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

toltcl/generic/tolaccess.cpp

@@ -825 +825 @@
 }
 
+inline void SAVE_SET_STRING( Tcl_Obj **obj, const char* str )
+{
+  if (Tcl_IsShared( *obj ) ) {
+    Tcl_DecrRefCount( *obj );
+    *obj = Tcl_NewStringObj( str, -1 );
+    Tcl_IncrRefCount( *obj );
+  } else 
+    Tcl_SetStringObj( *obj, str,-1 );
+}
+
 class ContainerIterator
 {
@@ -1096 +1106 @@
   datav[ OBJ_SUBTYPE ]    = Tcl_NewStringObj( "subtype", -1 );
   datav[ OBJ_SUBTYPEV ]   = Tcl_NewObj( );
-  datav[ OBJ_STRUCT ]     = Tcl_NewStringObj( "struct", -1 );
+  datav[ OBJ_STRUCT ]     = Tcl_NewObj( );
   datav[ OBJ_STRUCTV ]    = Tcl_NewObj( );
 
@@ -1192 +1202 @@
         Tcl_IncrRefCount( datav[ OBJ_SUBTYPEV ] );
       } else
-        Tcl_SetIntObj( datav[ OBJ_SUBTYPEV ],set_i->SubType( ) );
+        Tcl_SetIntObj( datav[ OBJ_SUBTYPEV ], set_i->SubType( ) );
         
-      /* STRUCT INFO */
+      /* STRUCT OR CLASS INFO */
       // asume que dstr esta a longitud 0
-      if ( set_i->Struct( ) ) {
-        btxt = set_i->Struct( )->Name( );
-        Tcl_ExternalToUtfDString( NULL, btxt, -1, &dstr );
+      if ( syn_i->Grammar() == GraNameBlock() ) {
+        SAVE_SET_STRING( datav + OBJ_STRUCT, "class" );
+        const BNameBlock& nb = ((BUserNameBlock*)(syn_i))->Contens();
+        const BClass* cls = nb.Class( );
+        if ( cls ) {
+          btxt = cls->FullName();
+          Tcl_ExternalToUtfDString( NULL, btxt, -1, &dstr );
+        }
+      } else {
+        SAVE_SET_STRING( datav + OBJ_STRUCT, "struct" );
+        if ( set_i->Struct( ) ) {
+          btxt = set_i->Struct( )->Name( );
+          Tcl_ExternalToUtfDString( NULL, btxt, -1, &dstr );
+        }
       }
-      SAVE_SET_STRING( datav + OBJ_PATHV, &dstr ); 
+      SAVE_SET_STRING( datav + OBJ_STRUCTV, &dstr ); 
       Tcl_DStringFree( &dstr );
       datac = NUM_OBJS;
@@ -2248 +2269 @@
 }
 
-/* ojo info debe tener espacio para 7 Tcl_Obj como maximo */
+/* ojo info debe tener espacio para 9 Tcl_Obj como maximo */
 /* retorna cuantos Tcl_Obj creo */
 
@@ -2320 +2341 @@
       
     /* STRUCTURE */
-    if ( ptrSet->Struct() ) {
+    if ( var->Grammar() == GraNameBlock() ) {
+      const BNameBlock& nb = ((BUserNameBlock*)(var))->Contens();
+      const BClass* cls = nb.Class( );
+      if ( cls ) {
+        info[8] = Tcl_NewStringObj( cls->FullName().String(), -1 );
+      } else {
+        info[8] = Tcl_NewStringObj( NULL, 0 );
+      }
+    } else if ( ptrSet->Struct() ) {
       BText btxt( ptrSet->Struct()->Name() );
       Tcl_ExternalToUtfDString(NULL,btxt,-1,&dstr);
       info[8] = Tcl_NewStringObj( Tcl_DStringValue(&dstr), -1 );
       Tcl_DStringFree( &dstr );
-    } else
+    } else {
       info[8] = Tcl_NewStringObj( NULL, 0 );
+    }
     infoc = 9;
   } else