(parse_map_in): Improve error message when user

attempts to use THRU with string variables.
Suggested by seth@swoolley.homeip.net.

diff --git a/src/language/xforms/ChangeLog b/src/language/xforms/ChangeLog
index 84afa3e066607377889b4315b39bb294e381fbce..4e15b1eda240fd29df22d88204ac2c5a6006fd68 100644 (file)
--- a/src/language/xforms/ChangeLog
+++ b/src/language/xforms/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-16  Ben Pfaff  <blp@gnu.org>
+
+       * recode.c (parse_map_in): Improve error message when user
+       attempts to use THRU with string variables.
+       Suggested by seth@swoolley.homeip.net.
+
 2007-04-15  Ben Pfaff  <blp@gnu.org>
 
        * recode.c (parse_mappings): Initialize "out" member of mapping

diff --git a/src/language/xforms/recode.c b/src/language/xforms/recode.c
index b0a6b7321bfe137cf03bfd596d168c854c9267f0..83d48553479b9e0f0f91dc1c5b201d15602a6064 100644 (file)
--- a/src/language/xforms/recode.c
+++ b/src/language/xforms/recode.c
@@ -313,6 +313,12 @@ parse_map_in (struct lexer *lexer, struct map_in *in, struct pool *pool,
         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;