ChangeLogTag: Sat Feb 11 000:26:18 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu>

6 files changed, 57 insertions, 52 deletions

diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp
index 71793021564..7283af70e0b 100644
--- a/TAO/TAO_IDL/ast/ast_decl.cpp
+++ b/TAO/TAO_IDL/ast/ast_decl.cpp
@@ -86,6 +86,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "global_extern.h"
 #include "nr_extern.h"
 #include "utl_identifier.h"
+#include "utl_string.h"
 #include "utl_scope.h"
 #include "utl_err.h"
 #include "ace/OS_NS_stdio.h"
@@ -133,7 +134,6 @@ AST_Decl::AST_Decl (void)
     pd_defined_in (0),
     pd_node_type (NT_module),
     pd_line (-1),
-    pd_file_name (0),
     pd_local_name (0),
     pd_original_local_name (0),
     pd_added (false),
@@ -161,7 +161,6 @@ AST_Decl::AST_Decl (NodeType nt,
                      : 0),
     pd_node_type (nt),
     pd_line (idl_global->lineno ()),
-    pd_file_name (idl_global->filename ()),
     pd_name (0),
     pd_local_name (n == 0 ? 0 : n->last_component ()->copy ()),
     pd_original_local_name (0),
@@ -174,6 +173,10 @@ AST_Decl::AST_Decl (NodeType nt,
     last_referenced_as_ (0),
     prefix_scope_ (0)
 {
+  // If this is the root node, the filename won't have been set yet.
+  UTL_String *fn = idl_global->filename ();
+  this->pd_file_name = (fn != 0 ? fn->get_string () : "");
+
   this->compute_full_name (n);
 
   char *prefix = 0;
@@ -1125,14 +1128,14 @@ AST_Decl::set_line (long l)
   this->pd_line = l;
 }
 
-UTL_String *
+ACE_CString
 AST_Decl::file_name (void)
 {
   return this->pd_file_name;
 }
 
 void
-AST_Decl::set_file_name (UTL_String *s)
+AST_Decl::set_file_name (ACE_CString s)
 {
   this->pd_file_name = s;
 }
diff --git a/TAO/TAO_IDL/ast/ast_interface.cpp b/TAO/TAO_IDL/ast/ast_interface.cpp
index 27f1889db0f..01dd4f7b78e 100644
--- a/TAO/TAO_IDL/ast/ast_interface.cpp
+++ b/TAO/TAO_IDL/ast/ast_interface.cpp
@@ -1328,7 +1328,7 @@ AST_Interface::redefine (AST_Interface *from)
   this->set_imported (idl_global->imported ());
   this->set_in_main_file (idl_global->in_main_file ());
   this->set_line (idl_global->lineno ());
-  this->set_file_name (idl_global->filename ());
+  this->set_file_name (idl_global->filename ()->get_string ());
   this->ifr_added_ = from->ifr_added_;
   this->ifr_fwd_added_ = from->ifr_fwd_added_;
 }
diff --git a/TAO/TAO_IDL/ast/ast_structure.cpp b/TAO/TAO_IDL/ast/ast_structure.cpp
index 371e713b0fe..dbcc25a7beb 100644
--- a/TAO/TAO_IDL/ast/ast_structure.cpp
+++ b/TAO/TAO_IDL/ast/ast_structure.cpp
@@ -74,6 +74,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ast_enum.h"
 #include "ast_enum_val.h"
 #include "ast_visitor.h"
+#include "utl_string.h"
 #include "utl_err.h"
 #include "utl_indenter.h"
 
@@ -692,7 +693,7 @@ AST_Structure::redefine (AST_Structure *from)
   this->set_imported (idl_global->imported ());
   this->set_in_main_file (idl_global->in_main_file ());
   this->set_line (idl_global->lineno ());
-  this->set_file_name (idl_global->filename ());
+  this->set_file_name (idl_global->filename ()->get_string ());
   this->ifr_added_ = from->ifr_added_;
   this->ifr_fwd_added_ = from->ifr_fwd_added_;
   this->fields_ = from->fields_;
diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h
index 5e7df502f84..ae56c2b8201 100644
--- a/TAO/TAO_IDL/include/ast_decl.h
+++ b/TAO/TAO_IDL/include/ast_decl.h
@@ -77,6 +77,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "utl_scoped_name.h"
 #include "idl_narrow.h"
 #include "ace/os_include/sys/os_types.h"
