Skip to content

various multi-ary expression types #3263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 5, 2018
Merged

various multi-ary expression types #3263

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ad5584
array_exprt is multi-ary
kroening Nov 3, 2018
0d34125
vector_exprt is multi-ary
kroening Nov 3, 2018
d062c45
array_list_exprt is multi-ary
kroening Nov 3, 2018
2acabea
struct_exprt is multi-ary
kroening Nov 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions src/util/std_expr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1642,16 +1642,16 @@ inline void validate_expr(const array_of_exprt &value)


/// \brief Array constructor from list of elements
class array_exprt:public exprt
class array_exprt : public multi_ary_exprt
{
public:
DEPRECATED("use array_exprt(type) instead")
array_exprt():exprt(ID_array)
array_exprt() : multi_ary_exprt(ID_array)
{
}

explicit array_exprt(const array_typet &_type):
exprt(ID_array, _type)
explicit array_exprt(const array_typet &_type)
: multi_ary_exprt(ID_array, _type)
{
}
};
Expand Down Expand Up @@ -1682,11 +1682,11 @@ template<> inline bool can_cast_expr<array_exprt>(const exprt &base)

/// Array constructor from a list of index-element pairs
/// Operands are index/value pairs, alternating.
class array_list_exprt : public exprt
class array_list_exprt : public multi_ary_exprt
{
public:
explicit array_list_exprt(const array_typet &_type)
: exprt(ID_array_list, _type)
: multi_ary_exprt(ID_array_list, _type)
{
}
};
Expand All @@ -1703,16 +1703,16 @@ inline void validate_expr(const array_list_exprt &value)
}

/// \brief Vector constructor from list of elements
class vector_exprt:public exprt
class vector_exprt : public multi_ary_exprt
{
public:
DEPRECATED("use vector_exprt(type) instead")
vector_exprt():exprt(ID_vector)
vector_exprt() : multi_ary_exprt(ID_vector)
{
}

explicit vector_exprt(const vector_typet &_type):
exprt(ID_vector, _type)
explicit vector_exprt(const vector_typet &_type)
: multi_ary_exprt(ID_vector, _type)
{
}
};
Expand Down Expand Up @@ -1823,16 +1823,15 @@ inline void validate_expr(const union_exprt &value)


/// \brief Struct constructor from list of elements
class struct_exprt:public exprt
class struct_exprt : public multi_ary_exprt
{
public:
DEPRECATED("use struct_exprt(component_name, value, type) instead")
struct_exprt():exprt(ID_struct)
struct_exprt() : multi_ary_exprt(ID_struct)
{
}

explicit struct_exprt(const typet &_type):
exprt(ID_struct, _type)
explicit struct_exprt(const typet &_type) : multi_ary_exprt(ID_struct, _type)
{
}

Expand Down