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

glr2.cc: put semantic_option into an unnamed namespace

Browse Source 
If we link several glr2.cc parsers together, we get linking failures
because of duplicate symbols.

* data/skeletons/glr2.cc (semantic_option::indexIn)
(semantic_option::next): Remove the useless overloads.
This commit is contained in:
Akim Demaille
2021-09-08 21:58:32 +02:00
parent ca96df89b2
commit 4ec4309cce
1 changed files with 243 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
data/skeletons/glr2.cc
View File

@@ -753,7 +753,10 @@ typedef int rule_num;
// Forward declarations. // Forward declarations.
class glr_state; class glr_state;
namespace
{
class semantic_option; class semantic_option;
}
class glr_stack_item; class glr_stack_item;
class glr_stack; class glr_stack;
@@ -1126,6 +1129,8 @@ private:
glr_state* yylastDeleted; glr_state* yylastDeleted;
}; };
namespace
{
class semantic_option class semantic_option
{ {
public: public:
@@ -1189,11 +1194,11 @@ public:
const glr_state* state() const; const glr_state* state() const;
void setState(const glr_state* s); void setState(const glr_state* s);
const semantic_option* next () const; const semantic_option* next () const YY_ATTRIBUTE_UNUSED;
semantic_option* next (); semantic_option* next ();
void setNext (const semantic_option* s); void setNext (const semantic_option* s);
std::ptrdiff_t indexIn (const glr_stack_item* array) const; std::ptrdiff_t indexIn (const glr_stack_item* array) const YY_ATTRIBUTE_UNUSED;
/** True iff YYY0 and YYY1 represent identical options at the top level. /** True iff YYY0 and YYY1 represent identical options at the top level.
* That is, they represent the same rule applied to RHS symbols * That is, they represent the same rule applied to RHS symbols
@@ -1380,6 +1385,7 @@ public:
enum { MAGIC = 0xeff1cace }; enum { MAGIC = 0xeff1cace };
unsigned int magic_;]])[ unsigned int magic_;]])[
}; };
}
/** Type of the items in the GLR stack. /** Type of the items in the GLR stack.
* It can be either a glr_state or a semantic_option. The is_state_ field * It can be either a glr_state or a semantic_option. The is_state_ field