From mboxrd@z Thu Jan 1 00:00:00 1970 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=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 8C6F0C433EF for ; Thu, 23 Sep 2021 07:46:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 707C461019 for ; Thu, 23 Sep 2021 07:46:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239757AbhIWHsS (ORCPT ); Thu, 23 Sep 2021 03:48:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239777AbhIWHsQ (ORCPT ); Thu, 23 Sep 2021 03:48:16 -0400 Received: from mail-qk1-x74a.google.com (mail-qk1-x74a.google.com [IPv6:2607:f8b0:4864:20::74a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03B22C061574 for ; Thu, 23 Sep 2021 00:46:45 -0700 (PDT) Received: by mail-qk1-x74a.google.com with SMTP id v14-20020a05620a0f0e00b0043355ed67d1so18091723qkl.7 for ; Thu, 23 Sep 2021 00:46:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=Hs5Rj+NJx7+HtIpxHcg+oHBvbk954rcb4LXyidx6Rwg=; b=s+JliFIJVOrnwMlQ9siG3F9Wi2QguFdhEczvYRLZv5jCJSUyt7HxXQwnujlvFbvvmt FTiXdoOIfIbe/KHSbHBOJV4MZoD+bfsVPxy5aPS1kr2S7CaPfNHUKpdepzCAf7ODEIib O9Aoqe1+3HDDV2bynzFEMZRynKlNYAkLoZHIctdFSTFRbMkY4UxIfHlIgJ3/s/YnNtmf SFPRCVJ/J8bKlGe9ZD0PJaDfcNYNsnEf+zAHKAuVQw6gQ1QyxkbyK1gFBc7WicnTzDeh +w6LQeCaA3lra2WUif7DWIg2abTK9nM5KlDrnXadASvSPt3uGAkCt66gb6IFRcwMkEc7 qoug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=Hs5Rj+NJx7+HtIpxHcg+oHBvbk954rcb4LXyidx6Rwg=; b=vC7IkD1A7lfC6Rij3yJd0uRhC9Bn6CgSY+2fw3kxjcWE/Hcm4mZQVZbQb/joYCcGlK YqxBsimZEdzSMzMpm8Fri5eBHsbo5zhvNrt9Os4IO8u8kdfHKJ9qdJiWxC4UYG4dP3hg p59fym6gKU71Xe/wgaOUf0xJPNSyRBXObkyi9hx6nGhSD507MaeZ6272qBfrsVkzwaWX O1x8tOz6WK42QXToF+YeMnTWuXar4hY8k0Js+wnD56sEvOAXmzzQzMncsR5KhccVh2Hl 9sn5Hilxk+VnJ2x15vw23ECNo8eaxsC3wy95OK+ITCYxv6MuY20JRLKAv77jxOCaMniF WjsA== X-Gm-Message-State: AOAM533XyHEHL09o+1JOgF5Yf04ywqjPO+u/7XdEcGm+r9VCSvVIhN8q qAKFWB2iVahNbSeGdeMhs6TU6iNNSi1C X-Google-Smtp-Source: ABdhPJx3s4c0RgpCmKkzxC7B+/vnn5DD2zrreDc1rFHinSChs2v9vVq/r+H09Lfd+zDVsj0RlwobFWxAhmWq X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:d3ff:e8f7:11f4:c738]) (user=irogers job=sendgmr) by 2002:a05:6214:4c9:: with SMTP id ck9mr3145524qvb.52.1632383204146; Thu, 23 Sep 2021 00:46:44 -0700 (PDT) Date: Thu, 23 Sep 2021 00:46:07 -0700 In-Reply-To: <20210923074616.674826-1-irogers@google.com> Message-Id: <20210923074616.674826-5-irogers@google.com> Mime-Version: 1.0 References: <20210923074616.674826-1-irogers@google.com> X-Mailer: git-send-email 2.33.0.464.g1972c5931b-goog Subject: [PATCH v9 04/13] perf expr: Separate token declataion from type From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , linux-kernel@vger.kernel.org, Andi Kleen , Jin Yao , John Garry , Paul Clarke , kajoljain , linux-perf-users@vger.kernel.org Cc: Stephane Eranian , Sandeep Dasgupta , Ian Rogers Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org No functional change, so the type of expr remains . A later patch will change the computation to be an aggregate type and making this change makes that later change smaller. Signed-off-by: Ian Rogers --- tools/perf/util/expr.y | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/perf/util/expr.y b/tools/perf/util/expr.y index e6005450feae..68b122e59b3f 100644 --- a/tools/perf/util/expr.y +++ b/tools/perf/util/expr.y @@ -20,11 +20,7 @@ char *str; } -%token EXPR_PARSE EXPR_OTHER EXPR_ERROR -%token NUMBER -%token ID -%destructor { free ($$); } -%token MIN MAX IF ELSE SMT_ON D_RATIO +%token ID NUMBER MIN MAX IF ELSE SMT_ON D_RATIO EXPR_ERROR EXPR_PARSE EXPR_OTHER %left MIN MAX IF %left '|' %left '^' @@ -33,6 +29,9 @@ %left '-' '+' %left '*' '/' '%' %left NEG NOT +%type NUMBER +%type ID +%destructor { free ($$); } %type expr if_expr %{ -- 2.33.0.464.g1972c5931b-goog