Changeset ad30f62 in tol

Timestamp:

Mar 29, 2011, 2:53:48 PM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

67102d7

Parents:

37576df

Message:

Fixes #992

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

File:

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

tol/stdlib/TolConfigManager/methods.tol

@@ -65 +65 @@
 Text _.autodoc.member.MergeOptions=
 "Merge default and user configurations";
-NameBlock MergeOptions(NameBlock a, NameBlock b)
+NameBlock MergeOptions(NameBlock a, NameBlock b, Text prefix)
 //////////////////////////////////////////////////////////////////////////////
 {
@@ -74 +74 @@
     Text gra = Grammar(element);
     Text name = Name(element);
+    Text fullName = prefix+FullName(a)+"::"+name;
     Case(
     TextBeginWith(name, "_.autodoc.member."), 
@@ -81 +82 @@
     !ObjectExist(gra,"b::"+name),             
     {
-      WriteLn("[MergeOptions] New configuration option "<<gra+" "+name+
-      " will be set as default value \n"<<element ,"W");
+      WriteLn("[MergeOptions] New configuration option \n"<<
+      "\n  "+gra+" "+fullName+"="<<element+";\n\n"+
+      "You can use this default value or change it running \n"+
+      "\n  "+gra+" "+fullName+":= Copy(<new_value>); \n\n"+
+      "Then you must run this line to avoid this messages at future\n"+
+      "\n  Real TolConfigManager::Save(?); \n\n"
+      ,"W");
+
+
       element
     },
@@ -91 +99 @@
     1==1,                                     
     {
-      MergeOptions(element,Eval(gra+" b::"+name))
+      MergeOptions(element,Eval(gra+" b::"+name),prefix+FullName(a)+"::")
     })
   });
@@ -111 +119 @@
   {
     NameBlock Config = 
-      MergeOptions(TolConfigManager::Default, { Include(_.path)[1] });
+      MergeOptions(TolConfigManager::Default, { Include(_.path)[1] },
+     "TolConfigManager::Config::");
     Real SaveConfig(Config);
     Config