Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6A3FC0044D for ; Mon, 16 Mar 2020 10:03:40 +0000 (UTC) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A68C52051A for ; Mon, 16 Mar 2020 10:03:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TILuxv64" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A68C52051A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-kernel-mentees-bounces@lists.linuxfoundation.org Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 795EF87A9E; Mon, 16 Mar 2020 10:03:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5GoAreP2dZca; Mon, 16 Mar 2020 10:03:39 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by fraxinus.osuosl.org (Postfix) with ESMTP id 787BB87A80; Mon, 16 Mar 2020 10:03:39 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 62A08C1D7C; Mon, 16 Mar 2020 10:03:39 +0000 (UTC) Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id A6ECCC013E for ; Mon, 16 Mar 2020 10:03:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9461589A39 for ; Mon, 16 Mar 2020 10:03:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5+IONglHETbp for ; Mon, 16 Mar 2020 10:03:36 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by hemlock.osuosl.org (Postfix) with ESMTPS id 9FB7689A56 for ; Mon, 16 Mar 2020 10:03:36 +0000 (UTC) Received: by mail-pf1-f172.google.com with SMTP id z5so9650230pfn.5 for ; Mon, 16 Mar 2020 03:03:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=E8iDrgsHE027K+FE3v0mwPnXtrzybe8lDJJX12h8vck=; b=TILuxv6445mlLoJGVL2FGozwg6KNabEwuHD0ugQnZZttwMLiwFBn8cgkzFFybCir3x arJh75Hc/D1fjuPuu4cGnsa/ZOKue2WA/0Q2C+KydK19GfpQ8tgagYTHQ+/AKdu8JWE+ I32/5rEVl0J5gL4gcTwGCSCvZI9Lecd3qu9nn/VDbztaEFvp2RxrX623NJP7KTfUg/g8 G7CUSeW4xHLpUr7n0JqocuoUBVL0qNQX7LP4/R6SG8lOicJbbv8cqHxizWvKBoDsWY3K vxREGsNDb3nbfs/OadtQR2mJYtBWJ/DQginqEVNGfi6BJF75WB1ACcx8f3E6mY9KMxxd giQw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=E8iDrgsHE027K+FE3v0mwPnXtrzybe8lDJJX12h8vck=; b=JmQlq3g0s6C1fIg0rrV0rOR0Co98+Lz6gvYehGYW5Z0J6fdyP9PyLL1eJZDExeFUsz 5rck4Y6sUScHVD2ATXgF/0rgBZcJeLzZyUxlhHXQ2K50AGnGp0MXz4c0eplapr4iNXni CXDzxwxVJn+d38YlGCPpNd5oSChar1rl0gf4XvRy9r8fVcVueLzEJOZInlFDhG/r9JH7 XDUWUs+JpK+0nvKl0+4CBhkk2BrFD2el4ZlDzOhJkCK1w10kQH9l+lb3Era/FPVfSCRx 3chYw3Wq7CDAOiQvISzOLmKZ78YVWJb32sjtta+Bw45y446CS0yLVpKLA7KrGOeK+Bti PF0A== X-Gm-Message-State: ANhLgQ1Q1hjuIl0sQFA5cO4cHMSTfJAB1f0gCbe9azO0FgycFycqAtj5 TBK84RddZAZlomaDegXW+HI= X-Google-Smtp-Source: ADFU+vuHDbRlrKvR17wodpG4OQigmIZChV0t9oXkwWTo/yT9rw+Kdv6qZNgAd24MojOTsZvJIFVtiA== X-Received: by 2002:a63:c4e:: with SMTP id 14mr25922355pgm.444.1584353015997; Mon, 16 Mar 2020 03:03:35 -0700 (PDT) Received: from localhost.localdomain ([2405:204:284:a4f2:cc63:b7fc:551c:dce5]) by smtp.gmail.com with ESMTPSA id u3sm19803374pjv.32.2020.03.16.03.03.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 03:03:35 -0700 (PDT) From: Jaskaran Singh To: cocci@systeme.lip6.fr Date: Mon, 16 Mar 2020 15:32:54 +0530 Message-Id: <20200316100319.27935-2-jaskaransingh7654321@gmail.com> X-Mailer: git-send-email 2.21.1 In-Reply-To: <20200316100319.27935-1-jaskaransingh7654321@gmail.com> References: <20200316100319.27935-1-jaskaransingh7654321@gmail.com> MIME-Version: 1.0 Cc: julia.lawall@inria.fr, Jaskaran Singh , linux-kernel-mentees@lists.linuxfoundation.org Subject: [Linux-kernel-mentees] [PATCH 01/26] parsing_cocci: Add Function Prototype token X-BeenThere: linux-kernel-mentees@lists.linuxfoundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-kernel-mentees-bounces@lists.linuxfoundation.org Sender: "Linux-kernel-mentees" To add the types ParenType and FunctionType to the SmPL AST, a reduce/reduce conflict with the funproto rule of the SmPL parser must be resolved. This requires explicitly identifying a function prototype by use of a token (TFunProto). While the correct method of identifying a function prototype would be to check if an identifier is preceded by a return type, it is challenging to implement. This is because implementing an OCaml function, to correctly determine a C type in SmPL, without the aid of Yacc, would have to handle a number of cases (disjunctions, typeof expressions, etc.). Thus, a slightly hacky approach is taken to determine a function prototype with not the best certainty but what works for most cases in SmPL. If the identifier is preceded by any token that does not seem to be part of a type, then it is not identified as a function prototype. Else, it is. Signed-off-by: Jaskaran Singh --- parsing_cocci/parse_cocci.ml | 72 +++++++++++++++++++++++---- parsing_cocci/parser_cocci_menhir.mly | 9 ++-- 2 files changed, 67 insertions(+), 14 deletions(-) diff --git a/parsing_cocci/parse_cocci.ml b/parsing_cocci/parse_cocci.ml index 679d213a..4b2cb7e4 100644 --- a/parsing_cocci/parse_cocci.ml +++ b/parsing_cocci/parse_cocci.ml @@ -295,6 +295,7 @@ let token2c (tok,_) add_clt = | PC.TLineEnd(clt) -> "line end" | PC.TInvalid -> "invalid" | PC.TFunDecl(clt) -> "fundecl" + | PC.TFunProto(clt) -> "funproto" | PC.TIso -> "<=>" | PC.TRightIso -> "=>" @@ -480,7 +481,7 @@ let get_clt (tok,_) = | PC.TOPar0(_,clt) | PC.TMid0(_,clt) | PC.TAnd0(_,clt) | PC.TCPar0(_,clt) | PC.TOEllipsis(clt) | PC.TCEllipsis(clt) - | PC.TPOEllipsis(clt) | PC.TPCEllipsis(clt) + | PC.TPOEllipsis(clt) | PC.TPCEllipsis(clt) | PC.TFunProto(clt) | PC.TFunDecl(clt) | PC.TDirective(_,clt) | PC.TAttr_(clt) | PC.TLineEnd(clt) -> clt | PC.TVAEllipsis(clt) -> clt @@ -718,6 +719,7 @@ let update_clt (tok,x) clt = | PC.TLineEnd(_) -> (PC.TLineEnd(clt),x) | PC.TFunDecl(_) -> (PC.TFunDecl(clt),x) + | PC.TFunProto(_) -> (PC.TFunProto(clt),x) | PC.TTildeExclEq(_) -> (PC.TTildeExclEq(clt),x) | PC.TDirective(a,_) -> (PC.TDirective(a,clt),x) | PC.TAttr_(_) -> (PC.TAttr_(clt),x) @@ -925,7 +927,7 @@ let split_token ((tok,_) as t) = | PC.TInitialize | PC.TFinalize -> ([t],[t]) | PC.TPArob clt | PC.TMetaPos(_,_,_,clt) | PC.TMetaCom(_,_,clt) -> split t clt - | PC.TFunDecl(clt) + | PC.TFunDecl(clt) | PC.TFunProto(clt) | PC.TWhen(clt) | PC.TWhenTrue(clt) | PC.TWhenFalse(clt) | PC.TAny(clt) | PC.TStrict(clt) | PC.TLineEnd(clt) | PC.TEllipsis(clt) @@ -1006,7 +1008,8 @@ let find_function_names l = | _ -> false in let rec split acc = function [] | [_] -> raise Irrelevant - | ((PC.TCPar(_),_) as t1) :: ((PC.TOBrace(_),_) as t2) :: rest -> + | ((PC.TCPar(_),_) as t1) :: ((PC.TOBrace(_),_) as t2) :: rest + | ((PC.TCPar(_),_) as t1) :: ((PC.TPtVirg(_),_) as t2) :: rest -> (List.rev (t1::acc),(t2::rest)) | x::xs -> split (x::acc) xs in let rec balanced_name level = function @@ -1037,7 +1040,48 @@ let find_function_names l = | (PC.TArobArob,_)::_ | (PC.TArob,_)::_ | (PC.EOF,_)::_ -> raise Irrelevant | t::rest -> balanced_args level rest in - let rec loop = function + let rec is_permissible_proto = function + [] -> false + | (PC.TCPar0(_),_):: + ((PC.TMid0(_),_) | (PC.TAnd0(_),_)):: + (PC.TOPar0(_),_)::_ -> false + | (PC.TOPar0(_),_)::rest + | (PC.TCPar0(_),_)::rest -> is_permissible_proto rest + | x::rest when is_mid x -> + let rec loop = function + [] -> false + | (PC.TOPar0(_),_)::xs -> is_permissible_proto xs + | x::xs -> loop xs in + loop rest + | _::((PC.TEq(_),_) | (PC.TNotEq(_),_))::(PC.TWhen(_),_)::_ + | _::(PC.TWhen(_),_)::_ + | (PC.TComma(_),_)::_ + | (PC.TDirective(_),_)::_ + | (PC.TElse(_),_)::_ + | (PC.TReturn(_),_)::_ + | (PC.TMetaStm(_),_)::_ + | (PC.TMetaExp(_),_)::_ + | (PC.TMetaId(_),_)::_ + | (PC.TMetaLocalIdExp(_),_)::_ + | (PC.TEq(_),_)::_ + | (PC.TEllipsis(_),_)::_ + | (PC.TOEllipsis(_),_)::_ + | (PC.TCEllipsis(_),_)::_ + | (PC.TPOEllipsis(_),_)::_ + | (PC.TPCEllipsis(_),_)::_ + | (PC.TPtVirg(_),_)::_ + | (PC.TOBrace(_),_)::_ + | (PC.TCBrace(_),_)::_ + | (PC.TOPar(_),_)::_ + | (PC.TCPar(_),_)::_ + | (PC.TIdent(_),_)::_ -> false + | _ -> true in + let decl_or_proto clt info bef aft = + match aft with + (PC.TOBrace(_),_)::_ -> (((PC.TFunDecl(clt),info) :: bef), aft) + | (PC.TPtVirg(_),_)::_ -> (((PC.TFunProto(clt),info) :: bef), aft) + | _ -> raise Irrelevant in + let rec loop acc = function [] -> [] | t :: rest -> if is_par t || is_mid t || is_ident t @@ -1046,26 +1090,30 @@ let find_function_names l = try let (bef,aft) = split [] (t::rest) in let rest = balanced_name 0 bef in + (match aft with + (PC.TPtVirg(_),_)::_ + when not(is_permissible_proto acc) -> raise Irrelevant + | _ -> (match rest with (PC.TOPar(_),_)::_ -> (match balanced_args 0 rest with [] -> let (_,info) as h = List.hd bef in let clt = get_clt h in - (((PC.TFunDecl(clt),info) :: bef), aft) + decl_or_proto clt info bef aft | (PC.TAttr_(_),_)::rest -> (match balanced_args 0 rest with [] -> let (_,info) as h = List.hd bef in let clt = get_clt h in - (((PC.TFunDecl(clt),info) :: bef), aft) + decl_or_proto clt info bef aft | _ -> raise Irrelevant) | _ -> raise Irrelevant) - | _ -> raise Irrelevant) + | _ -> raise Irrelevant)) with Irrelevant -> ([t],rest) in - t @ (loop rest) - else t :: (loop rest) in - loop l + t @ (loop (t @ acc) rest) + else t :: (loop (t :: acc) rest) in + loop [] l (* ----------------------------------------------------------------------- *) (* an attribute is an identifier that precedes another identifier and @@ -1168,6 +1216,8 @@ let detect_types in_meta_decls l = delim::newid::id::(loop false infn (ident::type_names) rest) | ((PC.TFunDecl(_),_) as fn)::rest -> fn::(loop false 1 type_names rest) + | ((PC.TFunProto(_),_) as fn)::rest -> + fn::(loop false 1 type_names rest) | ((PC.TOPar(_),_) as lp)::rest when infn > 0 -> lp::(loop false (infn + 1) type_names rest) | ((PC.TCPar(_),_) as rp)::rest when infn > 0 -> @@ -1252,7 +1302,7 @@ let token2line (tok,_) = | PC.TMetaDParamList(_,_,_,_,clt) | PC.TMetaFunc(_,_,_,clt) | PC.TMetaLocalFunc(_,_,_,clt) | PC.TMetaPos(_,_,_,clt) | PC.TMetaCom(_,_,clt) - | PC.TFunDecl(clt) + | PC.TFunDecl(clt) | PC.TFunProto(clt) | PC.TWhen(clt) | PC.TWhenTrue(clt) | PC.TWhenFalse(clt) | PC.TAny(clt) | PC.TStrict(clt) | PC.TEllipsis(clt) diff --git a/parsing_cocci/parser_cocci_menhir.mly b/parsing_cocci/parser_cocci_menhir.mly index 9e6c8a08..26958f63 100644 --- a/parsing_cocci/parser_cocci_menhir.mly +++ b/parsing_cocci/parser_cocci_menhir.mly @@ -239,7 +239,8 @@ let inline_id aft = function %token TVAEllipsis %token TIf TElse TWhile TFor TDo TSwitch TCase TDefault TReturn -%token TBreak TContinue TGoto TSizeof TTypeof TFunDecl Tdecimal Texec +%token TBreak TContinue TGoto TSizeof TTypeof TFunDecl TFunProto +%token Tdecimal Texec %token TIdent TTypeId TDeclarerId TIteratorId TSymId %token TDirective %token TAttr_ @@ -1439,7 +1440,8 @@ reverse_separated_nonempty_llist(separator, X): funproto: s=ioption(storage) i=ioption(Tinline) t=ctype - id=fn_ident lp=TOPar arglist=arg_list(name_opt_decl) rp=TCPar pt=TPtVirg + TFunProto id=fn_ident + lp=TOPar arglist=arg_list(name_opt_decl) rp=TCPar pt=TPtVirg { let s = match s with None -> [] | Some s -> [Ast0.FStorage s] in let i = match i with @@ -1453,7 +1455,8 @@ funproto: P.clt2mcode "(" lp, args, vararg, P.clt2mcode ")" rp, P.clt2mcode ";" pt)) } | i=Tinline s=storage t=ctype - id=fn_ident lp=TOPar arglist=arg_list(name_opt_decl) rp=TCPar pt=TPtVirg + TFunProto id=fn_ident + lp=TOPar arglist=arg_list(name_opt_decl) rp=TCPar pt=TPtVirg { let s = [Ast0.FStorage s] in let i = [Ast0.FInline (P.clt2mcode "inline" i)] in let t = [Ast0.FType t] in -- 2.21.1 _______________________________________________ Linux-kernel-mentees mailing list Linux-kernel-mentees@lists.linuxfoundation.org https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees