From owner-svn-src-user@FreeBSD.ORG  Sat Oct 22 11:39:18 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 0D6F51065673;
	Sat, 22 Oct 2011 11:39:18 +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 D81408FC14;
	Sat, 22 Oct 2011 11:39:17 +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 p9MBdHKH077309;
	Sat, 22 Oct 2011 11:39:17 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9MBdHc6077307;
	Sat, 22 Oct 2011 11:39:17 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201110221139.p9MBdHc6077307@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sat, 22 Oct 2011 11:39:17 +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: r226630 - user/gabor/tre-integration/contrib/tre/lib
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: Sat, 22 Oct 2011 11:39:18 -0000

Author: gabor
Date: Sat Oct 22 11:39:17 2011
New Revision: 226630
URL: http://svn.freebsd.org/changeset/base/226630

Log:
  - Use the pattern lenght if possible to limit the context that is processed
    with the automaton

Modified:
  user/gabor/tre-integration/contrib/tre/lib/regexec.c

Modified: user/gabor/tre-integration/contrib/tre/lib/regexec.c
==============================================================================
--- user/gabor/tre-integration/contrib/tre/lib/regexec.c	Sat Oct 22 10:29:06 2011	(r226629)
+++ user/gabor/tre-integration/contrib/tre/lib/regexec.c	Sat Oct 22 11:39:17 2011	(r226630)
@@ -203,20 +203,29 @@ tre_match(const tre_tnfa_t *tnfa, const 
 	      if (ret != REG_OK)
 		return ret;
 
-	      for (so = st + pmatch[0].rm_so - 1; ; so--)
+	      if (heur->tlen == -1)
 		{
-		  if ((type == STR_WIDE) ? (data_wide[so] == TRE_CHAR('\n')) :
-		      (data_byte[so] == '\n'))
-		    break;
-		  if (so == 0)
-		    break;
+		  for (so = st + pmatch[0].rm_so - 1; ; so--)
+		    {
+		      if ((type == STR_WIDE) ? (data_wide[so] == TRE_CHAR('\n')) :
+		         (data_byte[so] == '\n'))
+		      break;
+		    if (so == 0)
+		      break;
+		    }
+
+		  for (eo = st + pmatch[0].rm_eo; st + eo < len; eo++)
+		    {
+		      if ((type == STR_WIDE) ? (data_wide[eo] == TRE_CHAR('\n')) :
+		        (data_byte[eo] == '\n'))
+		      break;
+		    }
 		}
-
-	      for (eo = st + pmatch[0].rm_eo; st + eo < len; eo++)
+	      else
 		{
-		  if ((type == STR_WIDE) ? (data_wide[eo] == TRE_CHAR('\n')) :
-		      (data_byte[eo] == '\n'))
-		    break;
+		  size_t rem = heur->tlen - (pmatch[0].rm_eo - pmatch[0].rm_so);
+		  so = st + pmatch[0].rm_so - rem;
+		  eo = st + pmatch[0].rm_eo + rem;
 		}
 
 	      SEEK_TO(so);
@@ -272,8 +281,12 @@ tre_match(const tre_tnfa_t *tnfa, const 
 	    /* Suffix heuristic not available */
 	    else
 	      {
+		size_t l = (heur->tlen == -1) ? len - st : heur->tlen;
+
+		if (l < len - st)
+		  return REG_NOMATCH;
 		SEEK_TO(st);
-		ret = tre_match(tnfa, string, len - st, type, nmatch,
+		ret = tre_match(tnfa, string, l, type, nmatch,
 			        pmatch, eflags, NULL, NULL);
 		FIX_OFFSETS(st += n);
 	      }