From patchwork Fri Jan 12 00:58:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 124254 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp1436749qgn; Thu, 11 Jan 2018 16:59:52 -0800 (PST) X-Google-Smtp-Source: ACJfBot8QSujCuCDQFzgGYLxvj4qdCxMAOkhbX4eZ6FNdjLDwv6mhxiqwb041S8aAu60+XrK+kmr X-Received: by 10.99.5.69 with SMTP id 66mr12058313pgf.80.1515718792422; Thu, 11 Jan 2018 16:59:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515718792; cv=none; d=google.com; s=arc-20160816; b=V3w4nX1qkopNwpCdpChKrzwNiuEjK+TGIqY/VAhCytqzb9J+Y3NBLq2mIYAqlDFKED mjo6kNVUiIyDmqGLEp9lg5oTAsi8tANGW+wdfXJhVTx1JxVOmViErCKXVnmin+IyJv2f iZW/mPASPOQ2k1ncrmpbF0KtFkoDj7LA5iEubJk4BCINlCkvk/PDBnnN4Idz/H5YtWyC jDJPLtRFOog4F1/irbsbb0bhQSWchqpyK+bWORPBWGpeuAL+INoVMOIGsfvctfl8aQ+v gPu5Re6omE2SBfw2QTHASkEZpqJErz6F5BkRHtqUTZBCruE+OxBXnZkCq7KLz3xP29pU phNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter:arc-authentication-results; bh=ePjfag9hp/z117/tlcG9GQsrLn2KtESx0PJv62s4Rco=; b=to/jh+84pCmulw1b2o/XsiBv8p0AMIdeviCoWWRu+4yHlHDGtFVBXtK+2YzNMJ9QlS x3plGNPjtkYBTPjuE+sbOQF4NljIaRaDAyrFxsDfX7k0lvYAya7jRICpaicUDsLI3ddk 9diRFoADzp3PaCVo//Synk2S7UKXlZ5L46p5Unr2Upa22MsJqRPLwhg5NS0AEqz5OPr7 XqKiKzFS96ZYIY8JT1pPShBVvGDu/YvuI17cXz2r9kTl83Z5pzw1AJdHyM8VEESjftep w5g9gdGKnDXCgagC5JKIB7mk3qAjkau3xQhzXsC/XbxTlU0cKTwKwm2U+e7vFkF46gBH ZJzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=lJIV1+b5; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f15si10197138pgv.34.2018.01.11.16.59.52; Thu, 11 Jan 2018 16:59:52 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=lJIV1+b5; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933784AbeALA7u (ORCPT + 28 others); Thu, 11 Jan 2018 19:59:50 -0500 Received: from conuserg-10.nifty.com ([210.131.2.77]:55781 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932169AbeALA7d (ORCPT ); Thu, 11 Jan 2018 19:59:33 -0500 Received: from grover.sesame (FL1-125-199-20-195.osk.mesh.ad.jp [125.199.20.195]) (authenticated) by conuserg-10.nifty.com with ESMTP id w0C0wWaZ017540; Fri, 12 Jan 2018 09:58:32 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w0C0wWaZ017540 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1515718713; bh=ePjfag9hp/z117/tlcG9GQsrLn2KtESx0PJv62s4Rco=; h=From:To:Cc:Subject:Date:From; b=lJIV1+b5vfT9+WRavveyOZHzIbimYKcrLHubyalZu02VxvdQN30QRAUK0SVuHH30J b7Q+1coCAQ7lhHw92cAXKSUFHZo3VMb+x+5RjdosNXWyvPqj719lCfkldgh4ow8hxo N6z6Elub6KQGolHKX5j2urT7qk0aa+i6es5XKE54B/Wt1VqCjjIQrutX3C3OTVmbcW Qtj0IHNVHGD+6UcC1IxZg3wRZ3eN06O2375M9Ny+ZsVjEvKs23Aj7G5Tsida0FWNeZ M7cdhZcLIhaLfP5UkmkDG4GA+tW7PDHmEgL861pmnjs+D7haQeGJIkSGYA/2xt9Qzt lpuFQSvp0wL/A== X-Nifty-SrcIP: [125.199.20.195] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Michal Marek , Sam Ravnborg , Ulf Magnusson , "Luis R . Rodriguez" , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] kconfig: use default 'yy' prefix for lexer and parser Date: Fri, 12 Jan 2018 09:58:20 +0900 Message-Id: <1515718701-4552-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Flex and Bison provide an option to change the prefix of globally- visible symbols. This is useful to link multiple lexers and/or parsers into the same executable. However, Kconfig (and any other host programs in kernel) uses a single lexer and parser. I do not see a good reason to change the default 'yy' prefix. Signed-off-by: Masahiro Yamada --- scripts/kconfig/Makefile | 3 --- scripts/kconfig/zconf.l | 16 ++++++++-------- scripts/kconfig/zconf.y | 22 +++++++++++----------- 3 files changed, 19 insertions(+), 22 deletions(-) -- 2.7.4 Acked-by: Ulf Magnusson diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 61cdc5e..2ad1cf5 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -211,9 +211,6 @@ HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(srctree)/$(src)/check.sh $(HOSTCC) HOSTCFLAGS_zconf.lex.o := -I$(src) HOSTCFLAGS_zconf.tab.o := -I$(src) -LEX_PREFIX_zconf := zconf -YACC_PREFIX_zconf := zconf - HOSTLOADLIBES_qconf = $(KC_QT_LIBS) HOSTCXXFLAGS_qconf.o = $(KC_QT_CFLAGS) diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l index c410d25..07e074d 100644 --- a/scripts/kconfig/zconf.l +++ b/scripts/kconfig/zconf.l @@ -106,11 +106,11 @@ n [A-Za-z0-9_-] current_pos.file = current_file; current_pos.lineno = current_file->lineno; if (id && id->flags & TF_COMMAND) { - zconflval.id = id; + yylval.id = id; return id->token; } alloc_string(yytext, yyleng); - zconflval.string = text; + yylval.string = text; return T_WORD; } . warn_ignored_character(*yytext); @@ -142,11 +142,11 @@ n [A-Za-z0-9_-] ({n}|[/.])+ { const struct kconf_id *id = kconf_id_lookup(yytext, yyleng); if (id && id->flags & TF_PARAM) { - zconflval.id = id; + yylval.id = id; return id->token; } alloc_string(yytext, yyleng); - zconflval.string = text; + yylval.string = text; return T_WORD; } #.* /* comment */ @@ -161,7 +161,7 @@ n [A-Za-z0-9_-] { [^'"\\\n]+/\n { append_string(yytext, yyleng); - zconflval.string = text; + yylval.string = text; return T_WORD_QUOTE; } [^'"\\\n]+ { @@ -169,7 +169,7 @@ n [A-Za-z0-9_-] } \\.?/\n { append_string(yytext + 1, yyleng - 1); - zconflval.string = text; + yylval.string = text; return T_WORD_QUOTE; } \\.? { @@ -178,7 +178,7 @@ n [A-Za-z0-9_-] \'|\" { if (str == yytext[0]) { BEGIN(PARAM); - zconflval.string = text; + yylval.string = text; return T_WORD_QUOTE; } else append_string(yytext, 1); @@ -261,7 +261,7 @@ void zconf_starthelp(void) static void zconf_endhelp(void) { - zconflval.string = text; + yylval.string = text; BEGIN(INITIAL); } diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y index 600deb1..dd0c09d 100644 --- a/scripts/kconfig/zconf.y +++ b/scripts/kconfig/zconf.y @@ -20,10 +20,10 @@ int cdebug = PRINTD; -extern int zconflex(void); +int yylex(void); +static void yyerror(const char *err); static void zconfprint(const char *err, ...); static void zconf_error(const char *err, ...); -static void zconferror(const char *err); static bool zconf_endtoken(const struct kconf_id *id, int starttoken, int endtoken); struct symbol *symbol_hash[SYMBOL_HASHSIZE]; @@ -529,9 +529,9 @@ void conf_parse(const char *name) _menu_init(); if (getenv("ZCONF_DEBUG")) - zconfdebug = 1; - zconfparse(); - if (zconfnerrs) + yydebug = 1; + yyparse(); + if (yynerrs) exit(1); if (!modules_sym) modules_sym = sym_find( "n" ); @@ -544,9 +544,9 @@ void conf_parse(const char *name) menu_finalize(&rootmenu); for_all_symbols(i, sym) { if (sym_check_deps(sym)) - zconfnerrs++; + yynerrs++; } - if (zconfnerrs) + if (yynerrs) exit(1); sym_set_change_count(1); } @@ -571,7 +571,7 @@ static bool zconf_endtoken(const struct kconf_id *id, int starttoken, int endtok if (id->token != endtoken) { zconf_error("unexpected '%s' within %s block", id->name, zconf_tokenname(starttoken)); - zconfnerrs++; + yynerrs++; return false; } if (current_menu->file != current_file) { @@ -580,7 +580,7 @@ static bool zconf_endtoken(const struct kconf_id *id, int starttoken, int endtok fprintf(stderr, "%s:%d: location of the '%s'\n", current_menu->file->name, current_menu->lineno, zconf_tokenname(starttoken)); - zconfnerrs++; + yynerrs++; return false; } return true; @@ -601,7 +601,7 @@ static void zconf_error(const char *err, ...) { va_list ap; - zconfnerrs++; + yynerrs++; fprintf(stderr, "%s:%d: ", zconf_curname(), zconf_lineno()); va_start(ap, err); vfprintf(stderr, err, ap); @@ -609,7 +609,7 @@ static void zconf_error(const char *err, ...) fprintf(stderr, "\n"); } -static void zconferror(const char *err) +static void yyerror(const char *err) { fprintf(stderr, "%s:%d: %s\n", zconf_curname(), zconf_lineno() + 1, err); } From patchwork Fri Jan 12 00:58:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 124253 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp1436560qgn; Thu, 11 Jan 2018 16:59:37 -0800 (PST) X-Google-Smtp-Source: ACJfBot76m62ezfnAs6U4KHMs6xjnxOeH/lDMv1EmgzZjC/4bKM7llBjmZDP0xRzNqiERoAZeGsv X-Received: by 10.99.182.6 with SMTP id j6mr2040323pgf.221.1515718777546; Thu, 11 Jan 2018 16:59:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515718777; cv=none; d=google.com; s=arc-20160816; b=dBZuoI6Fo2fe/Qgqtz5F6+75PYUtA/K65UoNsxtxv0Tr9IO2XMQOkTGxcq9ovWdrKE Uq/SvkAiPDEAMHqPuv9nlYPzKfu8V4KMFU8y3BdEClu8fHDl/sJCmPxkh0UQGON5Xtxp YbU0u5K+oyDEl1EMD7YVJwMd45uJO1xstqyUMTVFeoTPciNSNc/b3UOwL/AoD5bllK/q qcz2yhQ2LPCkPyi/mS/swuQ8b1vW00DK7omgeUXvhATuGKLO5h5wBkR7ypXl/Y3bOwy4 rBNEjIRZqQ4/yyd/dkkoyxHO231hdSOd+Ulrd2cQ9vB2v1+raU6q1AZYQZRecu74EZwH V7rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter :arc-authentication-results; bh=tH3GXq18Wh1obBPRoPFxWZicFtjlNrSckUb78vu4pnU=; b=K6nAFAsDpVD8Of5D5EN3TGv8ci8kxmIM9N9vs4RBZiR2JmUqqUKuJvcXKrgyLLiSs+ YZtv9gaGPfQxg9VPB9/c8b+LuXLL+967PItOqxzJAxPJnL6abaMiwxtRASCRqOBMVoqb RlWClZq75FRl1wBOeSf6tu+XdrwUZrW+PT3zvHYcleakA+MymiWBsuhUb4H2ENTS4MM3 L9xslfLbM8IQvVltcmn8inWsR9+POwHY4cKu6GcYcYEhl+AQcZ/Vkh+E6VLKm+s+w9g9 RYVs+5EDjtI8yfcx40KiSAhmeE2jRW5bb3RRxtiOfk0Glbssl8qTQ58DkvC2OtpSlisl VegA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=zJqbuOow; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h10si6055334plk.706.2018.01.11.16.59.37; Thu, 11 Jan 2018 16:59:37 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=zJqbuOow; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933760AbeALA7g (ORCPT + 28 others); Thu, 11 Jan 2018 19:59:36 -0500 Received: from conuserg-10.nifty.com ([210.131.2.77]:55780 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933003AbeALA7d (ORCPT ); Thu, 11 Jan 2018 19:59:33 -0500 Received: from grover.sesame (FL1-125-199-20-195.osk.mesh.ad.jp [125.199.20.195]) (authenticated) by conuserg-10.nifty.com with ESMTP id w0C0wWaa017540; Fri, 12 Jan 2018 09:58:33 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w0C0wWaa017540 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1515718713; bh=tH3GXq18Wh1obBPRoPFxWZicFtjlNrSckUb78vu4pnU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zJqbuOow2w7zCvNjno72MXLrBEC3+QuNoG7juOhf17FT/lfotk7vn3vQafofhPfRE vAiJsHJyYIQ+BVvlkNoJNVO90l0uANxzX0gKnAx9F0iWfDkJQYXgmXHTeOUlSeu+lt M3fVbPJtNrkTG9QStltAHODleEMmV3D2hSmzn094EbmSJSJkv6nYnqG4U3c4P70slk nnHtywxEcRL0SQZczgd9MYzRJwreJPQ7jdSt8KTgPygGnTv6s2AduT5qZPctQ+a+t7 375nc4ExSy8M6d/WFBatgrj+QNnCcDUak+dIEFrvv500UbJt9z8ApgIddFuotHpEbG FupSUbbrz8uhQ== X-Nifty-SrcIP: [125.199.20.195] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Michal Marek , Sam Ravnborg , Ulf Magnusson , "Luis R . Rodriguez" , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 2/2] kbuild: remove unnecessary LEX_PREFIX and YACC_PREFIX Date: Fri, 12 Jan 2018 09:58:21 +0900 Message-Id: <1515718701-4552-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515718701-4552-1-git-send-email-yamada.masahiro@socionext.com> References: <1515718701-4552-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Kconfig was the only user of these. With Kconfig converted to use the default 'yy' prefix, we do not need them any more. Signed-off-by: Masahiro Yamada --- scripts/Makefile.lib | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) -- 2.7.4 Acked-by: Ulf Magnusson diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 0f9ef3f..5ff2761 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -188,10 +188,8 @@ endef # LEX # --------------------------------------------------------------------------- -LEX_PREFIX = $(if $(LEX_PREFIX_${baseprereq}),$(LEX_PREFIX_${baseprereq}),yy) - quiet_cmd_flex = LEX $@ - cmd_flex = $(LEX) -o$@ -L -P $(LEX_PREFIX) $< + cmd_flex = $(LEX) -o$@ -L $< ifdef REGENERATE_PARSERS .PRECIOUS: $(src)/%.lex.c_shipped @@ -205,10 +203,8 @@ $(filter %.lex.c,$(targets)): $(obj)/%.lex.c: $(src)/%.l FORCE # YACC # --------------------------------------------------------------------------- -YACC_PREFIX = $(if $(YACC_PREFIX_${baseprereq}),$(YACC_PREFIX_${baseprereq}),yy) - quiet_cmd_bison = YACC $@ - cmd_bison = $(YACC) -o$@ -t -l -p $(YACC_PREFIX) $< + cmd_bison = $(YACC) -o$@ -t -l $< ifdef REGENERATE_PARSERS .PRECIOUS: $(src)/%.tab.c_shipped