X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fweight.c;h=f1326f09d25fc6a70e99670b9ab68266f6c826f2;hb=d594340cb1ae007a92d094ae67116f9f622f2b5d;hp=642a2b736fdd69b304d56c4ac163400b39b8bdcd;hpb=3a7fba81ceae5b049d0f7d671e9e3c3c43bbf703;p=pspp

diff --git a/src/weight.c b/src/weight.c
index 642a2b736f..f1326f09d2 100644
--- a/src/weight.c
+++ b/src/weight.c
@@ -14,38 +14,25 @@
 
    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 <config.h>
-#include <assert.h>
+#include "error.h"
 #include <stdio.h>
 #include "command.h"
+#include "dictionary.h"
 #include "error.h"
 #include "lexer.h"
 #include "str.h"
 #include "var.h"
 
-/* Notes:
-
-   If the weighting variable is deleted somehow (for instance by
-   end-of-scope of TEMPORARY), weighting must be canceled.
-
-   Scratch vars may not be used for weighting. */
-
-/* WEIGHT transformation. */
-struct weight_trns
-  {
-    struct trns_header h;
-    int src;			/* `value' index of weighting variable. */
-    int dest;			/* `value' index of $WEIGHT. */
-  };
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
 
 int
 cmd_weight (void)
 {
-  lex_match_id ("WEIGHT");
-
   if (lex_match_id ("OFF"))
     dict_set_weight (default_dict, NULL);
   else
@@ -61,7 +48,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;