Changeset aaa0a6f in tol

Timestamp:

Apr 11, 2011, 9:09:20 AM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

a000872

Parents:

d48f481

Message:

Refs #1159

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

File:

• tol/stdlib/TolConfigManager/methods.tol (modified) (6 diffs)

tol/stdlib/TolConfigManager/methods.tol

@@ -65 +65 @@
 Text _.autodoc.member.MergeOptions=
 "Merge default and user configurations";
-NameBlock MergeOptions(NameBlock a, NameBlock b, Text prefix)
+NameBlock MergeOptions(NameBlock default, NameBlock config, Text prefix)
 //////////////////////////////////////////////////////////////////////////////
 {
-  Set a_set = NameBlockToSet(a);
-  Set b_set = NameBlockToSet(b);
-  Real aGTb = Card(a_set) >= Card(b_set);
-//WriteLn("TRACE [MergeOptions] 1 a="<<Name(a)+"("<<Card(a_set)+") b="<<Name(b)+"("<<Card(b_set)+")  prefix="<<prefix);
-  Set c_set = If(aGTb, EvalSet(a_set, Anything(Anything element)
+  Set default_set = NameBlockToSet(default);
+  Set config_set = NameBlockToSet(config);
+  Real aGTb = Card(default_set) >= Card(config_set);
+//WriteLn("TRACE [MergeOptions] 1 default="<<Name(default)+"("<<Card(default_set)+") config="<<Name(config)+"("<<Card(config_set)+")  prefix="<<prefix);
+  Set c_set = If(aGTb, EvalSet(default_set, Anything(Anything element)
   {
     Text gra = Grammar(element);
     Text name = Name(element);
-    Text fullName = prefix+FullName(a)+"::"+name;
+    Text fullName = prefix+FullName(default)+"::"+name;
     Case(
     TextBeginWith(name, "_.autodoc.member."), 
@@ -82 +82 @@
       element
     },
-    !ObjectExist(gra,"b::"+name),             
+    !ObjectExist(gra,"config::"+name),             
     {
       WriteLn("[MergeOptions] New configuration option \n"<<
@@ -95 +95 @@
     gra!="NameBlock",                         
     {
-      Eval(gra+" b::"+name)
+      Eval(gra+" config::"+name)
     },
     1==1,                                     
     {
-      MergeOptions(element,Eval(gra+" b::"+name),prefix+FullName(a)+"::")
+      MergeOptions(element,Eval(gra+" config::"+name),prefix+FullName(default)+"::")
     })
   }),
-  EvalSet(b_set, Anything(Anything element)
+  EvalSet(config_set, Anything(Anything element)
   {
     Text gra = Grammar(element);
@@ -111 +111 @@
       element
     },
-    !ObjectExist(gra,"a::"+name),             
+    !ObjectExist(gra,"default::"+name),             
     {
       element
@@ -121 +121 @@
     1==1,                                     
     {
-      MergeOptions(Eval(gra+" a::"+name),element,prefix+FullName(a)+"::")
+      MergeOptions(Eval(gra+" default::"+name),element,prefix+FullName(default)+"::")
     })
   }));
-  Eval(Name(b)+"=SetToNameBlock(c_set)")
+  Eval(Name(config)+"=SetToNameBlock(c_set)")
 };
 
@@ -133 +133 @@
 //////////////////////////////////////////////////////////////////////////////
 {
-  WriteLn("TRACE [LoadConfig] 1");
+//WriteLn("TRACE [LoadConfig] 1");
   Case(!FileExist(_.path),
   {
-  WriteLn("TRACE [LoadConfig] 2.1");
+//WriteLn("TRACE [LoadConfig] 2.1");
     Real SaveConfig(Default);
     Include(_.path)[1]