diff options
| author | John Hodge <tpg@mutabah.net> | 2016-03-16 18:36:22 +0800 |
|---|---|---|
| committer | John Hodge <tpg@mutabah.net> | 2016-03-16 18:36:22 +0800 |
| commit | a3d37e1f829fc974238815a9d9d468c9087048b4 (patch) | |
| tree | acf322854baa582943e4886a2648a61f9f74f34b /src/ast/ast.cpp | |
| parent | 967a2fd0b278c3e8f19bf8fd189304cb36000acf (diff) | |
| download | mrust-a3d37e1f829fc974238815a9d9d468c9087048b4.tar.gz | |
AST - Rework struct/enum fields
Diffstat (limited to 'src/ast/ast.cpp')
| -rw-r--r-- | src/ast/ast.cpp | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/src/ast/ast.cpp b/src/ast/ast.cpp index a8a8c342..0739fde2 100644 --- a/src/ast/ast.cpp +++ b/src/ast/ast.cpp @@ -497,9 +497,13 @@ SERIALISE_TYPE(Trait::, "AST_Trait", { })
SERIALISE_TYPE_A(EnumVariant::, "AST_EnumVariant", {
+ s.item(m_attrs);
s.item(m_name);
- s.item(m_sub_types);
- s.item(m_value);
+ s.item(m_data);
+})
+SERIALISE_TYPE(EnumVariantData::, "AST_EnumVariantData", {
+ // TODO: Serialise AST::EnumVariantData
+},{
})
SERIALISE_TYPE(Enum::, "AST_Enum", {
@@ -517,20 +521,20 @@ TypeRef Struct::get_field_type(const char *name, const ::std::vector<TypeRef>& a throw ::std::runtime_error("Incorrect parameter count for struct");
}
// TODO: Should the bounds be checked here? Or is the count sufficient?
- for(const auto& f : m_fields)
+ for(const auto& f : m_data.as_Struct().ents)
{
- if( f.name == name )
+ if( f.m_name == name )
{
// Found it!
if( args.size() )
{
- TypeRef res = f.data;
+ TypeRef res = f.m_type;
res.resolve_args( GenericResolveClosure(m_params, args) );
return res;
}
else
{
- return f.data;
+ return f.m_type;
}
}
}
@@ -540,10 +544,22 @@ TypeRef Struct::get_field_type(const char *name, const ::std::vector<TypeRef>& a SERIALISE_TYPE(Struct::, "AST_Struct", {
s << m_params;
- s << m_fields;
+ s << m_data;
},{
s.item(m_params);
- s.item(m_fields);
+ s.item(m_data);
+})
+SERIALISE_TYPE(StructData::, "AST_StructData", {
+ // TODO: AST::StructData serialise
+},{
+})
+SERIALISE_TYPE(StructItem::, "AST_StructItem", {
+ // TODO: AST::StructItem serialise
+},{
+})
+SERIALISE_TYPE(TupleItem::, "AST_TupleItem", {
+ // TODO: AST::TupleItem serialise
+},{
})
::std::ostream& operator<<(::std::ostream& os, const TypeParam& tp)
|