expressions: Simplify type declarations for nodes.

[pspp] / src / language / expressions / operations.def

diff --git a/src/language/expressions/operations.def b/src/language/expressions/operations.def
index 42728e46ea0c98bff01f7e077718bdb9c8726272..cc24f98751ef84db7861baadaef01e90b33321d9 100644 (file)
--- a/src/language/expressions/operations.def
+++ b/src/language/expressions/operations.def
@@ -201,22 +201,18 @@ string function MIN (string a[n])
 
 absorb_miss function NMISS (a[n])
 {
-  size_t i;
-  size_t missing_cnt = 0;
-
-  for (i = 0; i < n; i++)
-    missing_cnt += a[i] == SYSMIS;
-  return missing_cnt;
+  size_t n_missings = 0;
+  for (size_t i = 0; i < n; i++)
+    n_missings += a[i] == SYSMIS;
+  return n_missings;
 }
 
 absorb_miss function NVALID (a[n])
 {
-  size_t i;
-  size_t valid_cnt = 0;
-
-  for (i = 0; i < n; i++)
-    valid_cnt += a[i] != SYSMIS;
-  return valid_cnt;
+  size_t n_valids = 0;
+  for (size_t i = 0; i < n; i++)
+    n_valids += a[i] != SYSMIS;
+  return n_valids;
 }
 
 absorb_miss boolean function RANGE (x != SYSMIS, a[n*2])
@@ -681,20 +677,14 @@ absorb_miss no_opt no_abbrev string function VALUELABEL (var v)
 
 // Artificial.
 operator SQUARE (x) = x * x;
-boolean operator NUM_TO_BOOLEAN (x, string op_name)
+boolean operator NUM_TO_BOOLEAN (x)
 {
   if (x == 0. || x == 1. || x == SYSMIS)
     return x;
 
-  if (!ss_is_empty (op_name))
-    msg (SE, _("An operand of the %.*s operator was found to have a value "
-               "other than 0 (false), 1 (true), or the system-missing "
-               "value.  The result was forced to 0."),
-         (int) op_name.length, op_name.string);
-  else
-    msg (SE, _("A logical expression was found to have a value other than 0 "
-               "(false), 1 (true), or the system-missing value.  The result "
-               "was forced to 0."));
+  msg (SE, _("A logical expression was found to have a value other than 0 "
+             "(false), 1 (true), or the system-missing value.  The result "
+             "was forced to 0."));
   return 0.;
 }
 
@@ -979,7 +969,7 @@ no_opt operator VEC_ELEM_NUM (idx)
      vector v;
      case c;
 {
-  if (idx >= 1 && idx <= vector_get_var_cnt (v))
+  if (idx >= 1 && idx <= vector_get_n_vars (v))
     {
       const struct variable *var = vector_get_var (v, (size_t) idx - 1);
       double value = case_num (c, var);
@@ -1004,7 +994,7 @@ absorb_miss no_opt string operator VEC_ELEM_STR (idx)
      vector v;
      case c;
 {
-  if (idx >= 1 && idx <= vector_get_var_cnt (v))
+  if (idx >= 1 && idx <= vector_get_n_vars (v))
     {
       struct variable *var = vector_get_var (v, (size_t) idx - 1);
       return copy_string (e, CHAR_CAST_BUG (char *, case_str (c, var)),