Changeset a422cc8 in tol

Timestamp:

Nov 11, 2009, 3:05:01 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

6c9c9f7

Parents:

3a8f94f

Message:

Fixes #782

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

File:

• tol/btol/bgrammar/str.cpp (modified) (2 diffs)

tol/btol/bgrammar/str.cpp

@@ -611 +611 @@
       obj = set[n+1];
       fld = &(*field_)[n];
-      ok = obj && (fld->Grammar()==obj->Grammar());
+      ok = obj && ((fld->Grammar()==GraAnything()) || 
+                   (fld->Grammar()==obj->Grammar()));
       if(ok)
       {
@@ -621 +622 @@
                  " cuando se encontro el objeto de tipo")+" "+
               obj->Grammar()->Name()+" "+
-              I2("without structure or with onother one",
+              I2("without structure or with another one",
                  "sin estructura o con otra distinta")+" "+
-              I2("at element number ", "en el el elemento número ")+(n+1));
+              I2("at element number ", "en el elemento número ")+(n+1));
           ok = false;
         }