diff options
Diffstat (limited to 'gcc/rust/resolve/rust-ast-resolve-expr.h')
| -rw-r--r-- | gcc/rust/resolve/rust-ast-resolve-expr.h | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/gcc/rust/resolve/rust-ast-resolve-expr.h b/gcc/rust/resolve/rust-ast-resolve-expr.h index 9366818..f62f17c 100644 --- a/gcc/rust/resolve/rust-ast-resolve-expr.h +++ b/gcc/rust/resolve/rust-ast-resolve-expr.h @@ -102,16 +102,26 @@ public: void visit (AST::IdentifierExpr &expr) { - if (!resolver->get_name_scope ().lookup (expr.as_string (), &resolved_node)) + if (resolver->get_name_scope ().lookup (expr.as_string (), &resolved_node)) + { + resolver->insert_resolved_name (expr.get_node_id (), resolved_node); + resolver->insert_new_definition (expr.get_node_id (), + Definition{expr.get_node_id (), + parent}); + } + else if (resolver->get_type_scope ().lookup (expr.as_string (), + &resolved_node)) + { + 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 (), "failed to find name: %s", expr.as_string ().c_str ()); - return; } - - 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::ArithmeticOrLogicalExpr &expr) |