Clean up %skeleton and %language priority implementation.

* src/getargs.c (skeleton_prio): Use default_prio rather than 2, and
remove static qualifier because others will soon need to see it.
(language_prio): Likewise.
(getargs): Use command_line_prio rather than 0.
* src/getargs.h (command_line_prio, grammar_prio, default_prio): New
enum fields.
(skeleton_prio): Extern it.
(language_prio): Extern it.
* src/parse-gram.y: Use grammar_prio rather than 1.
This commit is contained in:
Joel E. Denny
2008-11-07 16:48:31 -05:00
parent 738cde3e93
commit 4b1ebc495b
6 changed files with 28 additions and 12 deletions

View File

@@ -70,9 +70,9 @@ static struct bison_language const valid_languages[] = {
{ "", "", "", "", false }
};
static int skeleton_prio = 2;
int skeleton_prio = default_prio;
const char *skeleton = NULL;
static int language_prio = 2;
int language_prio = default_prio;
struct bison_language const *language = &valid_languages[0];
const char *include = NULL;
@@ -520,11 +520,11 @@ getargs (int argc, char *argv[])
break;
case 'L':
language_argmatch (optarg, 0, NULL);
language_argmatch (optarg, command_line_prio, NULL);
break;
case 'S':
skeleton_arg (AS_FILE_NAME (optarg), 0, NULL);
skeleton_arg (AS_FILE_NAME (optarg), command_line_prio, NULL);
break;
case 'T':