Merge pull request #723 from iguessthislldo/igtd/xtypes

Annotation support in the tao_idl front end

1 files changed, 74 insertions, 16 deletions

diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html
index a036c26e5e8..359f2475a19 100644
--- a/TAO/docs/compiler.html
+++ b/TAO/docs/compiler.html
@@ -69,7 +69,7 @@ these files:) <P>
        unlinked if not used.
   <LI> <B><EM>CIAO servant files</EM></B>, <EM>i.e.</EM>, <tt>*_svnt.h</tt>,
       and <tt>*_svnt.cpp</tt>. Optionally generated files, containing component
-      and home servant implementations, as well as factory fuctions to create
+      and home servant implementations, as well as factory functions to create
       components and homes.
   <LI> <B><EM>Executor IDL file</EM></B>, <EM>i.e.</EM>, <tt>*E.idl</tt>.
       IDL file containing local interfaces used for component and home
@@ -153,7 +153,7 @@ to the preprocessor (MVS, HPUX, etc.).  And case 3 isn't used at all,
 but is included as a default case.</P>
 
 <P>Since the default preprocessor may not always work when TAO_IDL is moved to
-another machine or used in cross-compilation, it can be overriden at runtime
+another machine or used in cross-compilation, it can be overridden at runtime
 by setting the environment variables TAO_IDL_PREPROCESSOR and
 TAO_IDL_PREPROCESSOR_ARGS.</P>
 
@@ -251,20 +251,40 @@ also receives other options that are specific to it.<p>
     <th>Remark</th>
   </tr>
   <tr><a NAME="u">
-    <td><tt>-u</tt></td>
+    <td><tt>-h</br>--help</br>-u</tt></td>
 
-    <td>The compiler prints out the options that are given below and exits
-        clean </td>
+    <td>The compiler prints out the arguments it supports and exits</td>
     <td>&nbsp;</td>
   </tr>
 
   <tr> <a NAME="V">
-    <td><tt>-V</tt></td>
+    <td><tt>-V</br>--version</tt></td>
 
     <td>The compiler printouts its version and exits</td>
     <td>&nbsp;</td>
   </tr>
 
+  <tr>
+    <td><tt>--idl-version VERSION</tt></td>
+
+    <td>Set the IDL version to use</td>
+    <td>&nbsp;</td>
+  </tr>
+
+  <tr>
+    <td><tt>--default-idl-version</tt></td>
+
+    <td>Prints the default IDL version for the compiler and exits</td>
+    <td>&nbsp;</td>
+  </tr>
+
+  <tr>
+    <td><tt>--list-idl-versions</tt></td>
+
+    <td>Lists IDL versions the compiler supports and exits</td>
+    <td>&nbsp;</td>
+  </tr>
+
   <tr><a name="Wb">
     <td><tt>-Wb,</tt><i>option_list</i></EM</TD></td>
 
@@ -329,7 +349,7 @@ also receives other options that are specific to it.<p>
         or <tt>extern</tt> typecode declaration in the generated stub code,
         this is needed for Windows and newer versions of gcc, which require special directives to
         export symbols from DLLs, otherwise the definition is just a
-        space on unix platforms. This option works only in conjuction with
+        space on Unix platforms. This option works only in conjunction with
         the -GA option, which generates Any operators and typecodes into a
         separate set of files.&nbsp;</td>
   </tr>
@@ -341,7 +361,7 @@ also receives other options that are specific to it.<p>
 
     <td>The compiler will generate code to include <i>include_path</i> at the
         top of the anyop file header, this is usually a good place to define the export
-        macro. This option works in conjuction with the -GA option, which generates Any
+        macro. This option works in conjunction with the -GA option, which generates Any
         operators and typecodes into a separate set of files.</td>
   </tr>
 
@@ -377,7 +397,7 @@ also receives other options that are specific to it.<p>
     <td><tt>exec_export_macro=</tt><i>macro_name</i></td>
 
     <td>The compiler will emit <i>macro_name</i> right after each <tt>class</tt>
