/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <language/command.h>
#include <language/lexer/format-parser.h>
#include <language/lexer/lexer.h>
-#include <language/prompt.h>
#include <libpspp/compiler.h>
#include <libpspp/copyleft.h>
#include <libpspp/float-format.h>
cce=string;
compression=compress:on/off;
cpi=integer "x>0" "%s must be greater than 0";
- cprompt=string;
decimal=dec:dot/comma;
- dprompt=string;
epoch=custom;
errors=custom;
format=custom;
mxmemory=integer;
mxwarns=integer;
printback=custom;
- prompt=string;
results=custom;
rib=rib:msbfirst/lsbfirst/vax/native;
rrb=rrb:native/isl/isb/idl/idb/vf/vd/vg/zs/zl;
if (cmd.sbc_cce)
settings_set_cc ( cmd.s_cce, FMT_CCE);
- if (cmd.sbc_prompt)
- prompt_set (PROMPT_FIRST, cmd.s_prompt);
- if (cmd.sbc_cprompt)
- prompt_set (PROMPT_LATER, cmd.s_cprompt);
- if (cmd.sbc_dprompt)
- prompt_set (PROMPT_DATA, cmd.s_dprompt);
-
if (cmd.sbc_decimal)
settings_set_decimal_char (cmd.dec == STC_DOT ? '.' : ',');
}
static void
-format_cc (struct string *out, struct substring in, char grouping)
+format_cc (struct string *out, const char *in, char grouping)
{
- while (!ss_is_empty (in))
+ while (*in != '\0')
{
- char c = ss_get_byte (&in);
+ char c = *in++;
if (c == grouping || c == '\'')
ds_put_byte (out, '\'');
else if (c == '"')
struct string out;
ds_init_empty (&out);
- format_cc (&out, cc->neg_prefix, cc->grouping);
+ format_cc (&out, cc->neg_prefix.s, cc->grouping);
ds_put_byte (&out, cc->grouping);
- format_cc (&out, cc->prefix, cc->grouping);
+ format_cc (&out, cc->prefix.s, cc->grouping);
ds_put_byte (&out, cc->grouping);
- format_cc (&out, cc->suffix, cc->grouping);
+ format_cc (&out, cc->suffix.s, cc->grouping);
ds_put_byte (&out, cc->grouping);
- format_cc (&out, cc->neg_suffix, cc->grouping);
+ format_cc (&out, cc->neg_suffix.s, cc->grouping);
return ds_cstr (&out);
}