From patchwork Mon May 23 08:10:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Lacombe X-Patchwork-Id: 807932 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4N8B6oX032713 for ; Mon, 23 May 2011 08:11:12 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753930Ab1EWILL (ORCPT ); Mon, 23 May 2011 04:11:11 -0400 Received: from mail-iw0-f174.google.com ([209.85.214.174]:44747 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753933Ab1EWILK (ORCPT ); Mon, 23 May 2011 04:11:10 -0400 Received: by mail-iw0-f174.google.com with SMTP id 34so4551646iwn.19 for ; Mon, 23 May 2011 01:11:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=fO3LDQpZ/wi0XodXI1ZfMPGHA6bLh+gBvDp0pa+Zriw=; b=iDWz5tB1NRag40YO4SzEU6yFTxOhl++pOdalvf+YA7vNuKJRqfxP5MeeByBEBHeJCP CmE2ZSmLzLScVBtfEU0/DIkY7VPw0oZMTaxq8FY3TvWK+AuHm+vN2L41GqcXiIxVY32s IPKu4CmvVNMQDCBb4eKPRz/9XdKBZ7L8fs93Q= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=ZWTmzasf6oAvJMy6sUur48+ebWmoB8Pp2gN12taGR+rkWFMEIsYleH1MrF0CNQbbNT gisiBCeVrsPyfsEeNiGYBXrTBHUwmP8lnIzhs5xzlmBT/2TEau61KqMsw+X4CtQXWZFX xIWoyNDf0qVTKDddkWI/Ez+jQW94Jtc+5Kp+w= Received: by 10.42.241.138 with SMTP id le10mr1659312icb.430.1306138269870; Mon, 23 May 2011 01:11:09 -0700 (PDT) Received: from localhost.localdomain (76-10-146-236.dsl.teksavvy.com [76.10.146.236]) by mx.google.com with ESMTPS id gy41sm2820660ibb.56.2011.05.23.01.11.09 (version=SSLv3 cipher=OTHER); Mon, 23 May 2011 01:11:09 -0700 (PDT) From: Arnaud Lacombe To: linux-kbuild@vger.kernel.org Cc: Michal Marek , Arnaud Lacombe Subject: [RFCv2 07/13] kconfig: back-out parser prefix, from `zconf' to `yy' Date: Mon, 23 May 2011 04:10:33 -0400 Message-Id: <1306138239-13440-8-git-send-email-lacombar@gmail.com> X-Mailer: git-send-email 1.7.3.4.574.g608b.dirty In-Reply-To: <1306138239-13440-1-git-send-email-lacombar@gmail.com> References: <1306138239-13440-1-git-send-email-lacombar@gmail.com> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Mon, 23 May 2011 08:11:12 +0000 (UTC) --- scripts/kconfig/lkc.h | 2 +- scripts/kconfig/zconf.l | 16 ++++++++-------- scripts/kconfig/zconf.y | 22 +++++++++++----------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h index febf0c9..716c36c 100644 --- a/scripts/kconfig/lkc.h +++ b/scripts/kconfig/lkc.h @@ -69,7 +69,7 @@ struct kconf_id { }; #ifdef YYDEBUG -extern int zconfdebug; +extern int yyebug; #endif int zconfparse(void); diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l index ee92b10..cf549c7 100644 --- a/scripts/kconfig/zconf.l +++ b/scripts/kconfig/zconf.l @@ -101,11 +101,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; } . @@ -134,11 +134,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 */ @@ -152,7 +152,7 @@ n [A-Za-z0-9_] { [^'"\\\n]+/\n { append_string(yytext, yyleng); - zconflval.string = text; + yylval.string = text; return T_WORD_QUOTE; } [^'"\\\n]+ { @@ -160,7 +160,7 @@ n [A-Za-z0-9_] } \\.?/\n { append_string(yytext + 1, yyleng - 1); - zconflval.string = text; + yylval.string = text; return T_WORD_QUOTE; } \\.? { @@ -169,7 +169,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); @@ -252,7 +252,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 98c5716..8564238 100644 --- a/scripts/kconfig/zconf.y +++ b/scripts/kconfig/zconf.y @@ -21,10 +21,10 @@ int cdebug = PRINTD; -extern int zconflex(void); +extern int yylex(void); static void zconfprint(const char *err, ...); static void zconf_error(const char *err, ...); -static void zconferror(const char *err); +static void yyerror(const char *err); static bool zconf_endtoken(const struct kconf_id *id, int starttoken, int endtoken); struct symbol *symbol_hash[SYMBOL_HASHSIZE]; @@ -505,10 +505,10 @@ void conf_parse(const char *name) #if YYDEBUG if (getenv("ZCONF_DEBUG")) - zconfdebug = 1; + yydebug = 1; #endif - zconfparse(); - if (zconfnerrs) + yyparse(); + if (yynerrs) exit(1); if (!modules_sym->prop) { struct property *prop; @@ -523,9 +523,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); } @@ -550,7 +550,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", kconf_id_strings + id->name, zconf_tokenname(starttoken)); - zconfnerrs++; + yynerrs++; return false; } if (current_menu->file != current_file) { @@ -559,7 +559,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; @@ -580,7 +580,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); @@ -588,7 +588,7 @@ static void zconf_error(const char *err, ...) fprintf(stderr, "\n"); } -static void zconferror(const char *err) +static void yyerror(const char *err) { #if YYDEBUG fprintf(stderr, "%s:%d: %s\n", zconf_curname(), zconf_lineno() + 1, err);