From owner-svn-src-projects@FreeBSD.ORG  Mon May 13 21:34:01 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id B6A3A51D;
 Mon, 13 May 2013 21:34:01 +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 A8E7EBE8;
 Mon, 13 May 2013 21:34:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4DLY1X9000251;
 Mon, 13 May 2013 21:34:01 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4DLY1CG000250;
 Mon, 13 May 2013 21:34:01 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201305132134.r4DLY1CG000250@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Mon, 13 May 2013 21:34:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r250621 - projects/flex-sf/contrib/flex
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 13 May 2013 21:34:01 -0000

Author: jkim
Date: Mon May 13 21:34:01 2013
New Revision: 250621
URL: http://svnweb.freebsd.org/changeset/base/250621

Log:
  MFV:	r250620
  
  Partially revert r250128.

Modified:
  projects/flex-sf/contrib/flex/flex.skl
Directory Properties:
  projects/flex-sf/contrib/flex/   (props changed)

Modified: projects/flex-sf/contrib/flex/flex.skl
==============================================================================
--- projects/flex-sf/contrib/flex/flex.skl	Mon May 13 21:31:43 2013	(r250620)
+++ projects/flex-sf/contrib/flex/flex.skl	Mon May 13 21:34:01 2013	(r250621)
@@ -1290,6 +1290,8 @@ m4_ifdef( [[M4_YY_NOT_REENTRANT]],
     ]])
 ]])
 
+%% [7.0] user's declarations go here
+
 m4_ifdef( [[M4_YY_BISON_LVAL]],
 [[
     yylval = yylval_param;
@@ -1345,9 +1347,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
@@ -1505,7 +1504,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