projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed all the licence notices in all the files.
[pspp]
/
src
/
recode.c
diff --git
a/src/recode.c
b/src/recode.c
index 034ae959e83c2bd7aa02e5c2bbfd26b3fd954aa4..98e6dfdd2d0ecf1cddf842db228129439363b95f 100644
(file)
--- a/
src/recode.c
+++ b/
src/recode.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"
@@
-66,7
+66,7
@@
struct rcd_var
struct variable *src; /* Source variable. */
struct variable *dest; /* Destination variable. */
struct variable *src; /* Source variable. */
struct variable *dest; /* Destination variable. */
- char dest_name[
9
]; /* Name of dest variable if we're creating it. */
+ char dest_name[
LONG_NAME_LEN + 1
]; /* Name of dest variable if we're creating it. */
int has_sysmis; /* Do we recode for SYSMIS? */
union value sysmis; /* Coding for SYSMIS (if src is numeric). */
int has_sysmis; /* Do we recode for SYSMIS? */
union value sysmis; /* Coding for SYSMIS (if src is numeric). */
@@
-445,7
+445,7
@@
parse_dest_spec (struct rcd_var * rcd, union value * v, size_t *max_dst_width)
v->c = NULL;
v->c = NULL;
- if (
token == T_NUM
)
+ if (
lex_is_number ()
)
{
v->f = tokval;
lex_get ();
{
v->f = tokval;
lex_get ();
@@
-540,7
+540,7
@@
parse_src_spec (struct rcd_var * rcd, int type, size_t max_src_width)
return 0;
if (lex_match_id ("HI") || lex_match_id ("HIGHEST"))
c->type = RCD_ELSE;
return 0;
if (lex_match_id ("HI") || lex_match_id ("HIGHEST"))
c->type = RCD_ELSE;
- else if (
token == T_NUM
)
+ else if (
lex_is_number ()
)
{
c->type = RCD_LOW;
c->f1.f = tokval;
{
c->type = RCD_LOW;
c->f1.f = tokval;
@@
-568,7
+568,7
@@
parse_src_spec (struct rcd_var * rcd, int type, size_t max_src_width)
return 0;
}
}
return 0;
}
}
- else if (
token == T_NUM
)
+ else if (
lex_is_number ()
)
{
c->f1.f = tokval;
lex_get ();
{
c->f1.f = tokval;
lex_get ();
@@
-576,7
+576,7
@@
parse_src_spec (struct rcd_var * rcd, int type, size_t max_src_width)
{
if (lex_match_id ("HI") || lex_match_id ("HIGHEST"))
c->type = RCD_HIGH;
{
if (lex_match_id ("HI") || lex_match_id ("HIGHEST"))
c->type = RCD_HIGH;
- else if (
token == T_NUM
)
+ else if (
lex_is_number ()
)
{
c->type = RCD_RANGE;
c->f2.f = tokval;
{
c->type = RCD_RANGE;
c->f2.f = tokval;