From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sun, 18 Sep 2022 21:08:20 +0000 (-0700)
Subject: EXAMINE: Improve error messages.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2dd16cf37f7edd55d049aed0de9f9ab72ff7e8e;p=pspp

EXAMINE: Improve error messages.
---

diff --git a/src/language/stats/examine.c b/src/language/stats/examine.c
index 446f9058e9..6ad5e67e4b 100644
--- a/src/language/stats/examine.c
+++ b/src/language/stats/examine.c
@@ -1515,7 +1515,7 @@ cmd_examine (struct lexer *lexer, struct dataset *ds)
       while (iact);
     }
 
-
+  int nototals_ofs = 0;
   while (lex_token (lexer) != T_ENDCMD)
     {
       lex_match (lexer, T_SLASH);
@@ -1630,6 +1630,7 @@ cmd_examine (struct lexer *lexer, struct dataset *ds)
       else if (lex_match_id (lexer, "NOTOTAL"))
         {
           nototals_seen = true;
+          nototals_ofs = lex_ofs (lexer) - 1;
         }
       else if (lex_match_id (lexer, "MISSING"))
         {
@@ -1758,7 +1759,9 @@ cmd_examine (struct lexer *lexer, struct dataset *ds)
 
   if (totals_seen && nototals_seen)
     {
-      msg (SE, _("%s and %s are mutually exclusive."), "TOTAL", "NOTOTAL");
+      lex_ofs_error (lexer, nototals_ofs, nototals_ofs,
+                     _("%s and %s are mutually exclusive."),
+                     "TOTAL", "NOTOTAL");
       goto error;
     }