ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-07-09 13:01:38 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add semicolon stripping command: odin strip-semicolon, has the same parameters as odin check

Browse Source
This commit is contained in:
gingerBill
2021-08-31 22:20:36 +01:00
parent 1fff96e088
commit b176af2742
3 changed files with 145 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+131 -5
View File
@@ -733,7 +733,7 @@ bool parse_build_flags(Array<String> args) {
add_flag(&build_flags, BuildFlag_ShowUnusedWithLocation, str_lit("show-unused-with-location"), BuildFlagParam_None, Command_check);
add_flag(&build_flags, BuildFlag_ShowSystemCalls, str_lit("show-system-calls"), BuildFlagParam_None, Command_all);
add_flag(&build_flags, BuildFlag_ThreadCount, str_lit("thread-count"), BuildFlagParam_Integer, Command_all);
add_flag(&build_flags, BuildFlag_KeepTempFiles, str_lit("keep-temp-files"), BuildFlagParam_None, Command__does_build);
add_flag(&build_flags, BuildFlag_KeepTempFiles, str_lit("keep-temp-files"), BuildFlagParam_None, Command__does_build|Command_strip_semicolon);
add_flag(&build_flags, BuildFlag_Collection, str_lit("collection"), BuildFlagParam_String, Command__does_check);
add_flag(&build_flags, BuildFlag_Define, str_lit("define"), BuildFlagParam_String, Command__does_check, true);
add_flag(&build_flags, BuildFlag_BuildMode, str_lit("build-mode"), BuildFlagParam_String, Command__does_build); // Commands_build is not used to allow for a better error message
@@ -2012,12 +2012,43 @@ bool check_env(void) {
struct StripSemicolonFile {
String old_fullpath;
String old_fullpath_backup;
String new_fullpath;
AstFile *file;
i64 written;
};
gbFileError write_file_with_stripped_tokens(gbFile *f, AstFile *file, i64 *written_) {
i64 written = 0;
gbFileError err = gbFileError_None;
u8 const *file_data = file->tokenizer.start;
i32 prev_offset = 0;
i32 const end_offset = cast(i32)(file->tokenizer.end - file->tokenizer.start);
for_array(i, file->tokens) {
Token *token = &file->tokens[i];
if (token->flags & TokenFlag_Remove) {
i32 offset = token->pos.offset;
i32 to_write = offset-prev_offset;
if (!gb_file_write(f, file_data+prev_offset, to_write)) {
return gbFileError_Invalid;
}
written += to_write;
prev_offset = token_pos_end(*token).offset;
}
}
if (end_offset > prev_offset) {
i32 to_write = end_offset-prev_offset;
if (!gb_file_write(f, file_data+prev_offset, end_offset-prev_offset)) {
return gbFileError_Invalid;
}
written += to_write;
}
if (written_) *written_ = written;
return err;
}
int strip_semicolons(Parser *parser) {
#if 0
isize file_count = 0;
for_array(i, parser->packages) {
AstPackage *pkg = parser->packages[i];
@@ -2031,12 +2062,107 @@ int strip_semicolons(Parser *parser) {
AstPackage *pkg = parser->packages[i];
for_array(j, pkg->files) {
AstFile *file = pkg->files[j];
gb_printf_err("%.*s\n", LIT(file->fullpath));
String old_fullpath = copy_string(permanent_allocator(), file->fullpath);
// assumes .odin extension
String fullpath_base = substring(old_fullpath, 0, old_fullpath.len-5);
String old_fullpath_backup = concatenate_strings(permanent_allocator(), fullpath_base, str_lit("~backup.odin-temp"));
String new_fullpath = concatenate_strings(permanent_allocator(), fullpath_base, str_lit("~temp.odin-temp"));
array_add(&generated_files, StripSemicolonFile{old_fullpath, old_fullpath_backup, new_fullpath, file});
}
}
#endif
return 0;
isize generated_count = 0;
bool failed = false;
for_array(i, generated_files) {
auto *file = &generated_files[i];
char const *filename = cast(char const *)file->new_fullpath.text;
gbFileError err = gbFileError_None;
defer (if (err != gbFileError_None) {
failed = true;
});
gbFile f = {};
err = gb_file_create(&f, filename);
if (err) {
break;
}
defer (err = gb_file_close(&f));
generated_count += 1;
i64 written = 0;
defer (gb_file_truncate(&f, written));
err = write_file_with_stripped_tokens(&f, file->file, &written);
if (err) {
break;
}
file->written = written;
}
if (failed) {
for (isize i = 0; i < generated_count; i++) {
auto *file = &generated_files[i];
char const *filename = nullptr;
filename = cast(char const *)file->new_fullpath.text;
GB_ASSERT_MSG(gb_file_remove(filename), "unable to delete file %s", filename);
}
return 1;
}
isize overwritten_files = 0;
for_array(i, generated_files) {
auto *file = &generated_files[i];
char const *old_fullpath = cast(char const *)file->old_fullpath.text;
char const *old_fullpath_backup = cast(char const *)file->old_fullpath_backup.text;
char const *new_fullpath = cast(char const *)file->new_fullpath.text;
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;
}
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());
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);
}
failed = true;
break;
}
if (!gb_file_remove(old_fullpath_backup)) {
gb_printf_err("failed to remove '%s'\n", old_fullpath_backup);
}
overwritten_files++;
}
if (!build_context.keep_temp_files) {
for_array(i, generated_files) {
auto *file = &generated_files[i];
char const *filename = nullptr;
filename = cast(char const *)file->new_fullpath.text;
GB_ASSERT_MSG(gb_file_remove(filename), "unable to delete file %s", filename);
filename = cast(char const *)file->old_fullpath_backup.text;
if (gb_file_exists(filename) && !gb_file_remove(filename)) {
if (i < overwritten_files) {
gb_printf_err("unable to delete file %s", filename);
failed = true;
}
}
}
}
return cast(int)failed;
}
src/parser.cpp
+13 -6
View File
@@ -1240,6 +1240,7 @@ Token advance_token(AstFile *f) {
f->lead_comment = nullptr;
f->line_comment = nullptr;
f->prev_token_index = f->curr_token_index;
Token prev = f->prev_token = f->curr_token;
bool ok = next_token0(f);
@@ -1517,10 +1518,15 @@ void expect_semicolon_newline_error(AstFile *f, Token const &token, Ast *s) {
#endif
}
void assign_removal_flag_to_semicolon(Token *token) {
void assign_removal_flag_to_semicolon(AstFile *f) {
// NOTE(bill): this is used for rewriting files to strip unneeded semicolons
if (token->kind == Token_Semicolon && token->string == ";") {
token->flags |= TokenFlag_Remove;
Token *prev_token = &f->tokens[f->prev_token_index];
Token *curr_token = &f->tokens[f->curr_token_index];
GB_ASSERT(prev_token->kind == Token_Semicolon);
if (prev_token->string == ";") {
if (curr_token->pos.line > prev_token->pos.line) {
prev_token->flags |= TokenFlag_Remove;
}
}
}
@@ -1528,8 +1534,8 @@ void expect_semicolon(AstFile *f, Ast *s) {
Token prev_token = {};
if (allow_token(f, Token_Semicolon)) {
assign_removal_flag_to_semicolon(f);
expect_semicolon_newline_error(f, f->prev_token, s);
assign_removal_flag_to_semicolon(&f->prev_token);
return;
}
switch (f->curr_token.kind) {
@@ -1543,8 +1549,8 @@ void expect_semicolon(AstFile *f, Ast *s) {
prev_token = f->prev_token;
if (prev_token.kind == Token_Semicolon) {
assign_removal_flag_to_semicolon(f);
expect_semicolon_newline_error(f, f->prev_token, s);
assign_removal_flag_to_semicolon(&f->prev_token);
return;
}
@@ -4707,8 +4713,9 @@ ParseFileError init_ast_file(AstFile *f, String fullpath, TokenPos *err_pos) {
u64 end = time_stamp_time_now();
f->time_to_tokenize = cast(f64)(end-start)/cast(f64)time_stamp__freq();
f->prev_token_index = 0;
f->curr_token_index = 0;
f->prev_token = f->tokens[f->curr_token_index];
f->prev_token = f->tokens[f->prev_token_index];
f->curr_token = f->tokens[f->curr_token_index];
isize const page_size = 4*1024;
src/parser.hpp
+1
View File
@@ -102,6 +102,7 @@ struct AstFile {
Tokenizer tokenizer;
Array<Token> tokens;
isize curr_token_index;
isize prev_token_index;
Token curr_token;
Token prev_token; // previous non-comment
Token package_token;