Commit Graph

99 Commits

Author SHA1 Message Date
Ryan Lortie
ac05f990db Fix header cleaup fallout when using system pcre
Using the internal pcre has the side effect of exposing gregex.c to
glib.h.  When we use the system one, we lose that, so we need to
explicitly include the things we use (glist, gatomic, etc..)
2010-09-18 12:52:58 -04:00
Matthias Clasen
96d87da379 Remove redundant header inclusions 2010-09-03 20:30:54 -04:00
Matthias Clasen
789c0cc877 Fix a doc format issue 2010-08-16 15:30:04 -04:00
Matthias Clasen
63d19f0656 Fix doc format errors 2010-08-13 21:11:19 -04:00
Matthias Clasen
733d209b14 Move GRegex docs inline 2010-08-08 23:55:11 -04:00
Matthias Clasen
c3e5b3cca8 Whitespace cleanup 2010-08-08 23:55:11 -04:00
Matthias Clasen
f5a5863975 Minor cleanup
The definition is now present in pcre.h
2010-08-08 23:55:11 -04:00
Matthias Clasen
f9a4b4ecc7 Add introspection annotations in gregex.c
Also, make the new getters follow the style of other GRegex getters,
and take a const GRegex *.
2010-08-08 21:32:04 -04:00
Matthias Clasen
3fd1fc4f9a Trivial typo fix 2010-08-08 21:32:04 -04:00
Ryan Lortie
2e53e50244 glib/: fully remove galias hacks 2010-07-07 19:34:35 -04:00
Christian Persch
4c10cad661 Add API to get the compile and match flags from a GRegex
Bug #616967.
2010-05-01 13:57:11 +02:00
Matthias Clasen
53fc10d269 Fix a lot of clang complaints
Mostly dead assignments.
2009-09-18 19:20:06 -04:00
Paolo Borelli
e8a42bb81c Regex leak on error path
Don't leak the GRegex struct when g_regex_new() fails.
2009-04-03 00:04:39 -04:00
Murray Cumming
a431c976af Correct the grammar in some property documentation.
2009-02-06  Murray Cumming  <murrayc@murrayc.com>

* gio/gfilterinputstream.c:
* gio/gfilteroutputstream.c: Correct the grammar in some property 
documentation.
* gio/gdatainputstream.c:
* glib/gregex.c: Correct the spelling of 
occurrence in documentation.