+#include "ace/SString.h"
 
 // This is for AIX w/IBM C++
 class Identifier;
@@ -183,8 +184,8 @@ public:
   long line (void);
   void set_line (long l);
 
-  UTL_String *file_name (void);
-  void set_file_name (UTL_String *s);
+  ACE_CString file_name (void);
+  void set_file_name (ACE_CString s);
 
   UTL_ScopedName *name (void);
 
@@ -325,7 +326,7 @@ private:
   long pd_line;
   // Line defined in.
 
-  UTL_String *pd_file_name;
+  ACE_CString pd_file_name;
   // What file defined in.
 
   UTL_ScopedName *pd_name;
diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h
index 850864965b5..d04e1597ba9 100644
--- a/TAO/TAO_IDL/include/idl_global.h
+++ b/TAO/TAO_IDL/include/idl_global.h
@@ -365,11 +365,11 @@ public:
   virtual UTL_String       *stripped_filename (void);   // Stripped filename
   virtual void             set_stripped_filename (UTL_String *);  // Set it
 
-  virtual bool         imported (void);             // Are we imported?
-  virtual bool         import (void);               // Is import on?
+  virtual bool             imported (void);             // Are we imported?
+  virtual bool             import (void);               // Is import on?
   virtual void             set_import (bool);       // Set it
 
-  virtual bool         in_main_file (void);         // Are we?
+  virtual bool             in_main_file (void);         // Are we?
   virtual void             set_in_main_file (bool); // Set it
 
   virtual const char       *prog_name (void);           // Invoked as..
diff --git a/TAO/TAO_IDL/util/utl_err.cpp b/TAO/TAO_IDL/util/utl_err.cpp
index ec6f3384581..f412e4c0d09 100644
--- a/TAO/TAO_IDL/util/utl_err.cpp
+++ b/TAO/TAO_IDL/util/utl_err.cpp
@@ -223,12 +223,12 @@ error_string (UTL_Error::ErrorCode c)
 static void
 idl_error_header (UTL_Error::ErrorCode c,
                   long lineno,
-                  UTL_String *s)
+                  ACE_CString s)
 {
   ACE_ERROR ((LM_ERROR,
               "%s: \"%s\", line %d: %s",
               idl_global->prog_name (),
-              s->get_string (),
+              s.c_str (),
               lineno == -1 ? idl_global->lineno () : lineno,
               error_string (c)));
 }
@@ -626,7 +626,7 @@ UTL_Error::syntax_error (IDL_GlobalData::ParseState ps)
 {
   idl_error_header (EIDL_SYNTAX_ERROR,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
               "%s\n",
               parse_state_to_error_message (ps)));
@@ -638,7 +638,7 @@ UTL_Error::error0 (UTL_Error::ErrorCode c)
 {
   idl_error_header (c,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
               "\n"));
   idl_global->set_err_count (idl_global->err_count () + 1);
