ps
/
4coder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

extensions to the error parsing rules

This commit is contained in:
Allen Webster 2016-07-06 18:57:55 -04:00
parent 245d61d6a6
commit 611f270410
2 changed files with 113 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
power/4coder_default_building.cpp
View File

@ -222,55 +222,130 @@ read_line(Application_Links *app,
struct Jump_Location{ struct Jump_Location{
String file; String file;
int line; int line;
int column;
}; };
static void static void
jump_to_location(Application_Links *app, View_Summary *view, Jump_Location *l){ jump_to_location(Application_Links *app, View_Summary *view, Jump_Location *l){
view_open_file(app, view, l->file.str, l->file.size, false); view_open_file(app, view, l->file.str, l->file.size, false);
app->view_set_cursor(app, view, seek_line_char(l->line, 1), true); app->view_set_cursor(app, view, seek_line_char(l->line, l->column), true);
} }
static int static int
msvc_parse_error(String line, Jump_Location *location, gcc_style_verify(String line, int colon_pos){
int skip_sub_errors, int *colon_char){ int result = false;
String line_part = substr(line, colon_pos);
if (match_part(line_part, ": error")){
result = true;
}
else if (match_part(line_part, ": warning")){
result = true;
}
return(result);
}
static int
ms_style_verify(String line, int paren_pos){
int result = false;
String line_part = substr(line, paren_pos);
if (match_part(line_part, ") : error")){
result = true;
}
else if (match_part(line_part, ") : warning")){
result = true;
}
else if (match_part(line_part, ") : error")){
result = true;
}
else if (match_part(line_part, ") : warning")){
result = true;
}
return(result);
}
static int
parse_error(String line, Jump_Location *location,
int skip_sub_errors, int *colon_char){
int result = false; int result = false;
int colon_pos = find(line, 0, ')'); int colon_pos = find(line, 0, ')');
colon_pos = find(line, colon_pos, ':'); if (ms_style_verify(line, colon_pos)){
if (colon_pos < line.size){ colon_pos = find(line, colon_pos, ':');
String location_str = substr(line, 0, colon_pos); if (colon_pos < line.size){
String location_str = substr(line, 0, colon_pos);
if (!(skip_sub_errors && location_str.str[0] == ' ')){
location_str = skip_chop_whitespace(location_str);
int paren_pos = find(location_str, 0, '('); if (!(skip_sub_errors && location_str.str[0] == ' ')){
if (paren_pos < location_str.size){ location_str = skip_chop_whitespace(location_str);
String file = substr(location_str, 0, paren_pos);
file = skip_chop_whitespace(file);
int close_pos = find(location_str, 0, ')') + 1; int paren_pos = find(location_str, 0, '(');
if (close_pos == location_str.size && file.size > 0){ if (paren_pos < location_str.size){
String line_number = substr(location_str, String file = substr(location_str, 0, paren_pos);
paren_pos+1, file = skip_chop_whitespace(file);
close_pos-paren_pos-2);
line_number = skip_chop_whitespace(line_number);
if (line_number.size > 0){ int close_pos = find(location_str, 0, ')') + 1;
copy(&location->file, file); if (close_pos == location_str.size && file.size > 0){
location->line = str_to_int(line_number); String line_number = substr(location_str,
*colon_char = colon_pos; paren_pos+1,
result = true; close_pos-paren_pos-2);
line_number = skip_chop_whitespace(line_number);
if (line_number.size > 0){
copy(&location->file, file);
int comma_pos = find(line_number, 0, ',');
if (comma_pos < line_number.size){
int start = comma_pos+1;
String column_number = substr(line_number, start, line_number.size-start);
line_number = substr(line_number, 0, comma_pos);
location->line = str_to_int(line_number);
location->column = str_to_int(column_number);
}
else{
location->line = str_to_int(line_number);
location->column = 1;
}
*colon_char = colon_pos;
result = true;
}
} }
} }
} }
} }
} }
else{
int colon_pos1 = find(line, 0, ':');
int colon_pos2 = find(line, colon_pos1+1, ':');
int colon_pos3 = find(line, colon_pos2+1, ':');
if (gcc_style_verify(line, colon_pos3)){
String filename = substr(line, 0, colon_pos1);
String line_number = substr(line, colon_pos1+1, colon_pos2 - colon_pos1 - 1);
String column_number = substr(line, colon_pos2+1, colon_pos3 - colon_pos2 - 1);
if (filename.size > 0 &&
line_number.size > 0 &&
column_number.size > 0){
copy(&location->file, filename);
location->line = str_to_int(line_number);
location->column = str_to_int(column_number);
*colon_char = colon_pos3;
result = true;
}
}
}
return(result); return(result);
} }
static int static int
msvc_next_error(Application_Links *app, next_error(Application_Links *app,
View_Summary *comp_out, int *start_line, View_Summary *comp_out, int *start_line,
void *memory, int memory_size, void *memory, int memory_size,
Jump_Location *location, Jump_Location *location,
@ -283,7 +358,7 @@ msvc_next_error(Application_Links *app,
String line_str = make_string(memory, 0, memory_size); String line_str = make_string(memory, 0, memory_size);
for (;;){ for (;;){
if (read_line(app, comp_out, line, &line_str)){ if (read_line(app, comp_out, line, &line_str)){
if (msvc_parse_error(line_str, location, skip_sub_errors, colon_char)){ if (parse_error(line_str, location, skip_sub_errors, colon_char)){
result = true; result = true;
break; break;
} }
@ -304,7 +379,7 @@ msvc_next_error(Application_Links *app,
} }
static int static int
msvc_goto_error(Application_Links *app, int direction, int skip_sub_errors, Jump_Location *loc){ goto_error(Application_Links *app, int direction, int skip_sub_errors, Jump_Location *loc){
int result = false; int result = false;
View_Summary active_view = app->get_active_view(app, AccessAll); View_Summary active_view = app->get_active_view(app, AccessAll);
@ -319,8 +394,8 @@ msvc_goto_error(Application_Links *app, int direction, int skip_sub_errors, Jump
void *m = (char*)app->memory + ms; void *m = (char*)app->memory + ms;
int colon_char = 0; int colon_char = 0;
if (msvc_next_error(app, &view, &line, m, ms, &location, if (next_error(app, &view, &line, m, ms, &location,
skip_sub_errors, direction, &colon_char)){ skip_sub_errors, direction, &colon_char)){
jump_to_location(app, &active_view, &location); jump_to_location(app, &active_view, &location);
app->view_set_cursor(app, &view, seek_line_char(line, colon_char+1), true); app->view_set_cursor(app, &view, seek_line_char(line, colon_char+1), true);
result = true; result = true;
@ -356,12 +431,12 @@ skip_this_jump(Prev_Jump prev, Prev_Jump jump){
return(result); return(result);
} }
CUSTOM_COMMAND_SIG(msvc_goto_next_error){ CUSTOM_COMMAND_SIG(goto_next_error){
Jump_Location location = {0}; Jump_Location location = {0};
Prev_Jump jump = {0}; Prev_Jump jump = {0};
do{ do{
if (msvc_goto_error(app, true, 1, &location)){ if (goto_error(app, true, 1, &location)){
jump = jump_location_store(app, location); jump = jump_location_store(app, location);
} }
else{ else{
@ -371,12 +446,12 @@ CUSTOM_COMMAND_SIG(msvc_goto_next_error){
prev_location = jump; prev_location = jump;
} }
CUSTOM_COMMAND_SIG(msvc_goto_prev_error){ CUSTOM_COMMAND_SIG(goto_prev_error){
Jump_Location location = {0}; Jump_Location location = {0};
Prev_Jump jump = {0}; Prev_Jump jump = {0};
do{ do{
if (msvc_goto_error(app, true, -1, &location)){ if (goto_error(app, true, -1, &location)){
jump = jump_location_store(app, location); jump = jump_location_store(app, location);
} }
else{ else{
@ -386,12 +461,12 @@ CUSTOM_COMMAND_SIG(msvc_goto_prev_error){
prev_location = jump; prev_location = jump;
} }
CUSTOM_COMMAND_SIG(msvc_goto_first_error){ CUSTOM_COMMAND_SIG(goto_first_error){
View_Summary active_view = app->get_active_view(app, AccessAll); View_Summary active_view = app->get_active_view(app, AccessAll);
app->view_set_cursor(app, &active_view, seek_pos(0), true); app->view_set_cursor(app, &active_view, seek_pos(0), true);
Jump_Location location; Jump_Location location;
msvc_goto_error(app, true, 1, &location); goto_error(app, true, 1, &location);
prev_location = jump_location_store(app, location); prev_location = jump_location_store(app, location);
} }

6
power/4coder_experiments.cpp
View File

@ -291,9 +291,9 @@ get_bindings(void *data, int size){
begin_map(context, mapid_global); begin_map(context, mapid_global);
bind(context, '.', MDFR_ALT, change_to_build_panel); bind(context, '.', MDFR_ALT, change_to_build_panel);
bind(context, ',', MDFR_ALT, close_build_panel); bind(context, ',', MDFR_ALT, close_build_panel);
bind(context, 'n', MDFR_ALT, msvc_goto_next_error); bind(context, 'n', MDFR_ALT, goto_next_error);
bind(context, 'N', MDFR_ALT, msvc_goto_prev_error); bind(context, 'N', MDFR_ALT, goto_prev_error);
bind(context, 'M', MDFR_ALT, msvc_goto_first_error); bind(context, 'M', MDFR_ALT, goto_first_error);
end_map(context); end_map(context);
begin_map(context, mapid_file); begin_map(context, mapid_file);