mirror of
git://sourceware.org/git/libabigail.git
synced 2024-12-16 15:04:46 +00:00
d0bd599b4b
This patch is for supporting this kind of things: [suppress_type] name = S has_data_member_inserted_between = {8, end} or: [suppress_type] name = S has_data_members_inserted_between = {{8, 31}, {64, end}} or: [suppress_type] name = S has_data_members_inserted_at = offset_after(member0) How cool is that, heh? Anyway, to do this, the patch adds support for tuple values (i.e, lists of values) in INI files. Then on top of that the patch adds support for the specific has_data_member_inserted_between, has_data_members_inserted_between and has_data_members_inserted_at properties. * include/abg-comparison.h (type_suppression::insertion_range): Declare new type. (type_suppression::insertion_ranges): Declare new typedef. (type_suppression::{s,g}et_data_member_insertion_ranges): Declare new member functions. (is_integer_boundary, is_fn_call_expr_boundary): Declare new functions. (type_suppression::insertion_range::{boundary, integer_boundary, fn_call_expr_boundary}): Define new types. * src/abg-comparison.cc: (struct type_suppression::insertion_range::priv): New type. (type_suppression::insertion_range::{insertion_range, begin, end}): Define new member functions. (type_suppression::priv::insertion_ranges_): Add data member. (type_suppression::{s,g}et_data_member_insertion_ranges): Define new member functions. (type_suppression::insertion_range::boundary::priv): Define new type. (type_suppression::insertion_range::boundary::{boundary, ~boundary}): Define new member functions. (type_suppression::insertion_range::integer_boundary::priv): Define new type. (type_suppression::insertion_range::integer_boundary::{integer_boundary, as_integer, operator int, ~integer_boundary}): Define member functions. (type_suppression::insertion_range::fn_call_expr_boundary::priv): Define new type. (type_suppression::insertion_range::fn_call_expr_boundary::{fn_call_expr_boundary, as_function_call_expr, operator ini::function_call_expr_sptr}): Define new member functions. (type_suppression::insertion_range::{create_integer_boundary, type_suppression::insertion_range::create_fn_call_expr_boundary, type_suppression::insertion_range::eval_boundary}): Define new member functions. (is_integer_boundary, is_fn_call_expr_boundary): Define new functions. (read_type_suppression, read_function_suppression) (read_variable_suppression): Support the new kinds of property-related types. Aslo, in read_type_suppression, support the new properties has_data_member_inserted_at, has_data_member_inserted_between and has_data_members_inserted_between. (type_suppression::suppresses_diff): If we are looking at a type diff node that has inserted data members, evaluate the insertion ranges of the current type_suppression and see if they match the inserted data members. * include/abg-ini.h (property, simple_property, property_value) (string_property_value, tuple_property_value, function_call_expr): Declare new types. (property_sptr, property_value_sptr, string_property_value_sptr) (tuple_property_value_sptr): Declare new typedefs. (is_string_property_value, is_tuple_property_value) (is_simple_property, is_tuple_property, read_function_call_expr): Declare new functions. * src/abg-ini.cc (char_is_white_space, char_is_comment_start) (char_is_delimiter, char_is_property_value_char) (char_is_section_name_char, char_is_property_name_char) (char_is_comment_start, char_is_white_space) (remove_trailing_white_spaces, is_string_property_value) (is_tuple_property_value, is_simple_property, is_tuple_property) (write_property_value, char_is_function_name_char) (char_is_function_argument_char): Define new functions. (property::priv, tuple_property_value::priv) (simple_property::priv, tuple_property::priv): Define new types. (property::{property, get_name, set_name, ~property}): Define new member functions. (struct property_value::priv): Define new type. (property_value::{property_value, get_kind, operator const string&(), ~property_value}): Define new member functions. (struct string_property_value::priv): Define new type. (string_property_value::{string_property_value, set_content, as_string, operator string()}, ~string_property_value): Define new member functions. (tuple_property_value::{tuple_property_value, get_value_items, ~tuple_property_value, as_string}): Likewise. (simple_property::{simple_property, get_value, set_value, ~simple_property}): Likewise. (tuple_property::{tuple_property, set_value, get_value}): Likewise. (config::section::find_property): Adjust return type. (read_context::{char_is_delimiter, char_is_property_value_char, char_is_section_name_char, char_is_property_name_char, char_is_comment_start, char_is_white_space}): Remove these from here as they got moved them to be non-member functions above. (read_context::read_property_value): Return a property_value_sptr and do not take any parameter anymore. (read_context::{read_string_property_value, read_tuple_property_value, read_function_name, read_function_argument, read_function_call_expr}): Define new member functions. (read_context::read_property): Adjust return type. Also, change to read the different new kinds of properties values. (function_call_expr::priv): Define new type. (function_call_expr::{function_call_expr, get_name, get_arguments}): New member functions. (read_context::read_section): Adjust. (write_property, write_section): Adjust. * tests/data/test-diff-suppr/libtest{11,12}-add-data-member-v{0,1}.so: New test input binaries. * tests/data/test-diff-suppr/test{11,12}-add-data-member-{0,1}.suppr: New input suppression files. * tests/data/test-diff-suppr/test11-add-data-member-{2,3,4}.suppr: Add new test input files. * tests/data/test-diff-suppr/test{11,12}-add-data-member-report-{0,1}.txt: New reference output files. * tests/data/test-diff-suppr/test12-add-data-member-report-2.txt: Likewise. * tests/data/test-diff-suppr/test{11,12}-add-data-member-v{0,1}.cc: Source code for the new binaries above. * tests/test-diff-suppr.cc (in_out_specs): Add new test inputs. * tests/data/Makefile.am: Add the new test related files above to source distribution. * doc/manuals/libabigail-concepts.rst: Document the new properties has_data_member_inserted_at, has_data_member_inserted_between and has_data_members_inserted_between. Signed-off-by: Dodji Seketeli <dodji@redhat.com>
416 lines
8.8 KiB
C++
416 lines
8.8 KiB
C++
// -*- Mode: C++ -*-
|
|
//
|
|
// Copyright (C) 2013-2015 Red Hat, Inc.
|
|
//
|
|
// This file is part of the GNU Application Binary Interface Generic
|
|
// Analysis and Instrumentation Library (libabigail). This library is
|
|
// free software; you can redistribute it and/or modify it under the
|
|
// terms of the GNU Lesser General Public License as published by the
|
|
// Free Software Foundation; either version 3, or (at your option) any
|
|
// later version.
|
|
|
|
// This library is distributed in the hope that it will be useful, but
|
|
// WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
// General Lesser Public License for more details.
|
|
|
|
// You should have received a copy of the GNU Lesser General Public
|
|
// License along with this program; see the file COPYING-LGPLV3. If
|
|
// not, see <http://www.gnu.org/licenses/>.
|
|
//
|
|
// Author: Dodji Seketeli
|
|
|
|
/// @file
|
|
///
|
|
/// This file contains the declarations for the ini file reader used in
|
|
/// the libabigail library.
|
|
|
|
#ifndef __ABG_INI_H__
|
|
#define __ABG_INI_H__
|
|
|
|
#include <tr1/memory>
|
|
#include <string>
|
|
#include <vector>
|
|
#include <istream>
|
|
#include <ostream>
|
|
|
|
namespace abigail
|
|
{
|
|
/// Namespace for handling ini-style files
|
|
namespace ini
|
|
{
|
|
// Inject some standard types in this namespace.
|
|
using std::tr1::shared_ptr;
|
|
using std::tr1::dynamic_pointer_cast;
|
|
using std::string;
|
|
using std::vector;
|
|
using std:: pair;
|
|
|
|
class property;
|
|
/// Convenience typefef for shared_ptr to @ref property.
|
|
typedef shared_ptr<property> property_sptr;
|
|
|
|
/// The base class of the different kinds of properties of an INI
|
|
/// file.
|
|
class property
|
|
{
|
|
struct priv;
|
|
typedef shared_ptr<priv> priv_sptr;
|
|
priv_sptr priv_;
|
|
|
|
public:
|
|
|
|
property();
|
|
|
|
property(const string& name);
|
|
|
|
const string&
|
|
get_name() const;
|
|
|
|
void
|
|
set_name(const string& name);
|
|
|
|
virtual ~property();
|
|
}; // end class property
|
|
|
|
class property_value;
|
|
|
|
/// Convenience typedef for a shared_ptr to @ref property_value.
|
|
typedef shared_ptr<property_value> property_value_sptr;
|
|
|
|
/// Base class of propertie values.
|
|
class property_value
|
|
{
|
|
public:
|
|
enum value_kind
|
|
{
|
|
ABSTRACT_PROPERTY_VALUE = 0,
|
|
STRING_PROPERTY_VALUE = 1,
|
|
TUPLE_PROPERTY_VALUE = 2,
|
|
};
|
|
|
|
private:
|
|
struct priv;
|
|
typedef shared_ptr<priv> priv_sptr;
|
|
priv_sptr priv_;
|
|
|
|
public:
|
|
|
|
property_value();
|
|
property_value(value_kind);
|
|
|
|
value_kind
|
|
get_kind() const;
|
|
|
|
virtual const string&
|
|
as_string() const = 0;
|
|
|
|
operator const string& () const;
|
|
|
|
virtual ~property_value();
|
|
}; // end class property_value.
|
|
|
|
class string_property_value;
|
|
|
|
/// A convenience typedef for a shared_ptr to @ref string_property_value.
|
|
typedef shared_ptr<string_property_value> string_property_value_sptr;
|
|
|
|
/// A property value which is a string.
|
|
class string_property_value : public property_value
|
|
{
|
|
struct priv;
|
|
typedef shared_ptr<priv> priv_sptr;
|
|
priv_sptr priv_;
|
|
|
|
public:
|
|
string_property_value();
|
|
string_property_value(const string& value);
|
|
|
|
void
|
|
set_content(const string&);
|
|
|
|
virtual const string&
|
|
as_string() const;
|
|
|
|
operator string() const;
|
|
|
|
virtual ~string_property_value();
|
|
}; // end class string_property_value
|
|
|
|
string_property_value*
|
|
is_string_property_value(const property_value*);
|
|
|
|
string_property_value_sptr
|
|
is_string_property_value(const property_value_sptr);
|
|
|
|
class tuple_property_value;
|
|
|
|
/// Convenience typedef for a shared_ptr to a @ref
|
|
/// tuple_property_value.
|
|
typedef shared_ptr<tuple_property_value> tuple_property_value_sptr;
|
|
|
|
/// A property value that is a tuple.
|
|
///
|
|
/// Each element of the tuple is itself a property value that can
|
|
/// either be a string, or another tuple, for instance.
|
|
class tuple_property_value : public property_value
|
|
{
|
|
struct priv;
|
|
typedef shared_ptr<priv> priv_sptr;
|
|
priv_sptr priv_;
|
|
|
|
public:
|
|
tuple_property_value(const vector<property_value_sptr>&);
|
|
|
|
const vector<property_value_sptr>&
|
|
get_value_items() const;
|
|
|
|
vector<property_value_sptr>&
|
|
get_value_items();
|
|
|
|
virtual const string&
|
|
as_string() const;
|
|
|
|
operator string() const;
|
|
|
|
virtual ~tuple_property_value();
|
|
}; // end class tuple_property_value
|
|
|
|
tuple_property_value*
|
|
is_tuple_property_value(const property_value*);
|
|
|
|
tuple_property_value_sptr
|
|
is_tuple_property_value(const property_value_sptr);
|
|
|
|
class simple_property;
|
|
/// Convenience typedef for a shared_ptr to an @ref simple_property.
|
|
typedef shared_ptr<simple_property> simple_property_sptr;
|
|
|
|
/// A simple property. That is, one which value is a
|
|
/// @ref string_property_value.
|
|
class simple_property : public property
|
|
{
|
|
struct priv;
|
|
typedef shared_ptr<priv> priv_sptr;
|
|
|
|
priv_sptr priv_;
|
|
|
|
public:
|
|
simple_property();
|
|
|
|
simple_property(const string& name,
|
|
const string_property_value_sptr value);
|
|
|
|
const string_property_value_sptr&
|
|
get_value() const;
|
|
|
|
void
|
|
set_value(const string_property_value_sptr value);
|
|
|
|
virtual ~simple_property();
|
|
}; // end class simple_property
|
|
|
|
simple_property*
|
|
is_simple_property(const property* p);
|
|
|
|
simple_property_sptr
|
|
is_simple_property(const property_sptr p);
|
|
|
|
class tuple_property;
|
|
/// Convenience typedef for a shared_ptr of @ref tuple_property.
|
|
typedef shared_ptr<tuple_property> tuple_property_sptr;
|
|
|
|
/// Abstraction of a tuple property. A tuple property is a property
|
|
/// which value is a @ref tuple_property_value.
|
|
class tuple_property : public property
|
|
{
|
|
struct priv;
|
|
typedef shared_ptr<priv> priv_sptr;
|
|
|
|
priv_sptr priv_;
|
|
|
|
public:
|
|
tuple_property();
|
|
|
|
tuple_property(const string& name,
|
|
const tuple_property_value_sptr v);
|
|
|
|
void
|
|
set_value(const tuple_property_value_sptr value);
|
|
|
|
const tuple_property_value_sptr&
|
|
get_value() const;
|
|
|
|
virtual
|
|
~tuple_property();
|
|
}; // end class tuple_property
|
|
|
|
tuple_property*
|
|
is_tuple_property(const property* p);
|
|
|
|
tuple_property_sptr
|
|
is_tuple_property(const property_sptr p);
|
|
|
|
class config;
|
|
|
|
/// A convenience typedef for a shared pointer to @ref config
|
|
typedef shared_ptr<config> config_sptr;
|
|
|
|
/// The abstraction of the structured content of an .ini file. This
|
|
/// roughly follows what is explained at
|
|
/// http://en.wikipedia.org/wiki/INI_file.
|
|
class config
|
|
{
|
|
class priv;
|
|
typedef shared_ptr<priv> priv_sptr;
|
|
|
|
public:
|
|
class section;
|
|
/// A convenience typedef for a shared pointer to a config::section.
|
|
typedef shared_ptr<section> section_sptr;
|
|
|
|
/// A convenience typedef for a vector of config::section_sptr.
|
|
typedef vector<section_sptr> sections_type;
|
|
|
|
/// A convenience typedef for a vector of @ref property_sptr
|
|
typedef vector<property_sptr> property_vector;
|
|
|
|
private:
|
|
priv_sptr priv_;
|
|
|
|
public:
|
|
|
|
config();
|
|
|
|
config(const string& path,
|
|
sections_type& sections);
|
|
|
|
virtual ~config();
|
|
|
|
const string&
|
|
get_path() const;
|
|
|
|
void
|
|
set_path(const string& path);
|
|
|
|
const sections_type&
|
|
get_sections() const;
|
|
|
|
void
|
|
set_sections(const sections_type& sections);
|
|
}; // end class config
|
|
|
|
/// The abstraction of one section of the .ini config.
|
|
class config::section
|
|
{
|
|
struct priv;
|
|
typedef shared_ptr<priv> priv_sptr;
|
|
|
|
priv_sptr priv_;
|
|
|
|
// Forbid this
|
|
section();
|
|
|
|
public:
|
|
section(const string& name);
|
|
|
|
section(const string& name, const property_vector& properties);
|
|
|
|
const string&
|
|
get_name() const;
|
|
|
|
const property_vector&
|
|
get_properties() const;
|
|
|
|
void
|
|
set_properties(const property_vector& properties);
|
|
|
|
void
|
|
add_property(const property_sptr prop);
|
|
|
|
property_sptr
|
|
find_property(const string& prop_name) const;
|
|
|
|
virtual ~section();
|
|
}; //end class config::section
|
|
|
|
bool
|
|
read_sections(std::istream& input,
|
|
config::sections_type& sections);
|
|
|
|
bool
|
|
read_sections(const string& path,
|
|
config::sections_type& sections);
|
|
|
|
bool
|
|
read_config(std::istream& input,
|
|
config& conf);
|
|
|
|
config_sptr
|
|
read_config(std::istream& input);
|
|
|
|
bool
|
|
read_config(const string& path,
|
|
config& conf);
|
|
|
|
config_sptr
|
|
read_config(const string& path);
|
|
|
|
bool
|
|
write_sections(const config::sections_type& sections,
|
|
std::ostream& output);
|
|
|
|
bool
|
|
write_sections(const config::sections_type& sections,
|
|
const string& path);
|
|
|
|
bool
|
|
write_config(const config& conf,
|
|
std::ostream& output);
|
|
|
|
bool
|
|
write_config(const config& conf,
|
|
const string& path);
|
|
|
|
class function_call_expr;
|
|
|
|
/// Convenience typedef for a shared pointer to function_call_expr
|
|
typedef shared_ptr<function_call_expr> function_call_expr_sptr;
|
|
|
|
/// The abstraction of a function call expression.
|
|
class function_call_expr
|
|
{
|
|
struct priv;
|
|
typedef shared_ptr<priv> priv_sptr;
|
|
priv_sptr priv_;
|
|
|
|
function_call_expr();
|
|
|
|
public:
|
|
function_call_expr(const string& name,
|
|
const vector<string>& args);
|
|
|
|
const string&
|
|
get_name() const;
|
|
|
|
const vector<string>&
|
|
get_arguments() const;
|
|
|
|
vector<string>&
|
|
get_arguments();
|
|
}; //end function_call_expr
|
|
|
|
bool
|
|
read_function_call_expr(std::istream& input,
|
|
function_call_expr_sptr& expr);
|
|
|
|
bool
|
|
read_function_call_expr(const string& input,
|
|
function_call_expr_sptr& expr);
|
|
|
|
function_call_expr_sptr
|
|
read_function_call_expr(const string& input);
|
|
}// end namespace ini
|
|
}// end namespace abigail
|
|
#endif // __ABG_INI_H__
|