Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ACE6] tao_idl Improvements #1366

Closed
wants to merge 6 commits into from
Closed

[ACE6] tao_idl Improvements #1366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
464ec99
TAO/docs/compiler.html Cleanup
iguessthislldo Dec 28, 2020
a0835f8
Added __TAO_IDL_IDL_VERSION Macro
iguessthislldo Dec 28, 2020
0fdb3b7
TAO_IDL/driver/drv_args.cpp: --help
iguessthislldo Dec 28, 2020
b4c82d2
Change How tao_idl Passes Files to Preprocessor
iguessthislldo Dec 29, 2020
d955ef7
Make fuzz.pl Happy
iguessthislldo Dec 29, 2020
1e0e2c3
Add Possible Missing Include
iguessthislldo Dec 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions TAO/NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
USER VISIBLE CHANGES BETWEEN TAO-2.5.12 and TAO-2.5.13
======================================================

. TAO IDL:

. Version of IDL specification being used is available as the
`__TAO_IDL_IDL_VERSION` preprocessor macro.

. Added `--preprocessor-input` option to `tao_idl` to make behavior of
`#include ".."` consistent with C and C++. This is not enabled by default
like it is in TAO 3, though. For details, see the `--preprocessor-input`
argument in `docs/compiler.html`.
Comment on lines +10 to +12
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know if the TAO 3 note is needed here. The scope of this section is TAO 2.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe, but it is a behavior difference between the two, so I feel like it has to be mentioned somewhere.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it require time travel to have TAO 2 know what TAO 3 does?


USER VISIBLE CHANGES BETWEEN TAO-2.5.11 and TAO-2.5.12
======================================================

Expand Down
131 changes: 86 additions & 45 deletions TAO/TAO_IDL/driver/drv_args.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
extern long DRV_nfiles;
extern char *DRV_files[];

void process_long_option(long ac, char **av, long &i);
void process_long_option (long ac, char **av, long &i);

