lexer: move DIRECTIVE_INCLUDE to where it is used

3 files changed, 4 insertions, 10 deletions

diff --git a/include/lexer.h b/include/lexer.h
index 429648a..84c499e 100644
--- a/include/lexer.h
+++ b/include/lexer.h
@@ -21,8 +21,6 @@
 
 #include <list.h>
 
-#define DIRECTIVE_IS(key) strncmp(buffer + n, key, strlen(key)) == 0
-
 typedef enum {
     _NONE,
     _RAW,
diff --git a/src/engine/engine.c b/src/engine/engine.c
index 7edac19..a4606c2 100644
--- a/src/engine/engine.c
+++ b/src/engine/engine.c
@@ -114,14 +114,8 @@ engine_ingest(char **buffer)
             break;
         }
 
-        case PUTPAGE:
-            /* TODO: handle */
-        case PUT:
-        case ENDEACHDO:
-        case BODY:
-        case CONTENT:
-        case ENDCONTENT:
-        case _RAW:
+        /* TODO: handle */
+        default:
             skip++;
             break;
         }
diff --git a/src/lexer.c b/src/lexer.c
index 5f0b99c..61ecbdf 100644
--- a/src/lexer.c
+++ b/src/lexer.c
@@ -341,6 +341,8 @@ find_directive(char *content, key_match_t *match)
 found_start:
     directive = (directive_t *) calloc(1, sizeof(directive_t));
 
+#define DIRECTIVE_IS(key) strncmp(buffer + n, key, strlen(key)) == 0
+
     if (DIRECTIVE_IS("endcontent")) {
         directive->type = ENDCONTENT;
         directive->operands = NULL;