From owner-svn-src-vendor@FreeBSD.ORG  Mon May 13 21:31:44 2013
Return-Path: <owner-svn-src-vendor@FreeBSD.ORG>
Delivered-To: svn-src-vendor@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 3CE62390;
 Mon, 13 May 2013 21:31:44 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2F662B83;
 Mon, 13 May 2013 21:31:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4DLViT5099669;
 Mon, 13 May 2013 21:31:44 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4DLVirj099668;
 Mon, 13 May 2013 21:31:44 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201305132131.r4DLVirj099668@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Mon, 13 May 2013 21:31:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r250620 - vendor/flex/dist
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
 <svn-src-vendor.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor>
List-Post: <mailto:svn-src-vendor@freebsd.org>
List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 May 2013 21:31:44 -0000

Author: jkim
Date: Mon May 13 21:31:43 2013
New Revision: 250620
URL: http://svnweb.freebsd.org/changeset/base/250620

Log:
  Partially revert r250128.
  
  http://flex.git.sourceforge.net/git/gitweb.cgi?p=flex/flex;a=commit;h=ec2fdb8
  
  This patch is known to generate a broken scanner.
  
  http://sourceforge.net/mailarchive/message.php?msg_id=29909582

Modified:
  vendor/flex/dist/flex.skl

Modified: vendor/flex/dist/flex.skl
==============================================================================
--- vendor/flex/dist/flex.skl	Mon May 13 21:18:00 2013	(r250619)
+++ vendor/flex/dist/flex.skl	Mon May 13 21:31:43 2013	(r250620)
@@ -1277,6 +1277,8 @@ m4_ifdef( [[M4_YY_NOT_REENTRANT]],
     ]])
 ]])
 
+%% [7.0] user's declarations go here
+
 m4_ifdef( [[M4_YY_BISON_LVAL]],
 [[
     yylval = yylval_param;
@@ -1332,9 +1334,6 @@ m4_ifdef( [[M4_YY_USES_REJECT]],
 		yy_load_buffer_state( M4_YY_CALL_ONLY_ARG );
 		}
 
-	{
-%% [7.0] user's declarations go here
-
 	while ( 1 )		/* loops until end-of-file is reached */
 		{
 %% [8.0] yymore()-related code goes here
@@ -1492,7 +1491,6 @@ do_action:	/* This label is used only to
 			"fatal flex scanner internal error--no action found" );
 	} /* end of action switch */
 		} /* end of scanning one token */
-	} /* end of user's declarations */
 } /* end of yylex */
 %ok-for-header