X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c74cd8ff2a61ce60dcbb71c6b169c51c1085e059..756df47074b2d7b0721f234077f5ef8d75e13932:/src/mc/Type.hpp

diff --git a/src/mc/Type.hpp b/src/mc/Type.hpp
index bc3cc45e61..819cf81b6e 100644
--- a/src/mc/Type.hpp
+++ b/src/mc/Type.hpp
@@ -12,39 +12,26 @@
 
 #include <xbt/base.h>
 
-#include "mc_forward.h"
-#include "mc_location.h"
+#include "src/mc/mc_forward.h"
+#include "src/mc/LocationList.hpp"
 
 namespace simgrid {
 namespace mc {
 
-/** Represents a type in the program
+/** A member of a structure, union
  *
- *  It is currently used to represent members of structs and unions as well.
+ *  Inheritance is seen as a special member as well.
  */
-class Type {
+class Member {
 public:
-  Type();
-  Type(Type const& type) = default;
-  Type& operator=(Type const&) = default;
-  Type(Type&& type) = default;
-  Type& operator=(Type&&) = default;
-
-  /** The DWARF TAG of the type (e.g. DW_TAG_array_type) */
-  int type;
-  unsigned id; /* Offset in the section (in hexadecimal form) */
-  std::string name; /* Name of the type */
-  int byte_size; /* Size in bytes */
-  int element_count; /* Number of elements for array type */
-  unsigned type_id; /* DW_AT_type id */
-  std::vector<Type> members; /* if DW_TAG_structure_type, DW_TAG_class_type, DW_TAG_union_type*/
-  int is_pointer_type;
+  Member() : inheritance(false), byte_size(0), type_id(0) {}
 
-  // Location (for members) is either of:
-  simgrid::mc::DwarfExpression location_expression;
-
-  simgrid::mc::Type* subtype; // DW_AT_type
-  simgrid::mc::Type* full_type; // The same (but more complete) type
+  bool inheritance;
+  std::string name;
+  simgrid::dwarf::DwarfExpression location_expression;
+  std::size_t byte_size; // Do we really need this?
+  unsigned type_id;
+  simgrid::mc::Type* type;
 
   bool has_offset_location() const
   {
@@ -68,6 +55,29 @@ public:
   }
 };
 
+/** A type in the model-checked program */
+class Type {
+public:
+  Type();
+  Type(Type const& type) = default;
+  Type& operator=(Type const&) = default;
+  Type(Type&& type) = default;
+  Type& operator=(Type&&) = default;
+
+  /** The DWARF TAG of the type (e.g. DW_TAG_array_type) */
+  int type;
+  unsigned id; /* Offset in the section (in hexadecimal form) */
+  std::string name; /* Name of the type */
+  int byte_size; /* Size in bytes */
+  int element_count; /* Number of elements for array type */
+  unsigned type_id; /* DW_AT_type id */
+  std::vector<Member> members; /* if DW_TAG_structure_type, DW_TAG_class_type, DW_TAG_union_type*/
+  int is_pointer_type;
+
+  simgrid::mc::Type* subtype; // DW_AT_type
+  simgrid::mc::Type* full_type; // The same (but more complete) type
+};
+
 inline
 Type::Type()
 {