This must be the final step; otherwise we'd have to
delete destination variables on failure. */
if (trns->src_vars != trns->dst_vars)
- create_dst_vars (trns, dataset_dict (ds));
+ create_dst_vars (trns, dataset_dict (ds));
/* Done. */
add_transformation (ds,
do
{
struct map_in in;
+
if (!parse_map_in (lexer, &in, trns->pool,
trns->src_type, max_src_width))
return false;
if (!parse_map_out (lexer, trns->pool, &out))
return false;
- dst_type = val_type_from_width (out.width);
+
+ if (out.copy_input)
+ dst_type = trns->src_type;
+ else
+ dst_type = val_type_from_width (out.width);
if (have_dst_type && dst_type != trns->dst_type)
{
msg (SE, _("Inconsistent target variable types. "
parse_map_in (struct lexer *lexer, struct map_in *in, struct pool *pool,
enum val_type src_type, size_t max_src_width)
{
+
if (lex_match_id (lexer, "ELSE"))
+ {
set_map_in_generic (in, MAP_ELSE);
+ }
else if (src_type == VAL_NUMERIC)
{
if (lex_match_id (lexer, "MISSING"))
}
else
{
- if (!lex_force_string (lexer))
+ if (lex_match_id (lexer, "MISSING"))
+ set_map_in_generic (in, MAP_MISSING);
+ else if (!lex_force_string (lexer))
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;
- }
+ else
+ {
+ 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;
return false;
}
}
+
}
else
{
/* Returns the output mapping in TRNS for an input of VALUE with
the given WIDTH, or a null pointer if there is no mapping. */
static const struct map_out *
-find_src_string (struct recode_trns *trns, const char *value, int width)
+find_src_string (struct recode_trns *trns, const char *value, const struct variable *src_var)
{
struct mapping *m;
+ int width = var_get_width (src_var);
for (m = trns->mappings; m < trns->mappings + trns->map_cnt; m++)
{
out->value.f = uv.f;
break;
}
+ case MAP_MISSING:
+ match = var_is_str_missing (src_var, value, MV_ANY);
+ break;
default:
NOT_REACHED ();
}
if (trns->src_type == VAL_NUMERIC)
out = find_src_numeric (trns, src_data->f, src_var);
else
- out = find_src_string (trns, src_data->s, var_get_width (src_var));
+ out = find_src_string (trns, src_data->s, src_var);
if (trns->dst_type == VAL_NUMERIC)
{
RECODE x (4 THRU HIGHEST=2)(ELSE=COPY) INTO cx6.
RECODE x (LO THRU HI=3)(ELSE=COPY) INTO cx7.
RECODE x (SYSMIS=4)(ELSE=COPY) INTO cx8.
-LIST x cx0 TO cx8.
+RECODE x (5=COPY)(ELSE=22) INTO cx9.
+LIST x cx0 TO cx9.
* String to string, with INTO, without COPY.
-STRING s0 TO s2 (A4)/t0 TO t3 (A10).
+STRING s0 TO s3 (A4)/t0 TO t3 (A10).
RECODE s t ('a'='b')('ab'='bc') INTO s0 t0.
RECODE s t ('abcd'='xyzw') INTO s1 t1.
RECODE s t ('abc'='def')(ELSE='xyz') INTO s2 t2.
RECODE t ('a'='b')('abcdefghi'='xyz')('abcdefghij'='jklmnopqr') INTO t3.
-LIST s t s0 TO s2 t0 TO t3.
+RECODE s (MISSING='gone') INTO s3.
+LIST s t s0 TO s3 t0 TO t3.
* String to string, with INTO, with COPY.
STRING cs0 TO cs2 (A4)/ct0 TO ct3 (A10).
diff -bu $TEMPDIR/pspp.list - <<EOF
x x0 x1 x2 x3 x4 x5 x6 x7 x8
- --- --- --- --- --- --- --- --- ---
-0 0 0 0 0 0 1 0 3 0
-1 9 9 8 10 10 1 1 3 1
-2 2 2 9 10 10 1 2 3 2
-3 3 8 9 10 10 1 3 3 3
-4 4 4 9 10 10 1 2 3 4
-5 5 7 9 10 10 1 2 3 5
-6 6 6 9 10 10 6 2 3 6
-7 7 7 7 10 10 7 2 3 7
-8 8 8 9 10 10 8 2 3 8
-9 9 9 1 10 11 9 2 3 9
-. . . . 11 11 . . . 4
+0 0 0 0 0 0 1 0 3 0
+1 9 9 8 10 10 1 1 3 1
+2 2 2 9 10 10 1 2 3 2
+3 3 8 9 10 10 1 3 3 3
+4 4 4 9 10 10 1 2 3 4
+5 5 7 9 10 10 1 2 3 5
+6 6 6 9 10 10 6 2 3 6
+7 7 7 7 10 10 7 2 3 7
+8 8 8 9 10 10 8 2 3 8
+9 9 9 1 10 11 9 2 3 9
+. . . . 11 11 . . . 4
x ix0 ix1 ix2 ix3 ix4 ix5 ix6 ix7 ix8
- --- --- --- --- --- --- --- --- ---
-0 . . . . . 1 . 3 .
-1 9 9 8 10 10 1 . 3 .
-2 . . 9 10 10 1 . 3 .
-3 . 8 9 10 10 1 . 3 .
-4 . . 9 10 10 1 2 3 .
-5 . 7 9 10 10 1 2 3 .
-6 . . 9 10 10 . 2 3 .
-7 . . . 10 10 . 2 3 .
-8 . . 9 10 10 . 2 3 .
-9 . . 1 10 11 . 2 3 .
-. . . . 11 11 . . . 4
-x cx0 cx1 cx2 cx3 cx4 cx5 cx6 cx7 cx8
-- --- --- --- --- --- --- --- --- ---
-0 0 0 0 0 0 1 0 3 0
-1 9 9 8 10 10 1 1 3 1
-2 2 2 9 10 10 1 2 3 2
-3 3 8 9 10 10 1 3 3 3
-4 4 4 9 10 10 1 2 3 4
-5 5 7 9 10 10 1 2 3 5
-6 6 6 9 10 10 6 2 3 6
-7 7 7 7 10 10 7 2 3 7
-8 8 8 9 10 10 8 2 3 8
-9 9 9 1 10 11 9 2 3 9
-. . . . 11 11 . . . 4
- s t s0 s1 s2 t0 t1 t2 t3
----- ---------- ---- ---- ---- ---------- ---------- ---------- ----------
- xyz xyz
-a a b xyz b xyz b
-ab ab bc xyz bc xyz
-abc abc def def
-abcd abcd xyzw xyz xyzw xyz
-123 123 xyz xyz
- 123 123 xyz xyz
-+1 +1 xyz xyz
-1x 1x xyz xyz
-abcd abcdefghi xyzw xyz xyz xyz
-xxx abcdefghij xyz xyz jklmnopqr
+0 . . . . . 1 . 3 .
+1 9 9 8 10 10 1 . 3 .
+2 . . 9 10 10 1 . 3 .
+3 . 8 9 10 10 1 . 3 .
+4 . . 9 10 10 1 2 3 .
+5 . 7 9 10 10 1 2 3 .
+6 . . 9 10 10 . 2 3 .
+7 . . . 10 10 . 2 3 .
+8 . . 9 10 10 . 2 3 .
+9 . . 1 10 11 . 2 3 .
+. . . . 11 11 . . . 4
+x cx0 cx1 cx2 cx3 cx4 cx5 cx6 cx7 cx8 cx9
+- --- --- --- --- --- --- --- --- --- --------
+0 0 0 0 0 0 1 0 3 0 22.00
+1 9 9 8 10 10 1 1 3 1 22.00
+2 2 2 9 10 10 1 2 3 2 22.00
+3 3 8 9 10 10 1 3 3 3 22.00
+4 4 4 9 10 10 1 2 3 4 22.00
+5 5 7 9 10 10 1 2 3 5 5.00
+6 6 6 9 10 10 6 2 3 6 22.00
+7 7 7 7 10 10 7 2 3 7 22.00
+8 8 8 9 10 10 8 2 3 8 22.00
+9 9 9 1 10 11 9 2 3 9 22.00
+. . . . 11 11 . . . 4 22.00
+ s t s0 s1 s2 s3 t0 t1 t2 t3
+---- ---------- ---- ---- ---- ---- ---------- ---------- ---------- ----------
+ xyz xyz
+a a b xyz b xyz b
+ab ab bc xyz bc xyz
+abc abc def def
+abcd abcd xyzw xyz xyzw xyz
+123 123 xyz xyz
+ 123 123 xyz xyz
++1 +1 xyz xyz
+1x 1x xyz xyz
+abcd abcdefghi xyzw xyz xyz xyz
+xxx abcdefghij xyz gone xyz jklmnopqr
s t cs0 cs1 cs2 ct0 ct1 ct2 ct3
---- ---------- ---- ---- ---- ---------- ---------- ---------- ----------
- xyz xyz
-a a b a xyz b a xyz b
-ab ab bc ab xyz bc ab xyz ab
-abc abc abc abc def abc abc def abc
-abcd abcd abcd xyzw xyz abcd xyzw xyz abcd
-123 123 123 123 xyz 123 123 xyz 123
- 123 123 123 123 xyz 123 123 xyz 123
-+1 +1 +1 +1 xyz +1 +1 xyz +1
-1x 1x 1x 1x xyz 1x 1x xyz 1x
-abcd abcdefghi abcd xyzw xyz abcdefghi abcdefghi xyz xyz
-xxx abcdefghij xxx xxx xyz abcdefghij abcdefghij xyz jklmnopqr
+ xyz xyz
+a a b a xyz b a xyz b
+ab ab bc ab xyz bc ab xyz ab
+abc abc abc abc def abc abc def abc
+abcd abcd abcd xyzw xyz abcd xyzw xyz abcd
+123 123 123 123 xyz 123 123 xyz 123
+ 123 123 123 123 xyz 123 123 xyz 123
++1 +1 +1 +1 xyz +1 +1 xyz +1
+1x 1x 1x 1x xyz 1x 1x xyz 1x
+abcd abcdefghi abcd xyzw xyz abcdefghi abcdefghi xyz xyz
+xxx abcdefghij xxx xxx xyz abcdefghij abcdefghij xyz jklmnopqr
s t ns0 ns1 ns2 nt0 nt1 nt2
---- ---------- --- --- --- --- --- ---
- . 0 3 . 0 3
-a a . . 3 . . 3
-ab ab . . 3 . . 3
-abc abc . . 3 . . 3
-abcd abcd 1 1 2 1 1 2
-123 123 123 123 3 123 123 3
- 123 123 123 123 3 123 123 3
-+1 +1 1 1 3 1 1 3
-1x 1x . . 1 . . 1
-abcd abcdefghi 1 1 2 . . 3
-xxx abcdefghij . . 3 . . 3
+ . 0 3 . 0 3
+a a . . 3 . . 3
+ab ab . . 3 . . 3
+abc abc . . 3 . . 3
+abcd abcd 1 1 2 1 1 2
+123 123 123 123 3 123 123 3
+ 123 123 123 123 3 123 123 3
++1 +1 1 1 3 1 1 3
+1x 1x . . 1 . . 1
+abcd abcdefghi 1 1 2 . . 3
+xxx abcdefghij . . 3 . . 3
x sx0 sx1 sx2
- ---------- ---------- ----------
-0 xxx foobar
-1 abcdefghij xxx foobar
-2 abcdefghij xyz
-3 abcdefghij xxx xyz
-4 abcdefghij xyz
-5 abcdefghij xxx xyz
-6 abcdefghij xyz
-7 abcdefghij xxx foobar
-8 abcdefghij foobar
-9 abcdefghij xxx foobar
-. xxx xyz
+0 xxx foobar
+1 abcdefghij xxx foobar
+2 abcdefghij xyz
+3 abcdefghij xxx xyz
+4 abcdefghij xyz
+5 abcdefghij xxx xyz
+6 abcdefghij xyz
+7 abcdefghij xxx foobar
+8 abcdefghij foobar
+9 abcdefghij xxx foobar
+. xxx xyz
EOF
-
if [ $? -ne 0 ] ; then fail ; fi
pass
projects / pspp-builds.git / commitdiff