From: Ben Pfaff Date: Sun, 28 Dec 2025 20:00:24 +0000 (-0800) Subject: work X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa2f032e93d69f3428da985c0db245c60bccd376;p=pspp work --- diff --git a/rust/pspp/src/output/pivot/look.rs b/rust/pspp/src/output/pivot/look.rs index 8c7d725cc9..4483b4d0c9 100644 --- a/rust/pspp/src/output/pivot/look.rs +++ b/rust/pspp/src/output/pivot/look.rs @@ -216,14 +216,10 @@ impl Border { /// Returns an alternative border for this one. pub fn fallback(self) -> Self { - match self { - Self::Title - | Self::OuterFrame(_) - | Self::InnerFrame(_) - | Self::DataLeft - | Self::DataTop - | Self::Category(_) => self, - Self::Dimension(row_col_border) => Self::Category(row_col_border), + if let Self::Dimension(row_col_border) = self { + Self::Category(row_col_border) + } else { + self } } diff --git a/rust/pspp/src/output/pivot/output.rs b/rust/pspp/src/output/pivot/output.rs index 0eb09d7474..b48dae75ac 100644 --- a/rust/pspp/src/output/pivot/output.rs +++ b/rust/pspp/src/output/pivot/output.rs @@ -493,6 +493,7 @@ impl<'a> Heading<'a> { rotate_inner_labels: bool, rotate_outer_labels: bool, inner: bool, + n_dimensions: usize, ) { let v = !h; @@ -528,32 +529,61 @@ impl<'a> Heading<'a> { ); // Draw all the vertical lines in our running example, other - // than the far left and far right ones. Only the ones that - // start in the last row of the heading are drawn with the - // "category" style, the rest with the "dimension" style. + // than the far left and far right ones. + // + // On an axis with only one dimension, all the lines are drawn + // in "category" style. + // + // On an axis with multiple dimensions, lines that start at the + // innermost leaf categories are drawn in "category" style, and + // all the other lines (which start above the leaves) are drawn + // in "dimension" style. // // # Example // - // Suppose we have two dimensions `aaaa` and `bbbb`, each with - // three numbered categories. Only the `║` below are category + // Suppose we have four dimensions `a` through `d`, each with + // three numbered categories `a1`, `a2`, `a3` (etc.). Two of + // the categories in each dimension are grouped into `ag1` + // (etc.). Then, only the doubled lines below are category // style: // // ```text - // ┌─────────────────────────────────────────────────────┐ - // │ bbbb │ - // ├─────────────────┬─────────────────┬─────────────────┤ - // │ bbbb1 │ bbbb2 │ bbbb3 │ - // ├─────────────────┼─────────────────┼─────────────────┤ - // │ aaaa │ aaaa │ aaaa │ - // ├─────╥─────╥─────┼─────╥─────╥─────┼─────╥─────╥─────┤ - // │aaaa1║aaaa2║aaaa3│aaaa1║aaaa2║aaaa3│aaaa1║aaaa2║aaaa3│ - // └─────╨─────╨─────┴─────╨─────╨─────┴─────╨─────╨─────┘ - //``` + // Category and Dimension Borders 1 + // b │ + // bg1 │ │ + // b1 │ b2 │ b3 │ + // a │ a │ a │ + // │ ag1 │ │ ag1 │ │ ag1 │ + // d c a1│a2║a3│a1│a2║a3│a1│a2║a3│ + // dg1 d1 c1 0│ 1║ 2│ 3│ 4║ 5│ 6│ 7║ 8│ + // ╶─────────┼──╫──┼──┼──╫──┼──┼──╫──┤ + // cg1 c2 9│10║11│12│13║14│15│16║17│ + // ══════╪══╬══╪══╪══╬══╪══╪══╬══╡ + // c3 18│19║20│21│22║23│24│25║26│ + // ╶────────────┼──╫──┼──┼──╫──┼──┼──╫──┤ + // d2 c1 27│28║29│30│31║32│33│34║35│ + // ╶─────────┼──╫──┼──┼──╫──┼──┼──╫──┤ + // cg1 c2 36│37║38│39│40║41│42│43║44│ + // ══════╪══╬══╪══╪══╬══╪══╪══╬══╡ + // c3 45│46║47│48│49║50│51│52║53│ + // ────────────────┼──╫──┼──┼──╫──┼──┼──╫──┤ + // d3 c1 54│55║56│57│58║59│60│61║62│ + // ╶─────────┼──╫──┼──┼──╫──┼──┼──╫──┤ + // cg1 c2 63│64║65│66│67║68│69│70║71│ + // ══════╪══╬══╪══╪══╬══╪══╪══╬══╡ + // c3 72│73║74│75│76║77│78│79║80│ + // ────────────────┴──╨──┴──┴──╨──┴──┴──╨──╯ + // ``` + // + // (This is [tests::category_and_dimension_borders_1] with + // double instead of dashed lines, because double lines are + // easier to see in source code but SPSS shows rendering + // anomalies with them.) let row_col = RowColBorder(region, v); - let border = if row == self.height - 1 && inner { - Border::Category(row_col) - } else { + let border = if n_dimensions > 1 && (!inner || row != self.height - 1) { Border::Dimension(row_col) + } else { + Border::Category(row_col) }; for x in [x1, x2] { if !vrules[x] { @@ -687,6 +717,7 @@ impl<'a> Headings<'a> { rotate_inner_labels, rotate_outer_labels, inner, + self.headings.len(), ); v_ofs += heading.height; if !inner { diff --git a/rust/pspp/src/output/pivot/testdata/d2m_cr.expected b/rust/pspp/src/output/pivot/testdata/d2m_cr.expected index 914989b5b7..47ac362a79 100644 --- a/rust/pspp/src/output/pivot/testdata/d2m_cr.expected +++ b/rust/pspp/src/output/pivot/testdata/d2m_cr.expected @@ -3,12 +3,8 @@ Column x Row │ │a1│a2│a3│ ├───────┼──┼──┼──┤ │b b1 b2│ 0│ 1│ 2│ -│ ╶─────┼──┼──┼──┤ │ b3 │ 3│ 4│ 5│ -├───────┼──┼──┼──┤ │c c1 │ 6│ 7│ 8│ -├───────┼──┼──┼──┤ │d │ 9│10│11│ -├───────┼──┼──┼──┤ │e │12│13│14│ ╰───────┴──┴──┴──╯ diff --git a/rust/pspp/src/output/pivot/testdata/metadata_entry.expected b/rust/pspp/src/output/pivot/testdata/metadata_entry.expected index 9c2f712159..3095b5dcfb 100644 --- a/rust/pspp/src/output/pivot/testdata/metadata_entry.expected +++ b/rust/pspp/src/output/pivot/testdata/metadata_entry.expected @@ -1,9 +1,7 @@ ╭────────────────────┬──────────╮ │Name 1 │Value 1 │ -├────────────────────┼──────────┤ │Subgroup 1 Subname 1│Subvalue 1│ │ Subname 2│Subvalue 2│ │ Subname 3│ 3│ -├────────────────────┼──────────┤ │Name 2 │Value 2 │ ╰────────────────────┴──────────╯ diff --git a/rust/pspp/src/por/testdata/test1.expected b/rust/pspp/src/por/testdata/test1.expected index 9105615e6f..15097c171a 100644 --- a/rust/pspp/src/por/testdata/test1.expected +++ b/rust/pspp/src/por/testdata/test1.expected @@ -31,11 +31,9 @@ │SATISFACTION WITH HOUSING 1│VERY │ │ 2│FAIRLY │ │ 3│NOT VERY │ -├───────────────────────────┼──────────┤ │SATISFACTION NEIGHBORHOOD 1│VERY │ │ 2│FAIRLY │ │ 3│NOT VERY │ -├───────────────────────────┼──────────┤ │RESPOND. EDUCATION 1│NONE │ │ 2│< 8 YRS │ │ 3│C GRD SC │ @@ -45,24 +43,20 @@ │ 7│COLL DEG │ │ 8│MASTERS │ │ 9│PHD-M.D. │ -├───────────────────────────┼──────────┤ │STANDARD OF LIVING 1│PROSP │ │ 2│VERY COMF │ │ 3│REAS COMF │ │ 4│GET BY │ │ 5│NEAR POOR │ │ 6│POOR │ -├───────────────────────────┼──────────┤ │RESPONDENT RACE 1│BLACK │ │ 2│HISPANIC │ │ 3│WHITE │ │ 4│ASIAN │ │ 5│AM IND │ │ 8│OTHER │ -├───────────────────────────┼──────────┤ │RESPONDENT SEX 1│MALE │ │ 2│FEMALE │ -├───────────────────────────┼──────────┤ │R MARITAL STATUS 1│MARRIED │ │ 2│DIVORCED │ │ 3│SEPARATD │ diff --git a/rust/pspp/src/spv/read/legacy_xml.rs b/rust/pspp/src/spv/read/legacy_xml.rs index 99510240a2..3b45b634ae 100644 --- a/rust/pspp/src/spv/read/legacy_xml.rs +++ b/rust/pspp/src/spv/read/legacy_xml.rs @@ -38,8 +38,8 @@ use crate::{ output::pivot::{ self, Axis2, Axis3, Category, CategoryLocator, Dimension, Group, Leaf, Length, PivotTable, look::{ - self, Area, AreaStyle, Border, BorderStyle, BoxBorder, CellStyle, Color, HeadingRegion, - HorzAlign, Look, RowColBorder, RowParity, Stroke, VertAlign, + self, Area, AreaStyle, BorderStyle, BoxBorder, CellStyle, Color, HeadingRegion, + HorzAlign, Look, RowParity, Stroke, VertAlign, }, value::Value, }, @@ -371,7 +371,6 @@ impl Visualization { axes: &HashMap, styles: &HashMap<&str, &Style>, a: Axis3, - look: &mut Look, rotate_inner_column_labels: &mut bool, rotate_outer_row_labels: &mut bool, footnotes: &pivot::Footnotes, @@ -399,17 +398,6 @@ impl Visualization { (false, None, None, None) }; - if a == Axis3::Y - && let Some(axis) = axes.get(&base_level) - && let Some(gridline) = &axis.major_ticks.gridline - && let Some(style) = gridline.style.get(&styles) - { - if let Some(border_style) = style.border(BoxBorder::Bottom) { - // XXX probably not necessary, the Look is supplied at a higher level - look.borders[Border::Dimension(RowColBorder(HeadingRegion::Rows, Axis2::X))] = - border_style; - } - } if let Some(axis) = axes.get(&base_level) && axis.major_ticks.label_angle == -90.0 { @@ -547,7 +535,6 @@ impl Visualization { axes: &HashMap, styles: &HashMap<&str, &Style>, a: Axis3, - look: &mut Look, rotate_inner_column_labels: &mut bool, rotate_outer_row_labels: &mut bool, footnotes: &pivot::Footnotes, @@ -576,7 +563,6 @@ impl Visualization { axes, styles, a, - look, rotate_inner_column_labels, rotate_outer_row_labels, footnotes, @@ -592,7 +578,6 @@ impl Visualization { axes, styles, a, - look, rotate_inner_column_labels, rotate_outer_row_labels, footnotes, @@ -622,7 +607,6 @@ impl Visualization { &axes, &styles, Axis3::X, - &mut look, &mut rotate_inner_column_labels, &mut rotate_outer_row_labels, &footnotes, @@ -639,7 +623,6 @@ impl Visualization { &axes, &styles, Axis3::Y, - &mut look, &mut rotate_inner_column_labels, &mut rotate_outer_row_labels, &footnotes, @@ -653,7 +636,6 @@ impl Visualization { &axes, &styles, Axis3::Z, - &mut look, &mut rotate_inner_column_labels, &mut rotate_outer_row_labels, &footnotes, @@ -738,26 +720,6 @@ impl Visualization { } } - if let Some(style) = graph.style.get(&styles) { - // XXX probably not necessary, the Look is supplied at a higher level - for box_border in enum_iterator::all::() { - if let Some(border_style) = style.border(box_border) { - look.borders[Border::InnerFrame(box_border)] = border_style; - } - } - } - if let Some(style) = &graph.facet_layout.table_layout.style - && let Some(style) = style.get(&styles) - { - // XXX probably not necessary, the Look is supplied at a higher level - if let Some(border_style) = style.border(BoxBorder::Right) { - look.borders[Border::DataLeft] = border_style; - } - if let Some(border_style) = style.border(BoxBorder::Bottom) { - look.borders[Border::DataTop] = border_style; - } - } - for child in &graph.facet_layout.children { let FacetLayoutChild::SetCellProperties(scp) = child else { continue; diff --git a/rust/pspp/src/sys/testdata/attributes.expected b/rust/pspp/src/sys/testdata/attributes.expected index 675b710369..d1c82411f5 100644 --- a/rust/pspp/src/sys/testdata/attributes.expected +++ b/rust/pspp/src/sys/testdata/attributes.expected @@ -1,11 +1,8 @@ ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ │ Version │1.2.3 │ -├────────────────┼────────────────────────┤ │Compression │None │ -├────────────────┼────────────────────────┤ │Number of Cases │ 0│ ╰────────────────┴────────────────────────╯ @@ -31,13 +28,10 @@ │ Attr1[2] │'déclaration'│ │ SécondAttr[1]│123 │ │ SécondAttr[2]│456 │ -├────────────────────────────┼─────────────┤ │FirstVariable $@Role │1 │ │ adèle[1] │23 │ │ adèle[2] │34 │ │ bert │123 │ -├────────────────────────────┼─────────────┤ │SécondVariable xyzzy │quux │ -├────────────────────────────┼─────────────┤ │ThirdVariable fizz │buzz │ ╰────────────────────────────┴─────────────╯ diff --git a/rust/pspp/src/sys/testdata/bad_machine_float_info_size.expected b/rust/pspp/src/sys/testdata/bad_machine_float_info_size.expected index 8d0c1bc489..a3429ee208 100644 --- a/rust/pspp/src/sys/testdata/bad_machine_float_info_size.expected +++ b/rust/pspp/src/sys/testdata/bad_machine_float_info_size.expected @@ -2,11 +2,8 @@ Warning at file offsets 0xe0 to 0x100: In extension record: floating point recor ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/bad_machine_integer_info_count.expected b/rust/pspp/src/sys/testdata/bad_machine_integer_info_count.expected index f719eb5607..90a3522f79 100644 --- a/rust/pspp/src/sys/testdata/bad_machine_integer_info_count.expected +++ b/rust/pspp/src/sys/testdata/bad_machine_integer_info_count.expected @@ -2,11 +2,8 @@ Warning at file offsets 0xe0 to 0x104: In extension record: integer record has b ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/bad_machine_integer_info_endianness.big.expected b/rust/pspp/src/sys/testdata/bad_machine_integer_info_endianness.big.expected new file mode 100644 index 0000000000..1804d672aa --- /dev/null +++ b/rust/pspp/src/sys/testdata/bad_machine_integer_info_endianness.big.expected @@ -0,0 +1,20 @@ +Integer format indicated by system file (3) differs from expected (1). + +╭────────────────┬────────────────────────╮ +│Created │ 01-JAN-2011 20:53:52│ +│Writer Product │PSPP synthetic test file│ +│ Version │1.2.3 │ +│Compression │SAV │ +│Number of Cases │Unknown │ +╰────────────────┴────────────────────────╯ + +╭─────────┬─╮ +│Variables│1│ +╰─────────┴─╯ + + Variables +╭────┬────────┬─────┬─────────────────┬─────┬─────┬─────────┬────────────┬────────────┬──────────────╮ +│ │Position│Label│Measurement Level│ Role│Width│Alignment│Print Format│Write Format│Missing Values│ +├────┼────────┼─────┼─────────────────┼─────┼─────┼─────────┼────────────┼────────────┼──────────────┤ +│num1│ 1│ │ │Input│ 8│Right │F8.0 │F8.0 │ │ +╰────┴────────┴─────┴─────────────────┴─────┴─────┴─────────┴────────────┴────────────┴──────────────╯ diff --git a/rust/pspp/src/sys/testdata/bad_machine_integer_info_endianness.expected b/rust/pspp/src/sys/testdata/bad_machine_integer_info_endianness.expected deleted file mode 100644 index b3caf8fc99..0000000000 --- a/rust/pspp/src/sys/testdata/bad_machine_integer_info_endianness.expected +++ /dev/null @@ -1,23 +0,0 @@ -Integer format indicated by system file (3) differs from expected ({endian}). - -╭────────────────┬────────────────────────╮ -│Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ -│Writer Product │PSPP synthetic test file│ -│ Version │1.2.3 │ -├────────────────┼────────────────────────┤ -│Compression │SAV │ -├────────────────┼────────────────────────┤ -│Number of Cases │Unknown │ -╰────────────────┴────────────────────────╯ - -╭─────────┬─╮ -│Variables│1│ -╰─────────┴─╯ - - Variables -╭────┬────────┬─────┬─────────────────┬─────┬─────┬─────────┬────────────┬────────────┬──────────────╮ -│ │Position│Label│Measurement Level│ Role│Width│Alignment│Print Format│Write Format│Missing Values│ -├────┼────────┼─────┼─────────────────┼─────┼─────┼─────────┼────────────┼────────────┼──────────────┤ -│num1│ 1│ │ │Input│ 8│Right │F8.0 │F8.0 │ │ -╰────┴────────┴─────┴─────────────────┴─────┴─────┴─────────┴────────────┴────────────┴──────────────╯ diff --git a/rust/pspp/src/sys/testdata/bad_machine_integer_info_endianness.little.expected b/rust/pspp/src/sys/testdata/bad_machine_integer_info_endianness.little.expected new file mode 100644 index 0000000000..df4efb11ce --- /dev/null +++ b/rust/pspp/src/sys/testdata/bad_machine_integer_info_endianness.little.expected @@ -0,0 +1,20 @@ +Integer format indicated by system file (3) differs from expected (2). + +╭────────────────┬────────────────────────╮ +│Created │ 01-JAN-2011 20:53:52│ +│Writer Product │PSPP synthetic test file│ +│ Version │1.2.3 │ +│Compression │SAV │ +│Number of Cases │Unknown │ +╰────────────────┴────────────────────────╯ + +╭─────────┬─╮ +│Variables│1│ +╰─────────┴─╯ + + Variables +╭────┬────────┬─────┬─────────────────┬─────┬─────┬─────────┬────────────┬────────────┬──────────────╮ +│ │Position│Label│Measurement Level│ Role│Width│Alignment│Print Format│Write Format│Missing Values│ +├────┼────────┼─────┼─────────────────┼─────┼─────┼─────────┼────────────┼────────────┼──────────────┤ +│num1│ 1│ │ │Input│ 8│Right │F8.0 │F8.0 │ │ +╰────┴────────┴─────┴─────────────────┴─────┴─────┴─────────┴────────────┴────────────┴──────────────╯ diff --git a/rust/pspp/src/sys/testdata/bad_machine_integer_info_float_format.expected b/rust/pspp/src/sys/testdata/bad_machine_integer_info_float_format.expected index 645328e60b..ed480f0824 100644 --- a/rust/pspp/src/sys/testdata/bad_machine_integer_info_float_format.expected +++ b/rust/pspp/src/sys/testdata/bad_machine_integer_info_float_format.expected @@ -2,12 +2,9 @@ Floating-point representation indicated by system file (2) differs from expected ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ │ Version │1.2.3 │ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/bad_variable_name_in_long_string_value_label.expected b/rust/pspp/src/sys/testdata/bad_variable_name_in_long_string_value_label.expected index fd6d95e78f..f514b4338b 100644 --- a/rust/pspp/src/sys/testdata/bad_variable_name_in_long_string_value_label.expected +++ b/rust/pspp/src/sys/testdata/bad_variable_name_in_long_string_value_label.expected @@ -4,11 +4,8 @@ Ignoring long string value label for numeric variable NUM1. ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/bad_variable_name_in_variable_value_pair.expected b/rust/pspp/src/sys/testdata/bad_variable_name_in_variable_value_pair.expected index b5a3f1aa8f..e959146cf5 100644 --- a/rust/pspp/src/sys/testdata/bad_variable_name_in_variable_value_pair.expected +++ b/rust/pspp/src/sys/testdata/bad_variable_name_in_variable_value_pair.expected @@ -2,11 +2,8 @@ Warning at file offsets 0xe0 to 0xe5: In long variable name record: Missing `=` ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/bad_very_long_string_length.expected b/rust/pspp/src/sys/testdata/bad_very_long_string_length.expected index 1774a5ef82..43da00caab 100644 --- a/rust/pspp/src/sys/testdata/bad_very_long_string_length.expected +++ b/rust/pspp/src/sys/testdata/bad_very_long_string_length.expected @@ -6,11 +6,8 @@ Variable with short name NUM1 listed in very long string record with width 256 r ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/bad_very_long_string_segment_width.expected b/rust/pspp/src/sys/testdata/bad_very_long_string_segment_width.expected index 843a5b8fb7..30a8d47df6 100644 --- a/rust/pspp/src/sys/testdata/bad_very_long_string_segment_width.expected +++ b/rust/pspp/src/sys/testdata/bad_very_long_string_segment_width.expected @@ -4,11 +4,8 @@ Variable with short name STR1 listed in very long string record with width 256 h ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/compressed_data.expected b/rust/pspp/src/sys/testdata/compressed_data.expected index 8ad02aa36c..f37a3c4557 100644 --- a/rust/pspp/src/sys/testdata/compressed_data.expected +++ b/rust/pspp/src/sys/testdata/compressed_data.expected @@ -1,10 +1,7 @@ ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/compressed_data_other_bias.expected b/rust/pspp/src/sys/testdata/compressed_data_other_bias.expected index f4c927a6e1..315275dd41 100644 --- a/rust/pspp/src/sys/testdata/compressed_data_other_bias.expected +++ b/rust/pspp/src/sys/testdata/compressed_data_other_bias.expected @@ -2,11 +2,8 @@ Warning at file offsets 0x54 to 0x5c: In file header: Compression bias is 50 ins ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/compressed_data_zero_bias.expected b/rust/pspp/src/sys/testdata/compressed_data_zero_bias.expected index 21c7de6691..0241677777 100644 --- a/rust/pspp/src/sys/testdata/compressed_data_zero_bias.expected +++ b/rust/pspp/src/sys/testdata/compressed_data_zero_bias.expected @@ -1,10 +1,7 @@ ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/documents.expected b/rust/pspp/src/sys/testdata/documents.expected index d70739ff26..b39687103d 100644 --- a/rust/pspp/src/sys/testdata/documents.expected +++ b/rust/pspp/src/sys/testdata/documents.expected @@ -1,11 +1,8 @@ ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ │ Version │1.2.3 │ -├────────────────┼────────────────────────┤ │Compression │None │ -├────────────────┼────────────────────────┤ │Number of Cases │ 1│ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/duplicate_attribute_name.expected b/rust/pspp/src/sys/testdata/duplicate_attribute_name.expected index d941eaf9c0..ef7faed4ac 100644 --- a/rust/pspp/src/sys/testdata/duplicate_attribute_name.expected +++ b/rust/pspp/src/sys/testdata/duplicate_attribute_name.expected @@ -4,11 +4,8 @@ Warning at file offsets 0x10e to 0x12d: In file or variable attribute record: Du ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ @@ -28,6 +25,5 @@ Data File and Variable Attributes │Variable and Name │Value│ ├──────────────────┼─────┤ │(dataset) Attr1 │value│ -├──────────────────┼─────┤ │firstvar fred │23 │ ╰──────────────────┴─────╯ diff --git a/rust/pspp/src/sys/testdata/duplicate_long_variable_name.expected b/rust/pspp/src/sys/testdata/duplicate_long_variable_name.expected index 4f40124294..6e51b20a82 100644 --- a/rust/pspp/src/sys/testdata/duplicate_long_variable_name.expected +++ b/rust/pspp/src/sys/testdata/duplicate_long_variable_name.expected @@ -8,11 +8,8 @@ Duplicate long variable name LONGVARIABLENAME. ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/duplicate_value_labels_type.expected b/rust/pspp/src/sys/testdata/duplicate_value_labels_type.expected index 879b7ff8b5..ac366d19fb 100644 --- a/rust/pspp/src/sys/testdata/duplicate_value_labels_type.expected +++ b/rust/pspp/src/sys/testdata/duplicate_value_labels_type.expected @@ -4,11 +4,8 @@ NUM1 has duplicate value labels for the following value(s): 1 ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ @@ -29,6 +26,5 @@ NUM1 has duplicate value labels for the following value(s): 1 │Variable Value │ │ ├───────────────┼───┤ │str1 xyzzy │one│ -├───────────────┼───┤ │num1 1 │one│ ╰───────────────┴───╯ diff --git a/rust/pspp/src/sys/testdata/duplicate_variable_name.expected b/rust/pspp/src/sys/testdata/duplicate_variable_name.expected index f6781422f6..9e5523f872 100644 --- a/rust/pspp/src/sys/testdata/duplicate_variable_name.expected +++ b/rust/pspp/src/sys/testdata/duplicate_variable_name.expected @@ -2,11 +2,8 @@ Renaming variable with duplicate name VAR1 to VAR001. ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/empty_document_record.expected b/rust/pspp/src/sys/testdata/empty_document_record.expected index c1e88b37ea..96a89fa04b 100644 --- a/rust/pspp/src/sys/testdata/empty_document_record.expected +++ b/rust/pspp/src/sys/testdata/empty_document_record.expected @@ -1,11 +1,8 @@ ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ │ Version │1.2.3 │ -├────────────────┼────────────────────────┤ │Compression │None │ -├────────────────┼────────────────────────┤ │Number of Cases │ 1│ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/extra_product_info.expected b/rust/pspp/src/sys/testdata/extra_product_info.expected index 8800d553e9..e4579fced6 100644 --- a/rust/pspp/src/sys/testdata/extra_product_info.expected +++ b/rust/pspp/src/sys/testdata/extra_product_info.expected @@ -1,13 +1,10 @@ ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ │ Product 2│Extra product info │ │ │another line │ │ │blah │ -├────────────────┼────────────────────────┤ │Compression │None │ -├────────────────┼────────────────────────┤ │Number of Cases │ 0│ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/fewer_data_records_than_indicated_by_file_header.expected b/rust/pspp/src/sys/testdata/fewer_data_records_than_indicated_by_file_header.expected index c895ed4c14..673d1b3992 100644 --- a/rust/pspp/src/sys/testdata/fewer_data_records_than_indicated_by_file_header.expected +++ b/rust/pspp/src/sys/testdata/fewer_data_records_than_indicated_by_file_header.expected @@ -1,10 +1,7 @@ ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │None │ -├────────────────┼────────────────────────┤ │Number of Cases │ 5│ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/integer_overflows_in_long_string_missing_values.expected b/rust/pspp/src/sys/testdata/integer_overflows_in_long_string_missing_values.expected index 7692f631f7..4ae958a6f0 100644 --- a/rust/pspp/src/sys/testdata/integer_overflows_in_long_string_missing_values.expected +++ b/rust/pspp/src/sys/testdata/integer_overflows_in_long_string_missing_values.expected @@ -6,12 +6,9 @@ This system file does not indicate its own character encoding. For best results ╭────────────────┬────────────────────────────────────╮ │Created │ 30-JAN-2013 14:34:58│ -├────────────────┼────────────────────────────────────┤ │Writer Product │MS Windows Release 12.0 spssio32.dll│ │ Version │12.0.0 │ -├────────────────┼────────────────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────────────────┤ │Number of Cases │ 10│ ╰────────────────┴────────────────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/invalid_long_string_missing_values.expected b/rust/pspp/src/sys/testdata/invalid_long_string_missing_values.expected index d773e0a5e8..5ad585cad7 100644 --- a/rust/pspp/src/sys/testdata/invalid_long_string_missing_values.expected +++ b/rust/pspp/src/sys/testdata/invalid_long_string_missing_values.expected @@ -12,12 +12,9 @@ Invalid long string missing value for 7-byte string variable STR4. ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ │ Version │1.2.3 │ -├────────────────┼────────────────────────┤ │Compression │None │ -├────────────────┼────────────────────────┤ │Number of Cases │ 0│ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/invalid_variable_format.expected b/rust/pspp/src/sys/testdata/invalid_variable_format.expected index cb49d2699f..2945aec386 100644 --- a/rust/pspp/src/sys/testdata/invalid_variable_format.expected +++ b/rust/pspp/src/sys/testdata/invalid_variable_format.expected @@ -16,11 +16,8 @@ Substituting A4 for invalid write format on variable STR2. String variable with ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/invalid_variable_name.expected b/rust/pspp/src/sys/testdata/invalid_variable_name.expected index 90925e3c19..0a396fb5c8 100644 --- a/rust/pspp/src/sys/testdata/invalid_variable_name.expected +++ b/rust/pspp/src/sys/testdata/invalid_variable_name.expected @@ -8,11 +8,8 @@ ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/long_variable_names.expected b/rust/pspp/src/sys/testdata/long_variable_names.expected index ce67c85e47..554f11be93 100644 --- a/rust/pspp/src/sys/testdata/long_variable_names.expected +++ b/rust/pspp/src/sys/testdata/long_variable_names.expected @@ -1,11 +1,8 @@ ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ │ Version │1.2.3 │ -├────────────────┼────────────────────────┤ │Compression │None │ -├────────────────┼────────────────────────┤ │Number of Cases │ 0│ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/missing_attribute_value.expected b/rust/pspp/src/sys/testdata/missing_attribute_value.expected index 555fe4ab9e..2b5ec4e4a6 100644 --- a/rust/pspp/src/sys/testdata/missing_attribute_value.expected +++ b/rust/pspp/src/sys/testdata/missing_attribute_value.expected @@ -4,11 +4,8 @@ Warning at file offsets 0xf6 to 0x109: In file or variable attribute record: Att ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/missing_newline_after_variable_name_in_mrsets.expected b/rust/pspp/src/sys/testdata/missing_newline_after_variable_name_in_mrsets.expected index e16df37894..72d3948018 100644 --- a/rust/pspp/src/sys/testdata/missing_newline_after_variable_name_in_mrsets.expected +++ b/rust/pspp/src/sys/testdata/missing_newline_after_variable_name_in_mrsets.expected @@ -2,11 +2,8 @@ Multiple response set $a has only one variable. ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/missing_string_continuation.expected b/rust/pspp/src/sys/testdata/missing_string_continuation.expected index f673aa1d79..ff4ab3d06b 100644 --- a/rust/pspp/src/sys/testdata/missing_string_continuation.expected +++ b/rust/pspp/src/sys/testdata/missing_string_continuation.expected @@ -2,11 +2,8 @@ Variable index 0 is a 10-byte string that should be followed by long string cont ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/mixed_variable_types_in_mrsets.expected b/rust/pspp/src/sys/testdata/mixed_variable_types_in_mrsets.expected index a2b9316920..ba62b26ade 100644 --- a/rust/pspp/src/sys/testdata/mixed_variable_types_in_mrsets.expected +++ b/rust/pspp/src/sys/testdata/mixed_variable_types_in_mrsets.expected @@ -2,11 +2,8 @@ Multiple response set $a contains both string and numeric variables. ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/more_data_records_than_indicated_by_file_header.expected b/rust/pspp/src/sys/testdata/more_data_records_than_indicated_by_file_header.expected index e3851c28bc..bfcc778cbf 100644 --- a/rust/pspp/src/sys/testdata/more_data_records_than_indicated_by_file_header.expected +++ b/rust/pspp/src/sys/testdata/more_data_records_than_indicated_by_file_header.expected @@ -1,10 +1,7 @@ ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │None │ -├────────────────┼────────────────────────┤ │Number of Cases │ 5│ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/multiple_documents_records.expected b/rust/pspp/src/sys/testdata/multiple_documents_records.expected index 32c604a068..b76bf0a9d7 100644 --- a/rust/pspp/src/sys/testdata/multiple_documents_records.expected +++ b/rust/pspp/src/sys/testdata/multiple_documents_records.expected @@ -1,10 +1,7 @@ ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │None │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/multiple_response_sets.expected b/rust/pspp/src/sys/testdata/multiple_response_sets.expected index 63d1902fea..066f49a541 100644 --- a/rust/pspp/src/sys/testdata/multiple_response_sets.expected +++ b/rust/pspp/src/sys/testdata/multiple_response_sets.expected @@ -1,11 +1,8 @@ ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ │ Version │1.2.3 │ -├────────────────┼────────────────────────┤ │Compression │None │ -├────────────────┼────────────────────────┤ │Number of Cases │ 0│ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/multiple_response_sets_bad_counted_string.expected b/rust/pspp/src/sys/testdata/multiple_response_sets_bad_counted_string.expected index 705dd1d5f4..bacd99a658 100644 --- a/rust/pspp/src/sys/testdata/multiple_response_sets_bad_counted_string.expected +++ b/rust/pspp/src/sys/testdata/multiple_response_sets_bad_counted_string.expected @@ -2,11 +2,8 @@ Warning at file offsets 0xe0 to 0xe5: In multiple response set record: Syntax er ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/multiple_response_sets_bad_name.expected b/rust/pspp/src/sys/testdata/multiple_response_sets_bad_name.expected index 7909e1af19..a6c1d01eb3 100644 --- a/rust/pspp/src/sys/testdata/multiple_response_sets_bad_name.expected +++ b/rust/pspp/src/sys/testdata/multiple_response_sets_bad_name.expected @@ -4,12 +4,9 @@ Invalid multiple response set name. Multiple response set name "e" does not beg ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ │ Version │1.2.3 │ -├────────────────┼────────────────────────┤ │Compression │None │ -├────────────────┼────────────────────────┤ │Number of Cases │ 0│ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/multiple_response_sets_counted_string_bad_length.expected b/rust/pspp/src/sys/testdata/multiple_response_sets_counted_string_bad_length.expected index 632d653f60..bdf0a78134 100644 --- a/rust/pspp/src/sys/testdata/multiple_response_sets_counted_string_bad_length.expected +++ b/rust/pspp/src/sys/testdata/multiple_response_sets_counted_string_bad_length.expected @@ -2,11 +2,8 @@ Warning at file offsets 0xe0 to 0xe9: In multiple response set record: Syntax er ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/multiple_response_sets_counted_string_missing_space.expected b/rust/pspp/src/sys/testdata/multiple_response_sets_counted_string_missing_space.expected index 8816eee947..7c4e0e85aa 100644 --- a/rust/pspp/src/sys/testdata/multiple_response_sets_counted_string_missing_space.expected +++ b/rust/pspp/src/sys/testdata/multiple_response_sets_counted_string_missing_space.expected @@ -2,11 +2,8 @@ Warning at file offsets 0xe0 to 0xe6: In multiple response set record: Syntax er ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/multiple_response_sets_duplicate_variable_name.expected b/rust/pspp/src/sys/testdata/multiple_response_sets_duplicate_variable_name.expected index 3a87a32434..17f9472a20 100644 --- a/rust/pspp/src/sys/testdata/multiple_response_sets_duplicate_variable_name.expected +++ b/rust/pspp/src/sys/testdata/multiple_response_sets_duplicate_variable_name.expected @@ -4,11 +4,8 @@ Multiple response set $a has only one variable. ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/multiple_response_sets_missing_label_source.expected b/rust/pspp/src/sys/testdata/multiple_response_sets_missing_label_source.expected index de7277f3a5..d71538bfae 100644 --- a/rust/pspp/src/sys/testdata/multiple_response_sets_missing_label_source.expected +++ b/rust/pspp/src/sys/testdata/multiple_response_sets_missing_label_source.expected @@ -2,11 +2,8 @@ Warning at file offsets 0xe0 to 0xe5: In multiple response set record: Invalid m ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/multiple_response_sets_missing_newline_after_variable_name.expected b/rust/pspp/src/sys/testdata/multiple_response_sets_missing_newline_after_variable_name.expected index d412498ab6..a1ee3c2da4 100644 --- a/rust/pspp/src/sys/testdata/multiple_response_sets_missing_newline_after_variable_name.expected +++ b/rust/pspp/src/sys/testdata/multiple_response_sets_missing_newline_after_variable_name.expected @@ -2,11 +2,8 @@ Warning at file offsets 0xe0 to 0xec: In multiple response set record: Syntax er ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/multiple_response_sets_missing_space_after_c.expected b/rust/pspp/src/sys/testdata/multiple_response_sets_missing_space_after_c.expected index c3cb2776ee..6501caaa12 100644 --- a/rust/pspp/src/sys/testdata/multiple_response_sets_missing_space_after_c.expected +++ b/rust/pspp/src/sys/testdata/multiple_response_sets_missing_space_after_c.expected @@ -2,11 +2,8 @@ Warning at file offsets 0xe0 to 0xe5: In multiple response set record: Syntax er ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/multiple_response_sets_missing_space_after_counted_string.expected b/rust/pspp/src/sys/testdata/multiple_response_sets_missing_space_after_counted_string.expected index 02add88f3b..17162d6550 100644 --- a/rust/pspp/src/sys/testdata/multiple_response_sets_missing_space_after_counted_string.expected +++ b/rust/pspp/src/sys/testdata/multiple_response_sets_missing_space_after_counted_string.expected @@ -2,11 +2,8 @@ Warning at file offsets 0xe0 to 0xea: In multiple response set record: Syntax er ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/multiple_response_sets_missing_space_after_e.expected b/rust/pspp/src/sys/testdata/multiple_response_sets_missing_space_after_e.expected index de7277f3a5..d71538bfae 100644 --- a/rust/pspp/src/sys/testdata/multiple_response_sets_missing_space_after_e.expected +++ b/rust/pspp/src/sys/testdata/multiple_response_sets_missing_space_after_e.expected @@ -2,11 +2,8 @@ Warning at file offsets 0xe0 to 0xe5: In multiple response set record: Invalid m ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/multiple_response_sets_unexpected_label_source.expected b/rust/pspp/src/sys/testdata/multiple_response_sets_unexpected_label_source.expected index e242aa8faf..ac1cda1875 100644 --- a/rust/pspp/src/sys/testdata/multiple_response_sets_unexpected_label_source.expected +++ b/rust/pspp/src/sys/testdata/multiple_response_sets_unexpected_label_source.expected @@ -2,11 +2,8 @@ Warning at file offsets 0xe0 to 0xe6: In multiple response set record: Invalid m ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/no_variables.expected b/rust/pspp/src/sys/testdata/no_variables.expected index 75638b7f64..64ca4c12c1 100644 --- a/rust/pspp/src/sys/testdata/no_variables.expected +++ b/rust/pspp/src/sys/testdata/no_variables.expected @@ -1,10 +1,7 @@ ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │None │ -├────────────────┼────────────────────────┤ │Number of Cases │ 0│ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/null_dereference_skipping_bad_extension_record_18.expected b/rust/pspp/src/sys/testdata/null_dereference_skipping_bad_extension_record_18.expected index 2098f5a5a2..e0ff7ea092 100644 --- a/rust/pspp/src/sys/testdata/null_dereference_skipping_bad_extension_record_18.expected +++ b/rust/pspp/src/sys/testdata/null_dereference_skipping_bad_extension_record_18.expected @@ -4,11 +4,8 @@ This system file does not indicate its own character encoding. For best results ╭────────────────┬────────────────────────────────────╮ │Created │ 30-JAN-2013 14:34:58│ -├────────────────┼────────────────────────────────────┤ │Writer Product │MS Windows Release 12.0 spssio32.dll│ -├────────────────┼────────────────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────────────────┤ │Number of Cases │ 10│ ╰────────────────┴────────────────────────────────────╯ @@ -32,7 +29,6 @@ This system file does not indicate its own character encoding. For best results ├───────────────┼──────────┤ │VAR00002 1.00 │Male │ │ 2.00 │Female │ -├───────────────┼──────────┤ │VAR00003 2.00 │Student │ │ 3.00 │Employed │ │ 4.00 │Unemployed│ diff --git a/rust/pspp/src/sys/testdata/partial_compressed_data_record.expected b/rust/pspp/src/sys/testdata/partial_compressed_data_record.expected index d7920d3180..7122a6fa31 100644 --- a/rust/pspp/src/sys/testdata/partial_compressed_data_record.expected +++ b/rust/pspp/src/sys/testdata/partial_compressed_data_record.expected @@ -1,10 +1,7 @@ ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/partial_data_record_between_variables.expected b/rust/pspp/src/sys/testdata/partial_data_record_between_variables.expected index a852869211..d93b44e14c 100644 --- a/rust/pspp/src/sys/testdata/partial_data_record_between_variables.expected +++ b/rust/pspp/src/sys/testdata/partial_data_record_between_variables.expected @@ -1,10 +1,7 @@ ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │None │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/partial_data_record_within_long_string.expected b/rust/pspp/src/sys/testdata/partial_data_record_within_long_string.expected index c8eb632c4d..1da89afed6 100644 --- a/rust/pspp/src/sys/testdata/partial_data_record_within_long_string.expected +++ b/rust/pspp/src/sys/testdata/partial_data_record_within_long_string.expected @@ -1,10 +1,7 @@ ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │None │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/test-encrypted.expected b/rust/pspp/src/sys/testdata/test-encrypted.expected index 9f3b99c202..cce8bca9c6 100644 --- a/rust/pspp/src/sys/testdata/test-encrypted.expected +++ b/rust/pspp/src/sys/testdata/test-encrypted.expected @@ -1,11 +1,8 @@ ╭────────────────┬────────────────────────────────────────────╮ │Created │ 04-OCT-2013 19:13:09│ -├────────────────┼────────────────────────────────────────────┤ │Writer Product │@(#) IBM SPSS STATISTICS MS Windows 22.0.0.0│ │ Version │22.0.0 │ -├────────────────┼────────────────────────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────────────────────────┤ │Number of Cases │ 17│ ╰────────────────┴────────────────────────────────────────────╯ @@ -33,25 +30,21 @@ │ 3│No Opinion │ │ 4│Agree │ │ 5│Strongly Agree │ -├──────────────────────────────────────────────────────┼─────────────────┤ │The value for money was good 1│Strongly Disagree│ │ 2│Disagree │ │ 3│No Opinion │ │ 4│Agree │ │ 5│Strongly Agree │ -├──────────────────────────────────────────────────────┼─────────────────┤ │The staff were slow in responding 1│Strongly Disagree│ │ 2│Disagree │ │ 3│No Opinion │ │ 4│Agree │ │ 5│Strongly Agree │ -├──────────────────────────────────────────────────────┼─────────────────┤ │My concerns were dealt with in an efficient manner 1│Strongly Disagree│ │ 2│Disagree │ │ 3│No Opinion │ │ 4│Agree │ │ 5│Strongly Agree │ -├──────────────────────────────────────────────────────┼─────────────────┤ │There was too much noise in the rooms 1│Strongly Disagree│ │ 2│Disagree │ │ 3│No Opinion │ @@ -64,13 +57,9 @@ │Variable and Name │Value│ ├───────────────────────────────────────────────────────────┼─────┤ │I am satisfied with the level of service $@Role│0 │ -├───────────────────────────────────────────────────────────┼─────┤ │The value for money was good $@Role│0 │ -├───────────────────────────────────────────────────────────┼─────┤ │The staff were slow in responding $@Role│0 │ -├───────────────────────────────────────────────────────────┼─────┤ │My concerns were dealt with in an efficient manner $@Role│0 │ -├───────────────────────────────────────────────────────────┼─────┤ │There was too much noise in the rooms $@Role│0 │ ╰───────────────────────────────────────────────────────────┴─────╯ diff --git a/rust/pspp/src/sys/testdata/type_4_record_names_long_string_variable.expected b/rust/pspp/src/sys/testdata/type_4_record_names_long_string_variable.expected index 92893de8dc..0557cb3a93 100644 --- a/rust/pspp/src/sys/testdata/type_4_record_names_long_string_variable.expected +++ b/rust/pspp/src/sys/testdata/type_4_record_names_long_string_variable.expected @@ -2,11 +2,8 @@ At offsets 0xf4...0x114, record types 3 and 4 may not add value labels to one or ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/unknown_encoding.expected b/rust/pspp/src/sys/testdata/unknown_encoding.expected index 5d5780ec9f..eaafa3a2de 100644 --- a/rust/pspp/src/sys/testdata/unknown_encoding.expected +++ b/rust/pspp/src/sys/testdata/unknown_encoding.expected @@ -4,11 +4,8 @@ Text string contains invalid bytes for UTF-8 encoding: "PSPP synthetic test file ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │None │ -├────────────────┼────────────────────────┤ │Number of Cases │ 0│ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/unknown_extension_record.expected b/rust/pspp/src/sys/testdata/unknown_extension_record.expected index e5553f3573..c9f669d425 100644 --- a/rust/pspp/src/sys/testdata/unknown_extension_record.expected +++ b/rust/pspp/src/sys/testdata/unknown_extension_record.expected @@ -2,11 +2,8 @@ Unknown extension record with subtype 30 at offset 0xe0, consisting of 1 1-byte ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/unquoted_attribute_value.expected b/rust/pspp/src/sys/testdata/unquoted_attribute_value.expected index 9242f8b640..4772f43404 100644 --- a/rust/pspp/src/sys/testdata/unquoted_attribute_value.expected +++ b/rust/pspp/src/sys/testdata/unquoted_attribute_value.expected @@ -4,11 +4,8 @@ Warning at file offsets 0xfd to 0x10f: In file or variable attribute record: Att ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ @@ -28,6 +25,5 @@ Data File and Variable Attributes │Variable and Name │Value│ ├──────────────────┼─────┤ │(dataset) Attr1 │value│ -├──────────────────┼─────┤ │firstvar fred │23 │ ╰──────────────────┴─────╯ diff --git a/rust/pspp/src/sys/testdata/unspecified_number_of_variable_positions.expected b/rust/pspp/src/sys/testdata/unspecified_number_of_variable_positions.expected index 4887a92ec6..a5c9719fb4 100644 --- a/rust/pspp/src/sys/testdata/unspecified_number_of_variable_positions.expected +++ b/rust/pspp/src/sys/testdata/unspecified_number_of_variable_positions.expected @@ -1,10 +1,7 @@ ╭────────────────┬────────────────────────╮ │Created │ 05-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │None │ -├────────────────┼────────────────────────┤ │Number of Cases │ 1│ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/value_label_variable_indexes_must_be_in_correct_range.expected b/rust/pspp/src/sys/testdata/value_label_variable_indexes_must_be_in_correct_range.expected index 71239f97f0..3ee8473f04 100644 --- a/rust/pspp/src/sys/testdata/value_label_variable_indexes_must_be_in_correct_range.expected +++ b/rust/pspp/src/sys/testdata/value_label_variable_indexes_must_be_in_correct_range.expected @@ -6,11 +6,8 @@ Warning at file offsets 0x160 to 0x168: In value label record: One or more varia ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/value_label_variable_indexes_must_not_be_long_string_continuation.expected b/rust/pspp/src/sys/testdata/value_label_variable_indexes_must_not_be_long_string_continuation.expected index 3e2e93e63b..bf84c4b907 100644 --- a/rust/pspp/src/sys/testdata/value_label_variable_indexes_must_not_be_long_string_continuation.expected +++ b/rust/pspp/src/sys/testdata/value_label_variable_indexes_must_not_be_long_string_continuation.expected @@ -2,11 +2,8 @@ Warning at file offsets 0x110 to 0x114: In value label record: One or more varia ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/value_label_with_no_associated_variables.expected b/rust/pspp/src/sys/testdata/value_label_with_no_associated_variables.expected index f589de6a60..97b241de86 100644 --- a/rust/pspp/src/sys/testdata/value_label_with_no_associated_variables.expected +++ b/rust/pspp/src/sys/testdata/value_label_with_no_associated_variables.expected @@ -4,11 +4,8 @@ This system file does not indicate its own character encoding. For best results ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/value_labels.expected b/rust/pspp/src/sys/testdata/value_labels.expected index 8b862448c8..bbb0869f7c 100644 --- a/rust/pspp/src/sys/testdata/value_labels.expected +++ b/rust/pspp/src/sys/testdata/value_labels.expected @@ -1,11 +1,8 @@ ╭────────────────┬────────────────────────╮ │Created │ 05-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ │ Version │1.2.3 │ -├────────────────┼────────────────────────┤ │Compression │None │ -├────────────────┼────────────────────────┤ │Number of Cases │ 0│ ╰────────────────┴────────────────────────╯ @@ -42,55 +39,39 @@ │Variable Value │ │ ├───────────────────────┼───────────────────────────────────────────────────────────────┤ │num1 1 │один (in Russian) │ -├───────────────────────┼───────────────────────────────────────────────────────────────┤ │num2 1 │one │ │ 2 │two │ -├───────────────────────┼───────────────────────────────────────────────────────────────┤ │num3 3 │three │ │ 4 │four │ -├───────────────────────┼───────────────────────────────────────────────────────────────┤ │num4 5 │five │ │ 7 │seven │ │ 8 │eight │ │ 9 │nine │ -├───────────────────────┼───────────────────────────────────────────────────────────────┤ │num5 6 │six │ │ 7 │seven │ │ 8 │eight │ │ 10 │ten │ -├───────────────────────┼───────────────────────────────────────────────────────────────┤ │str1 a │value label for `a' │ -├───────────────────────┼───────────────────────────────────────────────────────────────┤ │str2 bc │value label for `bc' │ │ de │value label for `de' │ -├───────────────────────┼───────────────────────────────────────────────────────────────┤ │str3 fgh │value label for `fgh' │ │ ijk │value label for `ijk' │ -├───────────────────────┼───────────────────────────────────────────────────────────────┤ │str4 BCDE │value label for `BCDE' │ │ lmno │value label for `lmno' │ │ tuvw │value label for `tuvw' │ │ xyzA │value label for `xyzA' │ -├───────────────────────┼───────────────────────────────────────────────────────────────┤ │str5 FGHI │value label for `FGHI' │ │ pqrs │value label for `pqrs' │ │ tuvw │value label for `tuvw' │ │ xyzA │value label for `xyzA' │ -├───────────────────────┼───────────────────────────────────────────────────────────────┤ │str6 JKLMNO │value label for `JKLMNO' │ -├───────────────────────┼───────────────────────────────────────────────────────────────┤ │str7 JKLMNOP │value label for `JKLMNOP' │ -├───────────────────────┼───────────────────────────────────────────────────────────────┤ │str8 JKLMNOPQ │value label for `JKLMNOPQ' │ -├───────────────────────┼───────────────────────────────────────────────────────────────┤ │str9ж RSTUVWXYZ │value label for `RSTUVWXYZ' │ -├───────────────────────┼───────────────────────────────────────────────────────────────┤ │str12 0123456789ab │value label for `0123456789ab' │ │ cdefghijklmn │value label for `cdefghijklmn' │ -├───────────────────────┼───────────────────────────────────────────────────────────────┤ │str16 EFGHIJKLMNOPQRST │value label for `EFGHIJKLMNOPQRST' │ │ UVWXYZ0123456789 │value label for `UVWXYZ0123456789' with Cyrillic letters: `фхц'│ │ opqrstuvwxyzABCD │value label for `opqrstuvwxyzABCD' │ -├───────────────────────┼───────────────────────────────────────────────────────────────┤ │str17 abcdefghijklmnopq│value label for `abcdefghijklmnopq' │ ╰───────────────────────┴───────────────────────────────────────────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/variable_display_with_width.expected b/rust/pspp/src/sys/testdata/variable_display_with_width.expected index 1c24450e15..6de54865e7 100644 --- a/rust/pspp/src/sys/testdata/variable_display_with_width.expected +++ b/rust/pspp/src/sys/testdata/variable_display_with_width.expected @@ -1,10 +1,7 @@ ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │None │ -├────────────────┼────────────────────────┤ │Number of Cases │ 0│ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/variable_display_without_width.expected b/rust/pspp/src/sys/testdata/variable_display_without_width.expected index a215257b14..cd856f3429 100644 --- a/rust/pspp/src/sys/testdata/variable_display_without_width.expected +++ b/rust/pspp/src/sys/testdata/variable_display_without_width.expected @@ -1,10 +1,7 @@ ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │None │ -├────────────────┼────────────────────────┤ │Number of Cases │ 0│ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/variable_labels_and_missing_values.expected b/rust/pspp/src/sys/testdata/variable_labels_and_missing_values.expected index ea8895f26b..ec78fafd05 100644 --- a/rust/pspp/src/sys/testdata/variable_labels_and_missing_values.expected +++ b/rust/pspp/src/sys/testdata/variable_labels_and_missing_values.expected @@ -1,11 +1,8 @@ ╭────────────────┬────────────────────────╮ │Created │ 05-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ │ Version │1.2.3 │ -├────────────────┼────────────────────────┤ │Compression │None │ -├────────────────┼────────────────────────┤ │Number of Cases │ 1│ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/variable_roles.expected b/rust/pspp/src/sys/testdata/variable_roles.expected index a63a1d0fce..72ac29c9b9 100644 --- a/rust/pspp/src/sys/testdata/variable_roles.expected +++ b/rust/pspp/src/sys/testdata/variable_roles.expected @@ -2,12 +2,9 @@ Unknown role "6". ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ │ Version │1.2.3 │ -├────────────────┼────────────────────────┤ │Compression │None │ -├────────────────┼────────────────────────┤ │Number of Cases │ 0│ ╰────────────────┴────────────────────────╯ @@ -34,16 +31,10 @@ Data File and Variable Attributes │Variable and Name │Value│ ├──────────────────┼─────┤ │i $@Role │0 │ -├──────────────────┼─────┤ │o $@Role │1 │ -├──────────────────┼─────┤ │b $@Role │2 │ -├──────────────────┼─────┤ │n $@Role │3 │ -├──────────────────┼─────┤ │p $@Role │4 │ -├──────────────────┼─────┤ │s $@Role │5 │ -├──────────────────┼─────┤ │x $@Role │6 │ ╰──────────────────┴─────╯ diff --git a/rust/pspp/src/sys/testdata/variable_sets.expected b/rust/pspp/src/sys/testdata/variable_sets.expected index 191fc2f3b9..fac504d957 100644 --- a/rust/pspp/src/sys/testdata/variable_sets.expected +++ b/rust/pspp/src/sys/testdata/variable_sets.expected @@ -1,11 +1,8 @@ ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ │ Version │1.2.3 │ -├────────────────┼────────────────────────┤ │Compression │None │ -├────────────────┼────────────────────────┤ │Number of Cases │ 0│ ╰────────────────┴────────────────────────╯ @@ -37,21 +34,17 @@ │Variable Set 1 1 │あ │ │ 2 │b │ │ 3 │c │ -├──────────────────────────┼────────┤ │vs2 1 │d │ │ 2 │e │ │ 3 │f │ │ 4 │g │ -├──────────────────────────┼────────┤ │c 1 │h │ │ 2 │i │ │ 3 │j │ -├──────────────────────────┼────────┤ │d 1 │e │ │ 2 │g │ │ 3 │i │ │ 4 │b │ │ 5 │f │ -├──────────────────────────┼────────┤ │Empty Variable Set n/a │(empty) │ ╰──────────────────────────┴────────╯ diff --git a/rust/pspp/src/sys/testdata/variable_sets_unknown_variable.expected b/rust/pspp/src/sys/testdata/variable_sets_unknown_variable.expected index 62baaed631..7c394e331a 100644 --- a/rust/pspp/src/sys/testdata/variable_sets_unknown_variable.expected +++ b/rust/pspp/src/sys/testdata/variable_sets_unknown_variable.expected @@ -4,12 +4,9 @@ Variable set "vs2" includes unknown variable foo. ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ │ Version │1.2.3 │ -├────────────────┼────────────────────────┤ │Compression │None │ -├────────────────┼────────────────────────┤ │Number of Cases │ 0│ ╰────────────────┴────────────────────────╯ @@ -41,7 +38,6 @@ Variable set "vs2" includes unknown variable foo. │Variable Set 1 1 │あ │ │ 2 │b │ │ 3 │c │ -├──────────────────────────┼────────┤ │vs2 1 │d │ │ 2 │e │ │ 3 │f │ diff --git a/rust/pspp/src/sys/testdata/variables_for_value_label_must_all_be_same_type.expected b/rust/pspp/src/sys/testdata/variables_for_value_label_must_all_be_same_type.expected index acdddd94c2..f4438551b3 100644 --- a/rust/pspp/src/sys/testdata/variables_for_value_label_must_all_be_same_type.expected +++ b/rust/pspp/src/sys/testdata/variables_for_value_label_must_all_be_same_type.expected @@ -2,11 +2,8 @@ Warning at file offsets 0x110 to 0x118: In value label record: First variable in ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/very_long_strings.expected b/rust/pspp/src/sys/testdata/very_long_strings.expected index fba47dda14..e8100ddd24 100644 --- a/rust/pspp/src/sys/testdata/very_long_strings.expected +++ b/rust/pspp/src/sys/testdata/very_long_strings.expected @@ -1,11 +1,8 @@ ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ │ Version │1.2.3 │ -├────────────────┼────────────────────────┤ │Compression │None │ -├────────────────┼────────────────────────┤ │Number of Cases │ 1│ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/weight_must_be_numeric.expected b/rust/pspp/src/sys/testdata/weight_must_be_numeric.expected index b82e90af79..44219acbba 100644 --- a/rust/pspp/src/sys/testdata/weight_must_be_numeric.expected +++ b/rust/pspp/src/sys/testdata/weight_must_be_numeric.expected @@ -2,11 +2,8 @@ File designates string variable STR1 (index 2) as weight variable, but weight va ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/weight_variable_bad_index.expected b/rust/pspp/src/sys/testdata/weight_variable_bad_index.expected index bb4c5df8fd..2288633890 100644 --- a/rust/pspp/src/sys/testdata/weight_variable_bad_index.expected +++ b/rust/pspp/src/sys/testdata/weight_variable_bad_index.expected @@ -2,11 +2,8 @@ File weight variable index 3 is invalid because it exceeds maximum variable inde ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/weight_variable_continuation.expected b/rust/pspp/src/sys/testdata/weight_variable_continuation.expected index 1e362b02ac..1ad49fb7c0 100644 --- a/rust/pspp/src/sys/testdata/weight_variable_continuation.expected +++ b/rust/pspp/src/sys/testdata/weight_variable_continuation.expected @@ -2,11 +2,8 @@ File weight variable index 2 is invalid because it refers to long string continu ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/write-numeric-simple.expected b/rust/pspp/src/sys/testdata/write-numeric-simple.expected index c35ad0985f..7b66ae18a4 100644 --- a/rust/pspp/src/sys/testdata/write-numeric-simple.expected +++ b/rust/pspp/src/sys/testdata/write-numeric-simple.expected @@ -1,11 +1,8 @@ ╭────────────────┬────────────────────╮ │Created │30-JUL-2025 15:07:55│ -├────────────────┼────────────────────┤ │Writer Product │PSPP TEST DATA FILE │ │ Version │1.2.3 │ -├────────────────┼────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────┤ │Number of Cases │ 8│ ╰────────────────┴────────────────────╯ @@ -28,11 +25,8 @@ Data File and Variable Attributes │Variable and Name │Value│ ├──────────────────┼─────┤ │variable0 $@Role │0 │ -├──────────────────┼─────┤ │variable1 $@Role │0 │ -├──────────────────┼─────┤ │variable2 $@Role │0 │ -├──────────────────┼─────┤ │variable3 $@Role │0 │ ╰──────────────────┴─────╯ diff --git a/rust/pspp/src/sys/testdata/write-numeric-uncompressed.expected b/rust/pspp/src/sys/testdata/write-numeric-uncompressed.expected index 7d4e43cc96..6db854f244 100644 --- a/rust/pspp/src/sys/testdata/write-numeric-uncompressed.expected +++ b/rust/pspp/src/sys/testdata/write-numeric-uncompressed.expected @@ -1,11 +1,8 @@ ╭────────────────┬────────────────────╮ │Created │30-JUL-2025 15:07:55│ -├────────────────┼────────────────────┤ │Writer Product │PSPP TEST DATA FILE │ │ Version │1.2.3 │ -├────────────────┼────────────────────┤ │Compression │None │ -├────────────────┼────────────────────┤ │Number of Cases │ 8│ ╰────────────────┴────────────────────╯ @@ -28,11 +25,8 @@ Data File and Variable Attributes │Variable and Name │Value│ ├──────────────────┼─────┤ │variable0 $@Role │0 │ -├──────────────────┼─────┤ │variable1 $@Role │0 │ -├──────────────────┼─────┤ │variable2 $@Role │0 │ -├──────────────────┼─────┤ │variable3 $@Role │0 │ ╰──────────────────┴─────╯ diff --git a/rust/pspp/src/sys/testdata/write-numeric-zlib.expected b/rust/pspp/src/sys/testdata/write-numeric-zlib.expected index b6d9c98970..184e7141bd 100644 --- a/rust/pspp/src/sys/testdata/write-numeric-zlib.expected +++ b/rust/pspp/src/sys/testdata/write-numeric-zlib.expected @@ -1,11 +1,8 @@ ╭────────────────┬────────────────────╮ │Created │30-JUL-2025 15:07:55│ -├────────────────┼────────────────────┤ │Writer Product │PSPP TEST DATA FILE │ │ Version │1.2.3 │ -├────────────────┼────────────────────┤ │Compression │ZSAV │ -├────────────────┼────────────────────┤ │Number of Cases │ 8│ ╰────────────────┴────────────────────╯ @@ -28,11 +25,8 @@ Data File and Variable Attributes │Variable and Name │Value│ ├──────────────────┼─────┤ │variable0 $@Role │0 │ -├──────────────────┼─────┤ │variable1 $@Role │0 │ -├──────────────────┼─────┤ │variable2 $@Role │0 │ -├──────────────────┼─────┤ │variable3 $@Role │0 │ ╰──────────────────┴─────╯ diff --git a/rust/pspp/src/sys/testdata/write-string-simple.expected b/rust/pspp/src/sys/testdata/write-string-simple.expected index a1413fc88b..e736451c0c 100644 --- a/rust/pspp/src/sys/testdata/write-string-simple.expected +++ b/rust/pspp/src/sys/testdata/write-string-simple.expected @@ -1,11 +1,8 @@ ╭────────────────┬────────────────────╮ │Created │30-JUL-2025 15:07:55│ -├────────────────┼────────────────────┤ │Writer Product │PSPP TEST DATA FILE │ │ Version │1.2.3 │ -├────────────────┼────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────┤ │Number of Cases │ 2│ ╰────────────────┴────────────────────╯ @@ -29,13 +26,9 @@ Data File and Variable Attributes │Variable and Name │Value│ ├──────────────────┼─────┤ │s1 $@Role │0 │ -├──────────────────┼─────┤ │s2 $@Role │0 │ -├──────────────────┼─────┤ │s3 $@Role │0 │ -├──────────────────┼─────┤ │s4 $@Role │0 │ -├──────────────────┼─────┤ │s566 $@Role │0 │ ╰──────────────────┴─────╯ diff --git a/rust/pspp/src/sys/testdata/write-string-uncompressed.expected b/rust/pspp/src/sys/testdata/write-string-uncompressed.expected index 17d39b4134..5f596e9d08 100644 --- a/rust/pspp/src/sys/testdata/write-string-uncompressed.expected +++ b/rust/pspp/src/sys/testdata/write-string-uncompressed.expected @@ -1,11 +1,8 @@ ╭────────────────┬────────────────────╮ │Created │30-JUL-2025 15:07:55│ -├────────────────┼────────────────────┤ │Writer Product │PSPP TEST DATA FILE │ │ Version │1.2.3 │ -├────────────────┼────────────────────┤ │Compression │None │ -├────────────────┼────────────────────┤ │Number of Cases │ 2│ ╰────────────────┴────────────────────╯ @@ -29,13 +26,9 @@ Data File and Variable Attributes │Variable and Name │Value│ ├──────────────────┼─────┤ │s1 $@Role │0 │ -├──────────────────┼─────┤ │s2 $@Role │0 │ -├──────────────────┼─────┤ │s3 $@Role │0 │ -├──────────────────┼─────┤ │s4 $@Role │0 │ -├──────────────────┼─────┤ │s566 $@Role │0 │ ╰──────────────────┴─────╯ diff --git a/rust/pspp/src/sys/testdata/write-string-zlib.expected b/rust/pspp/src/sys/testdata/write-string-zlib.expected index 9549d0636c..21c11eede6 100644 --- a/rust/pspp/src/sys/testdata/write-string-zlib.expected +++ b/rust/pspp/src/sys/testdata/write-string-zlib.expected @@ -1,11 +1,8 @@ ╭────────────────┬────────────────────╮ │Created │30-JUL-2025 15:07:55│ -├────────────────┼────────────────────┤ │Writer Product │PSPP TEST DATA FILE │ │ Version │1.2.3 │ -├────────────────┼────────────────────┤ │Compression │ZSAV │ -├────────────────┼────────────────────┤ │Number of Cases │ 2│ ╰────────────────┴────────────────────╯ @@ -29,13 +26,9 @@ Data File and Variable Attributes │Variable and Name │Value│ ├──────────────────┼─────┤ │s1 $@Role │0 │ -├──────────────────┼─────┤ │s2 $@Role │0 │ -├──────────────────┼─────┤ │s3 $@Role │0 │ -├──────────────────┼─────┤ │s4 $@Role │0 │ -├──────────────────┼─────┤ │s566 $@Role │0 │ ╰──────────────────┴─────╯ diff --git a/rust/pspp/src/sys/testdata/wrong_display_alignment.expected b/rust/pspp/src/sys/testdata/wrong_display_alignment.expected index 91ce270678..c429dc3aea 100644 --- a/rust/pspp/src/sys/testdata/wrong_display_alignment.expected +++ b/rust/pspp/src/sys/testdata/wrong_display_alignment.expected @@ -2,11 +2,8 @@ Warning at file offsets 0xe0 to 0xe8: In variable display record: Invalid variab ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/wrong_display_measurement_level.expected b/rust/pspp/src/sys/testdata/wrong_display_measurement_level.expected index 32e9b53046..f338681648 100644 --- a/rust/pspp/src/sys/testdata/wrong_display_measurement_level.expected +++ b/rust/pspp/src/sys/testdata/wrong_display_measurement_level.expected @@ -2,11 +2,8 @@ Warning at file offsets 0xe0 to 0xe8: In variable display record: Invalid variab ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/wrong_display_parameter_count.expected b/rust/pspp/src/sys/testdata/wrong_display_parameter_count.expected index eb0efddf15..08d48218a3 100644 --- a/rust/pspp/src/sys/testdata/wrong_display_parameter_count.expected +++ b/rust/pspp/src/sys/testdata/wrong_display_parameter_count.expected @@ -2,11 +2,8 @@ Warning at file offsets 0xe0 to 0xf0: In variable display record: Record contain ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/wrong_display_parameter_size.expected b/rust/pspp/src/sys/testdata/wrong_display_parameter_size.expected index d56cab89f9..00267a6b8a 100644 --- a/rust/pspp/src/sys/testdata/wrong_display_parameter_size.expected +++ b/rust/pspp/src/sys/testdata/wrong_display_parameter_size.expected @@ -2,11 +2,8 @@ Warning at file offsets 0xe0 to 0xf0: In extension record: variable display reco ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/wrong_special_floats.expected b/rust/pspp/src/sys/testdata/wrong_special_floats.expected index 05f92769ac..441213f4c9 100644 --- a/rust/pspp/src/sys/testdata/wrong_special_floats.expected +++ b/rust/pspp/src/sys/testdata/wrong_special_floats.expected @@ -6,11 +6,8 @@ System file specifies value 2.0 (0x1.0p1) as LOWEST but -1.7976931348623157e308 ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/wrong_variable_positions.expected b/rust/pspp/src/sys/testdata/wrong_variable_positions.expected index 8584783afe..26061f90d3 100644 --- a/rust/pspp/src/sys/testdata/wrong_variable_positions.expected +++ b/rust/pspp/src/sys/testdata/wrong_variable_positions.expected @@ -2,11 +2,8 @@ File header claims 2 variable positions but 1 were read from file. ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/wrong_variable_positions_but_v13.expected b/rust/pspp/src/sys/testdata/wrong_variable_positions_but_v13.expected index ac2ef8a9c7..62880ff3b6 100644 --- a/rust/pspp/src/sys/testdata/wrong_variable_positions_but_v13.expected +++ b/rust/pspp/src/sys/testdata/wrong_variable_positions_but_v13.expected @@ -1,11 +1,8 @@ ╭────────────────┬────────────────────────╮ │Created │ 05-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ │ Version │13.2.3 │ -├────────────────┼────────────────────────┤ │Compression │None │ -├────────────────┼────────────────────────┤ │Number of Cases │ 1│ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/zcompressed_data.expected b/rust/pspp/src/sys/testdata/zcompressed_data.expected index 34178bfb2c..3c90940ebb 100644 --- a/rust/pspp/src/sys/testdata/zcompressed_data.expected +++ b/rust/pspp/src/sys/testdata/zcompressed_data.expected @@ -1,10 +1,7 @@ ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │ZSAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/zcompressed_data_uncompressed_size_block_size.expected b/rust/pspp/src/sys/testdata/zcompressed_data_uncompressed_size_block_size.expected index f517017aba..f1fc66b686 100644 --- a/rust/pspp/src/sys/testdata/zcompressed_data_uncompressed_size_block_size.expected +++ b/rust/pspp/src/sys/testdata/zcompressed_data_uncompressed_size_block_size.expected @@ -2,11 +2,8 @@ Warning at file offsets 0x1c4 to 0x1dc: In ZLIB trailer: Block descriptor 0 repo ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │ZSAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/testdata/zero_or_one_variable_in_mrset.expected b/rust/pspp/src/sys/testdata/zero_or_one_variable_in_mrset.expected index 445817aaf2..1cca4744b8 100644 --- a/rust/pspp/src/sys/testdata/zero_or_one_variable_in_mrset.expected +++ b/rust/pspp/src/sys/testdata/zero_or_one_variable_in_mrset.expected @@ -4,11 +4,8 @@ Multiple response set $b has no variables. ╭────────────────┬────────────────────────╮ │Created │ 01-JAN-2011 20:53:52│ -├────────────────┼────────────────────────┤ │Writer Product │PSPP synthetic test file│ -├────────────────┼────────────────────────┤ │Compression │SAV │ -├────────────────┼────────────────────────┤ │Number of Cases │Unknown │ ╰────────────────┴────────────────────────╯ diff --git a/rust/pspp/src/sys/tests.rs b/rust/pspp/src/sys/tests.rs index 1fb63e4f9a..5177db530c 100644 --- a/rust/pspp/src/sys/tests.rs +++ b/rust/pspp/src/sys/tests.rs @@ -241,7 +241,18 @@ fn bad_machine_integer_info_float_format() { #[test] fn bad_machine_integer_info_endianness() { - test_sack_sysfile("bad_machine_integer_info_endianness"); + let input_filename = Path::new("src/sys/testdata") + .join("bad_machine_integer_info_endianness") + .with_extension("sack"); + let input = String::from_utf8(std::fs::read(&input_filename).unwrap()).unwrap(); + for (endian, extension) in [(Endian::Big, "big"), (Endian::Little, "little")] { + let expected_filename = input_filename + .with_extension(extension) + .with_added_extension("expected"); + let expected = String::from_utf8(std::fs::read(&expected_filename).unwrap()).unwrap(); + let sysfile = sack(&input, Some(&input_filename), endian).unwrap(); + test_sysfile(Cursor::new(sysfile), &expected, &expected_filename); + } } #[test]