luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-01 15:03:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add new error codes for when compilation fails and make compilation error

Browse Source 
2007-12-03  Marco Barisione <marco@barisione.org>

	* glib/gregex.c:
	* glib/gregex.h: Add new error codes for when compilation fails and
	make compilation error translatable. (#482313, Morten Welinder)

svn path=/trunk/; revision=6021
This commit is contained in:
Marco Barisione
2007-12-03 18:36:26 +00:00
committed by Marco Barisione
parent e6588b7a23
commit 458f3eca76
5 changed files with 306 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
tests/regex-test.c
View File

@@ -132,13 +132,15 @@ test_new (const gchar *pattern,
static gboolean
test_new_fail (const gchar *pattern,
GRegexCompileFlags compile_opts)
GRegexCompileFlags compile_opts,
GRegexError expected_error)
{
GRegex *regex;
GError *error = NULL;
verbose ("compiling \"%s\" (expected a failure) \t", pattern);
regex = g_regex_new (pattern, compile_opts, 0, NULL);
regex = g_regex_new (pattern, compile_opts, 0, &error);
if (regex != NULL)
{
@@ -148,13 +150,22 @@ test_new_fail (const gchar *pattern,
return FALSE;
}
if (error->code != expected_error)
{
g_print ("failed \t(pattern: \"%s\", compile: %d, got error: %d, "
"expected error: %d)\n",
pattern, compile_opts, error->code, expected_error);
g_error_free (error);
return FALSE;
}
verbose ("passed\n");
return TRUE;
}
#define TEST_NEW_FAIL(pattern, compile_opts) { \
#define TEST_NEW_FAIL(pattern, compile_opts, expected_error) { \
total++; \
if (test_new_fail (pattern, compile_opts)) \
if (test_new_fail (pattern, compile_opts, expected_error)) \
PASS; \
else \
FAIL; \
@@ -1600,13 +1611,13 @@ main (int argc, char *argv[])
/* This gives "internal error: code overflow" with pcre 6.0 */
TEST_NEW("(?i)(?-i)", 0, 0);
/* TEST_NEW_FAIL(pattern, compile_opts) */
TEST_NEW_FAIL("(", 0);
TEST_NEW_FAIL(")", 0);
TEST_NEW_FAIL("[", 0);
TEST_NEW_FAIL("*", 0);
TEST_NEW_FAIL("?", 0);
TEST_NEW_FAIL("(?P<A>x)|(?P<A>y)", 0);
/* TEST_NEW_FAIL(pattern, compile_opts, expected_error) */
TEST_NEW_FAIL("(", 0, G_REGEX_ERROR_UNMATCHED_PARENTHESIS);
TEST_NEW_FAIL(")", 0, G_REGEX_ERROR_UNMATCHED_PARENTHESIS);
TEST_NEW_FAIL("[", 0, G_REGEX_ERROR_UNTERMINATED_CHARACTER_CLASS);
TEST_NEW_FAIL("*", 0, G_REGEX_ERROR_NOTHING_TO_REPEAT);
TEST_NEW_FAIL("?", 0, G_REGEX_ERROR_NOTHING_TO_REPEAT);
TEST_NEW_FAIL("(?P<A>x)|(?P<A>y)", 0, G_REGEX_ERROR_DUPLICATE_SUBPATTERN_NAME);
/* TEST_MATCH_SIMPLE(pattern, string, compile_opts, match_opts, expected) */
TEST_MATCH_SIMPLE("a", "", 0, 0, FALSE);