X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fvector.c;h=050886d9effd334d203b627e37d6d2e91c6595d4;hb=42489b63e0b4bec2e20c2f55c9791234f7b41764;hp=17cbb1a64d5ae0984c3566dab13316fc46f933e2;hpb=032126b098a3600655156bd26ded365953c5283e;p=pspp-builds.git diff --git a/src/language/dictionary/vector.c b/src/language/dictionary/vector.c index 17cbb1a6..050886d9 100644 --- a/src/language/dictionary/vector.c +++ b/src/language/dictionary/vector.c @@ -75,7 +75,7 @@ cmd_vector (void) goto fail; } - if (dict_lookup_vector (default_dict, tokid)) + if (dict_lookup_vector (dataset_dict (current_dataset), tokid)) { msg (SE, _("There is already a vector with name %s."), tokid); goto fail; @@ -104,11 +104,11 @@ cmd_vector (void) goto fail; } - if (!parse_variables (default_dict, &v, &nv, + if (!parse_variables (dataset_dict (current_dataset), &v, &nv, PV_SAME_TYPE | PV_DUPLICATE)) goto fail; - dict_create_vector (default_dict, vecnames, v, nv); + dict_create_vector (dataset_dict (current_dataset), vecnames, v, nv); free (v); } else if (lex_match ('(')) @@ -158,7 +158,7 @@ cmd_vector (void) for (i = 0; i < nv; i++) { sprintf (name, "%s%d", cp, i + 1); - if (dict_lookup_var (default_dict, name)) + if (dict_lookup_var (dataset_dict (current_dataset), name)) { msg (SE, _("There is already a variable named %s."), name); @@ -175,9 +175,9 @@ cmd_vector (void) for (i = 0; i < nv; i++) { sprintf (name, "%s%d", cp, i + 1); - v[i] = dict_create_var_assert (default_dict, name, 0); + v[i] = dict_create_var_assert (dataset_dict (current_dataset), name, 0); } - if (!dict_create_vector (default_dict, cp, v, nv)) + if (!dict_create_vector (dataset_dict (current_dataset), cp, v, nv)) NOT_REACHED (); cp += strlen (cp) + 1; }