projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed my authorship lines.
[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 ef43c5313e4aed91b860648a8233331f780f5ab1..13285918263d872d56d2e5a81e0828fd664be6f8 100644
(file)
--- a/
src/language/dictionary/variable-display.c
+++ b/
src/language/dictionary/variable-display.c
@@
-1,6
+1,5
@@
/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
/* PSPP - computes sample statistics.
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
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@
-22,10
+21,11
@@
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
-#include <procedure.h>
+#include <
data/
procedure.h>
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
#include <data/variable.h>
#include <language/command.h>
#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
#include <libpspp/alloc.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
#include <libpspp/alloc.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
@@
-35,7
+35,7
@@
It affects nothing but GUIs
*/
int
It affects nothing but GUIs
*/
int
-cmd_variable_alignment (
void
)
+cmd_variable_alignment (
struct lexer *lexer, struct dataset *ds
)
{
do
{
{
do
{
@@
-45,16
+45,16
@@
cmd_variable_alignment (void)
size_t i;
enum alignment align;
size_t i;
enum alignment align;
- if (!parse_variables (
default_dict
, &v, &nv, PV_NONE))
+ if (!parse_variables (
lexer, dataset_dict (ds)
, &v, &nv, PV_NONE))
return CMD_FAILURE;
return CMD_FAILURE;
- 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;
else
{
align = ALIGN_CENTRE;
else
{
@@
-62,7
+62,7
@@
cmd_variable_alignment (void)
return CMD_FAILURE;
}
return CMD_FAILURE;
}
- lex_force_match
(
')');
+ lex_force_match
(lexer,
')');
}
else
{
}
else
{
@@
-70,16
+70,15
@@
cmd_variable_alignment (void)
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
+87,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
+95,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))
+ if (!parse_variables (
lexer, dataset_dict (ds)
, &v, &nv, PV_NONE))
return CMD_FAILURE;
return CMD_FAILURE;
- 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 )
}
for( i = 0 ; i < nv ; ++i )
-
v[i]->display_width = tokval
;
+
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,16
+130,16
@@
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))
+ if (!parse_variables (
lexer, dataset_dict (ds)
, &v, &nv, PV_NONE))
return CMD_FAILURE;
return CMD_FAILURE;
- 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;
else
{
level = MEASURE_NOMINAL;
else
{
@@
-148,7
+147,7
@@
cmd_variable_level (void)
return CMD_FAILURE;
}
return CMD_FAILURE;
}
- lex_force_match
(
')');
+ lex_force_match
(lexer,
')');
}
else
{
}
else
{
@@
-157,14
+156,14
@@
cmd_variable_level (void)
}
for( i = 0 ; i < nv ; ++i )
}
for( i = 0 ; i < nv ; ++i )
- v
[i]->measure = level
;
+ 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;
}