mirror of
https://github.com/Ed94/Odin.git
synced 2026-08-05 07:08:48 +00:00
Add -max-error-count:<integer>
This commit is contained in:
@@ -7,6 +7,8 @@
|
|||||||
// #define DEFAULT_TO_THREADED_CHECKER
|
// #define DEFAULT_TO_THREADED_CHECKER
|
||||||
// #endif
|
// #endif
|
||||||
|
|
||||||
|
#define DEFAULT_MAX_ERROR_COLLECTOR_COUNT (36)
|
||||||
|
|
||||||
enum TargetOsKind : u16 {
|
enum TargetOsKind : u16 {
|
||||||
TargetOs_Invalid,
|
TargetOs_Invalid,
|
||||||
|
|
||||||
@@ -313,6 +315,8 @@ struct BuildContext {
|
|||||||
RelocMode reloc_mode;
|
RelocMode reloc_mode;
|
||||||
bool disable_red_zone;
|
bool disable_red_zone;
|
||||||
|
|
||||||
|
isize max_error_count;
|
||||||
|
|
||||||
|
|
||||||
u32 cmd_doc_flags;
|
u32 cmd_doc_flags;
|
||||||
Array<String> extra_packages;
|
Array<String> extra_packages;
|
||||||
@@ -344,6 +348,14 @@ gb_internal bool global_ignore_warnings(void) {
|
|||||||
return build_context.ignore_warnings;
|
return build_context.ignore_warnings;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gb_internal isize MAX_ERROR_COLLECTOR_COUNT(void) {
|
||||||
|
if (build_context.max_error_count <= 0) {
|
||||||
|
return DEFAULT_MAX_ERROR_COLLECTOR_COUNT;
|
||||||
|
}
|
||||||
|
return build_context.max_error_count;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
gb_global TargetMetrics target_windows_i386 = {
|
gb_global TargetMetrics target_windows_i386 = {
|
||||||
TargetOs_windows,
|
TargetOs_windows,
|
||||||
@@ -1081,6 +1093,10 @@ gb_internal void init_build_context(TargetMetrics *cross_target) {
|
|||||||
bc->ODIN_VERSION = ODIN_VERSION;
|
bc->ODIN_VERSION = ODIN_VERSION;
|
||||||
bc->ODIN_ROOT = odin_root_dir();
|
bc->ODIN_ROOT = odin_root_dir();
|
||||||
|
|
||||||
|
if (bc->max_error_count <= 0) {
|
||||||
|
bc->max_error_count = DEFAULT_MAX_ERROR_COLLECTOR_COUNT;
|
||||||
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
char const *found = gb_get_env("ODIN_ERROR_POS_STYLE", permanent_allocator());
|
char const *found = gb_get_env("ODIN_ERROR_POS_STYLE", permanent_allocator());
|
||||||
if (found) {
|
if (found) {
|
||||||
|
|||||||
+5
-5
@@ -14,8 +14,6 @@ struct ErrorCollector {
|
|||||||
|
|
||||||
gb_global ErrorCollector global_error_collector;
|
gb_global ErrorCollector global_error_collector;
|
||||||
|
|
||||||
#define MAX_ERROR_COLLECTOR_COUNT (36)
|
|
||||||
|
|
||||||
|
|
||||||
gb_internal bool any_errors(void) {
|
gb_internal bool any_errors(void) {
|
||||||
return global_error_collector.count.load() != 0;
|
return global_error_collector.count.load() != 0;
|
||||||
@@ -28,6 +26,8 @@ gb_internal void init_global_error_collector(void) {
|
|||||||
array_init(&global_files, heap_allocator(), 1, 4096);
|
array_init(&global_files, heap_allocator(), 1, 4096);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gb_internal isize MAX_ERROR_COLLECTOR_COUNT(void);
|
||||||
|
|
||||||
|
|
||||||
// temporary
|
// temporary
|
||||||
// defined in build_settings.cpp
|
// defined in build_settings.cpp
|
||||||
@@ -356,7 +356,7 @@ gb_internal void error_va(TokenPos const &pos, TokenPos end, char const *fmt, va
|
|||||||
show_error_on_line(pos, end);
|
show_error_on_line(pos, end);
|
||||||
}
|
}
|
||||||
mutex_unlock(&global_error_collector.mutex);
|
mutex_unlock(&global_error_collector.mutex);
|
||||||
if (global_error_collector.count > MAX_ERROR_COLLECTOR_COUNT) {
|
if (global_error_collector.count > MAX_ERROR_COLLECTOR_COUNT()) {
|
||||||
gb_exit(1);
|
gb_exit(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -407,7 +407,7 @@ gb_internal void error_no_newline_va(TokenPos const &pos, char const *fmt, va_li
|
|||||||
error_out_va(fmt, va);
|
error_out_va(fmt, va);
|
||||||
}
|
}
|
||||||
mutex_unlock(&global_error_collector.mutex);
|
mutex_unlock(&global_error_collector.mutex);
|
||||||
if (global_error_collector.count > MAX_ERROR_COLLECTOR_COUNT) {
|
if (global_error_collector.count > MAX_ERROR_COLLECTOR_COUNT()) {
|
||||||
gb_exit(1);
|
gb_exit(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -431,7 +431,7 @@ gb_internal void syntax_error_va(TokenPos const &pos, TokenPos end, char const *
|
|||||||
}
|
}
|
||||||
|
|
||||||
mutex_unlock(&global_error_collector.mutex);
|
mutex_unlock(&global_error_collector.mutex);
|
||||||
if (global_error_collector.count > MAX_ERROR_COLLECTOR_COUNT) {
|
if (global_error_collector.count > MAX_ERROR_COLLECTOR_COUNT()) {
|
||||||
gb_exit(1);
|
gb_exit(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+28
-2
@@ -691,6 +691,7 @@ enum BuildFlagKind {
|
|||||||
BuildFlag_TerseErrors,
|
BuildFlag_TerseErrors,
|
||||||
BuildFlag_VerboseErrors,
|
BuildFlag_VerboseErrors,
|
||||||
BuildFlag_ErrorPosStyle,
|
BuildFlag_ErrorPosStyle,
|
||||||
|
BuildFlag_MaxErrorCount,
|
||||||
|
|
||||||
// internal use only
|
// internal use only
|
||||||
BuildFlag_InternalIgnoreLazy,
|
BuildFlag_InternalIgnoreLazy,
|
||||||
@@ -866,6 +867,7 @@ gb_internal bool parse_build_flags(Array<String> args) {
|
|||||||
add_flag(&build_flags, BuildFlag_TerseErrors, str_lit("terse-errors"), BuildFlagParam_None, Command_all);
|
add_flag(&build_flags, BuildFlag_TerseErrors, str_lit("terse-errors"), BuildFlagParam_None, Command_all);
|
||||||
add_flag(&build_flags, BuildFlag_VerboseErrors, str_lit("verbose-errors"), BuildFlagParam_None, Command_all);
|
add_flag(&build_flags, BuildFlag_VerboseErrors, str_lit("verbose-errors"), BuildFlagParam_None, Command_all);
|
||||||
add_flag(&build_flags, BuildFlag_ErrorPosStyle, str_lit("error-pos-style"), BuildFlagParam_String, Command_all);
|
add_flag(&build_flags, BuildFlag_ErrorPosStyle, str_lit("error-pos-style"), BuildFlagParam_String, Command_all);
|
||||||
|
add_flag(&build_flags, BuildFlag_MaxErrorCount, str_lit("max-error-count"), BuildFlagParam_Integer, Command_all);
|
||||||
|
|
||||||
add_flag(&build_flags, BuildFlag_InternalIgnoreLazy, str_lit("internal-ignore-lazy"), BuildFlagParam_None, Command_all);
|
add_flag(&build_flags, BuildFlag_InternalIgnoreLazy, str_lit("internal-ignore-lazy"), BuildFlagParam_None, Command_all);
|
||||||
add_flag(&build_flags, BuildFlag_InternalIgnoreLLVMBuild, str_lit("internal-ignore-llvm-build"),BuildFlagParam_None, Command_all);
|
add_flag(&build_flags, BuildFlag_InternalIgnoreLLVMBuild, str_lit("internal-ignore-llvm-build"),BuildFlagParam_None, Command_all);
|
||||||
@@ -1522,6 +1524,17 @@ gb_internal bool parse_build_flags(Array<String> args) {
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case BuildFlag_MaxErrorCount: {
|
||||||
|
i64 count = big_int_to_i64(&value.value_integer);
|
||||||
|
if (count <= 0) {
|
||||||
|
gb_printf_err("-%.*s must be greater than 0", LIT(bf.name));
|
||||||
|
bad_flags = true;
|
||||||
|
} else {
|
||||||
|
build_context.max_error_count = cast(isize)count;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
case BuildFlag_InternalIgnoreLazy:
|
case BuildFlag_InternalIgnoreLazy:
|
||||||
build_context.ignore_lazy = true;
|
build_context.ignore_lazy = true;
|
||||||
break;
|
break;
|
||||||
@@ -2212,8 +2225,21 @@ gb_internal void print_show_help(String const arg0, String const &command) {
|
|||||||
print_usage_line(2, "Treats warning messages as error messages");
|
print_usage_line(2, "Treats warning messages as error messages");
|
||||||
print_usage_line(0, "");
|
print_usage_line(0, "");
|
||||||
|
|
||||||
print_usage_line(1, "-verbose-errors");
|
print_usage_line(1, "-terse-errors");
|
||||||
print_usage_line(2, "Prints verbose error messages showing the code on that line and the location in that line");
|
print_usage_line(2, "Prints a terse error message without showing the code on that line and the location in that line");
|
||||||
|
print_usage_line(0, "");
|
||||||
|
|
||||||
|
print_usage_line(1, "-error-pos-style:<string>");
|
||||||
|
print_usage_line(2, "Options are 'unix', 'odin' and 'default' (odin)");
|
||||||
|
print_usage_line(2, "'odin' file/path(45:3)");
|
||||||
|
print_usage_line(2, "'unix' file/path:45:3:");
|
||||||
|
print_usage_line(0, "");
|
||||||
|
|
||||||
|
|
||||||
|
print_usage_line(1, "-max-error-count:<integer>");
|
||||||
|
print_usage_line(2, "Set the maximum number of errors that can be displayed before the compiler terminates");
|
||||||
|
print_usage_line(2, "Must be an integer >0");
|
||||||
|
print_usage_line(2, "If not set, the default max error count is %d", DEFAULT_MAX_ERROR_COLLECTOR_COUNT);
|
||||||
print_usage_line(0, "");
|
print_usage_line(0, "");
|
||||||
|
|
||||||
print_usage_line(1, "-foreign-error-procedures");
|
print_usage_line(1, "-foreign-error-procedures");
|
||||||
|
|||||||
Reference in New Issue
Block a user