Cleanup: YYPARSE_PARAM and YYLEX_PARAM are deprecated in bison 2.6

[lttng-tools.git] / src / lib / lttng-ctl / filter-ast.h

diff --git a/src/lib/lttng-ctl/filter-ast.h b/src/lib/lttng-ctl/filter-ast.h
index 97a3ae410001a91f62c98d4dbb1f54ea331a96cf..d66fb8b58764a5bb638e4c3781106be75448236a 100644 (file)
--- a/src/lib/lttng-ctl/filter-ast.h
+++ b/src/lib/lttng-ctl/filter-ast.h
@@ -22,6 +22,10 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+/*
+ * Note: filter-ast.h should be included before filter-parser.h.
+ */
+
 #include <urcu/list.h>
 #include <stdint.h>
 
@@ -31,13 +35,6 @@
                        fprintf(stdout, "[debug] " fmt, ## args);       \
        } while (0)
 
-// the parameter name (of the reentrant 'yyparse' function)
-// data is a pointer to a 'SParserParam' structure
-//#define YYPARSE_PARAM        parser_ctx
-
-// the argument for the 'yylex' function
-#define YYLEX_PARAM    ((struct filter_parser_ctx *) parser_ctx)->scanner
-
 #ifndef YY_TYPEDEF_YY_SCANNER_T
 #define YY_TYPEDEF_YY_SCANNER_T
 typedef void* yyscan_t;
@@ -114,6 +111,7 @@ struct filter_node {
                                AST_EXP_UNKNOWN = 0,
                                AST_EXP_STRING,
                                AST_EXP_CONSTANT,
+                               AST_EXP_FLOAT_CONSTANT,
                                AST_EXP_IDENTIFIER,
                                AST_EXP_NESTED,
                        } type;
@@ -122,6 +120,7 @@ struct filter_node {
                        union {
                                char *string;
                                uint64_t constant;
+                               double float_constant;
                                char *identifier;
                                /*
                                 * child can be nested.