diff options
| author | SimplyTheOther <simplytheother@gmail.com> | 2021-01-11 16:33:01 +0800 |
|---|---|---|
| committer | SimplyTheOther <simplytheother@gmail.com> | 2021-01-11 16:33:01 +0800 |
| commit | bc94b7de4614100b63e17a50692a23feab1c139f (patch) | |
| tree | 697d3614ebc838d15875eb6602bd349ca885403c /gcc/rust/resolve/rust-ast-resolve-expr.h | |
| parent | aa487ef2717e0f319f2f8d3496d0003939ec2b09 (diff) | |
| parent | 9a3ad294e0af5ed45b53c340382a7806fb150bdf (diff) | |
| download | gcc-bc94b7de4614100b63e17a50692a23feab1c139f.zip gcc-bc94b7de4614100b63e17a50692a23feab1c139f.tar.gz gcc-bc94b7de4614100b63e17a50692a23feab1c139f.tar.bz2 | |
Merge branch 'master' of https://github.com/redbrain/gccrs
Diffstat (limited to 'gcc/rust/resolve/rust-ast-resolve-expr.h')
| -rw-r--r-- | gcc/rust/resolve/rust-ast-resolve-expr.h | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/gcc/rust/resolve/rust-ast-resolve-expr.h b/gcc/rust/resolve/rust-ast-resolve-expr.h index 2292d16..324d820 100644 --- a/gcc/rust/resolve/rust-ast-resolve-expr.h +++ b/gcc/rust/resolve/rust-ast-resolve-expr.h @@ -40,21 +40,27 @@ public: void visit (AST::PathInExpression &expr) { // name scope first - if (!resolver->get_name_scope ().lookup (expr.as_string (), &resolved_node)) + if (resolver->get_name_scope ().lookup (expr.as_string (), &resolved_node)) { - // check the type scope - if (!resolver->get_type_scope ().lookup (expr.as_string (), + resolver->insert_resolved_name (expr.get_node_id (), resolved_node); + resolver->insert_new_definition (expr.get_node_id (), + Definition{expr.get_node_id (), + parent}); + } + // check the type scope + else if (resolver->get_type_scope ().lookup (expr.as_string (), &resolved_node)) - { - rust_error_at (expr.get_locus (), "unknown path %s", - expr.as_string ().c_str ()); - return; - } + { + resolver->insert_resolved_type (expr.get_node_id (), resolved_node); + resolver->insert_new_definition (expr.get_node_id (), + Definition{expr.get_node_id (), + parent}); + } + else + { + rust_error_at (expr.get_locus (), "unknown path %s", + expr.as_string ().c_str ()); } - - resolver->insert_resolved_name (expr.get_node_id (), resolved_node); - resolver->insert_new_definition (expr.get_node_id (), - Definition{expr.get_node_id (), parent}); } void visit (AST::ReturnExpr &expr) |