Extract lexer_state_T and token_type_T enums

Author: marcoroth

src/include/lexer_struct.h

@@ -3,28 +3,30 @@
 
 #include <stdlib.h>
 
+typedef enum {
+  STATE_NONE,
+  STATE_SINGLE_QUOTE,
+  STATE_DOUBLE_QUOTE,
+  STATE_START_TAG_START,
+  STATE_END_TAG_START,
+  STATE_END_TAG_END,
+  STATE_TAG_ATTRIBUTES,
+  STATE_ATTRIBUTE_START,
+  STATE_ATTRIBUTE_VALUE_START,
+  STATE_ATTRIBUTE_VALUE,
+  STATE_ATTRIBUTE_VALUE_END,
+  STATE_ELEMENT_CHILDREN,
+  STATE_ERB_OPEN,
+} lexer_state_T;
+
 typedef struct LEXER_STRUCT {
   char* source;
   size_t source_length;
   char current_character;
   unsigned int current_position;
   unsigned int current_line;
   unsigned int current_column;
-  enum {
-    STATE_NONE,
-    STATE_SINGLE_QUOTE,
-    STATE_DOUBLE_QUOTE,
-    STATE_START_TAG_START,
-    STATE_END_TAG_START,
-    STATE_END_TAG_END,
-    STATE_TAG_ATTRIBUTES,
-    STATE_ATTRIBUTE_START,
-    STATE_ATTRIBUTE_VALUE_START,
-    STATE_ATTRIBUTE_VALUE,
-    STATE_ATTRIBUTE_VALUE_END,
-    STATE_ELEMENT_CHILDREN,
-    STATE_ERB_OPEN,
-  } state;
+  lexer_state_T state;
 } lexer_T;
 
 #endif

src/include/token_struct.h

@@ -4,31 +4,33 @@
 #include "location.h"
 #include "range.h"
 
+typedef enum {
+  TOKEN_ATTRIBUTE_NAME,
+  TOKEN_ATTRIBUTE_VALUE,
+  TOKEN_DOUBLE_QUOTE,
+  TOKEN_END_TAG_END,
+  TOKEN_END_TAG_START,
+  TOKEN_EOF,
+  TOKEN_EQUALS,
+  TOKEN_ID,
+  TOKEN_NEWLINE,
+  TOKEN_SINGLE_QUOTE,
+  TOKEN_SPACE,
+  TOKEN_START_TAG_END_VOID,
+  TOKEN_START_TAG_END,
+  TOKEN_START_TAG_START,
+  TOKEN_TAG_END,
+  TOKEN_TAG_NAME,
+  TOKEN_TEXT_CONTENT,
+  TOKEN_WHITESPACE,
+} token_type_T;
+
 typedef struct TOKEN_STRUCT {
   char* value;
   range_T* range;
   location_T* start;
   location_T* end;
-  enum {
-    TOKEN_ATTRIBUTE_NAME,
-    TOKEN_ATTRIBUTE_VALUE,
-    TOKEN_DOUBLE_QUOTE,
-    TOKEN_END_TAG_END,
-    TOKEN_END_TAG_START,
-    TOKEN_EOF,
-    TOKEN_EQUALS,
-    TOKEN_ID,
-    TOKEN_NEWLINE,
-    TOKEN_SINGLE_QUOTE,
-    TOKEN_SPACE,
-    TOKEN_START_TAG_END_VOID,
-    TOKEN_START_TAG_END,
-    TOKEN_START_TAG_START,
-    TOKEN_TAG_END,
-    TOKEN_TAG_NAME,
-    TOKEN_TEXT_CONTENT,
-    TOKEN_WHITESPACE,
-  } type;
+  token_type_T type;
 } token_T;
 
 #endif