projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
format: Create a new "struct fmt_affix" for prefix and suffix strings.
[pspp-builds.git]
/
src
/
language
/
utilities
/
set.q
diff --git
a/src/language/utilities/set.q
b/src/language/utilities/set.q
index a07efedf9e4418209c1e1537d9f88b5c9b9b8630..552747066740c53f3111b5521e1a96dafa4a9202 100644
(file)
--- a/
src/language/utilities/set.q
+++ b/
src/language/utilities/set.q
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* 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
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
@@
-32,7
+32,6
@@
#include <language/command.h>
#include <language/lexer/format-parser.h>
#include <language/lexer/lexer.h>
#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>
#include <libpspp/compiler.h>
#include <libpspp/copyleft.h>
#include <libpspp/float-format.h>
@@
-70,9
+69,7
@@
int tgetnum (const char *);
cce=string;
compression=compress:on/off;
cpi=integer "x>0" "%s must be greater than 0";
cce=string;
compression=compress:on/off;
cpi=integer "x>0" "%s must be greater than 0";
- cprompt=string;
decimal=dec:dot/comma;
decimal=dec:dot/comma;
- dprompt=string;
epoch=custom;
errors=custom;
format=custom;
epoch=custom;
errors=custom;
format=custom;
@@
-97,7
+94,6
@@
int tgetnum (const char *);
mxmemory=integer;
mxwarns=integer;
printback=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;
results=custom;
rib=rib:msbfirst/lsbfirst/vax/native;
rrb=rrb:native/isl/isb/idl/idb/vf/vd/vg/zs/zl;
@@
-146,13
+142,6
@@
cmd_set (struct lexer *lexer, struct dataset *ds)
if (cmd.sbc_cce)
settings_set_cc ( cmd.s_cce, FMT_CCE);
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 ? '.' : ',');
if (cmd.sbc_decimal)
settings_set_decimal_char (cmd.dec == STC_DOT ? '.' : ',');
@@
-547,11
+536,11
@@
show_blanks (const struct dataset *ds UNUSED)
}
static void
}
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 == '"')
if (c == grouping || c == '\'')
ds_put_byte (out, '\'');
else if (c == '"')
@@
-567,13
+556,13
@@
show_cc (enum fmt_type type)
struct string out;
ds_init_empty (&out);
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);
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);
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);
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);
}
return ds_cstr (&out);
}