segment: Add support for segmenting "snippets".

[pspp] / src / language / lexer / scan.c

diff --git a/src/language/lexer/scan.c b/src/language/lexer/scan.c
index 0e29dc9e71be9702c3213ab1ef32f85fba9836c5..57e3c2d1a871cc13c4970a1b349449db12cea68e 100644 (file)
--- a/src/language/lexer/scan.c
+++ b/src/language/lexer/scan.c
@@ -607,10 +607,12 @@ void
 string_lexer_init (struct string_lexer *slex, const char *input, size_t length,
                    enum segmenter_mode mode)
 {
-  slex->input = input;
-  slex->length = length;
-  slex->offset = 0;
-  segmenter_init (&slex->segmenter, mode);
+  *slex = (struct string_lexer) {
+    .input = input,
+    .length = length,
+    .offset = 0,
+    .segmenter = segmenter_init (mode, true),
+  };
 }
 
 /*  */