projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed memory leaks.
[pspp-builds.git]
/
src
/
language
/
dictionary
/
variable-display.c
diff --git
a/src/language/dictionary/variable-display.c
b/src/language/dictionary/variable-display.c
index b7dd8126c25a157a632ce71d363b96c12a32c6d5..bada08142561bbb354f09bcc1adb1b764eeefca9 100644
(file)
--- a/
src/language/dictionary/variable-display.c
+++ b/
src/language/dictionary/variable-display.c
@@
-1,40
+1,40
@@
-/* PSPP -
computes sample statistic
s.
+/* PSPP -
a program for statistical analysi
s.
Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
- Written by John Darrington <john@darrington.wattle.id.au>
- 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 the Free Software Foundation; either version 2 of the
-
License, or
(at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful,
but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+
but
WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ G
NU G
eneral Public License for more details.
You should have received a copy of the GNU General Public License
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#include <config.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
-#include "alloc.h"
-#include "command.h"
-#include "message.h"
-#include "lexer.h"
-#include "str.h"
-#include "variable.h"
-#include "debug-print.h"
+#include <data/procedure.h>
+#include <data/variable.h>
+#include <language/command.h>
+#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
+#include <libpspp/message.h>
+#include <libpspp/str.h>
+
+#include "xalloc.h"
/* Set variables' alignment
This is the alignment for GUI display only.
It affects nothing but GUIs
*/
int
/* Set variables' alignment
This is the alignment for GUI display only.
It affects nothing but GUIs
*/
int
-cmd_variable_alignment (
void
)
+cmd_variable_alignment (
struct lexer *lexer, struct dataset *ds
)
{
do
{
{
do
{
@@
-44,42
+44,40
@@
cmd_variable_alignment (void)
size_t i;
enum alignment align;
size_t i;
enum alignment align;
+ if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
+ return CMD_FAILURE;
- if (!parse_variables (default_dict, &v, &nv, PV_NONE))
- return CMD_PART_SUCCESS_MAYBE;
-
- if ( lex_force_match('(') )
+ if ( lex_force_match (lexer, '(') )
{
{
- if ( lex_match_id
(
"LEFT"))
+ if ( lex_match_id
(lexer,
"LEFT"))
align = ALIGN_LEFT;
align = ALIGN_LEFT;
- else if ( lex_match_id
(
"RIGHT"))
+ else if ( lex_match_id
(lexer,
"RIGHT"))
align = ALIGN_RIGHT;
align = ALIGN_RIGHT;
- else if ( lex_match_id
(
"CENTER"))
+ else if ( lex_match_id
(lexer,
"CENTER"))
align = ALIGN_CENTRE;
align = ALIGN_CENTRE;
- else
+ else
{
free (v);
{
free (v);
- return CMD_FAILURE;
+ return CMD_FAILURE;
}
}
- lex_force_match
(
')');
+ lex_force_match
(lexer,
')');
}
}
- else
+ else
{
free (v);
{
free (v);
- return CMD_FAILURE;
+ return CMD_FAILURE;
}
}
- for( i = 0 ; i < nv ; ++i )
- v[i]->alignment = align;
-
+ for( i = 0 ; i < nv ; ++i )
+ var_set_alignment (v[i], align);
- while (
token
== '/')
- lex_get ();
+ while (
lex_token (lexer)
== '/')
+ lex_get (
lexer
);
free (v);
}
free (v);
}
- while (
token
!= '.');
+ while (
lex_token (lexer)
!= '.');
return CMD_SUCCESS;
}
return CMD_SUCCESS;
}
@@
-88,7
+86,7
@@
cmd_variable_alignment (void)
It affects nothing but GUIs
*/
int
It affects nothing but GUIs
*/
int
-cmd_variable_width (
void
)
+cmd_variable_width (
struct lexer *lexer, struct dataset *ds
)
{
do
{
{
do
{
@@
-96,33
+94,33
@@
cmd_variable_width (void)
size_t nv;
size_t i;
size_t nv;
size_t i;
- if (!parse_variables (
default_dict
, &v, &nv, PV_NONE))
- return CMD_
PART_SUCCESS_MAYB
E;
+ if (!parse_variables (
lexer, dataset_dict (ds)
, &v, &nv, PV_NONE))
+ return CMD_
FAILUR
E;
- if ( lex_force_match
('(') )
+ if ( lex_force_match
(lexer, '(') )
{
{
- if ( lex_force_int
())
- lex_get
(
);
+ if ( lex_force_int
(lexer))
+ lex_get
(lexer
);
else
return CMD_FAILURE;
else
return CMD_FAILURE;
- lex_force_match
(
')');
+ lex_force_match
(lexer,
')');
}
}
- for( i = 0 ; i < nv ; ++i )
-
v[i]->display_width = tokval
;
+ for( i = 0 ; i < nv ; ++i )
+
var_set_display_width (v[i], lex_integer (lexer))
;
- while (
token
== '/')
- lex_get ();
+ while (
lex_token (lexer)
== '/')
+ lex_get (
lexer
);
free (v);
}
free (v);
}
- while (
token
!= '.');
+ while (
lex_token (lexer)
!= '.');
return CMD_SUCCESS;
}
/* Set variables' measurement level */
int
return CMD_SUCCESS;
}
/* Set variables' measurement level */
int
-cmd_variable_level (
void
)
+cmd_variable_level (
struct lexer *lexer, struct dataset *ds
)
{
do
{
{
do
{
@@
-131,40
+129,40
@@
cmd_variable_level (void)
enum measure level;
size_t i;
enum measure level;
size_t i;
- if (!parse_variables (
default_dict
, &v, &nv, PV_NONE))
- return CMD_
PART_SUCCESS_MAYB
E;
+ if (!parse_variables (
lexer, dataset_dict (ds)
, &v, &nv, PV_NONE))
+ return CMD_
FAILUR
E;
- if ( lex_force_match
('(') )
+ if ( lex_force_match
(lexer, '(') )
{
{
- if ( lex_match_id
(
"SCALE"))
+ if ( lex_match_id
(lexer,
"SCALE"))
level = MEASURE_SCALE;
level = MEASURE_SCALE;
- else if ( lex_match_id
(
"ORDINAL"))
+ else if ( lex_match_id
(lexer,
"ORDINAL"))
level = MEASURE_ORDINAL;
level = MEASURE_ORDINAL;
- else if ( lex_match_id
(
"NOMINAL"))
+ else if ( lex_match_id
(lexer,
"NOMINAL"))
level = MEASURE_NOMINAL;
level = MEASURE_NOMINAL;
- else
+ else
{
free (v);
{
free (v);
- return CMD_FAILURE;
+ return CMD_FAILURE;
}
}
- lex_force_match
(
')');
+ lex_force_match
(lexer,
')');
}
else
{
free (v);
}
else
{
free (v);
- return CMD_FAILURE;
+ return CMD_FAILURE;
}
}
-
- for( i = 0 ; i < nv ; ++i )
- v
[i]->measure = level
;
+
+ for( i = 0 ; i < nv ; ++i )
+ v
ar_set_measure (v[i], level)
;
- while (
token
== '/')
- lex_get ();
+ while (
lex_token (lexer)
== '/')
+ lex_get (
lexer
);
free (v);
}
free (v);
}
- while (
token
!= '.');
+ while (
lex_token (lexer)
!= '.');
return CMD_SUCCESS;
}
return CMD_SUCCESS;
}