X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/2cbe6b7f8f268366877078c8256011e20a76c464..08af01c2fc26eeb77afe3a667dded68c52ea3c37:/src/parse-gram.y diff --git a/src/parse-gram.y b/src/parse-gram.y index 66e5283a..cf7f7793 100644 --- a/src/parse-gram.y +++ b/src/parse-gram.y @@ -1,6 +1,7 @@ %{/* Bison Grammar Parser -*- C -*- - Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, + Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -93,13 +94,13 @@ static int current_prec = 0; boundary_set (&@$.end, current_file, 1, 1); } -/* Only NUMBERS have a value. */ %union { symbol *symbol; symbol_list *list; int integer; - char *chars; + char const *chars; + char *code; assoc assoc; uniqstr uniqstr; unsigned char character; @@ -116,8 +117,6 @@ static int current_prec = 0; %token PERCENT_TYPE "%type" %token PERCENT_DESTRUCTOR "%destructor" %token PERCENT_PRINTER "%printer" -%token PERCENT_SYMBOL_DEFAULT - "%symbol-default" %token PERCENT_LEFT "%left" %token PERCENT_RIGHT "%right" @@ -134,7 +133,6 @@ static int current_prec = 0; %token PERCENT_CODE "%code" - PERCENT_CODE_TOP "%code-top" PERCENT_DEBUG "%debug" PERCENT_DEFAULT_PREC "%default-prec" PERCENT_DEFINE "%define" @@ -145,6 +143,7 @@ static int current_prec = 0; PERCENT_FILE_PREFIX "%file-prefix" PERCENT_GLR_PARSER "%glr-parser" PERCENT_INITIAL_ACTION "%initial-action" + PERCENT_LANGUAGE "%language" PERCENT_LEX_PARAM "%lex-param" PERCENT_LOCATIONS "%locations" PERCENT_NAME_PREFIX "%name-prefix" @@ -154,11 +153,11 @@ static int current_prec = 0; "%nondeterministic-parser" PERCENT_OUTPUT "%output" PERCENT_PARSE_PARAM "%parse-param" - PERCENT_PROVIDES "%provides" PERCENT_PURE_PARSER "%pure-parser" PERCENT_PUSH_PARSER "%push-parser" + PERCENT_PUSH_PULL_PARSER + "%push-pull-parser" PERCENT_REQUIRE "%require" - PERCENT_REQUIRES "%requires" PERCENT_SKELETON "%skeleton" PERCENT_START "%start" PERCENT_TOKEN_TABLE "%token-table" @@ -177,17 +176,20 @@ static int current_prec = 0; %token PROLOGUE "%{...%}" %token SEMICOLON ";" %token TYPE "type" +%token TYPE_TAG_ANY "<*>" +%token TYPE_TAG_NONE "<>" %type CHAR %printer { fputs (char_name ($$), stderr); } CHAR /* braceless is not to be used for rule or symbol actions, as it - calls translate_code. */ -%type STRING "{...}" "%{...%}" EPILOGUE braceless content content.opt + calls code_props_plain_init. */ +%type STRING "%{...%}" EPILOGUE braceless content content.opt +%type "{...}" %printer { fputs (quotearg_style (c_quoting_style, $$), stderr); } - STRING + STRING %printer { fprintf (stderr, "{\n%s\n}", $$); } - braceless content content.opt "{...}" "%{...%}" EPILOGUE + braceless content content.opt "{...}" "%{...%}" EPILOGUE %type TYPE ID ID_COLON %printer { fprintf (stderr, "<%s>", $$); } TYPE @@ -221,14 +223,28 @@ prologue_declarations: prologue_declaration: grammar_declaration -| "%{...%}" { prologue_augment (translate_code ($1, @1), @1, union_seen); } +| "%{...%}" + { + code_props plain_code; + code_props_plain_init (&plain_code, $1, @1); + code_props_translate_code (&plain_code); + gram_scanner_last_string_free (); + prologue_augment (plain_code.code, @1, union_seen); + code_scanner_last_string_free (); + } | "%debug" { debug_flag = true; } | "%define" STRING content.opt { muscle_insert ($2, $3); } | "%defines" { defines_flag = true; } +| "%defines" STRING + { + defines_flag = true; + spec_defines_file = xstrdup ($2); + } | "%error-verbose" { error_verbose = true; } | "%expect" INT { expected_sr_conflicts = $2; } | "%expect-rr" INT { expected_rr_conflicts = $2; } -| "%file-prefix" "=" STRING { spec_file_prefix = $3; } +| "%file-prefix" STRING { spec_file_prefix = $2; } +| "%file-prefix" "=" STRING { spec_file_prefix = $3; } /* deprecated */ | "%glr-parser" { nondeterministic_parser = true; @@ -236,19 +252,28 @@ prologue_declaration: } | "%initial-action" "{...}" { - muscle_code_grow ("initial_action", translate_symbol_action ($2, @2), @2); + code_props action; + code_props_symbol_action_init (&action, $2, @2); + code_props_translate_code (&action); + gram_scanner_last_string_free (); + muscle_code_grow ("initial_action", action.code, @2); + code_scanner_last_string_free (); } +| "%language" STRING { language_argmatch ($2, 1, &@1); } | "%lex-param" "{...}" { add_param ("lex_param", $2, @2); } | "%locations" { locations_flag = true; } -| "%name-prefix" "=" STRING { spec_name_prefix = $3; } +| "%name-prefix" STRING { spec_name_prefix = $2; } +| "%name-prefix" "=" STRING { spec_name_prefix = $3; } /* deprecated */ | "%no-lines" { no_lines_flag = true; } | "%nondeterministic-parser" { nondeterministic_parser = true; } -| "%output" "=" STRING { spec_outfile = $3; } +| "%output" STRING { spec_outfile = $2; } +| "%output" "=" STRING { spec_outfile = $3; } /* deprecated */ | "%parse-param" "{...}" { add_param ("parse_param", $2, @2); } | "%pure-parser" { pure_parser = true; } -| "%push-parser" { push_parser = true; } +| "%push-parser" { push_parser = true; pull_parser = false; } +| "%push-pull-parser" { push_parser = true; pull_parser = true; } | "%require" STRING { version_check (&@2, $2); } -| "%skeleton" STRING { skeleton = $2; } +| "%skeleton" STRING { skeleton_arg ($2, 1, &@1); } | "%token-table" { token_table_flag = true; } | "%verbose" { report_flag = report_states; } | "%yacc" { yacc_flag = true; } @@ -265,17 +290,15 @@ grammar_declaration: | "%destructor" "{...}" generic_symlist { symbol_list *list; - const char *action = translate_symbol_action ($2, @2); for (list = $3; list; list = list->next) - symbol_list_destructor_set (list, action, @2); + symbol_list_destructor_set (list, $2, @2); symbol_list_free ($3); } | "%printer" "{...}" generic_symlist { symbol_list *list; - const char *action = translate_symbol_action ($2, @2); for (list = $3; list; list = list->next) - symbol_list_printer_set (list, action, @2); + symbol_list_printer_set (list, $2, @2); symbol_list_free ($3); } | "%default-prec" @@ -286,10 +309,22 @@ grammar_declaration: { default_prec = false; } -| "%code" braceless { prologue_augment ($2, @2, true); } -| "%code-top" braceless { prologue_augment ($2, @2, false); } -| "%provides" braceless { muscle_code_grow ("provides", $2, @2); } -| "%requires" braceless { muscle_code_grow ("requires", $2, @2); } +| "%code" braceless + { + muscle_code_grow ("percent_code", $2, @2); + code_scanner_last_string_free (); + } +| "%code" STRING braceless + { + char const name_prefix[] = "percent_code_"; + char *name = xmalloc (sizeof name_prefix + strlen ($2)); + strcpy (name, name_prefix); + strcpy (name + sizeof name_prefix - 1, $2); + muscle_code_grow (uniqstr_new (name), $3, @3); + free (name); + code_scanner_last_string_free (); + muscle_grow ("used_percent_code_qualifiers", $2, ","); + } ; @@ -326,6 +361,7 @@ grammar_declaration: union_seen = true; muscle_code_grow ("stype", body, @3); + gram_scanner_last_string_free (); } ; @@ -395,7 +431,8 @@ generic_symlist: generic_symlist_item: symbol { $$ = symbol_list_sym_new ($1, @1); } | TYPE { $$ = symbol_list_type_new ($1, @1); } -| "%symbol-default" { $$ = symbol_list_default_new (@1); } +| "<*>" { $$ = symbol_list_default_tagged_new (@1); } +| "<>" { $$ = symbol_list_default_tagless_new (@1); } ; /* One token definition. */ @@ -507,8 +544,12 @@ content.opt: braceless: "{...}" { + code_props plain_code; $1[strlen ($1) - 1] = '\n'; - $$ = translate_code ($1 + 1, @1); + code_props_plain_init (&plain_code, $1+1, @1); + code_props_translate_code (&plain_code); + gram_scanner_last_string_free (); + $$ = plain_code.code; } ; @@ -554,8 +595,12 @@ epilogue.opt: /* Nothing. */ | "%%" EPILOGUE { - muscle_code_grow ("epilogue", translate_code ($2, @2), @2); + code_props plain_code; + code_props_plain_init (&plain_code, $2, @2); + code_props_translate_code (&plain_code); gram_scanner_last_string_free (); + muscle_code_grow ("epilogue", plain_code.code, @2); + code_scanner_last_string_free (); } ;