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

glr2.cc: formatting changes

Browse Source 
* data/skeletons/glr2.cc (glr_state): here.
(glr_state::MAGIC): Make it easier to recognize in decimal.
This commit is contained in:
Akim Demaille
2020-12-20 18:46:28 +01:00
parent df34ad7c6e
commit c6a39f8409
1 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
data/skeletons/glr2.cc
View File

@@ -793,12 +793,12 @@ public:
{} {}
/// Build with a semantic option. /// Build with a semantic option.
glr_state(state_num lrState, size_t posn) glr_state (state_num lrState, size_t posn)
: yyresolved(false) : yyresolved (false)
, yylrState(lrState) , yylrState (lrState)
, yyposn(posn) , yyposn (posn)
, yypred(0) , yypred (0)
, yyfirstVal(0)]b4_parse_assert_if([[ , yyfirstVal (0)]b4_parse_assert_if([[
, magic_ (MAGIC)]])[ , magic_ (MAGIC)]])[
{} {}
@@ -832,12 +832,11 @@ public:
yyresolved = other.yyresolved; yyresolved = other.yyresolved;
yylrState = other.yylrState; yylrState = other.yylrState;
yyposn = other.yyposn; yyposn = other.yyposn;
setPred(other.pred()); setPred (other.pred ());
if (other.yyresolved) { if (other.yyresolved)
semanticVal() = other.semanticVal(); semanticVal () = other.semanticVal ();
} else { else
setFirstVal(other.firstVal()); setFirstVal (other.firstVal ());]b4_locations_if([[
}]b4_locations_if([[
yyloc = other.yyloc;]])[ yyloc = other.yyloc;]])[
} }
@@ -850,15 +849,15 @@ public:
size_t yyposn; size_t yyposn;
/// Only call pred() and setPred() on objects in yyitems, not temporaries. /// Only call pred() and setPred() on objects in yyitems, not temporaries.
glr_state* pred(); glr_state* pred ();
const glr_state* pred() const; const glr_state* pred () const;
void setPred(const glr_state* state); void setPred (const glr_state* state);
/// Only call firstVal() and setFirstVal() on objects in yyitems, not /// Only call firstVal() and setFirstVal() on objects in yyitems, not
/// temporaries. /// temporaries.
semantic_option* firstVal(); semantic_option* firstVal ();
const semantic_option* firstVal() const; const semantic_option* firstVal () const;
void setFirstVal(const semantic_option* option); void setFirstVal (const semantic_option* option);
value_type& semanticVal () value_type& semanticVal ()
{]b4_parse_assert_if([[ {]b4_parse_assert_if([[
@@ -877,21 +876,21 @@ public:
/* DEBUGGING ONLY */ /* DEBUGGING ONLY */
#if ]b4_api_PREFIX[DEBUG #if ]b4_api_PREFIX[DEBUG
void yy_yypstack() const void yy_yypstack () const
{]b4_parse_assert_if([[ {]b4_parse_assert_if([[
check_ ();]])[ check_ ();]])[
if (pred() != YY_NULLPTR) if (pred () != YY_NULLPTR)
{ {
pred()->yy_yypstack(); pred ()->yy_yypstack ();
std::cerr << " -> "; std::cerr << " -> ";
} }
std::cerr << yylrState << "@@" << yyposn; std::cerr << yylrState << "@@" << yyposn;
} }
#endif #endif
std::ptrdiff_t indexIn(glr_stack_item* array); std::ptrdiff_t indexIn (glr_stack_item* array);
glr_stack_item* asItem() glr_stack_item* asItem ()
{]b4_parse_assert_if([[ {]b4_parse_assert_if([[
check_ ();]])[ check_ ();]])[
return asItem(this); return asItem(this);
@@ -899,20 +898,22 @@ public:
private: private:
template <typename T> template <typename T>
static const glr_stack_item* asItem(const T* state) { static const glr_stack_item* asItem (const T* state)
{
return reinterpret_cast<const glr_stack_item*>(state); return reinterpret_cast<const glr_stack_item*>(state);
} }
template <typename T> template <typename T>
static glr_stack_item* asItem(T* state) { static glr_stack_item* asItem (T* state)
return reinterpret_cast<glr_stack_item*>(state); {
return reinterpret_cast<glr_stack_item*> (state);
} }
static const char *as_pointer_ (const glr_state *state) static const char *as_pointer_ (const glr_state *state)
{ {
return reinterpret_cast<const char *>(state); return reinterpret_cast<const char *> (state);
} }
static char *as_pointer_ (glr_state *state) static char *as_pointer_ (glr_state *state)
{ {
return reinterpret_cast<char *>(state); return reinterpret_cast<char *> (state);
} }
/** Preceding state in this stack */ /** Preceding state in this stack */
std::ptrdiff_t yypred; std::ptrdiff_t yypred;
@@ -940,7 +941,7 @@ public:
} }
// A magic number to check our pointer arithmetics is sane. // A magic number to check our pointer arithmetics is sane.
enum { MAGIC = 0x713705 }; enum { MAGIC = 713705 };
unsigned int magic_;]])[ unsigned int magic_;]])[
}; };