Skip to content

Commit

Permalink
glr2.cc: move StrongIndexAlias into the namespace
Browse files Browse the repository at this point in the history
* data/skeletons/glr2.cc: here.
  • Loading branch information
nitnelave authored and akimd committed Sep 12, 2020
1 parent 8bfc319 commit cf8723d
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 18 deletions.
4 changes: 0 additions & 4 deletions TODO
Expand Up @@ -162,10 +162,6 @@ Line -1 and -3 should mention CATEGORIE, not CATEGORY.
*** glr.c
Get rid of scaffolding in glr.c.

*** namespaces in glr2.cc
StrongIndexAlias should be in the parser's namespace. Possibly even an
inner class.

*** Coding style
Move to our coding conventions. In particular names such as yy_glr_stack,
not yyGLRStack.
Expand Down
28 changes: 14 additions & 14 deletions data/skeletons/glr2.cc
Expand Up @@ -145,6 +145,19 @@ b4_percent_code_get([[requires]])[
]b4_cast_define[
]b4_null_define[
// Whether we are compiled with exception support.
#ifndef YY_EXCEPTIONS
# if defined __GNUC__ && !defined __EXCEPTIONS
# define YY_EXCEPTIONS 0
# else
# define YY_EXCEPTIONS 1
# endif
#endif
]b4_YYDEBUG_define[
]b4_namespace_open[
template <typename Parameter>
class StrongIndexAlias
{
Expand Down Expand Up @@ -215,19 +228,6 @@ template<typename T>
const std::ptrdiff_t StrongIndexAlias<T>::INVALID_INDEX =
std::numeric_limits<std::ptrdiff_t>::max();
// Whether we are compiled with exception support.
#ifndef YY_EXCEPTIONS
# if defined __GNUC__ && !defined __EXCEPTIONS
# define YY_EXCEPTIONS 0
# else
# define YY_EXCEPTIONS 1
# endif
#endif
]b4_YYDEBUG_define[
]b4_namespace_open[
]b4_bison_locations_if([m4_ifndef([b4_location_file],
[b4_location_define])])[
Expand Down Expand Up @@ -791,7 +791,7 @@ struct yySemanticOption;
struct yyGLRStackItem;
struct yyGLRStack;

typedef StrongIndexAlias<struct yyGLRStateSetTag> yyStateSetIndex;
typedef ]b4_namespace_ref[::StrongIndexAlias<struct yyGLRStateSetTag> yyStateSetIndex;

yyStateSetIndex yycreateStateSetIndex(std::ptrdiff_t value) {
return yyStateSetIndex::create(value);
Expand Down

0 comments on commit cf8723d

Please sign in to comment.