// Push a file into the list of files to be processed
void
Expand Down Expand Up @@ -124,46 +124,42 @@ DRV_usage (void)
ACE_TEXT ("%C: usage: %C [[flag|file] ...] [-- file ...]\n"),
idl_global->prog_name (),
idl_global->prog_name ()));

ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("Legal flags:\n")
ACE_TEXT (" -h | --help | -u\tPrint this list and exit successfully\n")
ACE_TEXT (" -A...\t\t\tlocal implementation-specific escape\n")
ACE_TEXT (" -Cw\t\t\tWarning if identifier spellings differ ")
ACE_TEXT ("only in case (default is error)\n")
ACE_TEXT (" -Ce\t\t\tError if identifier spellings differ ")
ACE_TEXT ("only in case (default)\n")
ACE_TEXT (" -ae\t\t\tError if anonymous type is seen ")
ACE_TEXT ("(default)\n")
ACE_TEXT (" -aw\t\t\tWarning if anonymous type is seen ")
ACE_TEXT ("(default is error)\n")
ACE_TEXT (" -as\t\t\tSilences the anonymous type diagnostic ")
ACE_TEXT ("(default is error)\n")
ACE_TEXT (" -d | --dump\t\tPrints a dump of the AST and exits\n")
ACE_TEXT (" -Dname[=value]\t\tdefines name for preprocessor\n")
ACE_TEXT (" -E\t\t\truns preprocessor only, prints on stdout\n")
ACE_TEXT (" -Idir\t\t\tincludes dir in search path for preprocessor\n")
ACE_TEXT (" -t\t\t\tTemporary directory to be used")
ACE_TEXT (" by the IDL compiler.\n")
ACE_TEXT (" -Uname\t\t\tundefines name for preprocessor\n")
ACE_TEXT (" -v\t\t\ttraces compilation stages\n")
ACE_TEXT (" -V | --version\t\tprints version info then exits\n")
ACE_TEXT (" -w\t\t\tsuppresses IDL compiler warning messages\n")
ACE_TEXT (" -Wp,<arg1,...,argn>\tpasses args to preprocessor\n")
ACE_TEXT (" -Yp,path\t\tdefines location of preprocessor\n")
ACE_TEXT (" --idl-version VERSION\tSet the version of IDL to use\n")
ACE_TEXT (" --default-idl-version\tPrint the default IDL version and exit\n")
ACE_TEXT (" --list-idl-versions\tPrint IDL versions supported and exit\n")
ACE_TEXT (" --syntax-only\t\tJust check the syntax, do not create files\n")
ACE_TEXT (" --bison-trace\t\tEnable Bison Tracing (sets yydebug to 1)\n")
ACE_TEXT (" --dump-builtins\tDump the compiler and user defined IDL.\n")
ACE_TEXT (" --just-dump-builtins\tJust dump the compiler defined IDL and exit.\n")
ACE_TEXT (" --unknown-annotations ARG\t")
ACE_TEXT ("Set reaction to unknown annotations. ARG must be one of the following:\n")
ACE_TEXT ("\t\t\t\twarn-once\tThe default, warn once per unique local name\n")
ACE_TEXT ("\t\t\t\twarn-all\tWarn for all unknown annotations\n")
ACE_TEXT ("\t\t\t\terror\t\tCauses the process to exit with a failed return status\n")
ACE_TEXT ("\t\t\t\tignore\t\tDon't report unknown annotations\n")
ACE_TEXT (" -h | --help | -u Print this list and exit successfully\n")
ACE_TEXT (" -A... Local implementation-specific escape\n")
ACE_TEXT (" -Cw Warning if identifier spellings differ\n")
ACE_TEXT (" only in case (default is error)\n")
ACE_TEXT (" -Ce Error if identifier spellings differ only in case\n")
ACE_TEXT (" (default)\n")
ACE_TEXT (" -ae Error if anonymous type is seen (default)\n")
ACE_TEXT (" -aw Warning if anonymous type is seen (default is error)\n")
ACE_TEXT (" -as Silences the anonymous type error (default is error)\n")
ACE_TEXT (" -d | --dump Prints a dump of the AST and exits\n")
ACE_TEXT (" -Dname[=value] Defines name for preprocessor\n")
ACE_TEXT (" -E Runs preprocessor only, prints on stdout\n")
ACE_TEXT (" -Idir Includes dir in search path for preprocessor\n")
ACE_TEXT (" -t Temporary directory to be used by the IDL compiler.\n")
ACE_TEXT (" -Uname Undefines name for preprocessor\n")
ACE_TEXT (" -v Traces compilation stages\n")
ACE_TEXT (" -V | --version Prints version info then exits\n")
ACE_TEXT (" -w Suppresses IDL compiler warning messages\n")
ACE_TEXT (" -Wp,<arg1,...,argn> Passes args to preprocessor\n")
ACE_TEXT (" -Yp,path Defines location of preprocessor\n")
ACE_TEXT (" --idl-version VERSION Set the version of IDL to use\n")
ACE_TEXT (" --default-idl-version Print the default IDL version and exit\n")
ACE_TEXT (" --list-idl-versions Print IDL versions supported and exit\n")
ACE_TEXT (" --syntax-only Just check the syntax, do not create files\n")
ACE_TEXT (" --bison-trace Enable Bison Tracing (sets yydebug to 1)\n")
ACE_TEXT (" --dump-builtins Dump the compiler and user defined IDL.\n")
ACE_TEXT (" --just-dump-builtins Just dump the compiler defined IDL and exit.\n")
ACE_TEXT (" --unknown-annotations ARG Set reaction to unknown annotations.\n")
ACE_TEXT (" ARG must be `warn-once` (default), `warn-all`,\n")
ACE_TEXT (" `error`, or `ignore`.\n")
ACE_TEXT (" --preprocessor-input KIND Set C preprocessor file input method. KIND must \n")
ACE_TEXT (" be `guess`, `direct-with-e`, `direct-without-e`,\n")
ACE_TEXT (" `direct-gcc`, or `copy` (default).\n")
ACE_TEXT (" See docs/compiler.html for more info.\n")
));

