Changeset 0e896b7 in tol

Timestamp:

Mar 1, 2010, 4:30:46 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

e945583

Parents:

b2a343a

Message:

Adding default argument to Group function to use it when set is empty

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

File:

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

tol/btol/bgrammar/spfuninst.cpp

@@ -507 +507 @@
   else
   {
-    if(args.Card()==2)
+    if(args.Card()>=2)
     {
             uTxt = args[1];
             uSet = args[2];
-            if(uTxt && uSet && Set(uSet).Card())
+      
+            if(uTxt && uSet)
             {
-              BText txt  = uTxt->Dump();
+        BSet& set = Set(uSet);
+              BText txt = uTxt->Dump();
                                 txt = txt.SubString(1,txt.Length()-2);
               BStandardOperator* ope = (BStandardOperator*)gra->FindOperator(txt);
               if(ope)
               {
-                      BSet&  set  = Set(uSet);
-                      if(set.Card()>0) 
+                      if(set.Card()==0) 
+          {
+            if(args.Card()==3)
+            {
+                    result = args[3];
+            }
+            else
+            {
+              Error(I2("Cannot evaluate Group over empty set without "
+                       "a default value.",
+                                               "No sepuede evaluar Group sobre un conjunto vacío "
+                       "sin valor por defecto."));
+            }
+          }
+          else  
           {
                         BBool ok = BTRUE;
@@ -1959 +1974 @@
 
   AddInstance("Group",
-  I2("(Text function, Set s)",
-     "(Text función, Set s)"),
+  I2("(Text function, Set s [, Anything defaultForEmpty])",
+     "(Text función, Set s [, Anything defaultForEmpty])"),
   I2("Evaluates a function taking as arguments the elements of a set.\n\n"
      "Example:\n"