From owner-svn-src-projects@FreeBSD.ORG Tue Nov 13 03:56:50 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CE65D562; Tue, 13 Nov 2012 03:56:50 +0000 (UTC) (envelope-from neel@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 B29298FC08; Tue, 13 Nov 2012 03:56:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAD3uofH075714; Tue, 13 Nov 2012 03:56:50 GMT (envelope-from neel@svn.freebsd.org) Received: (from neel@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAD3uoUW075712; Tue, 13 Nov 2012 03:56:50 GMT (envelope-from neel@svn.freebsd.org) Message-Id: <201211130356.qAD3uoUW075712@svn.freebsd.org> From: Neel Natu Date: Tue, 13 Nov 2012 03:56:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r242946 - projects/bhyve/sys/dev/aic7xxx/aicasm 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 " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Nov 2012 03:56:51 -0000 Author: neel Date: Tue Nov 13 03:56:50 2012 New Revision: 242946 URL: http://svnweb.freebsd.org/changeset/base/242946 Log: Revert r229954 which in turn had reverted r228556 in projects/bhyve. This was done to work around build issues when building projects/bhyve on an 8.x system at the time. The workaround is no longer needed so re-instantiate r228556 in projects/bhyve. Discussed with: grehan@ Obtained from: NetApp Modified: projects/bhyve/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l projects/bhyve/sys/dev/aic7xxx/aicasm/aicasm_scan.l Modified: projects/bhyve/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l ============================================================================== --- projects/bhyve/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l Tue Nov 13 03:27:43 2012 (r242945) +++ projects/bhyve/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l Tue Nov 13 03:56:50 2012 (r242946) @@ -66,6 +66,8 @@ static char msgbuf[255]; extern int mmlex(void); %} +%option noinput + WORD [A-Za-z_][-A-Za-z_0-9]* SPACE [ \t]+ MCARG [^(), \t]+ Modified: projects/bhyve/sys/dev/aic7xxx/aicasm/aicasm_scan.l ============================================================================== --- projects/bhyve/sys/dev/aic7xxx/aicasm/aicasm_scan.l Tue Nov 13 03:27:43 2012 (r242945) +++ projects/bhyve/sys/dev/aic7xxx/aicasm/aicasm_scan.l Tue Nov 13 03:56:50 2012 (r242946) @@ -72,6 +72,8 @@ extern void mm_switch_to_buffer(YY_BUFFE extern void mm_delete_buffer(YY_BUFFER_STATE); %} +%option noinput + PATH ([/]*[-A-Za-z0-9_.])+ WORD [A-Za-z_][-A-Za-z_0-9]* SPACE [ \t]+