mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-04-19 13:00:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove dead code and add debug messages

Browse Source
This commit is contained in:
gingerBill
2021-08-31 22:31:43 +01:00
parent b450a853d5
commit 2db6fea665
2 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main.cpp
View File

@@ -2054,7 +2054,7 @@ int strip_semicolons(Parser *parser) {
AstPackage *pkg = parser->packages[i];
file_count += pkg->files.count;
}
gb_printf_err("File count: %td\n", file_count);
gb_printf_err("File count to be stripped of unneeded tokens: %td\n", file_count);
auto generated_files = array_make<StripSemicolonFile>(permanent_allocator(), 0, file_count);
@@ -2096,6 +2096,7 @@ int strip_semicolons(Parser *parser) {
i64 written = 0;
defer (gb_file_truncate(&f, written));
debugf("Write file with stripped tokens: %s\n", filename);
err = write_file_with_stripped_tokens(&f, file->file, &written);
if (err) {
break;
@@ -2122,14 +2123,17 @@ int strip_semicolons(Parser *parser) {
char const *old_fullpath_backup = cast(char const *)file->old_fullpath_backup.text;
char const *new_fullpath = cast(char const *)file->new_fullpath.text;
debugf("Copy '%s' to '%s'\n", old_fullpath, old_fullpath_backup);
if (!gb_file_copy(old_fullpath, old_fullpath_backup, false)) {
gb_printf_err("failed to copy '%s' to '%s'\n", old_fullpath, old_fullpath_backup);
failed = true;
break;
}
debugf("Copy '%s' to '%s'\n", new_fullpath, old_fullpath);
if (!gb_file_copy(new_fullpath, old_fullpath, false)) {
gb_printf_err("failed to move '%s' to '%s' %d\n", old_fullpath, new_fullpath, GetLastError());
debugf("Copy '%s' to '%s'\n", old_fullpath_backup, old_fullpath);
if (!gb_file_copy(old_fullpath_backup, old_fullpath, false)) {
gb_printf_err("failed to restore '%s' from '%s'\n", old_fullpath, old_fullpath_backup);
}
@@ -2137,6 +2141,7 @@ int strip_semicolons(Parser *parser) {
break;
}
debugf("Remove '%s'\n", old_fullpath_backup);
if (!gb_file_remove(old_fullpath_backup)) {
gb_printf_err("failed to remove '%s'\n", old_fullpath_backup);
}
@@ -2149,9 +2154,12 @@ int strip_semicolons(Parser *parser) {
auto *file = &generated_files[i];
char const *filename = nullptr;
filename = cast(char const *)file->new_fullpath.text;
debugf("Remove '%s'\n", filename);
GB_ASSERT_MSG(gb_file_remove(filename), "unable to delete file %s", filename);
filename = cast(char const *)file->old_fullpath_backup.text;
debugf("Remove '%s'\n", filename);
if (gb_file_exists(filename) && !gb_file_remove(filename)) {
if (i < overwritten_files) {
gb_printf_err("unable to delete file %s", filename);
@@ -2161,6 +2169,8 @@ int strip_semicolons(Parser *parser) {
}
}
gb_printf_err("Files stripped of unneeded token: %td\n", file_count);
return cast(int)failed;
}

33
src/parser.cpp
View File

@@ -1559,31 +1559,14 @@ void expect_semicolon(AstFile *f, Ast *s) {
}
if (s != nullptr) {
switch (f->curr_token.kind) {
case Token_CloseBrace:
case Token_CloseParen:
case Token_else:
case Token_EOF:
return;
default:
if (is_semicolon_optional_for_node(f, s)) {
return;
}
break;
}
String node_string = ast_strings[s->kind];
String p = token_to_string(f->curr_token);
syntax_error(prev_token, "Expected ';' after %.*s, got %.*s",
LIT(node_string), LIT(p));
} else {
switch (f->curr_token.kind) {
case Token_EOF:
return;
}
String p = token_to_string(f->curr_token);
syntax_error(prev_token, "Expected ';', got %.*s", LIT(p));
return;
}
switch (f->curr_token.kind) {
case Token_EOF:
return;
}
String p = token_to_string(f->curr_token);
syntax_error(prev_token, "Expected ';', got %.*s", LIT(p));
fix_advance_to_next_stmt(f);
}
@@ -4590,7 +4573,7 @@ Ast *parse_stmt(AstFile *f) {
case Token_Semicolon:
s = ast_empty_stmt(f, token);
advance_token(f);
expect_semicolon(f, nullptr);
return s;
}