Browse Source

Commit `import _` changes

gingerBill 3 years ago
parent
commit
23cb96de02
1 changed files with 5 additions and 8 deletions
  1. 5 8
      src/checker.cpp

+ 5 - 8
src/checker.cpp

@@ -4365,15 +4365,12 @@ void check_add_import_decl(CheckerContext *ctx, Ast *decl) {
 	// 	import_name = scope->pkg->name;
 	// 	import_name = scope->pkg->name;
 	// }
 	// }
 
 
-	if (import_name.len == 0 || is_blank_ident(import_name)) {
-		if (id->import_name.string == "") {
-			String invalid_name = id->fullpath;
-			invalid_name = get_invalid_import_name(invalid_name);
+	if (import_name.len == 0) {
+		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 <new_name> \"%.*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));
-		}
+		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 <new_name> \"%.*s\" ", LIT(invalid_name), LIT(invalid_name));
+		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 {
 	} else {
 		GB_ASSERT(id->import_name.pos.line != 0);
 		GB_ASSERT(id->import_name.pos.line != 0);
 		id->import_name.string = import_name;
 		id->import_name.string = import_name;