Changeset d6065b5 in tol

Timestamp:

Jun 10, 2009, 4:07:24 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

510f3f8

Parents:

3109e3a

Message:

Allowing type NameBlock or Set por argument optArgs of function getOptArg

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

File:

• tol/stdlib/general/various/_tools.tol (modified) (1 diff)

tol/stdlib/general/various/_tools.tol

@@ -49 +49 @@
 
 ////////////////////////////////////////////////////////////////////////////////
-  Anything getOptArg(Set optArgs, Text name, Anything defValue)
+  Anything getOptArg(Anything optArgs, Text name, Anything defValue)
 ////////////////////////////////////////////////////////////////////////////////
 {
-  If(!Card(optArgs), defValue,
-  {
-    Real Do If(Card(optArgs),!HasIndexByName(optArgs),SetIndexByName(optArgs));
-    Real idx = FindIndexByName(optArgs,name);
-    If(!idx, defValue, optArgs[idx])
-  })
+  Text g = Grammar(optArgs);
+  Case(
+    g=="Set",
+    If(!Card(optArgs), defValue,
+    {
+      Real Do If(Card(optArgs),!HasIndexByName(optArgs),SetIndexByName(optArgs));
+      Real idx = FindIndexByName(optArgs,name);
+      If(!idx, defValue, optArgs[idx])
+    }),
+    g=="NameBlock",
+    If(!ObjectExist("Anything","optArgs::"+name), defValue,
+       Eval("optArgs::"+name)),
+    1==1,
+    {
+      WriteLn("Non allowed type "+g+" for argument optArgs of function getOptArg",
+              "E")
+    }
+  )
 };
 ////////////////////////////////////////////////////////////////////////////////