From owner-svn-src-all@freebsd.org Tue May 22 04:14:03 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BB830EE5897; Tue, 22 May 2018 04:14:02 +0000 (UTC) (envelope-from ohartmann@walstatt.org) Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "mout.gmx.net", Issuer "TeleSec ServerPass DE-2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2F26A81A86; Tue, 22 May 2018 04:14:01 +0000 (UTC) (envelope-from ohartmann@walstatt.org) Received: from freyja.zeit4.iv.bundesimmobilien.de ([87.138.105.249]) by mail.gmx.com (mrgmx002 [212.227.17.190]) with ESMTPSA (Nemesis) id 0LbM2k-1g4W3H1IUc-00kuFi; Tue, 22 May 2018 06:13:53 +0200 Date: Tue, 22 May 2018 06:13:45 +0200 From: "O. Hartmann" To: Jilles Tjoelker Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r334008 - head/bin/sh Message-ID: <20180522061339.2149763e@freyja.zeit4.iv.bundesimmobilien.de> In-Reply-To: <201805212152.w4LLqmOi033238@repo.freebsd.org> References: <201805212152.w4LLqmOi033238@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K1:gS63a1MXnjoUdgS/Z4uzOUuJLZhk49GT268MtF0jbBiIdWQT1X2 73j5rmzaeQNX3NAW8yjvq2rDwzVft9YibyP4Rx76TvedQa+YVPyQ7+DuFniVUE73++n1s9f RCgNZGj5yWa+TxRo6au5GFW/7GqXH2DBmMwHYi84N+thqBUSnXJxd9sPQzfXZKTz9LVLhft MD1JB/5ubXWjX0Rp7zRiA== X-UI-Out-Filterresults: notjunk:1;V01:K0:m+mcj8MucAk=:kyFbFPpnqOy68bV7lQ2B5l r+S2AKgu5Wi8SF1yR1fW55HhXjjLGoXIF+eMolygnI7Vh9dO5L5bDwdhar9FBGSEG9E0f++oD g4BEG8brIB2w5SMlEFii+B8D6LmtMuWwaXqkTd/0Vuo4w3/PmtYoK09Ah3bB8iQXH/NRZrS0K d4p7OKb4RmPKfOZXtP8WHISegyFtcSfdD7UW6jwqlYhx8b9/dixLO9ymmajuOfa/yRzPcCt2M k2KOf9CHMt8Mw0E6SkcCeGZ4imqKyjJ4nT8qDSBZNdJi5NT32C+wyvzYFCZSwT4rmJODsryG1 jCVhHPt+H2Bh4iE4iggYHYj5GkD2eTDSD5ruwaY/9Us/GnfsPmymv+FUcI3LVaEZYqI7onvju P96XC4ikEiPg8JerhGU1tJuh9nyalUxFe+oqxp4BAO8ayxxlPO68redJZosRay8smwKwws5RP d357cLhi37efEg3FWNlB3zNIp73h+VI/Whikq+2EMNTclJ9fjr3hnaN23zk+E22PzHdVOA2n6 rzyIizroVDwdfziVjb45AozKH4PAVY8Za0qC16dd3/kumbdYksDJWsuChUy9jE+XBL3Y65R/R FPy08FEgyMsmiWhqLAv5RzTOuLqRfVBLrtTUouU8HJepoDuqa2ACzxUofg8Yfq3kyFTTr33mJ VGJC9traCXNYyiLZt79eXvTmwbP7cPbXgxec090/GRzVZRFTaTLeGpH7pQBJVcl7pIi1wWn+7 Vgs9qXfxjgB9aJrN9MgN8pFl3eOO2kmuJNO8OWy10eyJfYZLYCsErKTtyFCvmXZ2bYMahck5w 0iGWfk5 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 May 2018 04:14:03 -0000 On Mon, 21 May 2018 21:52:48 +0000 (UTC) Jilles Tjoelker wrote: > Author: jilles > Date: Mon May 21 21:52:48 2018 > New Revision: 334008 > URL: https://svnweb.freebsd.org/changeset/base/334008 > > Log: > sh: Split CNL syntax category to avoid a check on state[level].syntax > > No functional change is intended. > > Modified: > head/bin/sh/mksyntax.c > head/bin/sh/parser.c > > Modified: head/bin/sh/mksyntax.c > ============================================================================== > --- head/bin/sh/mksyntax.c Mon May 21 21:44:47 2018 (r334007) > +++ head/bin/sh/mksyntax.c Mon May 21 21:52:48 2018 (r334008) > @@ -65,6 +65,7 @@ struct synclass { > static const struct synclass synclass[] = { > { "CWORD", "character is nothing special" }, > { "CNL", "newline character" }, > + { "CQNL", "newline character in quotes" }, > { "CBACK", "a backslash character" }, > { "CSBACK", "a backslash character in single quotes" }, > { "CSQUOTE", "single quote" }, > @@ -185,7 +186,7 @@ main(int argc __unused, char **argv __unused) > fputs("\n/* syntax table used when in double quotes */\n", cfile); > init("dqsyntax"); > add_default(); > - add("\n", "CNL"); > + add("\n", "CQNL"); > add("\\", "CBACK"); > add("\"", "CENDQUOTE"); > add("`", "CBQUOTE"); > @@ -198,7 +199,7 @@ main(int argc __unused, char **argv __unused) > fputs("\n/* syntax table used when in single quotes */\n", cfile); > init("sqsyntax"); > add_default(); > - add("\n", "CNL"); > + add("\n", "CQNL"); > add("\\", "CSBACK"); > add("'", "CENDQUOTE"); > /* ':/' for tilde expansion, '-^]' for [a\-x] pattern ranges */ > @@ -208,7 +209,7 @@ main(int argc __unused, char **argv __unused) > fputs("\n/* syntax table used when in arithmetic */\n", cfile); > init("arisyntax"); > add_default(); > - add("\n", "CNL"); > + add("\n", "CQNL"); > add("\\", "CBACK"); > add("`", "CBQUOTE"); > add("\"", "CIGN"); > > Modified: head/bin/sh/parser.c > ============================================================================== > --- head/bin/sh/parser.c Mon May 21 21:44:47 2018 (r334007) > +++ head/bin/sh/parser.c Mon May 21 21:52:48 2018 (r334008) > @@ -1434,9 +1434,10 @@ readtoken1(int firstc, char const *initialsyntax, cons > > switch(synentry) { > case CNL: /* '\n' */ > - if (level == 0 && > - state[level].syntax == BASESYNTAX) > + if (level == 0) > goto endword; /* exit outer > loop */ > + /* FALLTHROUGH */ > + case CQNL: > USTPUTC(c, out); > plinno++; > if (doprompt) > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" Have this been tested? Doesn't compile for me: [...] Building /usr/obj/usr/src/amd64.amd64/kerberos5/libexec/hprop/hprop --- all_subdir_rescue --- --- parser.o --- /usr/src/bin/sh/parser.c:1440:9: error: use of undeclared identifier 'CQNL' case CQNL: ^ --- all_subdir_gnu --- Building /usr/obj/usr/src/amd64.amd64/gnu/usr.bin/gdb/libgdb/amd64bsd-nat.o --- all_subdir_rescue --- 1 error generated. *** [parser.o] Error code 1 make[6]: stopped in /usr/src/bin/sh