Changeset acda90cd in tol

Timestamp:

Apr 5, 2011, 9:03:32 AM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

71f1fbb

Parents:

668d386

Message:

Refs #992
When there are unknown saved options TolConfigManager::MergeOptions also must merge default and saved options to avoid losing information after calling old versions.

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

File:

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

tol/stdlib/TolConfigManager/methods.tol

@@ -70 +70 @@
   Set a_set = NameBlockToSet(a);
   Set b_set = NameBlockToSet(b);
-  Set c_set = EvalSet(a_set, Anything(Anything element)
+  Real aGTb = Card(a_set) > Card(b_set);
+  Set c_set = If(aGTb, EvalSet(a_set, Anything(Anything element)
   {
     Text gra = Grammar(element);
@@ -82 +83 @@
     !ObjectExist(gra,"b::"+name),             
     {
+      If(showWarn,
       WriteLn("[MergeOptions] New configuration option \n"<<
       "\n  "+gra+" "+fullName+"="<<element+";\n\n"+
@@ -88 +90 @@
       "Then you must run this line to avoid this messages at future\n"+
       "\n  Real TolConfigManager::Save(?); \n\n"
-      ,"W");
-
-
+      ,"W"));
       element
     },
@@ -101 +101 @@
       MergeOptions(element,Eval(gra+" b::"+name),prefix+FullName(a)+"::")
     })
-  });
+  }),
+  EvalSet(b_set, Anything(Anything element)
+  {
+    Text gra = Grammar(element);
+    Text name = Name(element);
+    Case(
+    TextBeginWith(name, "_.autodoc.member."), 
+    {
+      element
+    },
+    !ObjectExist(gra,"a::"+name),             
+    {
+      element
+    },
+    gra!="NameBlock",                         
+    {
+      element
+    },
+    1==1,                                     
+    {
+      MergeOptions(element,Eval(gra+" b::"+name),prefix+FullName(a)+"::")
+    })
+  }));
   Eval(Name(b)+"=SetToNameBlock(c_set)")
 };