message: Add column range to struct msg_locator.

[pspp] / src / language / expressions / helpers.c

diff --git a/src/language/expressions/helpers.c b/src/language/expressions/helpers.c
index a28f1a666ef2180ea17730c024dbfe19f4d1980e..08f787fea2f30c14099df3c82808623b2e886e30 100644 (file)
--- a/src/language/expressions/helpers.c
+++ b/src/language/expressions/helpers.c
@@ -1,3 +1,19 @@
+/* PSPP - a program for statistical analysis.
+   Copyright (C) 2008, 2010 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+
 #include <config.h>
 #include "helpers.h"
 #include <gsl/gsl_roots.h>
@@ -14,10 +30,14 @@ expr_error (void *aux UNUSED, const char *format, ...)
   struct msg m;
   va_list args;
 
-  m.category = MSG_SYNTAX;
-  m.severity = MSG_ERROR;
+  m.category = MSG_C_SYNTAX;
+  m.severity = MSG_S_ERROR;
   va_start (args, format);
   m.text = xvasprintf (format, args);
+  m.where.file_name = NULL;
+  m.where.line_number = 0;
+  m.where.first_column = 0;
+  m.where.last_column = 0;
   va_end (args);
 
   msg_emit (&m);
@@ -163,9 +183,11 @@ recognize_unit (struct substring name, enum date_unit *unit)
         return true;
       }
 
-  msg (SE, _("Unrecognized date unit \"%.*s\".  "
-             "Valid date units are \"years\", \"quarters\", \"months\", "
-             "\"weeks\", \"days\", \"hours\", \"minutes\", and \"seconds\"."),
+  /* TRANSLATORS: Don't translate the the actual unit names `weeks', `days' etc
+       They must remain in their original English. */
+  msg (SE, _("Unrecognized date unit `%.*s'.  "
+             "Valid date units are `years', `quarters', `months', "
+             "`weeks', `days', `hours', `minutes', and `seconds'."),
        (int) ss_length (name), ss_data (name));
   return false;
 }
@@ -314,7 +336,7 @@ recognize_method (struct substring method_name, enum date_sum_method *method)
   else
     {
       msg (SE, _("Invalid DATESUM method.  "
-                 "Valid choices are \"closest\" and \"rollover\"."));
+                 "Valid choices are `closest' and `rollover'."));
       return false;
     }
 }
@@ -388,7 +410,7 @@ expr_date_sum (double date, double quantity, struct substring unit_name,
 }
 
 int
-compare_string (const struct substring *a, const struct substring *b)
+compare_string_3way (const struct substring *a, const struct substring *b)
 {
   size_t i;
 
@@ -573,14 +595,14 @@ ncdf_beta (double x, double a, double b, double lambda)
 double
 cdf_bvnor (double x0, double x1, double r)
 {
-  double z = x0 * x0 - 2. * r * x0 * x1 + x1 * x1;
+  double z = pow2 (x0) - 2. * r * x0 * x1 + pow2 (x1);
   return exp (-z / (2. * (1 - r * r))) * (2. * M_PI * sqrt (1 - r * r));
 }
 
 double
 idf_fdist (double P, double df1, double df2)
 {
-  double temp = gslextras_cdf_beta_Pinv (P, df1 / 2, df2 / 2);
+  double temp = gsl_cdf_beta_Pinv (P, df1 / 2, df2 / 2);
   return temp * df2 / ((1. - temp) * df1);
 }