summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ast/ast.cpp3
-rw-r--r--src/ast/ast.hpp6
-rw-r--r--src/ast/dump.cpp26
-rw-r--r--src/expand/derive.cpp65
-rw-r--r--src/expand/mod.cpp2
-rw-r--r--src/hir/from_ast.cpp30
-rw-r--r--src/hir/from_ast_expr.cpp2
-rw-r--r--src/hir_conv/bind.cpp7
-rw-r--r--src/parse/root.cpp4
-rw-r--r--src/resolve/absolute.cpp4
-rw-r--r--src/resolve/index.cpp14
11 files changed, 95 insertions, 68 deletions
diff --git a/src/ast/ast.cpp b/src/ast/ast.cpp
index 39250a41..df5f4d5a 100644
--- a/src/ast/ast.cpp
+++ b/src/ast/ast.cpp
@@ -175,6 +175,9 @@ Enum Enum::clone() const
Struct Struct::clone() const
{
TU_MATCHA( (m_data), (e),
+ (Unit,
+ return Struct(m_params.clone());
+ ),
(Tuple,
decltype(e.ents) new_fields;
for(const auto& f : e.ents)
diff --git a/src/ast/ast.hpp b/src/ast/ast.hpp
index b63cb2e6..c067001a 100644
--- a/src/ast/ast.hpp
+++ b/src/ast/ast.hpp
@@ -319,6 +319,7 @@ public:
TAGGED_UNION_EX(StructData, (), Struct,
(
+ (Unit, struct {}),
(Tuple, struct {
::std::vector<TupleItem> ents;
}),
@@ -339,6 +340,11 @@ public:
StructData m_data;
Struct() {}
+ Struct(GenericParams params):
+ m_params( mv$(params) ),
+ m_data( StructData::make_Unit({}) )
+ {
+ }
Struct( GenericParams params, ::std::vector<StructItem> fields ):
m_params( move(params) ),
m_data( StructData::make_Struct({mv$(fields)}) )
diff --git a/src/ast/dump.cpp b/src/ast/dump.cpp
index a6c298b0..0d77054c 100644
--- a/src/ast/dump.cpp
+++ b/src/ast/dump.cpp
@@ -991,22 +991,18 @@ void RustPrinter::handle_struct(const AST::Struct& s)
print_params(s.params());
TU_MATCH(AST::StructData, (s.m_data), (e),
+ (Unit,
+ m_os << " /* unit-like */\n";
+ print_bounds(s.params());
+ m_os << indent() << ";\n";
+ ),
(Tuple,
- if( e.ents.size() == 0 )
- {
- m_os << " /* unit-like */\n";
- print_bounds(s.params());
- m_os << indent() << ";\n";
- }
- else
- {
- m_os << "(";
- for( const auto& i : e.ents )
- m_os << i.m_type << ", ";
- m_os << ")\n";
- print_bounds(s.params());
- m_os << indent() << ";\n";
- }
+ m_os << "(";
+ for( const auto& i : e.ents )
+ m_os << i.m_type << ", ";
+ m_os << ")\n";
+ print_bounds(s.params());
+ m_os << indent() << ";\n";
),
(Struct,
m_os << "\n";
diff --git a/src/expand/derive.cpp b/src/expand/derive.cpp
index c363b689..f09e9298 100644
--- a/src/expand/derive.cpp
+++ b/src/expand/derive.cpp
@@ -102,6 +102,8 @@ struct Deriver
{
::std::vector<TypeRef> ret;
TU_MATCH(AST::StructData, (str.m_data), (e),
+ (Unit,
+ ),
(Struct,
for( const auto& fld : e.ents )
{
@@ -299,6 +301,13 @@ public:
// Generate code for Debug
AST::ExprNodeP node;
TU_MATCH(AST::StructData, (str.m_data), (e),
+ (Unit,
+ node = NEWNODE(NamedValue, AST::Path("f"));
+ node = NEWNODE(CallMethod,
+ mv$(node), AST::PathNode("write_str",{}),
+ vec$( NEWNODE(String, name) )
+ );
+ ),
(Struct,
node = NEWNODE(NamedValue, AST::Path("f"));
node = NEWNODE(CallMethod,
@@ -480,6 +489,8 @@ public:
::std::vector<AST::ExprNodeP> nodes;
TU_MATCH(AST::StructData, (str.m_data), (e),
+ (Unit,
+ ),
(Struct,
for( const auto& fld : e.ents )
{
@@ -685,6 +696,8 @@ public:
::std::vector<AST::ExprNodeP> nodes;
TU_MATCH(AST::StructData, (str.m_data), (e),
+ (Unit,
+ ),
(Struct,
for( const auto& fld : e.ents )
{
@@ -896,6 +909,8 @@ public:
::std::vector<AST::ExprNodeP> nodes;
TU_MATCH(AST::StructData, (str.m_data), (e),
+ (Unit,
+ ),
(Struct,
for( const auto& fld : e.ents )
{
@@ -1049,6 +1064,8 @@ public:
::std::vector<AST::ExprNodeP> nodes;
TU_MATCH(AST::StructData, (str.m_data), (e),
+ (Unit,
+ ),
(Struct,
for( const auto& fld : e.ents )
{
@@ -1265,6 +1282,9 @@ public:
::std::vector<AST::ExprNodeP> nodes;
TU_MATCH(AST::StructData, (str.m_data), (e),
+ (Unit,
+ nodes.push_back( NEWNODE(NamedValue, AST::Path(ty_path)) );
+ ),
(Struct,
::std::vector< ::std::pair< ::std::string, AST::ExprNodeP> > vals;
for( const auto& fld : e.ents )
@@ -1274,19 +1294,12 @@ public:
nodes.push_back( NEWNODE(StructLiteral, ty_path, nullptr, mv$(vals)) );
),
(Tuple,
- if( e.ents.size() == 0 )
- {
- nodes.push_back( NEWNODE(NamedValue, AST::Path(ty_path)) );
- }
- else
+ ::std::vector<AST::ExprNodeP> vals;
+ for( unsigned int idx = 0; idx < e.ents.size(); idx ++ )
{
- ::std::vector<AST::ExprNodeP> vals;
- for( unsigned int idx = 0; idx < e.ents.size(); idx ++ )
- {
- vals.push_back( this->clone_val_ref(core_name, this->field(FMT(idx))) );
- }
- nodes.push_back( NEWNODE(CallPath, AST::Path(ty_path), mv$(vals)) );
+ vals.push_back( this->clone_val_ref(core_name, this->field(FMT(idx))) );
}
+ nodes.push_back( NEWNODE(CallPath, AST::Path(ty_path), mv$(vals)) );
)
)
@@ -1428,6 +1441,9 @@ public:
::std::vector<AST::ExprNodeP> nodes;
TU_MATCH(AST::StructData, (str.m_data), (e),
+ (Unit,
+ nodes.push_back( NEWNODE(NamedValue, AST::Path(ty_path)) );
+ ),
(Struct,
::std::vector< ::std::pair< ::std::string, AST::ExprNodeP> > vals;
for( const auto& fld : e.ents )
@@ -1437,19 +1453,12 @@ public:
nodes.push_back( NEWNODE(StructLiteral, ty_path, nullptr, mv$(vals)) );
),
(Tuple,
- if( e.ents.size() == 0 )
- {
- nodes.push_back( NEWNODE(NamedValue, AST::Path(ty_path)) );
- }
- else
+ ::std::vector<AST::ExprNodeP> vals;
+ for( unsigned int idx = 0; idx < e.ents.size(); idx ++ )
{
- ::std::vector<AST::ExprNodeP> vals;
- for( unsigned int idx = 0; idx < e.ents.size(); idx ++ )
- {
- vals.push_back( this->default_call(core_name) );
- }
- nodes.push_back( NEWNODE(CallPath, AST::Path(ty_path), mv$(vals)) );
+ vals.push_back( this->default_call(core_name) );
}
+ nodes.push_back( NEWNODE(CallPath, AST::Path(ty_path), mv$(vals)) );
)
)
@@ -1522,6 +1531,8 @@ public:
::std::vector<AST::ExprNodeP> nodes;
TU_MATCH(AST::StructData, (str.m_data), (e),
+ (Unit,
+ ),
(Struct,
for( const auto& fld : e.ents )
{
@@ -1680,6 +1691,8 @@ public:
::std::vector<AST::ExprNodeP> nodes;
TU_MATCH(AST::StructData, (str.m_data), (e),
+ (Unit,
+ ),
(Struct,
unsigned int idx = 0;
for( const auto& fld : e.ents )
@@ -1707,6 +1720,9 @@ public:
::AST::ExprNodeP node;
TU_MATCH(AST::StructData, (str.m_data), (e),
+ (Unit,
+ node = get_val_ok(core_name);
+ ),
(Struct,
node = NEWNODE(CallPath,
this->get_trait_path_Encoder() + "emit_struct",
@@ -1917,6 +1933,8 @@ public:
AST::ExprNodeP node_v;
TU_MATCH(AST::StructData, (str.m_data), (e),
+ (Unit,
+ ),
(Struct,
::std::vector< ::std::pair< ::std::string, AST::ExprNodeP > > vals;
unsigned int idx = 0;
@@ -1949,6 +1967,9 @@ public:
::AST::ExprNodeP node;
TU_MATCH(AST::StructData, (str.m_data), (e),
+ (Unit,
+ node = NEWNODE(NamedValue, mv$(base_path));
+ ),
(Struct,
assert( !args[2] );
args[2] = NEWNODE(Integer, e.ents.size(), CORETYPE_UINT);
diff --git a/src/expand/mod.cpp b/src/expand/mod.cpp
index 788b2109..1ee2e19e 100644
--- a/src/expand/mod.cpp
+++ b/src/expand/mod.cpp
@@ -896,6 +896,8 @@ void Expand_Mod(::AST::Crate& crate, LList<const AST::Module*> modstack, ::AST::
(Struct,
TU_MATCH(AST::StructData, (e.m_data), (sd),
+ (Unit,
+ ),
(Struct,
for(auto it = sd.ents.begin(); it != sd.ents.end(); ) {
auto& si = *it;
diff --git a/src/hir/from_ast.cpp b/src/hir/from_ast.cpp
index 1f1bc4e3..be823c6b 100644
--- a/src/hir/from_ast.cpp
+++ b/src/hir/from_ast.cpp
@@ -818,18 +818,16 @@ namespace {
::HIR::Struct::Data data;
TU_MATCH(::AST::StructData, (ent.m_data), (e),
+ (Unit,
+ data = ::HIR::Struct::Data::make_Unit({});
+ ),
(Tuple,
- if( e.ents.size() == 0 ) {
- data = ::HIR::Struct::Data::make_Unit({});
- }
- else {
- ::HIR::Struct::Data::Data_Tuple fields;
+ ::HIR::Struct::Data::Data_Tuple fields;
- for(const auto& field : e.ents)
- fields.push_back( { field.m_is_public, LowerHIR_Type(field.m_type) } );
+ for(const auto& field : e.ents)
+ fields.push_back( { field.m_is_public, LowerHIR_Type(field.m_type) } );
- data = ::HIR::Struct::Data::make_Tuple( mv$(fields) );
- }
+ data = ::HIR::Struct::Data::make_Tuple( mv$(fields) );
),
(Struct,
::HIR::Struct::Data::Data_Named fields;
@@ -1217,12 +1215,14 @@ void _add_mod_val_item(::HIR::Module& mod, ::std::string name, bool is_pub, ::H
),
(Struct,
/// Add value reference
- TU_IFLET( ::AST::StructData, e.m_data, Tuple, e2,
- if( e2.ents.size() == 0 )
- _add_mod_val_item( mod, item.name, item.is_pub, ::HIR::ValueItem::make_StructConstant({item_path.get_simple_path()}) );
- else
- _add_mod_val_item( mod, item.name, item.is_pub, ::HIR::ValueItem::make_StructConstructor({item_path.get_simple_path()}) );
- )
+ if( e.m_data.is_Unit() ) {
+ _add_mod_val_item( mod, item.name, item.is_pub, ::HIR::ValueItem::make_StructConstant({item_path.get_simple_path()}) );
+ }
+ else if( e.m_data.is_Tuple() ) {
+ _add_mod_val_item( mod, item.name, item.is_pub, ::HIR::ValueItem::make_StructConstructor({item_path.get_simple_path()}) );
+ }
+ else {
+ }
_add_mod_ns_item( mod, item.name, item.is_pub, LowerHIR_Struct(item_path, e) );
),
(Enum,
diff --git a/src/hir/from_ast_expr.cpp b/src/hir/from_ast_expr.cpp
index cd2b27fa..9085bd3b 100644
--- a/src/hir/from_ast_expr.cpp
+++ b/src/hir/from_ast_expr.cpp
@@ -627,7 +627,7 @@ struct LowerHIR_ExprNode_Visitor:
if( e.struct_->m_data.is_Struct() ) {
ERROR(v.span(), E0000, "Named value referring to a struct that isn't tuple-like or unit-like - " << v.m_path);
}
- is_tuple_constructor = e.struct_->m_data.as_Tuple().ents.size() > 0;
+ is_tuple_constructor = e.struct_->m_data.is_Tuple();
}
else
{
diff --git a/src/hir_conv/bind.cpp b/src/hir_conv/bind.cpp
index 20e8f7ca..c7a0829a 100644
--- a/src/hir_conv/bind.cpp
+++ b/src/hir_conv/bind.cpp
@@ -247,9 +247,12 @@ namespace {
),
(Struct,
const auto& str = get_struct_ptr(sp, m_crate, e.path);
- TU_IFLET(::HIR::Struct::Data, str.m_data, Named, _,
+ if(str.m_data.is_Named() ) {
e.binding = &str;
- )
+ }
+ else if( str.m_data.is_Unit() && e.sub_patterns.size() == 0 ) {
+ e.binding = &str;
+ }
else {
ERROR(sp, E0000, "Struct pattern on field-less struct " << e.path);
}
diff --git a/src/parse/root.cpp b/src/parse/root.cpp
index 3bdd34b1..2dc2ffc4 100644
--- a/src/parse/root.cpp
+++ b/src/parse/root.cpp
@@ -563,7 +563,7 @@ AST::Struct Parse_Struct(TokenStream& lex, const AST::MetaItems& meta_items)
else if(tok.type() == TOK_SEMICOLON)
{
// Unit-like struct
- return AST::Struct(mv$(params), ::std::vector<AST::TupleItem>());
+ return AST::Struct(mv$(params));
}
else if(tok.type() == TOK_BRACE_OPEN)
{
@@ -594,7 +594,7 @@ AST::Struct Parse_Struct(TokenStream& lex, const AST::MetaItems& meta_items)
}
//if( items.size() == 0 )
// WARNING( , W000, "Use 'struct Name;' instead of 'struct Nam { };' ... ning-nong");
- return AST::Struct(::std::move(params), ::std::move(items));
+ return AST::Struct(mv$(params), mv$(items));
}
else
{
diff --git a/src/resolve/absolute.cpp b/src/resolve/absolute.cpp
index db85ed3f..26a45a1e 100644
--- a/src/resolve/absolute.cpp
+++ b/src/resolve/absolute.cpp
@@ -1020,7 +1020,7 @@ namespace {
}
break;
}
- ERROR(sp, E0000, "Couldn't find path component '" << path_abs.nodes.back().name() << "' of " << path);
+ ERROR(sp, E0000, "Couldn't find " << Context::lookup_mode_msg(mode) << " '" << path_abs.nodes.back().name() << "' of " << path);
}
}
@@ -1946,6 +1946,8 @@ void Resolve_Absolute_Struct(Context& item_context, ::AST::Struct& e)
Resolve_Absolute_Generic(item_context, e.params());
TU_MATCH(::AST::StructData, (e.m_data), (s),
+ (Unit,
+ ),
(Tuple,
for(auto& field : s.ents) {
Resolve_Absolute_Type(item_context, field.m_type);
diff --git a/src/resolve/index.cpp b/src/resolve/index.cpp
index 7b988bc0..f57fc3e6 100644
--- a/src/resolve/index.cpp
+++ b/src/resolve/index.cpp
@@ -149,7 +149,7 @@ void Resolve_Index_Module_Base(const AST::Crate& crate, AST::Module& mod)
(Struct,
p.bind( ::AST::PathBinding::make_Struct({&e}) );
// - If the struct is a tuple-like struct (or unit-like), it presents in the value namespace
- if( e.m_data.is_Tuple() ) {
+ if( ! e.m_data.is_Struct() ) {
_add_item_value(i.data.span, mod, i.name, i.is_pub, p);
}
_add_item_type(i.data.span, mod, i.name, i.is_pub, mv$(p));
@@ -209,15 +209,9 @@ void Resolve_Index_Module_Base(const AST::Crate& crate, AST::Module& mod)
_add_item_type(sp, mod, i.name, i.is_pub, i_data.path, !allow_collide);
// - If the struct is a tuple-like struct, it presents in the value namespace
assert(e.struct_ || e.hir);
- if( e.struct_ ) {
- if( e.struct_->m_data.is_Tuple() ) {
- _add_item_value(sp, mod, i.name, i.is_pub, i_data.path, !allow_collide);
- }
- }
- else {
- if( ! e.hir->m_data.is_Named() ) {
- _add_item_value(sp, mod, i.name, i.is_pub, i_data.path, !allow_collide);
- }
+ if( !(e.struct_ ? e.struct_->m_data.is_Struct() : e.hir->m_data.is_Named()) )
+ {
+ _add_item_value(sp, mod, i.name, i.is_pub, i_data.path, !allow_collide);
}
),
(Static , _add_item_value(sp, mod, i.name, i.is_pub, i_data.path, !allow_collide); ),
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-04 08:33:51 +0000