Changeset d072dc9 in tol

Timestamp:

Mar 27, 2012, 5:39:32 PM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

7427dd4c

Parents:

318feeb

Message:

Fixes #1491

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

Location:

tol

Files:

• btol/bgrammar/str.cpp (modified) (4 diffs)
• init.cpp (modified) (1 diff)

tol/btol/bgrammar/str.cpp

@@ -35 +35 @@
 #include <tol/tol_bgrammar.h>
 #include <tol/tol_bsymboltable.h>
+#include <tol/tol_btxtgra.h>
 #include <tol/tol_bsetgra.h>
 #include <tol/tol_bcodgra.h>
@@ -40 +41 @@
 #include <tol/tol_bclass.h>
 
+static BStruct* strStructFieldInfo_  = NULL;
 
 #ifdef CATCH_NON_STANDARD_STRUCT
@@ -240 +242 @@
 # define TRACE_SHOW_STRUCT_STEP(fun,status,pos,step)
 #endif
+
 
 //--------------------------------------------------------------------
@@ -725 +728 @@
   return(ok);
 }
+
+//--------------------------------------------------------------------
+DeclareContensClass(BSet, BSetTemporary, BStructFields);
+DefExtOpr(1, BStructFields, "StructFields", 1, 1, "Text",
+ "(Text className)",
+ I2("Returns a set with a register of information about each field "
+    " on a structure. The information is returned using structure\n",
+    "Devuelve un conjunto con un registro de información acerca "
+    "de cada uno de los campos de una estructura. La "
+    "información se devuelve usando la estructura:\n")+
+    "  @StructFieldInfo { \n"
+    "    Text Type,\n"
+    "    Text Name,\n"
+    "    Text Description }\n",
+ BOperClassify::System_);
+//--------------------------------------------------------------------
+void BStructFields::CalcContens()
+//--------------------------------------------------------------------
+{
+  static BStruct* strStructFieldInfo_ = NULL;
+  if(!strStructFieldInfo_)
+  {
+    strStructFieldInfo_ = FindStruct("@StructFieldInfo");
+  }
+  assert(strStructFieldInfo_);
+  const BText& strName = Text(Arg(1));
+  BStruct* str = FindStruct(strName);
+  if(!str) { return; }
+  int i;
+  contens_.PrepareStore(str->Size());
+  for(i=0; i<str->Size(); i++)
+  {
+    BField& fld = (*str)[i];
+    BSet reg;
+    reg.PrepareStore(3);
+    reg.AddElement(new BContensText("",fld.GetType(),""));
+    reg.AddElement(new BContensText("",fld.Name(),""));
+    reg.AddElement(new BContensText("","",""));
+    reg.PutStruct(strStructFieldInfo_);
+    contens_.AddElement(new BSetTuple("", reg));
+  }
+}

tol/init.cpp

@@ -985 +985 @@
 
   InitRefStructs();
+
+  BStruct* strStructFieldInfo_  = NewStruct("@StructFieldInfo", 
+    "Text:Type,"
+    "Text:Name,"
+    "Text:Description");
 
   TOLHasBeenInitialized_ = true;