X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6ee7e9c2e455536ab817ae0136acfbb53822eecd..9ae37b5e7bcca89a9574f9ae0a01e929f025aed5:/src/simdag/sd_daxloader.c diff --git a/src/simdag/sd_daxloader.c b/src/simdag/sd_daxloader.c index c065fe082b..5117925cc2 100644 --- a/src/simdag/sd_daxloader.c +++ b/src/simdag/sd_daxloader.c @@ -280,7 +280,7 @@ xbt_dynar_t SD_daxload(const char *filename) SD_task_t file; char *name; FILE *in_file = fopen(filename, "r"); - xbt_assert1(in_file, "Unable to open \"%s\"\n", filename); + xbt_assert(in_file, "Unable to open \"%s\"\n", filename); input_buffer = dax__create_buffer(in_file, 10); dax__switch_to_buffer(input_buffer); dax_lineno = 1; @@ -295,7 +295,9 @@ xbt_dynar_t SD_daxload(const char *filename) xbt_dynar_push(result, &root_task); end_task = SD_task_create_comp_seq("end", NULL, 0); - xbt_assert2(!dax_lex(), "Parse error in %s: %s", filename, + int res; + res = dax_lex(); + xbt_assert(!res, "Parse error in %s: %s", filename, dax__parse_err_msg()); dax__delete_buffer(input_buffer); fclose(in_file); @@ -393,7 +395,7 @@ void STag_dax__adag(void) double version; version = dax_parse_double(A_dax__adag_version); - xbt_assert1((version == 2.1), + xbt_assert(version == 2.1, "Expected version 2.1 in tag, got %f. Fix the parser or your file", version); }