tao_idl: Update Grammer File

- Fixed Seg Fault when compiling TAO caused by not setting action result
in string template actions in Grammer File.
- Support for referencing Enums and Constants from the annotation in the
annotation parameters.
- Unknown annotations, by default, will now just be a warning, and only
once per unique local annotation name. Added Options to warn about all,
error, and ignore them.

2 files changed, 26 insertions, 1 deletions

diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h
index d6525e8b5ea..89842d5a77e 100644
--- a/TAO/TAO_IDL/include/idl_global.h
+++ b/TAO/TAO_IDL/include/idl_global.h
@@ -300,6 +300,13 @@ public:
     , PS_AnnotationDeclSeen
   };
 
+  enum Unknown_Annotations {
+    UNKNOWN_ANNOTATIONS_WARN_ONCE,
+    UNKNOWN_ANNOTATIONS_WARN_ALL,
+    UNKNOWN_ANNOTATIONS_ERROR,
+    UNKNOWN_ANNOTATIONS_IGNORE
+  };
+
   // flags for types of declarations seen while parsing.
   bool abstract_iface_seen_;
   bool abstractbase_seen_;
@@ -407,7 +414,7 @@ public:
   bool in_eval_;
 
   /**
-   * Dump contructs defined using eval() if true.
+   * Dump constructs defined using eval() if true.
    */
   bool dump_builtins_;
 
@@ -422,6 +429,21 @@ public:
    */
   bool ignore_files_;
 
+  /**
+   * If true, silently ignore lookup errors.
+   */
+  bool ignore_lookup_errors_;
+
+  /**
+   * Reaction to unknown annotations
+   */
+  Unknown_Annotations unknown_annotations_;
+
+  /**
+   * Set of the local names of unkown annotations already seen
+   */
+  ACE_Unbounded_Set<Identifier> unknown_annotations_seen_;
+
   IDL_GlobalData (void);
   ~IDL_GlobalData (void);
 
diff --git a/TAO/TAO_IDL/include/utl_err.h b/TAO/TAO_IDL/include/utl_err.h
index 40e9e711583..ecd81b7a330 100644
--- a/TAO/TAO_IDL/include/utl_err.h
+++ b/TAO/TAO_IDL/include/utl_err.h
@@ -218,6 +218,9 @@ public:
   // Report a failed name lookup attempt.
   void lookup_error (UTL_ScopedName *n);
 
+  /// Report a failed name lookup attempt as a warning.
+  void lookup_warning (UTL_ScopedName *n);
+
   // Report an illegal #pragma version.
   void version_number_error (char *n);