parser: Fixed build with bison 3.2 (fixes #11)

Bison 3.2 added support for movable types, but this change broke our
build. Each type is now enclosed in YY_RVREF() macro. If you use
templated type with multiple arguments it must contain comma. This comma
is however parsed by preprocessor which thinks that we have passed
multiple arguments to the function-like macro. This results in error
like:

error: too many arguments provided to function-like macro invocation

or

error: macro "YY_RVREF" passed 2 arguments, but takes just 1

This workaround fixes the problem and we can now build our parser with
pre-3.2 and 3.2+ bison versions. Since we want to abandon flex+bison
anyway, we will just use this workaround for now.

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+# dev
+
+* Fix: Build with bison 3.2 ([#11](https://github.com/avast-tl/yaramod/issues/11)).
+
 # v2.2.1 (2018-10-03)
 
 * Fix: Fixed build on certain specific MSVC versions.

src/parser/yy/parser.y

@@ -16,7 +16,22 @@
 #include "yaramod/types/rule.h"
 #include "yaramod/utils/trie.h"
 
-namespace yaramod { class ParserDriver; }
+namespace yaramod {
+
+class ParserDriver;
+
+// We need to provide alias to this type because since bison 3.2
+// types are enclosed in YY_RVREF() macro. The comma in template
+// parameter list is however parsed by preprocessor first and
+// therefore the preprocessor thinks we are passing it 2 arguments.
+// We then get error like this:
+//
+// error: too many arguments provided to function-like macro invocation
+//
+// See https://github.com/avast-tl/yaramod/issues/11 for further information.
+using RegexpRangePair = std::pair<nonstd::optional<std::uint64_t>, nonstd::optional<std::uint64_t>>;
+
+}
 
 // Uncomment for debugging
 // See also other occurrences of 'debugging' in this file and constructor of ParserDriver to enable it
@@ -137,7 +152,7 @@ static yy::Parser::symbol_type yylex(ParserDriver& driver)
 %token REGEXP_WORD_BOUNDARY
 %token REGEXP_NON_WORD_BOUNDARY
 %token <std::string> REGEXP_CHAR
-%token <std::pair<nonstd::optional<std::uint64_t>, nonstd::optional<std::uint64_t>>> REGEXP_RANGE
+%token <yaramod::RegexpRangePair> REGEXP_RANGE
 %token <std::string> REGEXP_CLASS
 
 %type <yaramod::Rule::Modifier> rule_mod