Extract lexer_peek_helpers.c utils (#35)

* Extract `lexer_peek.c` utils

* Rename `lexer_peek_helpers`

Author: marcoroth

src/include/lexer.h

@@ -5,11 +5,6 @@
 #include "token_struct.h"
 
 lexer_T* lexer_init(char* source);
-
-void lexer_advance(lexer_T* lexer);
-char lexer_peek(lexer_T* lexer, int offset);
-char lexer_backtrack(lexer_T* lexer, int offset);
-
 token_T* lexer_next_token(lexer_T* lexer);
 
 size_t lexer_sizeof(void);

src/include/lexer_peek_helpers.h

@@ -0,0 +1,23 @@
+#ifndef ERBX_LEXER_PEEK_H
+#define ERBX_LEXER_PEEK_H
+
+#include "lexer_struct.h"
+
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+char lexer_peek(lexer_T* lexer, int offset);
+bool lexer_peek_for_doctype(lexer_T* lexer, int offset);
+
+bool lexer_peek_for_html_comment_start(lexer_T* lexer, int offset);
+bool lexer_peek_for_html_comment_end(lexer_T* lexer, int offset);
+
+bool lexer_peek_erb_close_tag(lexer_T* lexer, int offset);
+bool lexer_peek_erb_dash_close_tag(lexer_T* lexer, int offset);
+bool lexer_peek_erb_percent_close_tag(lexer_T* lexer, int offset);
+bool lexer_peek_erb_end(lexer_T* lexer, int offset);
+
+char lexer_backtrack(lexer_T* lexer, int offset);
+
+#endif

src/lexer.c

@@ -1,6 +1,5 @@
-#include "include/lexer.h"
 #include "include/buffer.h"
-#include "include/macros.h"
+#include "include/lexer_peek_helpers.h"
 #include "include/token.h"
 #include "include/util.h"
 
@@ -39,32 +38,6 @@ token_T* lexer_error(lexer_T* lexer, const char* message) {
   return token_init(error_message, TOKEN_ERROR, lexer);
 }
 
-char lexer_peek(lexer_T* lexer, int offset) {
-  return lexer->source[MIN(lexer->current_position + offset, lexer->source_length)];
-}
-
-bool lexer_peek_for_doctype(lexer_T* lexer, int offset) {
-  return (lexer_peek(lexer, offset) == '<' && lexer_peek(lexer, offset + 1) == '!' &&
-          tolower(lexer_peek(lexer, offset + 2)) == 'd' && tolower(lexer_peek(lexer, offset + 3)) == 'o' &&
-          tolower(lexer_peek(lexer, offset + 4)) == 'c' && tolower(lexer_peek(lexer, offset + 5)) == 't' &&
-          tolower(lexer_peek(lexer, offset + 6)) == 'y' && tolower(lexer_peek(lexer, offset + 7)) == 'p' &&
-          tolower(lexer_peek(lexer, offset + 8)) == 'e');
-}
-
-bool lexer_peek_for_html_comment_start(lexer_T* lexer, int offset) {
-  return (lexer_peek(lexer, offset) == '<' && lexer_peek(lexer, offset + 1) == '!' &&
-          lexer_peek(lexer, offset + 2) == '-' && lexer_peek(lexer, offset + 3) == '-');
-}
-
-bool lexer_peek_for_html_comment_end(lexer_T* lexer, int offset) {
-  return (
-      lexer_peek(lexer, offset) == '-' && lexer_peek(lexer, offset + 1) == '-' && lexer_peek(lexer, offset + 2) == '>');
-}
-
-char lexer_backtrack(lexer_T* lexer, int offset) {
-  return lexer->source[MAX(lexer->current_position - offset, 0)];
-}
-
 void lexer_advance(lexer_T* lexer) {
   if (lexer->current_position < lexer->source_length && lexer->current_character != '\0') {
 
@@ -175,25 +148,6 @@ token_T* lexer_parse_erb_open(lexer_T* lexer) {
   return token_init("<%", TOKEN_ERB_START, lexer);
 }
 
-bool lexer_peek_erb_close_tag(lexer_T* lexer, int offset) {
-  return (lexer_peek(lexer, offset + 0) == '%' && lexer_peek(lexer, offset + 1) == '>');
-}
-
-bool lexer_peek_erb_dash_close_tag(lexer_T* lexer, int offset) {
-  return (lexer_peek(lexer, offset + 0) == '-' && lexer_peek(lexer, offset + 1) == '%' &&
-          lexer_peek(lexer, offset + 2) == '>');
-}
-
-bool lexer_peek_erb_percent_close_tag(lexer_T* lexer, int offset) {
-  return (lexer_peek(lexer, offset + 0) == '%' && lexer_peek(lexer, offset + 1) == '%' &&
-          lexer_peek(lexer, offset + 2) == '>');
-}
-
-bool lexer_peek_erb_end(lexer_T* lexer, int offset) {
-  return (lexer_peek_erb_close_tag(lexer, offset) || lexer_peek_erb_dash_close_tag(lexer, offset) ||
-          lexer_peek_erb_percent_close_tag(lexer, offset));
-}
-
 token_T* lexer_parse_erb_content(lexer_T* lexer) {
   buffer_T buffer = buffer_new();
 

src/lexer_peek_helpers.c

@@ -0,0 +1,51 @@
+#include "include/lexer_peek_helpers.h"
+#include "include/lexer_struct.h"
+#include "include/macros.h"
+
+#include <ctype.h>
+#include <stdbool.h>
+
+char lexer_backtrack(lexer_T* lexer, int offset) {
+  return lexer->source[MAX(lexer->current_position - offset, 0)];
+}
+
+char lexer_peek(lexer_T* lexer, int offset) {
+  return lexer->source[MIN(lexer->current_position + offset, lexer->source_length)];
+}
+
+bool lexer_peek_for_doctype(lexer_T* lexer, int offset) {
+  return (lexer_peek(lexer, offset) == '<' && lexer_peek(lexer, offset + 1) == '!' &&
+          tolower(lexer_peek(lexer, offset + 2)) == 'd' && tolower(lexer_peek(lexer, offset + 3)) == 'o' &&
+          tolower(lexer_peek(lexer, offset + 4)) == 'c' && tolower(lexer_peek(lexer, offset + 5)) == 't' &&
+          tolower(lexer_peek(lexer, offset + 6)) == 'y' && tolower(lexer_peek(lexer, offset + 7)) == 'p' &&
+          tolower(lexer_peek(lexer, offset + 8)) == 'e');
+}
+
+bool lexer_peek_for_html_comment_start(lexer_T* lexer, int offset) {
+  return (lexer_peek(lexer, offset) == '<' && lexer_peek(lexer, offset + 1) == '!' &&
+          lexer_peek(lexer, offset + 2) == '-' && lexer_peek(lexer, offset + 3) == '-');
+}
+
+bool lexer_peek_for_html_comment_end(lexer_T* lexer, int offset) {
+  return (
+      lexer_peek(lexer, offset) == '-' && lexer_peek(lexer, offset + 1) == '-' && lexer_peek(lexer, offset + 2) == '>');
+}
+
+bool lexer_peek_erb_close_tag(lexer_T* lexer, int offset) {
+  return (lexer_peek(lexer, offset + 0) == '%' && lexer_peek(lexer, offset + 1) == '>');
+}
+
+bool lexer_peek_erb_dash_close_tag(lexer_T* lexer, int offset) {
+  return (lexer_peek(lexer, offset + 0) == '-' && lexer_peek(lexer, offset + 1) == '%' &&
+          lexer_peek(lexer, offset + 2) == '>');
+}
+
+bool lexer_peek_erb_percent_close_tag(lexer_T* lexer, int offset) {
+  return (lexer_peek(lexer, offset + 0) == '%' && lexer_peek(lexer, offset + 1) == '%' &&
+          lexer_peek(lexer, offset + 2) == '>');
+}
+
+bool lexer_peek_erb_end(lexer_T* lexer, int offset) {
+  return (lexer_peek_erb_close_tag(lexer, offset) || lexer_peek_erb_dash_close_tag(lexer, offset) ||
+          lexer_peek_erb_percent_close_tag(lexer, offset));
+}