perf tools: Split term type into value type and term type

[mirror_ubuntu-zesty-kernel.git] / tools / perf / util / parse-events.y

diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
index d9637da7333c2eb5de44b759842df68f76ccafe5..936913ea0ab6a67344aa56a59900b35fd569e4fb 100644 (file)
--- a/tools/perf/util/parse-events.y
+++ b/tools/perf/util/parse-events.y
@@ -176,8 +176,8 @@ PE_NAME '=' PE_NAME
 {
        struct parse_events__term *term;
 
-       ABORT_ON(parse_events__new_term(&term, PARSE_EVENTS__TERM_TYPE_STR,
-                $1, $3, 0));
+       ABORT_ON(parse_events__term_str(&term, PARSE_EVENTS__TERM_TYPE_USER,
+                                       $1, $3));
        $$ = term;
 }
 |
@@ -185,8 +185,8 @@ PE_NAME '=' PE_VALUE
 {
        struct parse_events__term *term;
 
-       ABORT_ON(parse_events__new_term(&term, PARSE_EVENTS__TERM_TYPE_NUM,
-                $1, NULL, $3));
+       ABORT_ON(parse_events__term_num(&term, PARSE_EVENTS__TERM_TYPE_USER,
+                                       $1, $3));
        $$ = term;
 }
 |
@@ -194,8 +194,8 @@ PE_NAME
 {
        struct parse_events__term *term;
 
-       ABORT_ON(parse_events__new_term(&term, PARSE_EVENTS__TERM_TYPE_NUM,
-                $1, NULL, 1));
+       ABORT_ON(parse_events__term_num(&term, PARSE_EVENTS__TERM_TYPE_USER,
+                                       $1, 1));
        $$ = term;
 }
 |
@@ -203,7 +203,7 @@ PE_TERM '=' PE_VALUE
 {
        struct parse_events__term *term;
 
-       ABORT_ON(parse_events__new_term(&term, $1, NULL, NULL, $3));
+       ABORT_ON(parse_events__term_num(&term, $1, NULL, $3));
        $$ = term;
 }
 |
@@ -211,7 +211,7 @@ PE_TERM
 {
        struct parse_events__term *term;
 
-       ABORT_ON(parse_events__new_term(&term, $1, NULL, NULL, 1));
+       ABORT_ON(parse_events__term_num(&term, $1, NULL, 1));
        $$ = term;
 }