X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fctables.c;h=64c399bcbcd27a70634c398cd58ce554abb8e88f;hb=0adeecb1efdc424496743623aeef483bf29ee0fb;hp=f8c3f89f0d33f9688652f19c973d9f6ca1d03d3a;hpb=27c3188b5f738f19e5aec5cf65f4ea7424c4ef2d;p=pspp diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c index f8c3f89f0d..64c399bcbc 100644 --- a/src/language/stats/ctables.c +++ b/src/language/stats/ctables.c @@ -905,102 +905,9 @@ ctables_function_availability (enum ctables_summary_function f) static bool ctables_summary_function_is_count (enum ctables_summary_function f) { - switch (f) - { - case CTSF_COUNT: - case CTSF_ECOUNT: - case CTSF_ROWPCT_COUNT: - case CTSF_COLPCT_COUNT: - case CTSF_TABLEPCT_COUNT: - case CTSF_SUBTABLEPCT_COUNT: - case CTSF_LAYERPCT_COUNT: - case CTSF_LAYERROWPCT_COUNT: - case CTSF_LAYERCOLPCT_COUNT: - case CTSF_UCOUNT: - case CTSF_UROWPCT_COUNT: - case CTSF_UCOLPCT_COUNT: - case CTSF_UTABLEPCT_COUNT: - case CTSF_USUBTABLEPCT_COUNT: - case CTSF_ULAYERPCT_COUNT: - case CTSF_ULAYERROWPCT_COUNT: - case CTSF_ULAYERCOLPCT_COUNT: - return true; - - case CTSF_ROWPCT_VALIDN: - case CTSF_COLPCT_VALIDN: - case CTSF_TABLEPCT_VALIDN: - case CTSF_SUBTABLEPCT_VALIDN: - case CTSF_LAYERPCT_VALIDN: - case CTSF_LAYERROWPCT_VALIDN: - case CTSF_LAYERCOLPCT_VALIDN: - case CTSF_ROWPCT_TOTALN: - case CTSF_COLPCT_TOTALN: - case CTSF_TABLEPCT_TOTALN: - case CTSF_SUBTABLEPCT_TOTALN: - case CTSF_LAYERPCT_TOTALN: - case CTSF_LAYERROWPCT_TOTALN: - case CTSF_LAYERCOLPCT_TOTALN: - case CTSF_MAXIMUM: - case CTSF_MEAN: - case CTSF_MEDIAN: - case CTSF_MINIMUM: - case CTSF_MISSING: - case CTSF_MODE: - case CTSF_PTILE: - case CTSF_RANGE: - case CTSF_SEMEAN: - case CTSF_STDDEV: - case CTSF_SUM: - case CSTF_TOTALN: - case CTSF_ETOTALN: - case CTSF_VALIDN: - case CTSF_EVALIDN: - case CTSF_VARIANCE: - case CTSF_ROWPCT_SUM: - case CTSF_COLPCT_SUM: - case CTSF_TABLEPCT_SUM: - case CTSF_SUBTABLEPCT_SUM: - case CTSF_LAYERPCT_SUM: - case CTSF_LAYERROWPCT_SUM: - case CTSF_LAYERCOLPCT_SUM: - case CTSF_UROWPCT_VALIDN: - case CTSF_UCOLPCT_VALIDN: - case CTSF_UTABLEPCT_VALIDN: - case CTSF_USUBTABLEPCT_VALIDN: - case CTSF_ULAYERPCT_VALIDN: - case CTSF_ULAYERROWPCT_VALIDN: - case CTSF_ULAYERCOLPCT_VALIDN: - case CTSF_UROWPCT_TOTALN: - case CTSF_UCOLPCT_TOTALN: - case CTSF_UTABLEPCT_TOTALN: - case CTSF_USUBTABLEPCT_TOTALN: - case CTSF_ULAYERPCT_TOTALN: - case CTSF_ULAYERROWPCT_TOTALN: - case CTSF_ULAYERCOLPCT_TOTALN: - case CTSF_UMEAN: - case CTSF_UMEDIAN: - case CTSF_UMISSING: - case CTSF_UMODE: - case CTSF_UPTILE: - case CTSF_USEMEAN: - case CTSF_USTDDEV: - case CTSF_USUM: - case CSTF_UTOTALN: - case CTSF_UVALIDN: - case CTSF_UVARIANCE: - case CTSF_UROWPCT_SUM: - case CTSF_UCOLPCT_SUM: - case CTSF_UTABLEPCT_SUM: - case CTSF_USUBTABLEPCT_SUM: - case CTSF_ULAYERPCT_SUM: - case CTSF_ULAYERROWPCT_SUM: - case CTSF_ULAYERCOLPCT_SUM: - return false; - } - NOT_REACHED (); + return f == CTSF_COUNT || f == CTSF_ECOUNT || f == CTSF_UCOUNT; } - static bool parse_ctables_summary_function (struct lexer *lexer, enum ctables_summary_function *f)