Changeset 3cb1b13c in tol

Timestamp:

May 24, 2017, 9:39:02 AM (9 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

18d02f2e

Parents:

86bad57

Message:

se corrige un error en la función Element con argumento opcional

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

File:

• tol/btol/bgrammar/spfuninst.cpp (modified) (4 diffs)

tol/btol/bgrammar/spfuninst.cpp

@@ -925 +925 @@
             }
           result = set.GetElement((BInt)Real(uIndex));
-          if (nb>=3)
+          if (!result && nb>=3)
             {
             if(oldEnabled)
@@ -932 +932 @@
               }
             result = GraAnything()->EvaluateTree(Branch(tre,3));
+            }
+          if(nb>=3)
+            {
+            if(oldEnabled)
+              {
+              BOut::Enable();
+              }
             }
           }
@@ -961 +968 @@
               }
             result = set.GetElement(Text(uIndex).String());
-            if (nb>=3)
+            if (!result && nb>=3)
               {
               if(oldEnabled)
@@ -968 +975 @@
                 }
               result = GraAnything()->EvaluateTree(Branch(tre,3));
+              }
+            if(nb>=3)
+              {
+              if(oldEnabled)
+                {
+                BOut::Enable();
+                }
               }
             }