X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/30bb2edccf7f352a0c149513905f5e1fcac04aaf..2873fdf8b1f91a9cbc8d258367c920eb637a0099:/data/lalr1.cc diff --git a/data/lalr1.cc b/data/lalr1.cc index c5433435..4915caa2 100644 --- a/data/lalr1.cc +++ b/data/lalr1.cc @@ -113,6 +113,17 @@ m4_define([b4_symbol], [m4_indir([b4_symbol($1, $2)])]) +# b4_symbol_if(NUM, FIELD, IF-TRUE, IF-FALSE) +# ------------------------------------------- +# If FIELD about symbol #NUM is 1 expand IF-TRUE, if is 0, expand IF-FALSE. +# Otherwise an error. +m4_define([b4_symbol_if], +[m4_case(b4_symbol([$1], [$2]), + [1], [$3], + [0], [$4], + [m4_fatal([$0: field $2 of $1 is not a Boolean:] b4_symbol([$1], [$2]))])]) + + # b4_symbol_actions(FILENAME, LINENO, # SYMBOL-TAG, SYMBOL-NUM, # SYMBOL-ACTION, SYMBOL-TYPENAME) @@ -143,15 +154,97 @@ m4_define([b4_symbol_case_], # b4_type_action_(NUMS) # --------------------- # Run actions for the symbol NUMS that all have the same type-name. +# Skip NUMS that have no type-name. m4_define([b4_type_action_], +[b4_symbol_if([$1], [has_type_name], [m4_map([b4_symbol_case_], [$@])[]dnl b4_dollar_dollar([b4_symbol([$1], [number])], [b4_symbol([$1], [tag])], [b4_symbol([$1], [type_name])]); break; +])]) + + +# b4_symbol_constructor_declaration_(SYMBOL-NUMBERS) +# ---------------------------------------------------- +# Declare the overloaded version of make_symbol for the (common) type of +# these SYMBOL-NUMBERS. Use at class-level. +m4_define([b4_symbol_constructor_declaration_], +[ template + static inline symbol_type + make_symbol (b4_symbol_if([$1], [has_type_name], + [const b4_symbol([$1], [type_name])& v, ])dnl +const location_type& l); + ]) +# b4_symbol_constructor_declarations +# ---------------------------------- +# Declare the overloaded versions of make_symbol for all the value types. +# Use at class-level. +m4_define([b4_symbol_constructor_declarations], +[b4_variant_if([ + // Declaration of make_symbol for each value type. +m4_map([b4_symbol_constructor_declaration_], m4_defn([b4_type_names]))])]) + + + +# b4_symbol_constructor_specialization_(SYMBOL-NUMBER) +# ---------------------------------------------------- +# Declare the specialization of make_symbol for this each SYMBOL-NUMBER. +# Specializations cannot be declared at class-level, this must be done +# at namespace-level. +m4_define([b4_symbol_constructor_specialization_], +[b4_symbol_if([$1], [is_token], [b4_symbol_if([$1], [tag_is_id], +[ template <> + inline + b4_parser_class_name::symbol_type + b4_parser_class_name::make_symbol (dnl +b4_symbol_if([$1], [has_type_name], + [const b4_symbol([$1], [type_name])& v, ])dnl +const b4_parser_class_name::location_type& l); +])])]) + +# b4_symbol_constructor_specializations +# ------------------------------------- +# Declare specializations of make_symbol. +m4_define([b4_symbol_constructor_specializations], +[b4_variant_if([ + // Specializations of make_symbol for each symbol type. +m4_map([b4_symbol_constructor_specialization_], + m4_defn([b4_symbol_numbers]))])dnl +]) + + + +# b4_symbol_constructor_definition_(SYMBOL-NUMBER) +# ------------------------------------------------ +# Define make_symbol for this SYMBOL-NUMBER. +m4_define([b4_symbol_constructor_definition_], +[b4_symbol_if([$1], [is_token], [b4_symbol_if([$1], [tag_is_id], +[ template <> + b4_parser_class_name::symbol_type + b4_parser_class_name::make_symbol (dnl +b4_symbol_if([$1], [has_type_name], + [const b4_symbol([$1], [type_name])& v, ])dnl +const location_type& l) + { + return symbol_type (yytranslate_ (token::b4_symbol([$1], [tag])),dnl + b4_symbol_if([$1], [has_type_name], [v, ])l); + } + +])])]) + + +# b4_symbol_constructor_declarations +# ---------------------------------- +# Define the overloaded versions of make_symbol for all the value types. +m4_define([b4_symbol_constructor_definitions], +[b4_variant_if( +[ // Implementation of make_symbol for each symbol type. +m4_map([b4_symbol_constructor_definition_], m4_defn([b4_symbol_numbers]))])]) + # b4_symbol_variant(YYTYPE, YYVAL, ACTION, [ARGS]) # ------------------------------------------------ @@ -249,11 +342,12 @@ dnl FIXME: This is wrong, we want computed header guards. {]b4_assert_if([ /// Whether something is contained. bool built; - - /// Initially uninitialized. - variant () - : built(false) - {}])[ +])[ + /// Empty construction. + inline + variant ()]b4_assert_if([ + : built(false)])[ + {} /// Instantiate a \a T in here. template @@ -275,6 +369,15 @@ dnl FIXME: This is wrong, we want computed header guards. return *new (buffer) T(t); } + /// Construct and fill. + template + inline + variant (const T& t)]b4_assert_if([ + : built(true)])[ + { + new (buffer) T(t); + } + /// Accessor to a built \a T. template inline T& @@ -497,7 +600,7 @@ m4_ifdef([b4_stype], #endif /// Convert a scanner token number \a t to a symbol number. - token_number_type yytranslate_ (int t); + static inline token_number_type yytranslate_ (int t); /// A complete symbol, with its type. template @@ -507,6 +610,7 @@ m4_ifdef([b4_stype], inline symbol_base_type (); /// Constructor. + inline symbol_base_type (const location_type& l); inline symbol_base_type (const semantic_type& v, const location_type& l); /// Return this with its exact type. @@ -540,6 +644,7 @@ m4_ifdef([b4_stype], inline void yy_destroy_ (const char* yymsg, symbol_base_type& yysym) const; + public: /// Element of the stack: a state and its attributes. struct symbol_type : symbol_base_type { @@ -553,6 +658,9 @@ m4_ifdef([b4_stype], inline symbol_type (int t, const semantic_type& v, const location_type& l); + inline symbol_type (int t, + const location_type& l); + /// The symbol type. int type; @@ -560,6 +668,9 @@ m4_ifdef([b4_stype], inline int type_get_ () const; }; +]b4_symbol_constructor_declarations[ + + private: /// Element of the stack: a state and its attributes. struct stack_symbol_type : symbol_base_type { @@ -619,7 +730,7 @@ m4_ifdef([b4_stype], ]b4_parse_param_vars[ }; - +]b4_symbol_constructor_specializations[ ]b4_namespace_close[ ]b4_percent_define_flag_if([[global_tokens_and_yystype]], @@ -781,6 +892,13 @@ b4_percent_code_get[]dnl { } + template + ]b4_parser_class_name[::symbol_base_type::symbol_base_type (const location_type& l) + : value() + , location(l) + { + } + template ]b4_parser_class_name[::symbol_base_type::symbol_base_type (const semantic_type& v, const location_type& l) : value(v) @@ -816,6 +934,13 @@ b4_percent_code_get[]dnl { } + ]b4_parser_class_name[::symbol_type::symbol_type (int t, + const location_type& l) + : super_type (l) + , type (t) + { + } + ]b4_parser_class_name[::symbol_type::symbol_type (int t, const semantic_type& v, const location_type& l) : super_type (v, l) @@ -829,6 +954,8 @@ b4_percent_code_get[]dnl return type; } +]b4_symbol_constructor_definitions[ + // stack_symbol_type. ]b4_parser_class_name[::stack_symbol_type::stack_symbol_type () : super_type () @@ -1024,7 +1151,6 @@ b4_locations_if([, [[location*], [&yyla.location]]])dnl m4_ifdef([b4_lex_param], [, ]b4_lex_param))[; } - /* Convert token to internal form. */ if (yychar <= yyeof_) {