From owner-svn-src-user@FreeBSD.ORG  Mon Aug 22 23:19:20 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EEC4B106564A;
	Mon, 22 Aug 2011 23:19:20 +0000 (UTC)
	(envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DE2CC8FC17;
	Mon, 22 Aug 2011 23:19:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7MNJKZc072491;
	Mon, 22 Aug 2011 23:19:20 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7MNJKZ4072487;
	Mon, 22 Aug 2011 23:19:20 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201108222319.p7MNJKZ4072487@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 22 Aug 2011 23:19:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r225093 - in user/gabor/tre-integration:
	contrib/tre/lib include
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 22 Aug 2011 23:19:21 -0000

Author: gabor
Date: Mon Aug 22 23:19:20 2011
New Revision: 225093
URL: http://svn.freebsd.org/changeset/base/225093

Log:
  - Add an internal flag for heuristics: it understands ^$. but handles
    everything else as literal. This allows using the fast algorithm while
    treating {}, \, *, etc. as literal.

Modified:
  user/gabor/tre-integration/contrib/tre/lib/tre-fastmatch.c
  user/gabor/tre-integration/include/regex.h

Modified: user/gabor/tre-integration/contrib/tre/lib/tre-fastmatch.c
==============================================================================
--- user/gabor/tre-integration/contrib/tre/lib/tre-fastmatch.c	Mon Aug 22 23:15:15 2011	(r225092)
+++ user/gabor/tre-integration/contrib/tre/lib/tre-fastmatch.c	Mon Aug 22 23:19:20 2011	(r225093)
@@ -428,10 +428,11 @@ tre_compile_fast(fastmatch_t *fg, const 
   for (unsigned int i = 0; i < n; i++)
     {
       /* Can still cheat? */
-      if ((tre_isalnum(pat[i])) || tre_isspace(pat[i]) ||
+      if (!(cflags & _REG_HEUR) &&
+	  ((tre_isalnum(pat[i])) || tre_isspace(pat[i]) ||
 	  (pat[i] == TRE_CHAR('_')) || (pat[i] == TRE_CHAR(',')) ||
 	  (pat[i] == TRE_CHAR('=')) || (pat[i] == TRE_CHAR('-')) ||
-	  (pat[i] == TRE_CHAR(':')) || (pat[i] == TRE_CHAR('/')))
+	  (pat[i] == TRE_CHAR(':')) || (pat[i] == TRE_CHAR('/'))))
 	continue;
       else if (pat[i] == TRE_CHAR('.'))
 	fg->hasdot = i;

Modified: user/gabor/tre-integration/include/regex.h
==============================================================================
--- user/gabor/tre-integration/include/regex.h	Mon Aug 22 23:15:15 2011	(r225092)
+++ user/gabor/tre-integration/include/regex.h	Mon Aug 22 23:19:20 2011	(r225093)
@@ -110,6 +110,7 @@ typedef enum {
 #define REG_PEND	(REG_UNGREEDY << 1)
 #define REG_GNU         (REG_PEND << 1)
 #define REG_WORD	(REG_GNU << 1)
+#define _REG_HEUR	(REG_WORD << 1)
 
 /* POSIX tre_regexec() flags. */
 #define REG_NOTBOL 1