aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Rogers <[email protected]>2021-09-23 00:46:07 -0700
committerArnaldo Carvalho de Melo <[email protected]>2021-09-29 13:27:17 -0300
commitaed0d6f8c6edab48be649a071e18d28efb1a203a (patch)
tree7a79df235a10e6b3c04d5a7eee83a05a21bff4d2
parent7f8fdcbbbefb2d95259aa76a362689affafa4e4b (diff)
perf expr: Separate token declataion from type
No functional change, so the type of expr remains <num>. 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 <[email protected]> Tested-by: John Garry <[email protected]> Acked-by: Jiri Olsa <[email protected]> Cc: Alexander Shishkin <[email protected]> Cc: Andi Kleen <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Jin Yao <[email protected]> Cc: Kajol Jain <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Paul Clarke <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Sandeep Dasgupta <[email protected]> Cc: Stephane Eranian <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
-rw-r--r--tools/perf/util/expr.y9
1 files 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 <num> NUMBER
-%token <str> ID
-%destructor { free ($$); } <str>
-%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 <num> NUMBER
+%type <str> ID
+%destructor { free ($$); } <str>
%type <num> expr if_expr
%{