@@ -650,7 +650,7 @@ UTL_Error::error1 (UTL_Error::ErrorCode c,
 {
   idl_error_header (c,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);;
   ACE_ERROR ((LM_ERROR,
               "\n"));
@@ -664,7 +664,7 @@ UTL_Error::error2 (UTL_Error::ErrorCode c,
 {
   idl_error_header (c,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   d1->name ()->dump (*ACE_DEFAULT_LOG_STREAM);;
   ACE_ERROR ((LM_ERROR,
               ", "));
@@ -682,7 +682,7 @@ UTL_Error::error3 (UTL_Error::ErrorCode c,
 {
   idl_error_header (c,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   d1->name ()->dump (*ACE_DEFAULT_LOG_STREAM);;
   ACE_ERROR ((LM_ERROR,
               ", "));
@@ -702,7 +702,7 @@ UTL_Error::warning0 (UTL_Error::ErrorCode c)
     {
       idl_error_header (c,
                         idl_global->lineno (),
-                        idl_global->filename ());
+                        idl_global->filename ()->get_string ());
       ACE_ERROR ((LM_ERROR,
                   "\n"));
     }
@@ -716,7 +716,7 @@ UTL_Error::warning1 (UTL_Error::ErrorCode c,
     {
       idl_error_header (c,
                         idl_global->lineno (),
-                        idl_global->filename ());
+                        idl_global->filename ()->get_string ());
       d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
       ACE_ERROR ((LM_ERROR,
                   "\n"));
@@ -732,7 +732,7 @@ UTL_Error::warning2 (UTL_Error::ErrorCode c,
     {
       idl_error_header (c,
                         idl_global->lineno (),
-                        idl_global->filename ());
+                        idl_global->filename ()->get_string ());
       d1->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
       ACE_ERROR ((LM_ERROR,
                   ", "));
@@ -752,7 +752,7 @@ UTL_Error::warning3 (UTL_Error::ErrorCode c,
     {
       idl_error_header (c,
                         idl_global->lineno (),
-                        idl_global->filename ());
+                        idl_global->filename ()->get_string ());
       d1->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
       ACE_ERROR ((LM_ERROR,
                   ", "));
@@ -772,7 +772,7 @@ UTL_Error::coercion_error (AST_Expression *v,
 {
   idl_error_header (EIDL_COERCION_FAILURE,
                     v->line (),
-                    v->file_name ());
+                    v->file_name ()->get_string ());
   v->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               " to %s\n",
@@ -786,7 +786,7 @@ UTL_Error::lookup_error (UTL_ScopedName *n)
 {
   idl_error_header (EIDL_LOOKUP_ERROR,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   n->dump (*ACE_DEFAULT_LOG_STREAM);;
   ACE_ERROR ((LM_ERROR,
               "\n"));
@@ -799,7 +799,7 @@ UTL_Error::version_number_error (char *n)
 {
   idl_error_header (EIDL_ILLEGAL_VERSION,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
               "%s\n",
               n));
@@ -812,7 +812,7 @@ UTL_Error::version_reset_error (void)
 {
   idl_error_header (EIDL_VERSION_RESET,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
               "\n"));
   idl_global->set_err_count (idl_global->err_count () + 1);
@@ -825,7 +825,7 @@ UTL_Error::id_reset_error (const char *o,
 {
   idl_error_header (EIDL_ID_RESET,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
               "%s, %s\n",
               o,
@@ -860,7 +860,7 @@ UTL_Error::inheritance_error (UTL_ScopedName *n,
 {
   idl_error_header (EIDL_CANT_INHERIT,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   n->dump (*ACE_DEFAULT_LOG_STREAM);;
   ACE_ERROR ((LM_ERROR,
               " attempts to inherit from "));
@@ -897,7 +897,7 @@ UTL_Error::supports_error (UTL_ScopedName *n,
 {
   idl_error_header (EIDL_CANT_SUPPORT,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   n->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               " attempts to support "));
@@ -913,7 +913,7 @@ UTL_Error::derived_supports_error (UTL_ScopedName *n)
 {
   idl_error_header (EIDL_CANT_SUPPORT,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
               "derived component or home "));
   n->dump (*ACE_DEFAULT_LOG_STREAM);
@@ -929,7 +929,7 @@ UTL_Error::abstract_inheritance_error (UTL_ScopedName *v,
 {
   idl_error_header (EIDL_CANT_INHERIT,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
               " abstract valuetype "));
   v->dump (*ACE_DEFAULT_LOG_STREAM);
@@ -948,7 +948,7 @@ UTL_Error::abstract_support_error (UTL_ScopedName *v,
 {
   idl_error_header (EIDL_CANT_SUPPORT,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
               " valuetype "));
   v->dump (*ACE_DEFAULT_LOG_STREAM);
@@ -967,7 +967,7 @@ UTL_Error::unconstrained_interface_expected (UTL_ScopedName *c,
 {
   idl_error_header (EIDL_CANT_SUPPORT,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
               " component or home "));
   c->dump (*ACE_DEFAULT_LOG_STREAM);
@@ -985,7 +985,7 @@ UTL_Error::concrete_supported_inheritance_error (UTL_ScopedName *v,
 {
   idl_error_header (EIDL_CANT_SUPPORT,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
               " valuetype "));
   v->dump (*ACE_DEFAULT_LOG_STREAM);
@@ -1005,7 +1005,7 @@ UTL_Error::eval_error (AST_Expression *v)
 {
   idl_error_header (EIDL_EVAL_ERROR,
                     v->line (),
-                    v->file_name ());
+                    v->file_name ()->get_string ());
   v->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               "\n"));
@@ -1018,7 +1018,7 @@ UTL_Error::incompatible_type_error (AST_Expression *v)
 {
   idl_error_header (EIDL_INCOMPATIBLE_TYPE,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   v->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               "\n"));
@@ -1052,7 +1052,7 @@ UTL_Error::interface_expected (AST_Decl *d)
 {
   idl_error_header (EIDL_INTERFACE_EXPECTED,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               "\n"));
@@ -1067,7 +1067,7 @@ UTL_Error::valuetype_expected (AST_Decl *d)
 {
   idl_error_header (EIDL_VALUETYPE_EXPECTED,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               "\n"));
@@ -1082,7 +1082,7 @@ UTL_Error::concrete_valuetype_expected (AST_Decl *d)
 {
   idl_error_header (EIDL_CONCRETE_VT_EXPECTED,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               "\n"));
@@ -1098,7 +1098,7 @@ UTL_Error::abstract_expected (AST_Decl *d)
 {
   idl_error_header (EIDL_ABSTRACT_EXPECTED,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               "\n"));
@@ -1114,7 +1114,7 @@ UTL_Error::eventtype_expected (AST_Decl *d)
 {
   idl_error_header (EIDL_EVENTTYPE_EXPECTED,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               "\n"));
@@ -1129,7 +1129,7 @@ UTL_Error::primary_key_error (AST_Decl *d)
 {
   idl_error_header (EIDL_PRIMARY_KEY_ERROR,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
               "primary key "));
   d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
@@ -1188,7 +1188,7 @@ UTL_Error::redef_error (char *b,
 {
   idl_error_header (EIDL_REDEF,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
               "\"%s\" and \"%s\"\n",
               b,
@@ -1203,7 +1203,7 @@ UTL_Error::name_case_error (char *b,
 {
   idl_error_header (EIDL_NAME_CASE_ERROR,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
               "\"%s\" and \"%s\"\n",
               b,
@@ -1219,7 +1219,7 @@ UTL_Error::name_case_warning (char *b,
     {
       idl_error_header (EIDL_NAME_CASE_WARNING,
                         idl_global->lineno (),
-                        idl_global->filename ());
+                        idl_global->filename ()->get_string ());
       ACE_ERROR ((LM_ERROR,
                   "\"%s\" and \"%s\"\n",
                   b,
@@ -1232,7 +1232,7 @@ UTL_Error::idl_keyword_error (char *n)
 {
   idl_error_header (EIDL_KEYWORD_ERROR,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
               "\"%s\"\n",
               n));
@@ -1246,7 +1246,7 @@ UTL_Error::idl_keyword_warning (char *n)
     {
       idl_error_header (EIDL_KEYWORD_WARNING,
                         idl_global->lineno (),
-                        idl_global->filename ());
+                        idl_global->filename ()->get_string ());
       ACE_ERROR ((LM_ERROR,
                   "\"%s\"\n",
                   n));
@@ -1296,7 +1296,7 @@ UTL_Error::fwd_decl_lookup (AST_Interface *d,
 {
   idl_error_header (EIDL_FWD_DECL_LOOKUP,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
               "trying to look up "));
   n->dump (*ACE_DEFAULT_LOG_STREAM);;
@@ -1331,7 +1331,7 @@ UTL_Error::not_a_type (AST_Decl *d)
 {
   idl_error_header (EIDL_NOT_A_TYPE,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   if (d == 0 || d->name () == 0)
     {
       ACE_ERROR ((LM_ERROR,
@@ -1353,7 +1353,7 @@ UTL_Error::back_end (long lineno,
 {
   idl_error_header (EIDL_BACK_END,
                     lineno,
-                    s);
+                    s->get_string ());
   ACE_ERROR ((LM_ERROR,
               "\n"));
   idl_global->set_err_count (idl_global->err_count () + 1);
@@ -1364,7 +1364,7 @@ UTL_Error::illegal_infix (void)
 {
   idl_error_header (EIDL_ILLEGAL_INFIX,
                     idl_global->lineno (),
-                    idl_global->filename ());
+                    idl_global->filename ()->get_string ());
   ACE_ERROR ((LM_ERROR,
               "\n"));
   idl_global->set_err_count (idl_global->err_count () + 1);