-/* $Id$ */
-
/* xbt_str.c - various helping functions to deal with strings */
-/* Copyright (C) 2005-2008 The SimGrid Team. */
-/* All rights reserved. */
+/* Copyright (c) 2007-2014. The SimGrid Team.
+ * All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
- * under the terms of the license (GNU LGPL) which comes with this package.
- */
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+#include "src/internal_config.h"
#include "xbt/misc.h"
#include "xbt/sysdep.h"
#include "xbt/str.h" /* headers of these functions */
#include "xbt/strbuff.h"
-#include "portable.h"
-#include "xbt/matrix.h" /* for the diff */
/** @brief Strip whitespace (or other characters) from the end of a string.
*
* Strips the whitespaces from the end of s.
* By default (when char_list=NULL), these characters get stripped:
*
- * - " " (ASCII 32 (0x20)) space.
- * - "\t" (ASCII 9 (0x09)) tab.
- * - "\n" (ASCII 10 (0x0A)) line feed.
- * - "\r" (ASCII 13 (0x0D)) carriage return.
- * - "\0" (ASCII 0 (0x00)) NULL.
- * - "\x0B" (ASCII 11 (0x0B)) vertical tab.
+ * - " " (ASCII 32 (0x20)) space.
+ * - "\t" (ASCII 9 (0x09)) tab.
+ * - "\n" (ASCII 10 (0x0A)) line feed.
+ * - "\r" (ASCII 13 (0x0D)) carriage return.
+ * - "\0" (ASCII 0 (0x00)) NULL.
+ * - "\x0B" (ASCII 11 (0x0B)) vertical tab.
*
* @param s The string to strip. Modified in place.
* @param char_list A string which contains the characters you want to strip.
- *
*/
void xbt_str_rtrim(char *s, const char *char_list)
{
* Strips the whitespaces from the begining of s.
* By default (when char_list=NULL), these characters get stripped:
*
- * - " " (ASCII 32 (0x20)) space.
- * - "\t" (ASCII 9 (0x09)) tab.
- * - "\n" (ASCII 10 (0x0A)) line feed.
- * - "\r" (ASCII 13 (0x0D)) carriage return.
- * - "\0" (ASCII 0 (0x00)) NULL.
- * - "\x0B" (ASCII 11 (0x0B)) vertical tab.
+ * - " " (ASCII 32 (0x20)) space.
+ * - "\t" (ASCII 9 (0x09)) tab.
+ * - "\n" (ASCII 10 (0x0A)) line feed.
+ * - "\r" (ASCII 13 (0x0D)) carriage return.
+ * - "\0" (ASCII 0 (0x00)) NULL.
+ * - "\x0B" (ASCII 11 (0x0B)) vertical tab.
*
* @param s The string to strip. Modified in place.
* @param char_list A string which contains the characters you want to strip.
- *
*/
void xbt_str_ltrim(char *s, const char *char_list)
{
* Strips the whitespaces from both the beginning and the end of s.
* By default (when char_list=NULL), these characters get stripped:
*
- * - " " (ASCII 32 (0x20)) space.
- * - "\t" (ASCII 9 (0x09)) tab.
- * - "\n" (ASCII 10 (0x0A)) line feed.
- * - "\r" (ASCII 13 (0x0D)) carriage return.
- * - "\0" (ASCII 0 (0x00)) NULL.
- * - "\x0B" (ASCII 11 (0x0B)) vertical tab.
+ * - " " (ASCII 32 (0x20)) space.
+ * - "\t" (ASCII 9 (0x09)) tab.
+ * - "\n" (ASCII 10 (0x0A)) line feed.
+ * - "\r" (ASCII 13 (0x0D)) carriage return.
+ * - "\0" (ASCII 0 (0x00)) NULL.
+ * - "\x0B" (ASCII 11 (0x0B)) vertical tab.
*
* @param s The string to strip.
* @param char_list A string which contains the characters you want to strip.
- *
*/
void xbt_str_trim(char *s, const char *char_list)
{
-
if (!s)
return;
xbt_str_ltrim(s, char_list);
}
-/** @brief Replace double whitespaces (but no other characters) from the string.
- *
- * The function modifies the string so that each time that several spaces appear,
- * they are replaced by a single space. It will only do so for spaces (ASCII 32, 0x20).
- *
- * @param s The string to strip. Modified in place.
- *
- */
-void xbt_str_strip_spaces(char *s)
-{
- char *p = s;
- int e = 0;
-
- if (!s)
- return;
-
- while (1) {
- if (!*p)
- goto end;
-
- if (*p != ' ')
- break;
-
- p++;
- }
-
- e = 1;
-
- do {
- if (e)
- *s++ = *p;
-
- if (!*++p)
- goto end;
-
- if (e ^ (*p != ' '))
- if ((e = !e))
- *s++ = ' ';
- } while (1);
-
-end:
- *s = '\0';
-}
-
/** @brief Substitutes a char for another in a string
*
* @param str the string to modify
* @param from char to search
* @param to char to put instead
- * @param amount amount of changes to do (=0 means all)
+ * @param occurence number of changes to do (=0 means all)
*/
void xbt_str_subst(char *str, char from, char to, int occurence)
{
/** @brief Replaces a set of variables by their values
*
- * @param str where to apply the change
- * @param patterns what to change
+ * @param str The input of the replacement process
+ * @param patterns The changes to apply
* @return The string modified
*
- * Check xbt_strbuff_varsubst() for more details, and remember that the string may be reallocated (moved) in the process.
+ * Both '$toto' and '${toto}' are valid (and the two writing are equivalent).
+ *
+ * If the variable name contains spaces, use the brace version (ie, ${toto tutu})
+ *
+ * You can provide a default value to use if the variable is not set in the dict by using '${var:=default}' or
+ * '${var:-default}'. These two forms are equivalent, even if they shouldn't to respect the shell standard (:= form
+ * should set the value in the dict, but does not) (BUG).
*/
-
-char *xbt_str_varsubst(char *str, xbt_dict_t patterns)
+char *xbt_str_varsubst(const char *str, xbt_dict_t patterns)
{
xbt_strbuff_t buff = xbt_strbuff_new_from(str);
char *res;
*
* By default (with sep=NULL), these characters are used as separator:
*
- * - " " (ASCII 32 (0x20)) space.
- * - "\t" (ASCII 9 (0x09)) tab.
- * - "\n" (ASCII 10 (0x0A)) line feed.
- * - "\r" (ASCII 13 (0x0D)) carriage return.
- * - "\0" (ASCII 0 (0x00)) NULL.
- * - "\x0B" (ASCII 11 (0x0B)) vertical tab.
+ * - " " (ASCII 32 (0x20)) space.
+ * - "\t" (ASCII 9 (0x09)) tab.
+ * - "\n" (ASCII 10 (0x0A)) line feed.
+ * - "\r" (ASCII 13 (0x0D)) carriage return.
+ * - "\0" (ASCII 0 (0x00)) NULL.
+ * - "\x0B" (ASCII 11 (0x0B)) vertical tab.
*/
-
xbt_dynar_t xbt_str_split(const char *s, const char *sep)
{
- xbt_dynar_t res = xbt_dynar_new(sizeof(char *), xbt_free_ref);
+ xbt_dynar_t res = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
const char *p, *q;
int done;
const char *sep_dflt = " \t\n\r\x0B";
*/
xbt_dynar_t xbt_str_split_str(const char *s, const char *sep)
{
- xbt_dynar_t res = xbt_dynar_new(sizeof(char *), xbt_free_ref);
+ xbt_dynar_t res = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
int done;
const char *p, *q;
//if substring was not found add the entire string
if (NULL == q) {
v = strlen(p);
- to_push = malloc(v + 1);
+ to_push = xbt_malloc(v + 1);
memcpy(to_push, p, v);
to_push[v] = '\0';
xbt_dynar_push(res, &to_push);
done = 1;
} else {
//get the appearance
- to_push = malloc(q - p + 1);
+ to_push = xbt_malloc(q - p + 1);
memcpy(to_push, p, q - p);
//add string terminator
to_push[q - p] = '\0';
return res;
}
-/** @brief Splits a string into a dynar of strings, taking quotes into account
+/** @brief Just like @ref xbt_str_split_quoted (Splits a string into a dynar of strings), but without memory allocation
*
- * It basically does the same argument separation than the shell, where white
- * spaces can be escaped and where arguments are never splitted within a
- * quote group.
- * Several subsequent spaces are ignored (unless within quotes, of course).
+ * The string passed as argument must be writable (not const)
+ * The elements of the dynar are just parts of the string passed as argument.
+ * So if you don't store that argument elsewhere, you should free it in addition to freeing the dynar. This can be done
+ * by simply freeing the first argument of the dynar:
+ * free(xbt_dynar_get_ptr(dynar,0));
*
+ * Actually this function puts a bunch of \0 in the memory area you passed as argument to separate the elements, and
+ * pushes the address of each chunk in the resulting dynar. Yes, that's uneven. Yes, that's gory. But that's efficient.
*/
-
-xbt_dynar_t xbt_str_split_quoted(const char *s)
-{
- xbt_dynar_t res = xbt_dynar_new(sizeof(char *), xbt_free_ref);
- char *str_to_free; /* we have to copy the string before, to handle backslashes */
+xbt_dynar_t xbt_str_split_quoted_in_place(char *s) {
+ xbt_dynar_t res = xbt_dynar_new(sizeof(char *), NULL);
char *beg, *end; /* pointers around the parsed chunk */
int in_simple_quote = 0, in_double_quote = 0;
int done = 0;
if (s[0] == '\0')
return res;
- beg = str_to_free = xbt_strdup(s);
- /* trim leading spaces */
- xbt_str_ltrim(beg, " ");
+ beg = s;
+
+ /* do not trim leading spaces: caller responsibility to clean his cruft */
end = beg;
while (!done) {
-
-
switch (*end) {
case '\\':
ctn = 1;
/* Protected char; move it closer */
memmove(end, end + 1, strlen(end));
if (*end == '\0')
- THROW0(arg_error, 0, "String ends with \\");
+ THROWF(arg_error, 0, "String ends with \\");
end++; /* Pass the protected char */
break;
-
case '\'':
ctn = 1;
if (!in_double_quote) {
end++;
}
break;
-
case ' ':
case '\t':
case '\n':
case '\0':
if (*end == '\0' && (in_simple_quote || in_double_quote)) {
- THROW2(arg_error, 0,
- "End of string found while searching for %c in %s",
- (in_simple_quote ? '\'' : '"'), s);
+ THROWF(arg_error, 0, "End of string found while searching for %c in %s", (in_simple_quote ? '\'' : '"'), s);
}
if (in_simple_quote || in_double_quote) {
end++;
} else {
+ if (*end == '\0')
+ done = 1;
+
+ *end = '\0';
if (ctn) {
/* Found a separator. Push the string if contains something */
- char *topush = xbt_malloc(end - beg + 1);
- memcpy(topush, beg, end - beg);
- topush[end - beg] = '\0';
- xbt_dynar_push(res, &topush);
+ xbt_dynar_push(res, &beg);
}
ctn = 0;
- if (*end == '\0') {
- done = 1;
+ if (done)
break;
- }
beg = ++end;
- xbt_str_ltrim(beg, " ");
+ /* trim within the string, manually to speed things up */
+ while (*beg == ' ')
+ beg++;
end = beg;
}
break;
-
default:
ctn = 1;
end++;
}
}
- free(str_to_free);
return res;
}
-#ifdef SIMGRID_TEST
-#include "xbt/str.h"
-
-#define mytest(name, input, expected) \
- xbt_test_add0(name); \
- d=xbt_str_split_quoted(input); \
- s=xbt_str_join(d,"XXX"); \
- xbt_test_assert3(!strcmp(s,expected),\
- "Input (%s) leads to (%s) instead of (%s)", \
- input,s,expected);\
- free(s); \
- xbt_dynar_free(&d);
-
-XBT_TEST_SUITE("xbt_str", "String Handling");
-XBT_TEST_UNIT("xbt_str_split_quoted", test_split_quoted,"test the function xbt_str_split_quoted")
+/** @brief Splits a string into a dynar of strings, taking quotes into account
+ *
+ * It basically does the same argument separation than the shell, where white spaces can be escaped and where arguments
+ * are never split within a quote group.
+ * Several subsequent spaces are ignored (unless within quotes, of course).
+ * You may want to trim the input string, if you want to avoid empty entries
+ */
+xbt_dynar_t xbt_str_split_quoted(const char *s)
{
- xbt_dynar_t d;
- char *s;
-
- mytest("Empty", "", "");
- mytest("Basic test", "toto tutu", "totoXXXtutu");
- mytest("Useless backslashes", "\\t\\o\\t\\o \\t\\u\\t\\u", "totoXXXtutu");
- mytest("Protected space", "toto\\ tutu", "toto tutu");
- mytest("Several spaces", "toto tutu", "totoXXXtutu");
- mytest("LTriming", " toto tatu", "totoXXXtatu");
- mytest("Triming", " toto tutu ", "totoXXXtutu");
- mytest("Single quotes", "'toto tutu' tata", "toto tutuXXXtata");
- mytest("Double quotes", "\"toto tutu\" tata", "toto tutuXXXtata");
- mytest("Mixed quotes", "\"toto' 'tutu\" tata", "toto' 'tutuXXXtata");
- mytest("Backslashed quotes", "\\'toto tutu\\' tata",
- "'totoXXXtutu'XXXtata");
- mytest("Backslashed quotes + quotes", "'toto \\'tutu' tata",
- "toto 'tutuXXXtata");
-
-}
-
-#define mytest_str(name, input, separator, expected) \
- xbt_test_add0(name); \
- d=xbt_str_split_str(input, separator); \
- s=xbt_str_join(d,"XXX"); \
- xbt_test_assert3(!strcmp(s,expected),\
- "Input (%s) leads to (%s) instead of (%s)", \
- input,s,expected);\
- free(s); \
- xbt_dynar_free(&d);
+ xbt_dynar_t res = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
+ xbt_dynar_t parsed;
+ char *str_to_free; /* we have to copy the string before, to handle backslashes */
+ unsigned int cursor;
+ char *p;
-XBT_TEST_UNIT("xbt_str_split_str", test_split_str,"test the function xbt_str_split_str")
-{
- xbt_dynar_t d;
- char *s;
+ if (s[0] == '\0')
+ return res;
+ str_to_free = xbt_strdup(s);
- mytest_str("Empty string and separator", "", "", "");
- mytest_str("Empty string", "", "##", "");
- mytest_str("Empty separator", "toto", "", "toto");
- mytest_str("String with no separator in it", "toto", "##", "toto");
- mytest_str("Basic test", "toto##tutu", "##", "totoXXXtutu");
+ parsed = xbt_str_split_quoted_in_place(str_to_free);
+ xbt_dynar_foreach(parsed,cursor,p) {
+ char *q=xbt_strdup(p);
+ xbt_dynar_push(res,&q);
+ }
+ free(str_to_free);
+ xbt_dynar_shrink(res, 0);
+ xbt_dynar_free(&parsed);
+ return res;
}
-#endif /* SIMGRID_TEST */
/** @brief Join a set of strings as a single string */
-
char *xbt_str_join(xbt_dynar_t dyn, const char *sep)
{
int len = 1, dyn_len = xbt_dynar_length(dyn);
return res;
}
-#if !defined(HAVE_GETLINE) || defined(DOXYGEN)
-/* prototype here, just in case */
-long getline(char **buf, size_t * n, FILE * stream);
-
-/** @brief Get a single line from the stream (reimplementation of the GNU getline)
- *
- * This is a redefinition of the GNU getline function, used on platforms where it does not exists.
+/** @brief Join a set of strings as a single string
*
- * getline() reads an entire line from stream, storing the address of the buffer
- * containing the text into *buf. The buffer is null-terminated and includes
- * the newline character, if one was found.
- *
- * If *buf is NULL, then getline() will allocate a buffer for storing the line,
- * which should be freed by the user program. Alternatively, before calling getline(),
- * *buf can contain a pointer to a malloc()-allocated buffer *n bytes in size. If the buffer
- * is not large enough to hold the line, getline() resizes it with realloc(), updating *buf and *n
- * as necessary. In either case, on a successful call, *buf and *n will be updated to
- * reflect the buffer address and allocated size respectively.
+ * The parameter must be a NULL-terminated array of chars,
+ * just like xbt_dynar_to_array() produces
*/
-long getline(char **buf, size_t * n, FILE * stream)
+char *xbt_str_join_array(const char *const *strs, const char *sep)
{
+ char *res,*q;
+ int amount_strings=0;
+ int len=0;
+ int i;
- size_t i;
- int ch;
+ if ((!strs) || (!strs[0]))
+ return xbt_strdup("");
- if (!*buf) {
- *buf = xbt_malloc(512);
- *n = 512;
+ /* compute the length before malloc */
+ for (i=0;strs[i];i++) {
+ len += strlen(strs[i]);
+ amount_strings++;
}
+ len += strlen(sep) * amount_strings;
- if (feof(stream))
- return (ssize_t) - 1;
-
- for (i = 0; (ch = fgetc(stream)) != EOF; i++) {
-
- if (i >= (*n) + 1)
- *buf = xbt_realloc(*buf, *n += 512);
-
- (*buf)[i] = ch;
-
- if ((*buf)[i] == '\n') {
- i++;
- (*buf)[i] = '\0';
- break;
+ /* Do the job */
+ q = res = xbt_malloc(len);
+ for (i=0;strs[i];i++) {
+ if (i!=0) { // not first loop
+ q += sprintf(q, "%s%s", sep, strs[i]);
+ } else {
+ q += sprintf(q,"%s",strs[i]);
}
}
+ return res;
+}
- if (i == *n)
- *buf = xbt_realloc(*buf, *n += 1);
+/** @brief creates a new string containing what can be read on a fd */
+char *xbt_str_from_file(FILE * file)
+{
+ xbt_strbuff_t buff = xbt_strbuff_new();
+ char *res;
+ char bread[1024];
+ memset(bread, 0, 1024);
- (*buf)[i] = '\0';
+ while (!feof(file)) {
+ int got = fread(bread, 1, 1023, file);
+ bread[got] = '\0';
+ xbt_strbuff_append(buff, bread);
+ }
- return (ssize_t) i;
+ res = buff->data;
+ xbt_strbuff_free_container(buff);
+ return res;
}
-#endif /* HAVE_GETLINE */
-
-/*
- * Diff related functions
+/** @brief Parse an integer out of a string, or raise an error
+ *
+ * The #str is passed as argument to your #error_msg, as follows:
+ * THROWF(arg_error, 0, error_msg, str);
*/
-static xbt_matrix_t diff_build_LCS(xbt_dynar_t da, xbt_dynar_t db)
+long int xbt_str_parse_int(const char* str, const char* error_msg)
{
- 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;
-}
+ char *endptr;
+ if (str == NULL || str[0] == '\0')
+ THROWF(arg_error, 0, error_msg, str);
-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);
- }
+ long int res = strtol(str, &endptr, 10);
+ if (endptr[0] != '\0')
+ THROWF(arg_error, 0, error_msg, str);
+ return res;
}
-/** @brief Compute the unified diff of two strings */
-char *xbt_str_diff(char *a, char *b)
+/** @brief Parse a double out of a string, or raise an error
+ *
+ * The #str is passed as argument to your #error_msg, as follows:
+ * THROWF(arg_error, 0, error_msg, str);
+ */
+double xbt_str_parse_double(const char* str, const char* error_msg)
{
- 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");
+ char *endptr;
+ if (str == NULL || str[0] == '\0')
+ THROWF(arg_error, 0, error_msg, str);
- xbt_dynar_free(&da);
- xbt_dynar_free(&db);
- xbt_dynar_free(&diff);
- xbt_matrix_free(C);
+ double res = strtod(str, &endptr);
+ if (endptr[0] != '\0')
+ THROWF(arg_error, 0, error_msg, str);
return res;
}
+#ifdef SIMGRID_TEST
+#include "xbt/str.h"
-/** @brief creates a new string containing what can be read on a fd
- *
- */
-char* xbt_str_from_file(FILE *file) {
- xbt_strbuff_t buff = xbt_strbuff_new();
- char *res;
- char bread[1024];
- memset(bread,0,1024);
+XBT_TEST_SUITE("xbt_str", "String Handling");
- while (!feof(file)) {
- int got = fread(bread, 1, 1023, file);
- bread[got] = '\0';
- xbt_strbuff_append(buff,bread);
- }
+#define mytest(name, input, expected) \
+ xbt_test_add(name); \
+ d=xbt_str_split_quoted(input); \
+ s=xbt_str_join(d,"XXX"); \
+ xbt_test_assert(!strcmp(s,expected),\
+ "Input (%s) leads to (%s) instead of (%s)", \
+ input,s,expected);\
+ free(s); \
+ xbt_dynar_free(&d);
+XBT_TEST_UNIT("xbt_str_split_quoted", test_split_quoted, "test the function xbt_str_split_quoted")
+{
+ xbt_dynar_t d;
+ char *s;
- res = buff->data;
- xbt_strbuff_free_container(buff);
- return res;
+ mytest("Empty", "", "");
+ mytest("Basic test", "toto tutu", "totoXXXtutu");
+ mytest("Useless backslashes", "\\t\\o\\t\\o \\t\\u\\t\\u", "totoXXXtutu");
+ mytest("Protected space", "toto\\ tutu", "toto tutu");
+ mytest("Several spaces", "toto tutu", "totoXXXtutu");
+ mytest("LTriming", " toto tatu", "totoXXXtatu");
+ mytest("Triming", " toto tutu ", "totoXXXtutu");
+ mytest("Single quotes", "'toto tutu' tata", "toto tutuXXXtata");
+ mytest("Double quotes", "\"toto tutu\" tata", "toto tutuXXXtata");
+ mytest("Mixed quotes", "\"toto' 'tutu\" tata", "toto' 'tutuXXXtata");
+ mytest("Backslashed quotes", "\\'toto tutu\\' tata", "'totoXXXtutu'XXXtata");
+ mytest("Backslashed quotes + quotes", "'toto \\'tutu' tata", "toto 'tutuXXXtata");
+}
+
+#define mytest_str(name, input, separator, expected) \
+ xbt_test_add(name); \
+ d=xbt_str_split_str(input, separator); \
+ s=xbt_str_join(d,"XXX"); \
+ xbt_test_assert(!strcmp(s,expected),\
+ "Input (%s) leads to (%s) instead of (%s)", \
+ input,s,expected);\
+ free(s); \
+ xbt_dynar_free(&d);
+
+XBT_TEST_UNIT("xbt_str_split_str", test_split_str, "test the function xbt_str_split_str")
+{
+ xbt_dynar_t d;
+ char *s;
+
+ mytest_str("Empty string and separator", "", "", "");
+ mytest_str("Empty string", "", "##", "");
+ mytest_str("Empty separator", "toto", "", "toto");
+ mytest_str("String with no separator in it", "toto", "##", "toto");
+ mytest_str("Basic test", "toto##tutu", "##", "totoXXXtutu");
+}
+
+#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");
}
+#endif /* SIMGRID_TEST */
