projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New implementation of long variable names. Each variable has a
[pspp]
/
src
/
count.c
diff --git
a/src/count.c
b/src/count.c
index 35021f09e3589d8055c240d528711dcb0ef73d5f..82085d6fe0f6e476d74b9e2d653dfaca34e06ca4 100644
(file)
--- a/
src/count.c
+++ b/
src/count.c
@@
-14,8
+14,8
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
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., 5
9 Temple Place - Suite 330
, Boston, MA
- 0211
1-1307
, USA. */
+ Foundation, Inc., 5
1 Franklin Street, Fifth Floor
, Boston, MA
+ 0211
0-1301
, USA. */
#include <config.h>
#include "error.h"
#include <config.h>
#include "error.h"
@@
-108,7
+108,7
@@
struct cnt_var_info
struct cnt_var_info *next;
struct variable *d; /* Destination variable. */
struct cnt_var_info *next;
struct variable *d; /* Destination variable. */
- char n[
9];
/* Name of dest var. */
+ char n[
LONG_NAME_LEN + 1];
/* Name of dest var. */
struct counting *c; /* The counting specifications. */
};
struct counting *c; /* The counting specifications. */
};
@@
-145,7
+145,7
@@
cmd_count (void)
cnt->d = NULL;
cnt->c = NULL;
cnt->d = NULL;
cnt->c = NULL;
- /* Get destination
struct
variable, or at least its name. */
+ /* Get destination variable, or at least its name. */
if (!lex_force_id ())
goto fail;
cnt->d = dict_lookup_var (default_dict, tokid);
if (!lex_force_id ())
goto fail;
cnt->d = dict_lookup_var (default_dict, tokid);
@@
-158,7
+158,7
@@
cmd_count (void)
}
}
else
}
}
else
- st
rcpy (cnt->n, tokid
);
+ st
_trim_copy (cnt->n, tokid, sizeof cnt->n
);
lex_get ();
if (!lex_force_match ('='))
lex_get ();
if (!lex_force_match ('='))
@@
-244,13
+244,13
@@
parse_numeric_criteria (struct counting * c)
}
cur = &c->crit.n[n++];
}
cur = &c->crit.n[n++];
- if (
token == T_NUM
)
+ if (
lex_is_number ()
)
{
cur->a = tokval;
lex_get ();
if (lex_match_id ("THRU"))
{
{
cur->a = tokval;
lex_get ();
if (lex_match_id ("THRU"))
{
- if (
token == T_NUM
)
+ if (
lex_is_number ()
)
{
if (!lex_force_num ())
return 0;
{
if (!lex_force_num ())
return 0;
@@
-282,7
+282,7
@@
parse_numeric_criteria (struct counting * c)
{
if (!lex_force_match_id ("THRU"))
return 0;
{
if (!lex_force_match_id ("THRU"))
return 0;
- if (
token == T_NUM
)
+ if (
lex_is_number ()
)
{
cur->type = CNT_LOW;
cur->a = tokval;
{
cur->type = CNT_LOW;
cur->a = tokval;