lexer: Drop 'line_pos' from lex_token and lex_source.

[pspp] / src / language / lexer / segment.h

diff --git a/src/language/lexer/segment.h b/src/language/lexer/segment.h
index bb788f42306ad0ea8dbf3c99a468fda459381da4..199e390f7e4f1279d877c9e01935534d405a2289 100644 (file)
--- a/src/language/lexer/segment.h
+++ b/src/language/lexer/segment.h
@@ -79,6 +79,7 @@ enum segmenter_mode
     SEG_TYPE(INLINE_DATA)                       \
                                                 \
     SEG_TYPE(MACRO_ID)                          \
+    SEG_TYPE(MACRO_NAME)                        \
     SEG_TYPE(MACRO_BODY)                        \
                                                 \
     SEG_TYPE(START_DOCUMENT)                    \
@@ -91,7 +92,6 @@ enum segmenter_mode
                                                 \
     SEG_TYPE(EXPECTED_QUOTE)                    \
     SEG_TYPE(EXPECTED_EXPONENT)                 \
-    SEG_TYPE(UNEXPECTED_DOT)                    \
     SEG_TYPE(UNEXPECTED_CHAR)
 
 /* Types of segments. */
@@ -118,7 +118,7 @@ struct segmenter
     unsigned char mode;
   };
 
-void segmenter_init (struct segmenter *, enum segmenter_mode);
+struct segmenter segmenter_init (enum segmenter_mode, bool is_snippet);
 
 enum segmenter_mode segmenter_get_mode (const struct segmenter *);