svn path=/trunk/; revision=7856
2009-02-06 14:08:19 +00:00
Matthias Clasen
c5e6e11d8e Improve docs
svn path=/trunk/; revision=7802
2009-01-11 04:58:25 +00:00
Matthias Clasen
38202496e7 Docs improvement
svn path=/trunk/; revision=7801
2009-01-11 04:53:34 +00:00
Matthias Clasen
889152e4c6 Add docs
svn path=/trunk/; revision=7762
2009-01-03 05:10:33 +00:00
Matthias Clasen
a9df28d181 Improve docs
svn path=/trunk/; revision=7708
2008-11-29 00:07:33 +00:00
Matthias Clasen
6310f898b8 Fix gcc warnings
svn path=/trunk/; revision=7585
2008-10-10 04:54:51 +00:00
Christian Persch
9c17697b56 Use g_set_error_literal where appropriate. Patch from bug #535947.
svn path=/trunk/; revision=7051
2008-06-16 16:53:58 +00:00
Marco Barisione
a74c1a1a7c Avoid some useless casts from const gchar * to gchar *. (#516597, patch by
2008-02-17  Marco Barisione  <marco@barisione.org>

	* glib/gregex.c: (translate_compile_error), (g_regex_new): Avoid some
	useless casts from const gchar * to gchar *.  (#516597, patch by
	Yevgen Muntyan)

svn path=/trunk/; revision=6528
2008-02-17 14:26:30 +00:00
Marco Barisione
7e0677b076 Don't return duplicate matches when matching empty strings. (#515944) Add
2008-02-17  Marco Barisione  <marco@barisione.org>

	* glib/gregex.c: (match_info_new), (g_match_info_next): Don't return
	duplicate matches when matching empty strings.  (#515944)
	* tests/regex-test.c: Add tests.

svn path=/trunk/; revision=6527
2008-02-17 14:07:32 +00:00
Matthias Clasen
1b2fe32904 Add a translator comment (#503051, Pedro de Medeiros)
2008-01-06  Matthias Clasen  <mclasen@redhat.com>

        * glib/gregex.c: Add a translator comment (#503051,
        Pedro de Medeiros)

svn path=/trunk/; revision=6255
2008-01-07 03:39:41 +00:00
Mathias Hasselmann
69f071c88b Give exmples in error message unsupported case-changing escape
sequences. (503222)

* glib/gregex.c: Add examples to error message for PCRE-ERR37.

svn path=/trunk/; revision=6113
2007-12-13 15:08:59 +00:00
Marco Barisione
458f3eca76 Add new error codes for when compilation fails and make compilation error
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
2007-12-03 18:36:26 +00:00
Matthias Clasen
d2f111fca7 Require gtk-doc 1.8.
2007-11-25  Matthias Clasen  <mclasen@redhat.com>

        * configure.in: Require gtk-doc 1.8.

        * glib/gasyncqueue.c:
        * glib/gdate.c:
        * glib/gfileutils.c:
        * glib/gmain.c:
        * glib/gmarkup.c:
        * glib/gregex.c:
        * glib/gtestutils.c:
        * glib/gutils.c: Use gtk-doc abbreviations for
        examples in doc comments.


svn path=/trunk/; revision=5933
2007-11-25 06:05:06 +00:00
Marco Barisione
9f86f44826 Pass an unsigned long instead of an int to pcre_fullinfo() to avoid
2007-11-19  Marco Barisione  <marco@barisione.org>

	* glib/gregex.c: Pass an unsigned long instead of an int to
	pcre_fullinfo() to avoid problems on 64-bit systems

svn path=/trunk/; revision=5869
2007-11-19 14:06:18 +00:00
Marco Barisione
d887ff42eb When the compilation of a pattern fails in the error message use the
2007-11-19  Marco Barisione  <marco@barisione.org>

	* glib/gregex.c: When the compilation of a pattern fails in the error
	message use the character offset and not the byte offset.

svn path=/trunk/; revision=5867
2007-11-19 11:27:43 +00:00
Behdad Esfahbod
9df1f4fcc7 Fix warnings from sparse. (#487491, Kjartan Maraas)
2007-10-21  Behdad Esfahbod  <behdad@gnome.org>

        * glib/gdate.c (g_date_strftime):
        * glib/gmain.c (g_main_context_check):
        * glib/gregex.c (g_match_info_fetch_all), (g_regex_split_full):
        * glib/gthread.c (g_once_init_enter_impl), (g_once_init_leave):
        * glib/gthread.h:
        * glib/gutf8.c (g_utf16_to_utf8), (g_utf16_to_ucs4):
        * tests/errorcheck-mutex-test.c (lock_locked_mutex),
        (trylock_locked_mutex), (unlock_unlocked_mutex),
        (free_locked_mutex), (wait_on_unlocked_mutex),
        (wait_on_otherwise_locked_mutex), (timed_wait_on_unlocked_mutex),
        (timed_wait_on_otherwise_locked_mutex):
        Fix warnings from sparse. (#487491, Kjartan Maraas)


svn path=/trunk/; revision=5792
2007-10-21 17:01:29 +00:00
Marco Barisione
6273407af6 change the type of ref_count from guint to gint, so we can remove some
2007-09-10  Marco Barisione <marco@barisione.org>

	* glib/gregex.c: change the type of ref_count from guint to gint, so
	we can remove some ugly casts.

svn path=/trunk/; revision=5746
2007-09-10 16:27:38 +00:00
Marco Barisione
4356f18a3d use pcre_get_stringnumber() in get_matched_substring_number() if
2007-09-10  Marco Barisione <marco@barisione.org>

	* glib/gregex.c: use pcre_get_stringnumber() in
	get_matched_substring_number() if G_REGEX_DUPNAMES was not set.
	(#444765, Yevgen Muntyan)

svn path=/trunk/; revision=5745
2007-09-10 16:20:51 +00:00
Marco Barisione
eb5d1e18b1 define PCRE_ERROR_NULLWSLIMIT if it's not defined by PCRE, has PCRE 7.3
2007-09-10  Marco Barisione <marco@barisione.org>

	* glib/gregex.c: define PCRE_ERROR_NULLWSLIMIT if it's not defined by
	PCRE, has PCRE 7.3 removed this definition. (#475474)

svn path=/trunk/; revision=5742
2007-09-10 15:17:19 +00:00
Behdad Esfahbod
2f14244e24 Fix header inclusion. (#473879, Peter Kjellerstedt)
2007-09-05  Behdad Esfahbod  <behdad@gnome.org>

        * glib/gregex.c: Fix header inclusion. (#473879, Peter Kjellerstedt)


svn path=/trunk/; revision=5735
2007-09-05 15:44:52 +00:00
Behdad Esfahbod
bf04380d3c Fix typos
svn path=/trunk/; revision=5712
2007-08-20 23:34:35 +00:00
Matthias Clasen
1331663939 Revert the J handling change
svn path=/trunk/; revision=5671
2007-08-04 00:38:12 +00:00
Matthias Clasen
daa4a93583 Fix a C99ism
svn path=/trunk/; revision=5670
2007-08-03 18:13:56 +00:00
Matthias Clasen
d9ef72e4e9 Handle J changes in the pattern correctly. (#444765, Yevgen Muntyan)
2007-08-03  Matthias Clasen  <mclasen@redhat.com>

        * glib/gregex.c: Handle J changes in the pattern
        correctly.  (#444765, Yevgen Muntyan)



svn path=/trunk/; revision=5669
2007-08-03 18:07:55 +00:00
Matthias Clasen
9b4f6314dd remove debug spew
svn path=/trunk/; revision=5657
2007-07-31 17:04:10 +00:00
Matthias Clasen
bda8d80b6d Documentation cleanups
svn path=/trunk/; revision=5652
2007-07-22 04:14:54 +00:00
Cody Russell
49f802b83e Added GRegex boxed type. (#445065, Carlos Garnacho)
2007-06-15  Cody Russell  <bratsche@gnome.org>

	* docs/reference/gobject/tmpl/gboxed.sgml:
	* docs/reference/gobject/gobject-sections.txt:
	* glib/gregex.c:
	* gobject/gboxed.[ch]:
	* gobject/gobject.symbols: Added GRegex boxed type.
	(#445065, Carlos Garnacho)


svn path=/trunk/; revision=5566
2007-06-15 16:31:21 +00:00
Sebastian Wilhelmi
e674f5fe77 Replaced & by &amp; in <programlisting> to make gtk-doc happy.
2007-06-15  Sebastian Wilhelmi  <wilhelmi@google.com>

	* glib/gregex.c: Replaced & by &amp; in <programlisting> to make
	gtk-doc happy.


svn path=/trunk/; revision=5565
2007-06-15 15:55:37 +00:00
Yevgen Muntyan
1db61c07d2 fixed g_regex_fetch_named* for cases when (?J) is used inside a pattern
2007-06-03  Yevgen Muntyan  <muntyan@tamu.edu>

	* glib/gregex.c: fixed g_regex_fetch_named* for cases when (?J)
	is used inside a pattern (#442265, comment #12).
	* tests/regex-test.c: Test it.


svn path=/trunk/; revision=5526
2007-06-03 06:05:23 +00:00
Yevgen Muntyan
904c42896f New functions: g_regex_ref(), g_regex_unref() which replaces
2007-06-03  Yevgen Muntyan  <muntyan@tamu.edu>

	* glib/gregex.c:
	* glib/gregex.h: New functions: g_regex_ref(), g_regex_unref() which
	replaces g_regex_free(); g_match_info_get_regex(), g_match_info_get_string();
	g_regex_check_replacement().
	Made g_match_info_expand_references() accept NULL; changed GRegexEvalCallback
	to take only arguments which are likely to be actualy used.

	* docs/reference/glib/glib-sections.txt:
	* glib/glib.symbols: Added new functions.

	* tests/regex-test.c: Test them.

	* docs/reference/glib/tmpl/gregex.sgml: Updated GRegexEvalCallback docs.


svn path=/trunk/; revision=5524
2007-06-03 05:48:17 +00:00
Marco Barisione
0fc6c7288a Fix g_regex_fetch_named() and g_regex_fetch_named_pos() when
2007-05-29  Marco Barisione <marco@barisione.org>

	* glib/gregex.c: Fix g_regex_fetch_named() and
	g_regex_fetch_named_pos() when G_REGEX_DUPNAMES is used  (#434358,
	Yevgen Muntyan and #419376, Marco Barisione, patch by Yevgen Muntyan)

svn path=/trunk/; revision=5518
2007-05-29 09:32:34 +00:00
Marco Barisione
850ad7e494 Made more clear that the string passed to the match functions cannot be
2007-05-02  Marco Barisione <marco@barisione.org>

	* glib/gregex.c: Made more clear that the string passed to the match
	functions cannot be freed before using g_match_info_fetch() and
	similar functions, and fixed a typo.

svn path=/trunk/; revision=5474
2007-05-02 10:39:23 +00:00
Matthias Clasen
88651f758b Add g_regex_get_max_backref() and g_regex_get_capture_count(). (#419371,
2007-04-30  Matthias Clasen  <mclasen@redhat.com>

        * glib/glib.symbols:
        * glib/gregex.[hc]: Add g_regex_get_max_backref() and
        g_regex_get_capture_count().  (#419371, Marco Barisione)


svn path=/trunk/; revision=5469
2007-04-30 16:37:38 +00:00
Matthias Clasen
a793051fda Split GRegex into GRegex and GMatchInfo. (#419368, Marco Barisione)
2007-04-30  Matthias Clasen  <mclasen@redhat.com>

        * glib/glib.symbols:
        * glib/gregex.[hc]: Split GRegex into GRegex and GMatchInfo.
        (#419368, Marco Barisione)

        * tests/regex-test.c: Adapt.


svn path=/trunk/; revision=5468
2007-04-30 16:02:26 +00:00
Matthias Clasen
c1025d6be4 Cosmetic fixes
svn path=/trunk/; revision=5426
2007-03-18 05:18:12 +00:00
Marco Barisione
0196d63975 Add GRegex for regular expression matching. (#50075)
2007-03-15  Marco Barisione <marco@barisione.org>

	Add GRegex for regular expression matching.  (#50075)

	* configure.in: Handle GRegex compilation.

	* glib/gregex.c:
	* glib/gregex.h: Code for GRegex.

	* glib/Makefile.am:
	* glib/makefile.msc.in: Updated makefiles.

	* glib/pcre/*: Internal copy of PCRE.

	* glib/update-pcre/*: Stuff to automatically update the internal PCRE
	to a newer version.

	* tests/regex-test.c:
	* tests/Makefile.am:
	* tests/makefile.msc.in: Add tests for GRegex.

svn path=/trunk/; revision=5408
2007-03-15 13:01:31 +00:00