[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/6] c++: value_type -> kind_type
From: |
Akim Demaille |
Subject: |
[PATCH 3/6] c++: value_type -> kind_type |
Date: |
Tue, 29 Jan 2013 09:04:34 +0100 |
* data/c++.m4, data/lalr1.cc (by_type, by_state): Rename 'value_type'
as 'kind_type', as it is clearer.
---
data/c++.m4 | 10 +++++-----
data/lalr1.cc | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/data/c++.m4 b/data/c++.m4
index fcfda23..894602f 100644
--- a/data/c++.m4
+++ b/data/c++.m4
@@ -176,11 +176,11 @@ m4_define([b4_public_types_declare],
basic_symbol (const basic_symbol& other);
/// Constructor for valueless symbols.
- basic_symbol (typename Base::value_type t]b4_locations_if([,
+ basic_symbol (typename Base::kind_type t]b4_locations_if([,
const location_type& l])[);
/// Constructor for symbols with semantic value.
- basic_symbol (typename Base::value_type t,
+ basic_symbol (typename Base::kind_type t,
const semantic_type& v]b4_locations_if([,
const location_type& l])[);
@@ -229,7 +229,7 @@ m4_define([b4_public_types_declare],
token_type token () const;
/// The type used to store the symbol type.
- typedef token_type value_type;
+ typedef token_type kind_type;
};
/// "External" symbols: returned by the scanner.
@@ -271,7 +271,7 @@ m4_define([b4_public_types_define],
template <typename Base>
inline
]b4_parser_class_name[::basic_symbol<Base>::basic_symbol (]b4_join(
- [typename Base::value_type t],
+ [typename Base::kind_type t],
[const semantic_type& v],
b4_locations_if([const location_type& l]))[)
: Base (t)
@@ -284,7 +284,7 @@ m4_define([b4_public_types_define],
template <typename Base>
inline
]b4_parser_class_name[::basic_symbol<Base>::basic_symbol (]b4_join(
- [typename Base::value_type t],
+ [typename Base::kind_type t],
b4_locations_if([const location_type& l]))[)
: Base (t)
, value ()]b4_locations_if([
diff --git a/data/lalr1.cc b/data/lalr1.cc
index a0a059a..9055633 100644
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -289,7 +289,7 @@ b4_location_define])])[
int type_get () const;
/// The type used to store the symbol type.
- typedef state_type value_type;
+ typedef state_type kind_type;
};
/// "Internal" symbol: element of the stack.
--
1.8.1.1
- [PATCH 0/6] {master} c++: various improvements, Akim Demaille, 2013/01/29
- [PATCH 2/6] c++: improve the signature of yysyntax_error_, Akim Demaille, 2013/01/29
- [PATCH 4/6] c++: use more explicit types than int, Akim Demaille, 2013/01/29
- [PATCH 1/6] c++: style changes, Akim Demaille, 2013/01/29
- [PATCH 6/6] c++: please G++ 4.8 with -O3: type puning issue, Akim Demaille, 2013/01/29
- [PATCH 3/6] c++: value_type -> kind_type,
Akim Demaille <=
- [PATCH 5/6] c++: please G++ 4.8 with -O3: array bounds, Akim Demaille, 2013/01/29