DeforaOS/Asm
DeforaOS/Asm
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adapt to the new API for the Error class

Browse Source
This commit is contained in:
Pierre Pronchery 2015-11-24 00:18:55 +01:00
parent 6e51edbe42
commit a87606c43a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/parser.c
View File

@ -257,7 +257,7 @@ int parser(AsmPrefs * ap, AsmCode * code, char const * infile)
if(_parser_scan(&state) != 0) if(_parser_scan(&state) != 0)
{ {
cpp_delete(state.cpp); cpp_delete(state.cpp);
return _parser_error(&state, "%s", error_get()); return _parser_error(&state, "%s", error_get(NULL));
} }
if(_program(&state) != 0) if(_program(&state) != 0)
error_set_code(1, "%s%s%u%s%u%s", infile, error_set_code(1, "%s%s%u%s%u%s", infile,
@ -295,7 +295,7 @@ int parser_string(AsmPrefs * ap, AsmCode * code, char const * string)
return -1; return -1;
} }
if(_parser_scan(&state) != 0) if(_parser_scan(&state) != 0)
return _parser_error(&state, "%s", error_get()); return _parser_error(&state, "%s", error_get(NULL));
if(_program(&state) != 0) if(_program(&state) != 0)
error_set_code(1, "%s%u%s%u%s", "Compilation failed with ", error_set_code(1, "%s%u%s%u%s", "Compilation failed with ",
state.error_cnt, " error(s) and ", state.error_cnt, " error(s) and ",
@ -380,7 +380,7 @@ static int _section_name(State * state)
fprintf(stderr, "%s\"%s\"\n", "DEBUG: section ", section); fprintf(stderr, "%s\"%s\"\n", "DEBUG: section ", section);
#endif #endif
if(asmcode_section(state->code, section) != 0) if(asmcode_section(state->code, section) != 0)
ret |= _parser_error(state, "%s", error_get()); ret |= _parser_error(state, "%s", error_get(NULL));
free(section); free(section);
return ret; return ret;
} }
@ -479,7 +479,7 @@ static int _function_name(State * state)
fprintf(stderr, "DEBUG: %s \"%s\"\n", "function", function); fprintf(stderr, "DEBUG: %s \"%s\"\n", "function", function);
#endif #endif
if(asmcode_function(state->code, function) != 0) if(asmcode_function(state->code, function) != 0)
ret |= _parser_error(state, "%s", error_get()); ret |= _parser_error(state, "%s", error_get(NULL));
free(function); free(function);
return ret; return ret;
} }
@ -510,7 +510,7 @@ static int _instruction(State * state)
if(state->call.name != NULL) if(state->call.name != NULL)
{ {
if(asmcode_instruction(state->code, &state->call) != 0) if(asmcode_instruction(state->code, &state->call) != 0)
ret |= _parser_error(state, "%s", error_get()); ret |= _parser_error(state, "%s", error_get(NULL));
free(state->call.name); free(state->call.name);
} }
/* FIXME memory leak (register names...) */ /* FIXME memory leak (register names...) */