Changeset 664 for CMT/v1r25-branch/source/cmt_symbol.h

Timestamp:

Jan 13, 2014, 4:09:37 PM (10 years ago)

Author:

rybkin

Message:

merge -r 646:663 HEAD

Location:

CMT/v1r25-branch

Files:

• . (modified) (1 prop)
• source/cmt_symbol.h (modified) (6 diffs)

CMT/v1r25-branch/source/cmt_symbol.h

@@ -2 +2 @@
 // Copyright Christian Arnault LAL-Orsay CNRS
 // arnault@lal.in2p3.fr
+// Modified by Grigory Rybkin
 // See the complete license in cmt_license.txt "http://www.cecill.info". 
 //-----------------------------------------------------------
@@ -34 +35 @@
   int select_last () const;
   void show (const Symbol& symbol, const SymbolValue& value, bool& first_definition) const;
-  int print (const Symbol& symbol, const SymbolValue& value, bool& first_definition) const;
+  int print (const Symbol& symbol, const SymbolValue& value, bool& first_definition, ostream& out = cout) const;
 
   CommandType command_type;
@@ -89 +90 @@
 
   static void all_set ();
-  static void all_print (PrintMode mode);
+  static void all_print (PrintMode mode, ostream& out = cout);
+  //static void all_print (PrintMode mode);
   static void all_print_clean (PrintMode mode);
   static void check_all_paths ();
@@ -96 +98 @@
   static SymbolVector& symbols ();
   static SymbolMap& symbol_map ();
+  static SymbolMap& std_env_vars ();
   static Symbol& symbol (int index);
   static void clear_all ();
@@ -107 +110 @@
 
   static bool get_inhibit_display ();
+  static bool set_strip_path (const bool& strip_path);
 
 public:
@@ -118 +122 @@
 
   int print_clean (PrintMode mode);
-  int print (PrintMode mode);
+  int print (PrintMode mode, ostream& out = cout);
+  //int print (PrintMode mode);
   cmt_string build_macro_value (bool display_it = false) const;
   int print_macro (PrintMode mode, ostream& out = cout) const;