symbol_typet is now a tag_typet

Author: Daniel Kroening

src/util/std_types.h

@@ -105,16 +105,19 @@ class real_typet:public typet
   }
 };
 
-/*! \brief A reference into the symbol table
+/*! \brief A generic tag-based type
 */
-class symbol_typet:public typet
+
+class tag_typet:public typet
 {
 public:
-  symbol_typet():typet(ID_symbol)
+  explicit tag_typet(const irep_idt &_id):typet(_id)
   {
   }
 
-  explicit symbol_typet(const irep_idt &identifier):typet(ID_symbol)
+  explicit tag_typet(
+    const irep_idt &_id,
+    const irep_idt &identifier):typet(_id)
   {
     set_identifier(identifier);
   }
@@ -130,6 +133,52 @@ class symbol_typet:public typet
   }
 };
 
+/*! \brief Cast a generic typet to a \ref tag_typet
+ *
+ * This is an unchecked conversion. \a type must be known to be \ref
+ * tag_typet.
+ *
+ * \param type Source type
+ * \return Object of type \ref tag_typet
+ *
+ * \ingroup gr_std_types
+*/
+inline const tag_typet &to_tag_type(const typet &type)
+{
+  PRECONDITION(type.id()==ID_symbol ||
+               type.id()==ID_c_enum_tag ||
+               type.id()==ID_struct_tag ||
+               type.id()==ID_union_tag);
+  return static_cast<const tag_typet &>(type);
+}
+
+/*! \copydoc to_tag_type(const typet &)
+ * \ingroup gr_std_types
+*/
+inline tag_typet &to_tag_type(typet &type)
+{
+  PRECONDITION(type.id()==ID_symbol ||
+               type.id()==ID_c_enum_tag ||
+               type.id()==ID_struct_tag ||
+               type.id()==ID_union_tag);
+  return static_cast<tag_typet &>(type);
+}
+
+/*! \brief A reference into the symbol table, used for typedefs
+*/
+class symbol_typet:public tag_typet
+{
+public:
+  symbol_typet():tag_typet(ID_symbol)
+  {
+  }
+
+  explicit symbol_typet(const irep_idt &identifier):tag_typet(ID_symbol)
+  {
+    set_identifier(identifier);
+  }
+};
+
 /*! \brief Cast a generic typet to a \ref symbol_typet
  *
  * This is an unchecked conversion. \a type must be known to be \ref
@@ -486,63 +535,6 @@ inline union_typet &to_union_type(typet &type)
   return static_cast<union_typet &>(type);
 }
 
-/*! \brief A generic tag-based type
-*/
-
-class tag_typet:public typet
-{
-public:
-  explicit tag_typet(const irep_idt &_id):typet(_id)
-  {
-  }
-
-  explicit tag_typet(
-    const irep_idt &_id,
-    const irep_idt &identifier):typet(_id)
-  {
-    set_identifier(identifier);
-  }
-
-  void set_identifier(const irep_idt &identifier)
-  {
-    set(ID_identifier, identifier);
-  }
-
-  const irep_idt &get_identifier() const
-  {
-    return get(ID_identifier);
-  }
-};
-
-/*! \brief Cast a generic typet to a \ref tag_typet
- *
- * This is an unchecked conversion. \a type must be known to be \ref
- * tag_typet.
- *
- * \param type Source type
- * \return Object of type \ref tag_typet
- *
- * \ingroup gr_std_types
-*/
-inline const tag_typet &to_tag_type(const typet &type)
-{
-  PRECONDITION(type.id()==ID_c_enum_tag ||
-               type.id()==ID_struct_tag ||
-               type.id()==ID_union_tag);
-  return static_cast<const tag_typet &>(type);
-}
-
-/*! \copydoc to_tag_type(const typet &)
- * \ingroup gr_std_types
-*/
-inline tag_typet &to_tag_type(typet &type)
-{
-  PRECONDITION(type.id()==ID_c_enum_tag ||
-               type.id()==ID_struct_tag ||
-               type.id()==ID_union_tag);
-  return static_cast<tag_typet &>(type);
-}
-
 /*! \brief A struct tag type
 */