Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-21 02:03:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

c++: use more explicit types than int

Browse Source 
* data/c++.m4 (b4_public_types_declare): Declare token_number_type soon.
Introduce symbol_number_type (wider than token_number_type).
Clarify the requirement that kind_type from by_state and by_type
denote the _input_ type (required by the constructor), not the stored type.
Use symbol_number_type and token_number_type where appropriate, instead
of int.
* data/lalr1.cc: Adjust to these changes.
Propagate "symbol_number_type".
Invoke "type_get ()" instead of read "type" directly.
This commit is contained in:
Akim Demaille
2013-01-29 08:16:15 +01:00
parent 7fc7df7a38
commit 26f95f5f35
2 changed files with 36 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
data/c++.m4
View File

@@ -154,9 +154,15 @@ m4_define([b4_public_types_declare],
]b4_token_enums[
};
/// Token type.
/// (External) token type, as returned by yylex.
typedef token::yytokentype token_type;
/// Internal symbol number.
typedef int symbol_number_type;
/// Internal symbol number for tokens (subsumed by symbol_number_type).
typedef ]b4_int_type_for([b4_translate])[ token_number_type;
/// A complete symbol.
///
/// Expects its Base type to provide access to the symbol type
@@ -209,27 +215,26 @@ m4_define([b4_public_types_declare],
/// Copy constructor.
by_type (const by_type& other);
/// Constructor.
///
by_type (token_type t);
/// The symbol type as needed by the constructor.
typedef token_type kind_type;
/// Steal the type of \a that.
/// Constructor from (external) token numbers.
by_type (kind_type t);
/// Steal the symbol type from \a that.
void move (by_type& that);
/// The symbol type.
///
/// The (internal) type number (corresponding to \a type).
/// -1 when this symbol is empty.
int type;
/// The type (corresponding to \a type).
/// -1 when this symbol is empty.
int type_get () const;
symbol_number_type type_get () const;
/// The token.
token_type token () const;
/// The type used to store the symbol type.
typedef token_type kind_type;
/// The symbol type.
///
/// -1 when this symbol is empty.
token_number_type type;
};
/// "External" symbols: returned by the scanner.
@@ -296,7 +301,7 @@ m4_define([b4_public_types_define],
]b4_parser_class_name[::basic_symbol<Base>::~basic_symbol ()
{]b4_variant_if([[
// User destructor.
int yytype = this->type_get ();
symbol_number_type yytype = this->type_get ();
switch (yytype)
{
]b4_symbol_foreach([b4_symbol_destructor])dnl