Revision: 1780
http://complement.svn.sourceforge.net/complement/?rev=1780&view=rev
Author: complement
Date: 2007-10-31 10:38:28 -0700 (Wed, 31 Oct 2007)
Log Message:
-----------
see on captures
Modified Paths:
--------------
trunk/complement/explore/inquiry/boost/regex/Makefile
trunk/complement/explore/inquiry/boost/regex/Makefile.inc
trunk/complement/explore/inquiry/boost/regex/re.cc
Modified: trunk/complement/explore/inquiry/boost/regex/Makefile
===================================================================
--- trunk/complement/explore/inquiry/boost/regex/Makefile 2007-10-26 16:02:33 UTC (rev 1779)
+++ trunk/complement/explore/inquiry/boost/regex/Makefile 2007-10-31 17:38:28 UTC (rev 1780)
@@ -1,5 +1,4 @@
# -*- Makefile -*- Time-stamp: <03/11/21 08:02:55 ptr>
-# $Id$
SRCROOT := ../../..
COMPILER_NAME := gcc
@@ -7,41 +6,24 @@
include Makefile.inc
include ${SRCROOT}/Makefiles/gmake/top.mak
+# INCLUDES += -I$(SRCROOT)/include -I$(STLPORT_INCLUDE_DIR) -I$(BOOST_INCLUDE_DIR)
-INCLUDES += -I$(SRCROOT)/include -I$(STLPORT_INCLUDE_DIR) -I$(BOOST_INCLUDE_DIR)
-
# temporary, before dums fix strings:
# DEFS += -D_STLP_DONT_USE_TEMPLATE_EXPRESSION
+LIBBOOST_RE_DIR = ${CoMT_DIR}/../extern/custom/boost/libs/regex
+# LIBUTF_DIR = ${CoMT_DIR}/../extern/custom/boost/libs/test/unit_test_framework
+
ifeq ($(OSNAME),linux)
-release-shared: LDSEARCH = -L${STLPORT_LIB_DIR} -L${CoMT_LIB_DIR} -Wl,--rpath=${CoMT_LIB_DIR}:${STLPORT_LIB_DIR}
-stldbg-shared: LDSEARCH = -L${STLPORT_LIB_DIR} -L${CoMT_LIB_DIR_STLDBG} -Wl,--rpath=${CoMT_LIB_DIR_STLDBG}
-dbg-shared: LDSEARCH = -L${STLPORT_LIB_DIR} -L${CoMT_LIB_DIR_DBG} -Wl,--rpath=${CoMT_LIB_DIR_DBG}
+release-shared: LDSEARCH += -L${LIBBOOST_RE_DIR}/${OUTPUT_DIR} -Wl,--rpath=${LIBBOOST_RE_DIR}/${OUTPUT_DIR}:${STLPORT_LIB_DIR}
+ifndef WITHOUT_STLPORT
+stldbg-shared: LDSEARCH += -L${LIBBOOST_RE_DIR}/${OUTPUT_DIR_STLDBG} -Wl,--rpath=${LIBBOOST_RE_DIR}/${OUTPUT_DIR_STLDBG}:${STLPORT_LIB_DIR}
endif
-
-ifeq ($(OSNAME),openbsd)
-release-shared: LDSEARCH = -L${STLPORT_LIB_DIR} -L${CoMT_LIB_DIR} -Wl,-R${CoMT_LIB_DIR}
-stldbg-shared: LDSEARCH = -L${STLPORT_LIB_DIR} -L${CoMT_LIB_DIR_STLDBG} -Wl,-R${CoMT_LIB_DIR_STLDBG}
-dbg-shared: LDSEARCH = -L${STLPORT_LIB_DIR} -L${CoMT_LIB_DIR_DBG} -Wl,-R${CoMT_LIB_DIR_DBG}
+dbg-shared: LDSEARCH += -L${LIBBOOST_RE_DIR}/${OUTPUT_DIR_DBG} -Wl,--rpath=${LIBBOOST_RE_DIR}/${OUTPUT_DIR_DBG}:${STLPORT_LIB_DIR}
endif
-release-shared : LDLIBS = -lboost_regex_gcc -lstlport_gcc
-stldbg-shared : LDLIBS = -lstlport_gcc_stldebug -lboost_regex_gcc_stl-g
-dbg-shared : LDLIBS = -lboost_regex_gcc-g -lstlport_gcc_debug
-
-ifeq ($(OSNAME),freebsd)
-release-shared : LDLIBS += -lthr
-stldbg-shared : LDLIBS += -lthr
-dbg-shared : LDLIBS += -lthr
+release-shared : LDLIBS = -lboost_regex
+ifndef WITHOUT_STLPORT
+stldbg-shared : LDLIBS = -lboost_regexstlg
endif
-
-ifeq ($(OSNAME),sunos)
-release-shared : LDLIBS += -lrt
-stldbg-shared : LDLIBS += -lrt
-dbg-shared : LDLIBS += -lrt
-endif
-
-ifeq ($(OSNAME),openbsd)
-release-shared: LDLIBS = -Wl,-Bstatic -lstlport_gcc -Wl,-Bdynamic -lxmt_gcc -lboost_test_utf_gcc -Wl,-Bstatic -lstlport_gcc -Wl,-Bdynamic
-endif
-
+dbg-shared : LDLIBS = -lboost_regexg
Modified: trunk/complement/explore/inquiry/boost/regex/Makefile.inc
===================================================================
--- trunk/complement/explore/inquiry/boost/regex/Makefile.inc 2007-10-26 16:02:33 UTC (rev 1779)
+++ trunk/complement/explore/inquiry/boost/regex/Makefile.inc 2007-10-31 17:38:28 UTC (rev 1780)
@@ -1,5 +1,4 @@
# -*- makefile -*- Time-stamp: <04/05/06 18:40:56 ptr>
-# $Id$
PRGNAME = re
SRC_CC = re.cc
Modified: trunk/complement/explore/inquiry/boost/regex/re.cc
===================================================================
--- trunk/complement/explore/inquiry/boost/regex/re.cc 2007-10-26 16:02:33 UTC (rev 1779)
+++ trunk/complement/explore/inquiry/boost/regex/re.cc 2007-10-31 17:38:28 UTC (rev 1780)
@@ -8,6 +8,7 @@
int main()
{
+#if 0
string s( "12345678" );
const regex re1( "^[0-9]+" );
const regex re2( "\\d" );
@@ -29,6 +30,25 @@
cout << m.str() << endl;
b = m[0].second;
}
+#endif
+#if 1
+ string s( "L=DGhFBHBqSWNZWQN/XHlmc2FwfVN/C1VsHTg0GlsAKBg1FD9VGgRYBh8COC0xDiMjTlxJOSk/cQ4ZIAN/Lm5+CQ==.1193829498.1711.233703.f3ced884c7fb604c9a53e562ff921344; path=/; domain=.yandex.ru; expires=Tuesday, 29-Jan-08 11:18:18 GMT" );
+ // boost::regex cookie_re( "^(?:(\\w+)=([^;]*?)(?:;[[:space:]]+))*?(?:(\\w+)=([^;]*?))$" );
+ boost::regex cookie_re( "(?:(\\w+)=([^;]*)(?:;\\s+)?)*" );
+ boost::smatch ma;
+ if ( regex_search( s, ma, cookie_re, boost::match_extra ) ) {
+ for ( int i = 1; i < ma.size(); ++i ) {
+ cout << ma[i] << endl;
+#ifdef BOOST_REGEX_MATCH_EXTRA
+ cout << "@ ";
+ for ( int j = 0; j < ma.captures(i).size(); ++j ) {
+ cout << ma.captures(i)[j] << "%";
+ }
+ cout << endl;
+#endif
+ }
+ }
+#endif
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
