From 86c1aed20d3900b2a5df905a821bf13a074dc102 Mon Sep 17 00:00:00 2001 From: Kelly Wilson Date: Sun, 25 Apr 2021 23:26:12 -0600 Subject: Fix for issue 820 (import name is not an identifier) --- src/checker.cpp | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'src/checker.cpp') diff --git a/src/checker.cpp b/src/checker.cpp index f386d6da7..42462c0fa 100644 --- a/src/checker.cpp +++ b/src/checker.cpp @@ -3747,6 +3747,19 @@ Array find_import_path(Checker *c, AstPackage *start, AstPackage return empty_path; } #endif + +String get_invalid_import_name(String input) { + isize slash = 0; + for (isize i = input.len-1; i >= 0; i--) { + if (input[i] == '/' || input[i] == '\\') { + break; + } + slash = i; + } + input = substring(input, slash, input.len); + return input; +} + void check_add_import_decl(CheckerContext *ctx, Ast *decl) { if (decl->state_flags & StateFlag_BeenHandled) return; decl->state_flags |= StateFlag_BeenHandled; @@ -3804,7 +3817,14 @@ void check_add_import_decl(CheckerContext *ctx, Ast *decl) { if (id->is_using) { // TODO(bill): Should this be a warning? } else { - error(token, "Import name, %.*s, cannot be use as an import name as it is not a valid identifier", LIT(id->import_name.string)); + if (id->import_name.string == "") { + String invalid_name = id->fullpath; + invalid_name = get_invalid_import_name(invalid_name); + + error(id->token, "Import name %.*s, is not a valid identifier. Perhaps you want to reference the package by a different name like this: import \"%.*s\" ", LIT(invalid_name), LIT(invalid_name)); + } else { + error(token, "Import name, %.*s, cannot be use as an import name as it is not a valid identifier", LIT(id->import_name.string)); + } } } else { GB_ASSERT(id->import_name.pos.line != 0); -- cgit v1.2.3