be_util::usage ();
Expand Down Expand Up @@ -493,7 +489,7 @@ DRV_parse_args (long ac, char **av)
}
else
{
process_long_option(ac, av, i);
process_long_option (ac, av, i);
}
break;

Expand Down Expand Up @@ -564,7 +560,7 @@ DRV_parse_args (long ac, char **av)
}

void
print_idl_versions()
print_idl_versions ()
{
ACE_DEBUG ((LM_INFO,
ACE_TEXT ("These are the valid IDL versions this compiler will accept:\n")
Expand All @@ -578,7 +574,7 @@ print_idl_versions()
}

void
process_long_option(long ac, char **av, long &i)
process_long_option (long ac, char **av, long &i)
{
const char *long_option = av[i] + 2;
bool no_more_args = i + 1 >= ac;
Expand Down Expand Up @@ -688,21 +684,66 @@ process_long_option(long ac, char **av, long &i)
{
invalid_argument = true;
ACE_ERROR ((LM_ERROR,
ACE_TEXT ("\"%C\" is not a valid argument.\n"),
ACE_TEXT ("\"%C\" is not a valid argument to --unknown-annotations.\n"),
av[i]
));
}
}
if (invalid_argument)
{
ACE_ERROR ((LM_ERROR,
ACE_TEXT ("Use either \"warn-once\", \"warn-all\", ")
ACE_TEXT ("\"error\" or \"ignore\".\n"),
ACE_TEXT ("Use \"warn-once\", \"warn-all\", \"error\" or \"ignore\".\n"),
av[i]
));
idl_global->parse_args_exit (1);
}
}
else if (!ACE_OS::strcmp (long_option, "preprocessor-input"))
{
bool invalid_argument = no_more_args;
if (no_more_args)
{
ACE_ERROR ((LM_ERROR,
ACE_TEXT ("--preprocessor-input is missing its required argument.")));
}
else
{
i++;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
i++;
++i;

if (!ACE_OS::strcmp (av[i], "guess"))
{
idl_global->preprocessor_input_ = IDL_GlobalData::PreprocessorInputGuess;
}
else if (!ACE_OS::strcmp (av[i], "direct-with-e"))
{
idl_global->preprocessor_input_ = IDL_GlobalData::PreprocessorInputDirectWithE;
}
else if (!ACE_OS::strcmp (av[i], "direct-without-e"))
{
idl_global->preprocessor_input_ = IDL_GlobalData::PreprocessorInputDirectWithoutE;
}
else if (!ACE_OS::strcmp (av[i], "direct-gcc"))
{
idl_global->preprocessor_input_ = IDL_GlobalData::PreprocessorInputDirectGcc;
}
else if (!ACE_OS::strcmp (av[i], "copy"))
{
idl_global->preprocessor_input_ = IDL_GlobalData::PreprocessorInputCopy;
}
else
{
invalid_argument = true;
ACE_ERROR ((LM_ERROR,
ACE_TEXT ("\"%C\" is not a valid argument to --preprocessor-input.\n"), av[i]));
}
}
if (invalid_argument)
{
ACE_ERROR ((LM_ERROR, ACE_TEXT ("Use \"guess\", \"direct-with-e\", ")
ACE_TEXT ("\"direct-without-e\", \"direct-gcc\", or \"copy\".\n"),
av[i]));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there supposed to be a %C or similar in the format string?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, it's a old typo I copied from the code for --unknown-annotations. I will fix both.

idl_global->parse_args_exit (1);
}
}
else
{
be_global->parse_args (i, av);
Expand Down
Loading