Changeset 045d4c4 in tol

Timestamp:

Apr 12, 2011, 10:46:34 AM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

337eba4

Parents:

cf54c98

Message:

Fixes #1163
There was short-circuit for empty set's which disables error messages

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

File:

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

tol/btol/set_type/set.cpp

@@ -515 +515 @@
 //--------------------------------------------------------------------
 {
-  if(nameBlock_ && nameBlock_->EnsureIsAssigned())
-  {
-    Error(I2("Cannot access to NameBlock members with operator ",
-             "No se puede acceder a los miembros de un NameBlock con el operador ")+
-             "[...]\n"+
-             nameBlock_->Name()+"["+n+"]");
-    return NIL;
-  }
-  BSyntaxObject* result = operator[](n);
+  BSyntaxObject* result = NULL;
+  if(array_.Size()) 
+  { 
+    if(nameBlock_ && nameBlock_->EnsureIsAssigned())
+    {
+      Error(I2("Cannot access to NameBlock members with operator ",
+               "No se puede acceder a los miembros de un NameBlock con el operador ")+
+               "[...]\n"+
+               nameBlock_->Name()+"["+n+"]");
+      return NIL;
+    }
+    result = operator[](n);
+  }
   if(!result)
   {
@@ -626 +630 @@
 //--------------------------------------------------------------------
 {
-  if(!array_.Size()) { return(NULL); }
-  if(nameBlock_ && nameBlock_->EnsureIsAssigned())
-  {
-    Error(I2("Cannot access to NameBlock members with operator ",
-             "No se puede acceder a los miembros de un NameBlock con el operador ")+
-             "[\"...\"]\n"+
-             nameBlock_->Name()+"[\""+name+"\"]");
-    return NIL;
-  }
-  BSyntaxObject* result = operator[](name);
+  BSyntaxObject* result = NULL;
+  if(array_.Size()) 
+  { 
+    if(nameBlock_ && nameBlock_->EnsureIsAssigned())
+    {
+      Error(I2("Cannot access to NameBlock members with operator ",
+               "No se puede acceder a los miembros de un NameBlock con el operador ")+
+               "[\"...\"]\n"+
+               nameBlock_->Name()+"[\""+name+"\"]");
+      return NIL;
+    }
+    result = operator[](name);
+  }
   if(!result)
   {