tao_idl: Move exprtype_to_string into AST_Expression

3 files changed, 54 insertions, 52 deletions

diff --git a/TAO/TAO_IDL/ast/ast_expression.cpp b/TAO/TAO_IDL/ast/ast_expression.cpp
index 914774bea98..d14e551ed12 100644
--- a/TAO/TAO_IDL/ast/ast_expression.cpp
+++ b/TAO/TAO_IDL/ast/ast_expression.cpp
@@ -3321,3 +3321,54 @@ AST_Expression::set_n (UTL_ScopedName *new_n)
 {
   this->pd_n = new_n;
 }
+
+const char *
+AST_Expression::exprtype_to_string (ExprType t)
+{
+  switch (t) {
+  case AST_Expression::EV_short:
+    return "short";
+  case AST_Expression::EV_ushort:
+    return "unsigned short";
+  case AST_Expression::EV_long:
+    return "long";
+  case AST_Expression::EV_ulong:
+    return "unsigned long";
+  case AST_Expression::EV_float:
+    return "float";
+  case AST_Expression::EV_double:
+    return "double";
+  case AST_Expression::EV_char:
+    return "char";
+  case AST_Expression::EV_octet:
+    return "octet";
+  case AST_Expression::EV_bool:
+    return "boolean";
+  case AST_Expression::EV_string:
+    return "string";
+  case AST_Expression::EV_enum:
+    return "enum";
+  case AST_Expression::EV_void:
+    return "void";
+  case AST_Expression::EV_none:
+    return "none";
+  case AST_Expression::EV_wchar:
+    return "wchar";
+  case AST_Expression::EV_longlong:
+    return "longlong";
+  case AST_Expression::EV_ulonglong:
+    return "ulonglong";
+  case AST_Expression::EV_longdouble:
+    return "longdouble";
+  case AST_Expression::EV_wstring:
+    return "wstring";
+  case AST_Expression::EV_any:
+    return "any";
+  case AST_Expression::EV_object:
+    return "object";
+  case AST_Expression::EV_fixed:
+    return "fixed";
+  default:
+    return "<UNKNOWN TYPE>";
+  }
+}
diff --git a/TAO/TAO_IDL/include/ast_expression.h b/TAO/TAO_IDL/include/ast_expression.h
index 87798bea6f4..521aed16203 100644
--- a/TAO/TAO_IDL/include/ast_expression.h
+++ b/TAO/TAO_IDL/include/ast_expression.h
@@ -290,6 +290,8 @@ public:
   // Accessor for the member.
   AST_Param_Holder *param_holder (void) const;
 
+  static const char *exprtype_to_string (ExprType t);
+
 protected:
   // Evaluate different sets of operators.
   AST_ExprValue *eval_bin_op (EvalKind ek);
diff --git a/TAO/TAO_IDL/util/utl_err.cpp b/TAO/TAO_IDL/util/utl_err.cpp
index 1eb4e9f91be..832f70fb8cb 100644
--- a/TAO/TAO_IDL/util/utl_err.cpp
+++ b/TAO/TAO_IDL/util/utl_err.cpp
@@ -316,57 +316,6 @@ idl_warning_header (UTL_Error::ErrorCode c, AST_Decl *node = 0)
 }
 ///}
 
-// Convert the type of an AST_Expression to a char *.
-static const char *
-exprtype_to_string (AST_Expression::ExprType t)
-{
-  switch (t) {
-  case AST_Expression::EV_short:
-    return "short";
-  case AST_Expression::EV_ushort:
-    return "unsigned short";
-  case AST_Expression::EV_long:
-    return "long";
-  case AST_Expression::EV_ulong:
-    return "unsigned long";
-  case AST_Expression::EV_float:
-    return "float";
-  case AST_Expression::EV_double:
-    return "double";
-  case AST_Expression::EV_char:
-    return "char";
-  case AST_Expression::EV_octet:
-    return "octet";
-  case AST_Expression::EV_bool:
-    return "boolean";
-  case AST_Expression::EV_string:
-    return "string";
-  case AST_Expression::EV_enum:
-    return "enum";
-  case AST_Expression::EV_void:
-    return "void";
-  case AST_Expression::EV_none:
-    return "none";
-  case AST_Expression::EV_wchar:
-    return "wchar";
-  case AST_Expression::EV_longlong:
-    return "longlong";
-  case AST_Expression::EV_ulonglong:
-    return "ulonglong";
-  case AST_Expression::EV_longdouble:
-    return "longdouble";
-  case AST_Expression::EV_wstring:
-    return "wstring";
-  case AST_Expression::EV_any:
-    return "any";
-  case AST_Expression::EV_object:
-    return "object";
-  case AST_Expression::EV_fixed:
-    return "fixed";
-  }
-  return 0;
-}
-
 // Convert a parse state into a possible error message
 static const char *
 parse_state_to_error_message (IDL_GlobalData::ParseState ps)
@@ -911,7 +860,7 @@ UTL_Error::coercion_error (AST_Expression *v,
   v->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               " to %C\n",
-              exprtype_to_string (t)));
+              AST_Expression::exprtype_to_string (t)));
 }
 
 // Report a failed name lookup attempt.