alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix symbol collision, seen with clang-3.5

Browse source 
autfilt would segfault after reading any file, because the local result_
structure used in hoaparse has the same name as the local result_
structure used in dstarparse.  For some reason I can only see this
problem using clang-3.5, not with gcc.

* src/dstarparse/dstarparse.yy, src/hoaparse/hoaparse.yy: Declare both
structures in a different namespace.
This commit is contained in:
Alexandre Duret-Lutz 2015-01-08 19:21:41 +01:00
parent ee0c0cd28c
commit d3fdf55fa3
2 changed files with 98 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/dstarparse/dstarparse.yy
View file

@ -1,6 +1,6 @@
/* -*- coding: utf-8 -*- /* -*- coding: utf-8 -*-
** Copyright (C) 2013, 2014 Laboratoire de Recherche et Développement ** Copyright (C) 2013, 2014, 2015 Laboratoire de Recherche et
** de l'Epita (LRDE). ** Développement de l'Epita (LRDE).
** **
** This file is part of Spot, a model checking library. ** This file is part of Spot, a model checking library.
** **
@ -34,6 +34,8 @@
#include "ltlast/constant.hh" #include "ltlast/constant.hh"
#include "public.hh" #include "public.hh"
inline namespace dstaryy
{
typedef std::map<int, bdd> map_t; typedef std::map<int, bdd> map_t;
struct result_ struct result_
@ -62,6 +64,7 @@
{ {
} }
}; };
}
} }
%parse-param {spot::dstar_parse_error_list& error_list} %parse-param {spot::dstar_parse_error_list& error_list}

3
src/hoaparse/hoaparse.yy
View file

@ -40,6 +40,8 @@
#include "priv/accmap.hh" #include "priv/accmap.hh"
#include "ltlparse/public.hh" #include "ltlparse/public.hh"
inline namespace hoayy
{
/* Cache parsed formulae. Labels on arcs are frequently identical /* Cache parsed formulae. Labels on arcs are frequently identical
and it would be a waste of time to parse them to formula* over and and it would be a waste of time to parse them to formula* over and
over, and to register all their atomic_propositions in the over, and to register all their atomic_propositions in the
@ -110,6 +112,7 @@
delete acc_mapper; delete acc_mapper;
} }
}; };
}
} }
%parse-param {spot::hoa_parse_error_list& error_list} %parse-param {spot::hoa_parse_error_list& error_list}