Do not require a generator when building the C++ decoder only (#374)

Decoder in C++ only requires a reference to the serializer and the type
of treeformat to be used. It doesn't need any information about the
generator, model, listener, or transformer used for generating the
tree to be decoded. The patch eliminates such artificial requirements
from the build system and config.

Author: renatahodovan

grammarinator-cxx/config/grammarinator/config.hpp

@@ -9,10 +9,6 @@
 #define GRAMMARINATOR_VERSION "0.0 (unknown)"
 #endif
 
-#ifndef GRAMMARINATOR_GENERATOR
-#error "GRAMMARINATOR_GENERATOR must be defined"
-#endif
-
 #ifndef GRAMMARINATOR_MODEL
 #define GRAMMARINATOR_MODEL grammarinator::runtime::DefaultModel
 #endif
@@ -34,9 +30,14 @@
 #endif
 
 #ifndef GRAMMARINATOR_INCLUDE
+#ifdef GRAMMARINATOR_GENERATOR
 #define GRAMMARINATOR_INCLUDE GRAMMARINATOR_GENERATOR.hpp
 #endif
+#endif
 
 #define GRAMMARINATOR_STRFY_INTERNAL(MACRO) #MACRO
 #define GRAMMARINATOR_STRFY(MACRO) GRAMMARINATOR_STRFY_INTERNAL(MACRO)
+
+#ifdef GRAMMARINATOR_INCLUDE
 #include GRAMMARINATOR_STRFY(GRAMMARINATOR_INCLUDE)
+#endif

grammarinator-cxx/dev/build.py

@@ -31,17 +31,21 @@ def build_options_append(cmakeopt, cliarg):
     build_options_append('GRAMMARINATOR_DECODE', 'ON' if args.decode else 'OFF')
     build_options_append('GRAMMARINATOR_FUZZNULL', 'ON' if args.fuzznull else 'OFF')
     build_options_append('GRAMMARINATOR_GRLF', 'ON' if args.grlf else 'OFF')
-    if args.generate or args.decode or args.fuzznull or args.grlf:
+
+    if args.generate or args.fuzznull or args.grlf:
         build_options_append('GRAMMARINATOR_GENERATOR', args.generator)
         build_options_append('GRAMMARINATOR_MODEL', args.model)
         build_options_append('GRAMMARINATOR_LISTENER', args.listener)
         build_options_append('GRAMMARINATOR_TRANSFORMER', args.transformer)
+
+    if args.generate or args.decode or args.fuzznull or args.grlf:
         build_options_append('GRAMMARINATOR_SERIALIZER', args.serializer)
         build_options_append('GRAMMARINATOR_TREECODEC', args.treecodec)
         build_options_append('GRAMMARINATOR_INCLUDE', args.include)
         build_options_append('GRAMMARINATOR_INCLUDEDIRS', ';'.join(os.path.abspath(includedir) for includedir in args.includedir))
         build_options_append('GRAMMARINATOR_SUFFIX', args.suffix)
         build_options_append('GRAMMARINATOR_LOG_LEVEL', args.log_level)
+
     return build_options
 
 

grammarinator-cxx/libgrlf/grlf.cpp

@@ -20,6 +20,10 @@
 
 #include "grammarinator/config.hpp"
 
+#ifndef GRAMMARINATOR_GENERATOR
+#error "GRAMMARINATOR_GENERATOR must be defined"
+#endif
+
 namespace {
 
 struct {

grammarinator-cxx/tools/generate.cpp

@@ -20,6 +20,10 @@
 
 #include "grammarinator/config.hpp"
 
+#ifndef GRAMMARINATOR_GENERATOR
+#error "GRAMMARINATOR_GENERATOR must be defined"
+#endif
+
 using namespace grammarinator::runtime;
 using namespace grammarinator::tool;
 using namespace grammarinator::util;