projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Apply patch #5225, assertions.
[pspp-builds.git]
/
src
/
language
/
stats
/
crosstabs.q
diff --git
a/src/language/stats/crosstabs.q
b/src/language/stats/crosstabs.q
index 23b12a9d8af184a3f18091725e33c2959fc9d250..a2115cef8aaac660d337e03e05f5b5a1336cb7be 100644
(file)
--- a/
src/language/stats/crosstabs.q
+++ b/
src/language/stats/crosstabs.q
@@
-47,6
+47,7
@@
#include <language/lexer/variable-parser.h>
#include <libpspp/alloc.h>
#include <libpspp/array.h>
#include <language/lexer/variable-parser.h>
#include <libpspp/alloc.h>
#include <libpspp/array.h>
+#include <libpspp/assertion.h>
#include <libpspp/compiler.h>
#include <libpspp/hash.h>
#include <libpspp/magic.h>
#include <libpspp/compiler.h>
#include <libpspp/hash.h>
#include <libpspp/magic.h>
@@
-68,7
+69,7
@@
crosstabs (crs_):
*^tables=custom;
+variables=custom;
crosstabs (crs_):
*^tables=custom;
+variables=custom;
-
+
missing=miss:!table/include/report;
+ missing=miss:!table/include/report;
+write[wr_]=none,cells,all;
+format=fmt:!labels/nolabels/novallabs,
val:!avalue/dvalue,
+write[wr_]=none,cells,all;
+format=fmt:!labels/nolabels/novallabs,
val:!avalue/dvalue,
@@
-1799,8
+1800,7
@@
display_crosstabulation (void)
* (1. - col_tot[c] / W)));
break;
default:
* (1. - col_tot[c] / W)));
break;
default:
- assert (0);
- abort ();
+ NOT_REACHED ();
}
format_cell_entry (table, c, i, v, suffix, mark_missing);
}
format_cell_entry (table, c, i, v, suffix, mark_missing);
@@
-1855,8
+1855,7
@@
display_crosstabulation (void)
v = 0.;
break;
default:
v = 0.;
break;
default:
- assert (0);
- abort ();
+ NOT_REACHED ();
}
format_cell_entry (table, n_cols, 0, v, suffix, mark_missing);
}
format_cell_entry (table, n_cols, 0, v, suffix, mark_missing);
@@
-1911,8
+1910,7
@@
display_crosstabulation (void)
case CRS_CL_ASRESIDUAL:
continue;
default:
case CRS_CL_ASRESIDUAL:
continue;
default:
- assert (0);
- abort ();
+ NOT_REACHED ();
}
format_cell_entry (table, c, i, v, suffix, mark_missing);
}
format_cell_entry (table, c, i, v, suffix, mark_missing);