Changed int to bool in dict_get_weight and sort_active_file_in_place

[pspp-builds.git] / src / language / stats / frequencies.q

diff --git a/src/language/stats/frequencies.q b/src/language/stats/frequencies.q
index 95041d5d80aa3fa059e967e811b4f073dccc2f60..7174cf4cacfc97818afdbda1f30768f86651cde5 100644 (file)
--- a/src/language/stats/frequencies.q
+++ b/src/language/stats/frequencies.q
@@ -68,13 +68,13 @@
 
 /* (specification)
    FREQUENCIES (frq_):
-     *variables=custom;
-     format=cond:condense/onepage(*n:onepage_limit,"%s>=0")/!standard,
-           table:limit(n:limit,"%s>0")/notable/!table, 
-           labels:!labels/nolabels,
-           sort:!avalue/dvalue/afreq/dfreq,
-           spaces:!single/double,
-           paging:newpage/!oldpage;
+     *+variables=custom;
+     +format=cond:condense/onepage(*n:onepage_limit,"%s>=0")/!standard,
+            table:limit(n:limit,"%s>0")/notable/!table, 
+            labels:!labels/nolabels,
+            sort:!avalue/dvalue/afreq/dfreq,
+            spaces:!single/double,
+            paging:newpage/!oldpage;
      missing=miss:include/!exclude;
      barchart(ba_)=:minimum(d:min),
            :maximum(d:max),
@@ -92,12 +92,12 @@
            scale:freq(*n:freq,"%s>0")/percent(*n:pcnt,"%s>0"),
            norm:!nonormal/normal,
            incr:increment(d:inc,"%s>0");
-     grouped=custom;
-     ntiles=integer;
+     +grouped=custom;
+     +ntiles=integer;
      +percentiles = double list;
-     statistics[st_]=1|mean,2|semean,3|median,4|mode,5|stddev,6|variance,
-           7|kurtosis,8|skewness,9|range,10|minimum,11|maximum,12|sum,
-           13|default,14|seskewness,15|sekurtosis,all,none.
+     +statistics[st_]=1|mean,2|semean,3|median,4|mode,5|stddev,6|variance,
+           7|kurtosis,8|skewness,9|range,10|minimum,11|maximum,12|sum,
+           13|default,14|seskewness,15|sekurtosis,all,none.
 */
 /* (declarations) */
 /* (functions) */
@@ -509,7 +509,7 @@ calc (const struct ccase *c, void *aux UNUSED)
 {
   double weight;
   size_t i;
-  int bad_warn = 1;
+  bool bad_warn = true;
 
   weight = dict_get_case_weight (default_dict, c, &bad_warn);
 
@@ -557,7 +557,7 @@ calc (const struct ccase *c, void *aux UNUSED)
            ft->out_of_range += weight;
          break;
        default:
-         assert (0);
+          NOT_REACHED ();
        }
     }
   return true;
@@ -645,7 +645,7 @@ postcalc (void *aux UNUSED)
              dump_full (v);
            break;
          default:
-           assert (0);
+            NOT_REACHED ();
          }
       else
        dumped_freq_tab = 0;
@@ -706,7 +706,7 @@ get_freq_comparator (int frq_sort, int var_type)
     case FRQ_AFREQ | (ALPHA << 16):     return compare_freq_alpha_a;
     case FRQ_DFREQ | (NUMERIC << 16):   return compare_freq_numeric_d;
     case FRQ_DFREQ | (ALPHA << 16):     return compare_freq_alpha_d;
-    default: assert (0);
+    default: NOT_REACHED ();
     }
 
   return 0;