-        or <tt>extern</tt> keyword in the generated CIAO executor implmentation header
+        or <tt>extern</tt> keyword in the generated CIAO executor implementation header
         (*_exec.h) files, if such
         code is being generated (see <tt>-Gex</tt> option below). These macros
         are needed for Windows and newer versions of gcc, which require special directives to
@@ -401,7 +421,7 @@ also receives other options that are specific to it.<p>
     <td><tt>conn_export_macro=</tt><i>macro_name</i></td>
 
     <td>The compiler will emit <i>macro_name</i> right after each <tt>class</tt>
-        or <tt>extern</tt> keyword in the generated CIAO connector implmentation header
+        or <tt>extern</tt> keyword in the generated CIAO connector implementation header
         (*_conn.h) files, if such
         code is being generated (see <tt>-Gcn</tt> option below). These macros
         are needed for Windows and newer versions of gcc, which require special directives to
@@ -556,10 +576,33 @@ also receives other options that are specific to it.<p>
     <td>&nbsp;</td>
   </tr>
 
+  <tr>
+    <td><tt>--syntax-only</tt></td>
+
+    <td>Parse input files, but exit without generating any files.</td>
+    <td>&nbsp;</td>
+  </tr>
+
   <tr><a name="d">
-    <td><tt>-d</tt></td>
+    <td><tt>--dump </br> -d</tt></td>
+
+    <td>Causes output of a dump of the AST and exits before any files would be
+      created.</td>
+    <td>&nbsp;</td>
+  </tr>
+
+  <tr>
+    <td><tt>--dump-builtins</tt></td>
 
-    <td>Causes output of a dump of the AST</td>
+    <td>Implies --dump, but also dumps IDL defined by the compiler.</td>
+    <td>&nbsp;</td>
+  </tr>
+
+  <tr>
+    <td><tt>--just-dump-builtins</tt></td>
+
+    <td>Dumps IDL defined by the compiler but ignores any files passed and
+      exits.</td>
     <td>&nbsp;</td>
   </tr>
 
@@ -636,7 +679,7 @@ also receives other options that are specific to it.<p>
 
   <tr><a name="in">
     <TD><TT>-in</TT></TD>
-    <TD> To generate #include statements with <>'s for the standard
+    <TD> To generate #include statements with &lt;&gt;'s for the standard
         include files (e.g. tao/corba.h) indicating them as non-changing
         files</TD>
     <td>&nbsp;</td>
@@ -779,7 +822,7 @@ also receives other options that are specific to it.<p>
   <tr><a name="Ce">
     <td><tt>-Ce</tt></td>
 
-    <td>Output an error if two indentifiers in the same scope differ in
+    <td>Output an error if two identifiers in the same scope differ in
         spelling only by case (default).</td>
 
     <td>&nbsp;</td>
@@ -836,7 +879,7 @@ also receives other options that are specific to it.<p>
 
     <td>Generate AMI4CCM code</td>
     <td>*A.idl file (containing callback interface, "sendc_" methods
-        and CCM connector) plus addition to CCM servant and exectuor</td>
+        and CCM connector) plus addition to CCM servant and executor</td>
   </tr>
 
   <tr><a name="Gp">
@@ -1036,7 +1079,7 @@ also receives other options that are specific to it.<p>
 
     <td>Generate CIAO executor implementation code for component and home IDL declarations</td>
     <td>
-    These files have empty function bodies for all facet, suported and inherited operations,
+    These files have empty function bodies for all facet, supported and inherited operations,
     to be filled in by the developer.</td>
   </tr>
 
@@ -1296,6 +1339,21 @@ also receives other options that are specific to it.<p>
     <td>Default is 2 spaces</td>
   </tr>
 
+  <tr>
+    <td><tt>--unknown-annotations ARG</tt></td>
+
+    <td>
+      Controls the reaction when encountering undefined annotations. The valid
+      arguments to this option are "warn-once" (Default), "warn-all", "error",
+      and "ignore".
+    </td>
+    <td>
+      The difference between "warn-once" and "warn-all" is that with
+      "warn-once" using annotations the same local name will not be warned
+      about more than once, while "warn-all" will warn with every usage.
+    </td>
+  </tr>
+
 </table> <P>
 
 <P><HR><P>