Changeset 136

Timestamp:

Jan 9, 2006, 6:55:56 PM (18 years ago)

Author:

arnault

Message:

Implement ticket #14 - See CL 292

Location:

CMT/HEAD

Files:

• ChangeLog (modified) (1 diff)
• mgr/cmt.nmake (modified) (1 diff)
• source/cmt_parser.cxx (modified) (2 diffs)
• source/cmt_project.cxx (modified) (2 diffs)
• source/cmt_symbol.cxx (modified) (11 diffs)
• source/cmt_symbol.h (modified) (2 diffs)

CMT/HEAD/ChangeLog

@@ +1 @@
+2006-01-09    <arnault@lal.in2p3.fr> 292
+
+        * source/cmt_project.cxx (create_project): Access CMTPROJECTPATH through 
+        symbol or getenv
+
+        * source/cmt_symbol.cxx (get_env_value): Make use of the global 
+        display inhibitor to ensure that temporary value builder will not
+        show unexpected output.
+
+        * source/cmt_symbol.h (class Symbol): Define a special accessor function for
+        retrieving the value a symbols associated with an env. var. (typically
+        for CMTPATH like variables)
+
+        * source/cmt_symbol.cxx (action): Trigger the Cmt::configure_cmt_path 
+        from CMTPROJECTPATH like CMTPATH
+
 2005-10-31  Christian Arnault  <arnault@lal.in2p3.fr> 291
 

CMT/HEAD/mgr/cmt.nmake

@@ -3 +3 @@
 #  Application cmt
 #
-#   Generated Sun Oct 30 10:05:41 2005  by ARNAULT
+#   Generated Mon Jan 09 18:51:50 2006  by ARNAULT
 #
 #====================================

CMT/HEAD/source/cmt_parser.cxx

@@ -559 +559 @@
   cmt_string s;
 
+  /*
   Symbol* symbol = Symbol::find ("CMTPATH");
   if (symbol != 0)
@@ -583 +584 @@
       s = CmtSystem::getenv ("CMTPATH");
     }
+  */
+
+  s = Symbol::get_env_value ("CMTPATH");
 
   {

CMT/HEAD/source/cmt_project.cxx

@@ -204 +204 @@
   sep = CmtSystem::path_separator ();
 
-  cmt_string cmtprojectpath = CmtSystem::getenv ("CMTPROJECTPATH");
+  cmt_string cmtprojectpath = Symbol::get_env_value ("CMTPROJECTPATH");
   CmtSystem::cmt_string_vector items;
   CmtSystem::split (cmtprojectpath, sep, items);
@@ -1427 +1427 @@
   //   +             the new project is then parsed ... etc...
 
-  cmt_string cmtprojectpath = CmtSystem::getenv ("CMTPROJECTPATH");
+  cmt_string cmtprojectpath = Symbol::get_env_value ("CMTPROJECTPATH");
+
   cmt_string sep;
   sep = CmtSystem::path_separator ();

CMT/HEAD/source/cmt_symbol.cxx

@@ -14 +14 @@
 #include "cmt_system.h"
 #include "cmt_database.h"
+
+// Global inhibitor of any display
+bool Symbol::m_inhibit_display = false;
 
 //-------------------------------------------------------------
@@ -981 +984 @@
       if (Cmt::get_current_access () == UserMode)
         {
+          /*
+            The following statements mean that some symbols are 
+            always private.
+            This list is hardcoded. This should be replaced by a
+            database of "private" symbols.
+           */
           if (name == "constituents") return;
           if (name == "constituentscclean") return;
@@ -1028 +1037 @@
 
       if (name == "CMTPATH")
+        {
+          Cmt::configure_cmt_path (use);
+        }
+      else if (name == "CMTPROJECTPATH")
         {
           Cmt::configure_cmt_path (use);
@@ -1942 +1955 @@
       SymbolValue& value = value_list.values[selected];
 
-      if (show_it)
+      if (show_it && !Symbol::get_inhibit_display())
         {
           value_list.show (symbol, value, first_definition);
@@ -2148 +2161 @@
       SymbolValue& value = value_list.values[selected];
           
-      if (show_it)
+      if (show_it && !Symbol::get_inhibit_display())
         {
           value_list.show (symbol, value, first_definition);
@@ -2499 +2512 @@
       SymbolValue& value = value_list.values[selected];
 
-      if (show_it)
+      if (show_it && !Symbol::get_inhibit_display())
         {
           value_list.show (symbol, value, first_definition);
@@ -2531 +2544 @@
       SymbolValue& value = value_list.values[selected];
 
-      if (show_it)
+      if (show_it && !Symbol::get_inhibit_display())
         {
           value_list.show (symbol, value, first_definition);
@@ -2592 +2605 @@
       SymbolValue& value = value_list.values[selected];
 
-      if (show_it)
+      if (show_it && !Symbol::get_inhibit_display())
         {
           value_list.show (symbol, value, first_definition);
@@ -2620 +2633 @@
       SymbolValue& value = value_list.values[selected];
 
-      if (show_it)
+      if (show_it && !Symbol::get_inhibit_display())
         {
           value_list.show (symbol, value, first_definition);
@@ -2745 +2758 @@
       SymbolValue& value = value_list.values[selected];
 
-      if (show_it)
+      if (show_it && !Symbol::get_inhibit_display())
         {
           value_list.show (symbol, value, first_definition);
@@ -3011 +3024 @@
 }
 
+//-------------------------------------------------------------
+cmt_string Symbol::get_env_value (const cmt_string& name)
+{
+  cmt_string s;
+
+  Symbol* symbol = Symbol::find (name);
+  if (symbol != 0)
+    {
+      m_inhibit_display = true;
+
+      s = symbol->build_macro_value ();
+      Symbol::expand (s);
+
+      m_inhibit_display = false;
+    }
+  else
+    {
+      s = CmtSystem::getenv (name);
+    }
+
+  return (s);
+}
+
+bool Symbol::get_inhibit_display ()
+{
+  return (m_inhibit_display);
+}
+

CMT/HEAD/source/cmt_symbol.h

@@ -101 +101 @@
   static bool check_tag_used (Tag* tag);
 
+  static cmt_string get_env_value (const cmt_string& name);
+
+  static bool get_inhibit_display ();
+
 public:
   Symbol ();
@@ -126 +130 @@
 
   int selected_value;        /* according to the last selected tag */
+
+private:
+
+  static bool m_inhibit_display;  // Global inhibitor of any display
+
 };