X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fweight.c;h=9128bc3e90038b2f44bb33e0df94528144ea5195;hb=6c00e8aa67a343882caaeb9b794b4891b50b9be5;hp=fd19f8c8978a371ea6f3003dc4a92a6f2eca32f1;hpb=37597beca4a11edba50b847932fdfeca3a648fa2;p=pspp diff --git a/src/weight.c b/src/weight.c index fd19f8c897..9128bc3e90 100644 --- a/src/weight.c +++ b/src/weight.c @@ -14,18 +14,22 @@ 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., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. */ #include -#include +#include "error.h" #include #include "command.h" +#include "dictionary.h" #include "error.h" #include "lexer.h" #include "str.h" #include "var.h" +#include "gettext.h" +#define _(msgid) gettext (msgid) + /* WEIGHT transformation. */ struct weight_trns { @@ -37,8 +41,6 @@ struct weight_trns int cmd_weight (void) { - lex_match_id ("WEIGHT"); - if (lex_match_id ("OFF")) dict_set_weight (default_dict, NULL); else @@ -54,7 +56,7 @@ cmd_weight (void) msg (SE, _("The weighting variable must be numeric.")); return CMD_FAILURE; } - if (v->name[0] == '#') + if (dict_class_from_id (v->name) == DC_SCRATCH) { msg (SE, _("The weighting variable may not be scratch.")); return CMD_FAILURE;