Merge branch 'gh-132/static-libs' into v1.x

[awesomized/libmemcached] / src / libmemcached / csl / parser.yy

diff --git a/src/libmemcached/csl/parser.yy b/src/libmemcached/csl/parser.yy
index 87fe4f3b4f9b706cbf429f166fdafd428562b1fd..9dfb4a2554c5cd24f5230e56fa1417057a02dc25 100644 (file)
--- a/src/libmemcached/csl/parser.yy
+++ b/src/libmemcached/csl/parser.yy
@@ -36,33 +36,34 @@
 
 %{
 
-#include <libmemcached/csl/common.h>
+#include "libmemcached/csl/common.h"
 
 class Context;
 
 %}
 
-%define parse.error verbose
-%define api.pure
-%define api.prefix {config_}
-%define api.value.type {union CONFIG_STYPE}
+%require "2.3"
+
 %debug
-%defines
+%error-verbose
+%verbose
 %expect 0
+
+%pure-parser
+%name-prefix="config_"
+
 %lex-param { yyscan_t *scanner }
 %parse-param { class Context *context }
 %parse-param { yyscan_t *scanner }
-%require "2.5"
 %start begin
-%verbose
 
 %{
 
-#include <libmemcached/options.hpp>
+#include "libmemcached/options.hpp"
 
-#include <libmemcached/csl/context.h>
-#include <libmemcached/csl/symbol.h>
-#include <libmemcached/csl/scanner.h>
+#include "libmemcached/csl/context.h"
+#include "libmemcached/csl/symbol.h"
+#include "libmemcached/csl/scanner.h"
 
 #ifndef __INTEL_COMPILER
 # pragma GCC diagnostic ignored "-Wold-style-cast"