projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
reractor
[pspp]
/
src
/
ui
/
terminal
/
terminal-opts.c
diff --git
a/src/ui/terminal/terminal-opts.c
b/src/ui/terminal/terminal-opts.c
index eeb10356d8ecf7f971dc82f7c280b12231c1e504..b9d9e50c589c9ae0507bdadc575223dc7eac40b2 100644
(file)
--- a/
src/ui/terminal/terminal-opts.c
+++ b/
src/ui/terminal/terminal-opts.c
@@
-56,7
+56,7
@@
struct terminal_opts
bool has_output_driver;
bool has_terminal_driver;
bool has_error_file;
bool has_output_driver;
bool has_terminal_driver;
bool has_error_file;
- enum
lex_syntax
_mode *syntax_mode;
+ enum
segmenter
_mode *syntax_mode;
bool *process_statrc;
char **syntax_encoding;
char *table_look;
bool *process_statrc;
char **syntax_encoding;
char *table_look;
@@
-224,11
+224,11
@@
terminal_option_callback (int id, void *to_)
break;
case OPT_BATCH:
break;
case OPT_BATCH:
- *to->syntax_mode =
LEX_SYNTAX
_BATCH;
+ *to->syntax_mode =
SEG_MODE
_BATCH;
break;
case OPT_INTERACTIVE:
break;
case OPT_INTERACTIVE:
- *to->syntax_mode =
LEX_SYNTAX
_INTERACTIVE;
+ *to->syntax_mode =
SEG_MODE
_INTERACTIVE;
break;
case OPT_SYNTAX_ENCODING:
break;
case OPT_SYNTAX_ENCODING:
@@
-260,16
+260,14
@@
terminal_option_callback (int id, void *to_)
struct terminal_opts *
terminal_opts_init (struct argv_parser *ap,
struct terminal_opts *
terminal_opts_init (struct argv_parser *ap,
- enum
lex_syntax
_mode *syntax_mode, bool *process_statrc,
+ enum
segmenter
_mode *syntax_mode, bool *process_statrc,
char **syntax_encoding)
{
char **syntax_encoding)
{
- struct terminal_opts *to;
-
- *syntax_mode = LEX_SYNTAX_AUTO;
+ *syntax_mode = SEG_MODE_AUTO;
*process_statrc = true;
*syntax_encoding = "Auto";
*process_statrc = true;
*syntax_encoding = "Auto";
-
to = xzalloc (sizeof *to
);
+
struct terminal_opts *to = XZALLOC (struct terminal_opts
);
to->syntax_mode = syntax_mode;
string_map_init (&to->options);
to->has_output_driver = false;
to->syntax_mode = syntax_mode;
string_map_init (&to->options);
to->has_output_driver = false;