projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
segment: Add support for segmenting "snippets".
[pspp]
/
src
/
language
/
lexer
/
lexer.c
diff --git
a/src/language/lexer/lexer.c
b/src/language/lexer/lexer.c
index cedbeafd50b21432c24ed376623078ad6c04168a..1148cc29e0856752d071b784207944c5d95fa536 100644
(file)
--- a/
src/language/lexer/lexer.c
+++ b/
src/language/lexer/lexer.c
@@
-1229,7
+1229,8
@@
lex_interactive_reset (struct lexer *lexer)
src->journal_pos = src->seg_pos = src->line_pos = 0;
src->n_newlines = 0;
src->suppress_next_newline = false;
src->journal_pos = src->seg_pos = src->line_pos = 0;
src->n_newlines = 0;
src->suppress_next_newline = false;
- segmenter_init (&src->segmenter, segmenter_get_mode (&src->segmenter));
+ src->segmenter = segmenter_init (segmenter_get_mode (&src->segmenter),
+ false);
while (!deque_is_empty (&src->deque))
lex_source_pop__ (src);
lex_source_push_endcmd__ (src);
while (!deque_is_empty (&src->deque))
lex_source_pop__ (src);
lex_source_push_endcmd__ (src);
@@
-1758,7
+1759,7
@@
lex_source_create (struct lexer *lexer, struct lex_reader *reader)
src = xzalloc (sizeof *src);
src->reader = reader;
src = xzalloc (sizeof *src);
src->reader = reader;
- s
egmenter_init (&src->segmenter, reader->syntax
);
+ s
rc->segmenter = segmenter_init (reader->syntax, false
);
src->lexer = lexer;
src->tokens = deque_init (&src->deque, 4, sizeof *src->tokens);
src->lexer = lexer;
src->tokens = deque_init (&src->deque, 4, sizeof *src->tokens);