-#endif /* HAVE_GETLINE */
-
-/*
- * Diff related functions
- */
-static xbt_matrix_t diff_build_LCS(xbt_dynar_t da, xbt_dynar_t db) {
- xbt_matrix_t C = xbt_matrix_new(xbt_dynar_length(da),xbt_dynar_length(db),
- sizeof(int),NULL);
- unsigned long i,j;
-
- /* Compute the LCS */
- /*
- C = array(0..m, 0..n)
- for i := 0..m
- C[i,0] = 0
- for j := 1..n
- C[0,j] = 0
- for i := 1..m
- for j := 1..n
- if X[i] = Y[j]
- C[i,j] := C[i-1,j-1] + 1
- else:
- C[i,j] := max(C[i,j-1], C[i-1,j])
- return C[m,n]
- */
- if (xbt_dynar_length(db) != 0)
- for (i=0; i<xbt_dynar_length(da); i++)
- *((int*) xbt_matrix_get_ptr(C,i,0) ) = 0;
-
- if (xbt_dynar_length(da) != 0)
- for (j=0; j<xbt_dynar_length(db); j++)
- *((int*) xbt_matrix_get_ptr(C,0,j) ) = 0;
-
- for (i=1; i<xbt_dynar_length(da); i++)
- for (j=1; j<xbt_dynar_length(db); j++) {
-
- if (!strcmp(xbt_dynar_get_as(da,i,char*), xbt_dynar_get_as(db,j,char*)))
- *((int*) xbt_matrix_get_ptr(C,i,j) ) = xbt_matrix_get_as(C,i-1,j-1,int) + 1;
- else
- *((int*) xbt_matrix_get_ptr(C,i,j) ) = max(xbt_matrix_get_as(C,i ,j-1,int),
- xbt_matrix_get_as(C,i-1,j,int));
- }
- return C;
-}
-
-static void diff_build_diff(xbt_dynar_t res,
- xbt_matrix_t C,
- xbt_dynar_t da, xbt_dynar_t db,
- int i,int j) {
- char *topush;
- /* Construct the diff
- function printDiff(C[0..m,0..n], X[1..m], Y[1..n], i, j)
- if i > 0 and j > 0 and X[i] = Y[j]
- printDiff(C, X, Y, i-1, j-1)
- print " " + X[i]
- else
- if j > 0 and (i = 0 or C[i,j-1] >= C[i-1,j])
- printDiff(C, X, Y, i, j-1)
- print "+ " + Y[j]
- else if i > 0 and (j = 0 or C[i,j-1] < C[i-1,j])
- printDiff(C, X, Y, i-1, j)
- print "- " + X[i]
- */
-
- if (i>=0 && j >= 0 && !strcmp(xbt_dynar_get_as(da,i,char*),
- xbt_dynar_get_as(db,j,char*))) {
- diff_build_diff(res,C,da,db,i-1,j-1);
- topush = bprintf(" %s",xbt_dynar_get_as(da,i,char*));
- xbt_dynar_push(res, &topush);
- } else if (j>=0 &&
- (i<=0 ||j==0|| xbt_matrix_get_as(C,i,j-1,int) >= xbt_matrix_get_as(C,i-1,j,int))) {
- diff_build_diff(res,C,da,db,i,j-1);
- topush = bprintf("+ %s",xbt_dynar_get_as(db,j,char*));
- xbt_dynar_push(res,&topush);
- } else if (i>=0 &&
- (j<=0 || xbt_matrix_get_as(C,i,j-1,int) < xbt_matrix_get_as(C,i-1,j,int))) {
- diff_build_diff(res,C,da,db,i-1,j);
- topush = bprintf("- %s",xbt_dynar_get_as(da,i,char*));
- xbt_dynar_push(res,&topush);
- } else if (i<=0 && j<=0) {
- return;
- } else {
- THROW2(arg_error,0,"Invalid values: i=%d, j=%d",i,j);
- }
-
-}
-
-/** @brief Compute the unified diff of two strings */
-char *xbt_str_diff(char *a, char *b) {
- xbt_dynar_t da = xbt_str_split(a, "\n");
- xbt_dynar_t db = xbt_str_split(b, "\n");
-
- xbt_matrix_t C = diff_build_LCS(da,db);
- xbt_dynar_t diff = xbt_dynar_new(sizeof(char*),xbt_free_ref);
- char *res=NULL;
-
- diff_build_diff(diff, C, da,db, xbt_dynar_length(da)-1, xbt_dynar_length(db)-1);
- /* Clean empty lines at the end */
- while (xbt_dynar_length(diff) > 0) {
- char *str;
- xbt_dynar_pop(diff,&str);
- if (str[0]=='\0' || !strcmp(str," ")) {
- free(str);
- } else {
- xbt_dynar_push(diff,&str);
- break;
- }
- }
- res = xbt_str_join(diff, "\n");
-
- xbt_dynar_free(&da);
- xbt_dynar_free(&db);
- xbt_dynar_free(&diff);
- xbt_matrix_free(C);
-
- return res;
+#define test_parse_error(function, name, variable, str) \
+ do { \
+ xbt_test_add(name); \
+ TRY { \
+ variable = function(str, "Parse error"); \
+ xbt_test_fail("The test '%s' did not detect the problem",name ); \
+ } CATCH(e) { \
+ if (e.category != arg_error) { \
+ xbt_test_exception(e); \
+ } else { \
+ xbt_ex_free(e); \
+ } \
+ } \
+ } while (0)
+#define test_parse_ok(function, name, variable, str, value) \
+ do { \
+ xbt_test_add(name); \
+ TRY { \
+ variable = function(str, "Parse error"); \
+ } CATCH(e) { \
+ xbt_test_exception(e); \
+ } \
+ xbt_test_assert(variable == value, "Fail to parse '%s'", str); \
+ } while (0)
+
+XBT_TEST_UNIT("xbt_str_parse", test_parse, "Test the parsing functions")
+{
+ xbt_ex_t e;
+ int rint = -9999;
+ test_parse_ok(xbt_str_parse_int, "Parse int", rint, "42", 42);
+ test_parse_ok(xbt_str_parse_int, "Parse 0 as an int", rint, "0", 0);
+ test_parse_ok(xbt_str_parse_int, "Parse -1 as an int", rint, "-1", -1);
+
+ test_parse_error(xbt_str_parse_int, "Parse int + noise", rint, "342 cruft");
+ test_parse_error(xbt_str_parse_int, "Parse NULL as an int", rint, NULL);
+ test_parse_error(xbt_str_parse_int, "Parse '' as an int", rint, "");
+ test_parse_error(xbt_str_parse_int, "Parse cruft as an int", rint, "cruft");
+
+ double rdouble = -9999;
+ test_parse_ok(xbt_str_parse_double, "Parse 42 as a double", rdouble, "42", 42);
+ test_parse_ok(xbt_str_parse_double, "Parse 42.5 as a double", rdouble, "42.5", 42.5);
+ test_parse_ok(xbt_str_parse_double, "Parse 0 as a double", rdouble, "0", 0);
+ test_parse_ok(xbt_str_parse_double, "Parse -1 as a double", rdouble, "-1", -1);
+
+ test_parse_error(xbt_str_parse_double, "Parse double + noise", rdouble, "342 cruft");
+ test_parse_error(xbt_str_parse_double, "Parse NULL as a double", rdouble, NULL);
+ test_parse_error(xbt_str_parse_double, "Parse '' as a double", rdouble, "");
+ test_parse_error(xbt_str_parse_double, "Parse cruft as a double", rdouble, "cruft");