[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp/src/language/xforms ChangeLog recode.c
From: |
Ben Pfaff |
Subject: |
[Pspp-cvs] pspp/src/language/xforms ChangeLog recode.c |
Date: |
Mon, 16 Apr 2007 14:52:56 +0000 |
CVSROOT: /cvsroot/pspp
Module name: pspp
Changes by: Ben Pfaff <blp> 07/04/16 14:52:56
Modified files:
src/language/xforms: ChangeLog recode.c
Log message:
(parse_map_in): Improve error message when user
attempts to use THRU with string variables.
Suggested by address@hidden
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/xforms/ChangeLog?cvsroot=pspp&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/xforms/recode.c?cvsroot=pspp&r1=1.22&r2=1.23
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/xforms/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- ChangeLog 16 Apr 2007 02:54:49 -0000 1.11
+++ ChangeLog 16 Apr 2007 14:52:56 -0000 1.12
@@ -1,3 +1,9 @@
+2007-04-16 Ben Pfaff <address@hidden>
+
+ * recode.c (parse_map_in): Improve error message when user
+ attempts to use THRU with string variables.
+ Suggested by address@hidden
+
2007-04-15 Ben Pfaff <address@hidden>
* recode.c (parse_mappings): Initialize "out" member of mapping
Index: recode.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/xforms/recode.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- recode.c 16 Apr 2007 02:54:49 -0000 1.22
+++ recode.c 16 Apr 2007 14:52:56 -0000 1.23
@@ -313,6 +313,12 @@
return false;
set_map_in_str (in, pool, lex_tokstr (lexer), max_src_width);
lex_get (lexer);
+ if (lex_token (lexer) == T_ID
+ && lex_id_match (ss_cstr ("THRU"), ss_cstr (lex_tokid (lexer))))
+ {
+ msg (SE, _("THRU is not allowed with string variables."));
+ return false;
+ }
}
return true;