Changeset a67249e in tol

Timestamp:

Oct 19, 2015, 3:51:37 PM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

bb5bbac

Parents:

b567d4c

Message:

fixes #1884, un campo con tipo Anything admite cualquier valor

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

File:

• tol/btol/set_type/set.cpp (modified) (2 diffs)

tol/btol/set_type/set.cpp

@@ -327 +327 @@
 {
   if(arg && str)
-  {
+    {
     BList* argLst = arg;
     BList* lst    = NIL;
     BList* aux    = NIL;
     for(BInt n=0; (n<str->Size()); n++)
-    {
+      {
 //    Std(BText("\nRobStruct Field ")+n+" "+(*str)[n].Name()+" -> ");
       if(argLst)
+        {
+        BSyntaxObject* obj = (BSyntaxObject*)Car(argLst);
+        BText name = obj->Name();
+        BText desc = obj->Description();
+        BGrammar * gra_n = (*str)[n].Grammar();
+        if( gra_n != GraAnything() &&
+            gra_n !=obj->Grammar() )
+          {
+          BText id = name;
+          if(!id.HasName()) { id = obj->Dump(); }
+          if(!id.HasName()) { id = desc; }
+          Error(id + I2(" is not an object of type ",
+                        " no es un objeto de tipo ") +
+                (*str)[n].Grammar()->Name()+ ".\n "+
+                I2("Cannot create field ","No se puede crear el campo")+
+                (*str)[n].Name()+
+                I2(" of structure "," de la estructura ")+str->Name());
+          }
+        LstFastAppend(lst,aux,obj);
+        argLst = Cdr(argLst);
+        }
+      else
+        {
+        Error(I2("Too few parameters to create a set with structure ",
+                 "Faltan argumentos para crear un conjunto con estructura ")+
+              str->Name());
+        }
+    }
+    if(argLst)
       {
-              BSyntaxObject* obj = (BSyntaxObject*)Car(argLst);
-              BText name = obj->Name();
-              BText desc = obj->Description();
-              if((*str)[n].Grammar()!=obj->Grammar())
-              {
-                BText id = name;
-                if(!id.HasName()) { id = obj->Dump(); }
-                if(!id.HasName()) { id = desc; }
-                Error(id + I2(" is not an object of type ",
-                                          " no es un objeto de tipo ") +
-                           (*str)[n].Grammar()->Name()+ ".\n "+
-                           I2("Cannot create field ","No se puede crear el campo")+
-                              (*str)[n].Name()+
-                           I2(" of structure "," de la estructura ")+str->Name());
-              }
-        LstFastAppend(lst,aux,obj);
-              argLst = Cdr(argLst);
+      Error(I2("Too mach parameters to create a set with structure ",
+               "Sobran argumentos para crear un conjunto con estructura ")+
+            str->Name());
       }
-      else
-      {
-              Error(I2("Too few parameters to create a set with structure ",
-                             "Faltan argumentos para crear un conjunto con estructura ")+
-                    str->Name());
-      }
-    }
-    if(argLst)
-    {
-            Error(I2("Too mach parameters to create a set with structure ",
-                           "Sobran argumentos para crear un conjunto con estructura ")+
-                  str->Name());
-    }
     DESTROY(arg);
     RobElement(lst);
@@ -373 +375 @@
   }
   else
-  {
+    {
     RobElement(arg);
     PutSubType(sub);
-  }
+    }
 }