first working attempt

This commit is contained in:
jan 2025-04-12 12:06:36 -07:00
commit e2ba1390c6

View file

@ -20,35 +20,54 @@ use std::collections::HashMap;
//use std::io::Write;
use arrow::array::{
StructBuilder, ListBuilder, StringBuilder, ArrayBuilder, Float64Builder, BooleanBuilder,
Int32Builder, Int16Builder, UInt32Builder, UInt8Builder,
StructBuilder, FixedSizeListBuilder, ListBuilder, StringBuilder, ArrayBuilder, BooleanBuilder,
Int32Builder, Int16Builder, UInt32Builder, UInt8Builder, Float64Builder,
};
pub type DListBuilder = ListBuilder<Box<dyn ArrayBuilder>>;
pub type FListBuilder = FixedSizeListBuilder<Box<dyn ArrayBuilder>>;
pub fn read_elements<'a>(input: &'a [u8], cell_builder: &mut StructBuilder, names: &mut HashMap<String, u32>) -> IResult<'a, ()> {
let (mut input, mut header) = RecordHeader::read(input)?;
let mut input = input;
let (_, mut header) = RecordHeader::read(input)?; // don't consume tag
while header.tag != records::RTAG_ENDSTR {
match header.tag {
records::RTAG_BOUNDARY => {(input, _) = read_boundary(input, cell_builder)?;},
records::RTAG_PATH => {read_path(input, cell_builder)?;},
records::RTAG_NODE => {read_boxnode(input, cell_builder, header.tag)?;},
records::RTAG_BOX => {read_boxnode(input, cell_builder, header.tag)?;},
records::RTAG_TEXT => {read_text(input, cell_builder)?;},
records::RTAG_SREF => {read_ref(input, cell_builder, header.tag, names)?;},
records::RTAG_AREF => {read_ref(input, cell_builder, header.tag, names)?;},
(input, _) = match header.tag {
records::RTAG_SREF => read_ref(input, cell_builder, header.tag, names)?,
records::RTAG_AREF => read_ref(input, cell_builder, header.tag, names)?,
records::RTAG_BOUNDARY => read_boundary(input, cell_builder)?,
records::RTAG_PATH => read_path(input, cell_builder)?,
records::RTAG_NODE => read_boxnode(input, cell_builder, header.tag)?,
records::RTAG_BOX => read_boxnode(input, cell_builder, header.tag)?,
records::RTAG_TEXT => read_text(input, cell_builder)?,
_ => {
// don't care, skip
(input, _) = take_bytes(input, header.data_size)?;
let result = take_bytes(input, header.data_size + 4)?;
(result.0, ())
}
}
(input, header) = RecordHeader::read(input)?;
};
(_, header) = RecordHeader::read(input)?; // don't consume tag
}
(input, _) = take_bytes(input, 4_usize)?; // consume endstr tag
let refs_builder = cell_builder.field_builder::<DListBuilder>(2).unwrap();
refs_builder.append(true);
let boundaries_builder = cell_builder.field_builder::<DListBuilder>(3).unwrap();
boundaries_builder.append(true);
let paths_builder = cell_builder.field_builder::<DListBuilder>(4).unwrap();
paths_builder.append(true);
let nodes_builder = cell_builder.field_builder::<DListBuilder>(5).unwrap();
nodes_builder.append(true);
let boxes_builder = cell_builder.field_builder::<DListBuilder>(6).unwrap();
boxes_builder.append(true);
let texts_builder = cell_builder.field_builder::<DListBuilder>(7).unwrap();
texts_builder.append(true);
Ok((input, ()))
}
pub fn read_boundary<'a>(input: &'a [u8], cell_builder: &mut StructBuilder) -> IResult<'a, ()> {
let boundaries_builder = cell_builder.field_builder::<DListBuilder>(3).unwrap();
let boundary_builder = boundaries_builder.values().as_any_mut().downcast_mut::<StructBuilder>().unwrap();
@ -75,7 +94,6 @@ pub fn read_boundary<'a>(input: &'a [u8], cell_builder: &mut StructBuilder) -> I
let (input, ()) = read_properties(input, props_builder)?;
boundary_builder.append(true);
boundaries_builder.append(true);
Ok((input, ()))
}
@ -84,7 +102,6 @@ pub fn read_path<'a>(input: &'a [u8], cell_builder: &mut StructBuilder) -> IResu
let paths_builder = cell_builder.field_builder::<DListBuilder>(4).unwrap();
let path_builder = paths_builder.values().as_any_mut().downcast_mut::<StructBuilder>().unwrap();
let (input, _) = records::PATH::read(input)?;
let (input, layer) = LAYER::skip_and_read(input)?;
@ -137,7 +154,7 @@ pub fn read_path<'a>(input: &'a [u8], cell_builder: &mut StructBuilder) -> IResu
width_builder.append_option(width);
let xys_builder = path_builder.field_builder::<DListBuilder>(6).unwrap();
let (input, xy_iter) = XY::read(input)?;
let (input, xy_iter) = XY::read_data(input, header.data_size)?;
for xy in xy_iter {
let xy_builder = xys_builder.values().as_any_mut().downcast_mut::<Int32Builder>().unwrap();
xy_builder.append_value(xy);
@ -148,7 +165,6 @@ pub fn read_path<'a>(input: &'a [u8], cell_builder: &mut StructBuilder) -> IResu
let (input, ()) = read_properties(input, props_builder)?;
path_builder.append(true);
paths_builder.append(true);
Ok((input, ()))
}
@ -192,7 +208,6 @@ pub fn read_boxnode<'a>(input: &'a [u8], cell_builder: &mut StructBuilder, tag:
let (input, ()) = read_properties(input, props_builder)?;
boxnode_builder.append(true);
boxnodes_builder.append(true);
Ok((input, ()))
}
@ -200,7 +215,6 @@ pub fn read_text<'a>(input: &'a [u8], cell_builder: &mut StructBuilder) -> IResu
let texts_builder = cell_builder.field_builder::<DListBuilder>(7).unwrap();
let text_builder = texts_builder.values().as_any_mut().downcast_mut::<StructBuilder>().unwrap();
let mut path_type = None;
let mut pres_hori = None;
let mut pres_vert = None;
@ -277,7 +291,7 @@ pub fn read_text<'a>(input: &'a [u8], cell_builder: &mut StructBuilder) -> IResu
let angle_builder = text_builder.field_builder::<Float64Builder>(9).unwrap();
angle_builder.append_option(angle_deg);
let (input, mut xy_iter) = XY::read(input)?;
let (input, mut xy_iter) = XY::read_data(input, header.data_size)?;
let x_builder = text_builder.field_builder::<Int32Builder>(10).unwrap();
x_builder.append_value(xy_iter.next().unwrap());
let y_builder = text_builder.field_builder::<Int32Builder>(11).unwrap();
@ -288,19 +302,24 @@ pub fn read_text<'a>(input: &'a [u8], cell_builder: &mut StructBuilder) -> IResu
let string_builder = text_builder.field_builder::<StringBuilder>(12).unwrap();
string_builder.append_value(string);
let props_builder = text_builder.field_builder::<DListBuilder>(13).unwrap();
let props_builder = text_builder.field_builder::<DListBuilder>(13).unwrap();
let (input, ()) = read_properties(input, props_builder)?;
text_builder.append(true);
texts_builder.append(true);
Ok((input, ()))
}
pub fn read_ref<'a>(input: &'a [u8], cell_builder: &mut StructBuilder, tag: u16, names: &mut HashMap<String, u32>) -> IResult<'a, ()> {
let (input, _) = match tag {
records::RTAG_SREF => records::SREF::read(input)?,
records::RTAG_AREF => records::AREF::read(input)?,
_ => return fail(input, format!("Unexpected tag {:04x}", tag)),
};
let is_aref = tag == records::RTAG_AREF;
let refs_builder = cell_builder.field_builder::<DListBuilder>(7).unwrap();
let refs_builder = cell_builder.field_builder::<DListBuilder>(2).unwrap();
let ref_builder = refs_builder.values().as_any_mut().downcast_mut::<StructBuilder>().unwrap();
let mut invert_y = None;
@ -361,6 +380,7 @@ pub fn read_ref<'a>(input: &'a [u8], cell_builder: &mut StructBuilder, tag: u16,
y_builder.append_value(xy_iter.next().unwrap());
let rep_builder = ref_builder.field_builder::<StructBuilder>(6).unwrap();
println!("ref, {is_aref:?}");
if is_aref {
let x0_builder = rep_builder.field_builder::<Int32Builder>(0).unwrap();
x0_builder.append_value(xy_iter.next().unwrap());
@ -380,6 +400,19 @@ pub fn read_ref<'a>(input: &'a [u8], cell_builder: &mut StructBuilder, tag: u16,
count1_builder.append_value(count1);
},
}
} else {
let x0_builder = rep_builder.field_builder::<Int32Builder>(0).unwrap();
x0_builder.append_null();
let y0_builder = rep_builder.field_builder::<Int32Builder>(1).unwrap();
y0_builder.append_null();
let x1_builder = rep_builder.field_builder::<Int32Builder>(2).unwrap();
x1_builder.append_null();
let y1_builder = rep_builder.field_builder::<Int32Builder>(3).unwrap();
y1_builder.append_null();
let count0_builder = rep_builder.field_builder::<Int16Builder>(4).unwrap();
count0_builder.append_null();
let count1_builder = rep_builder.field_builder::<Int16Builder>(5).unwrap();
count1_builder.append_null();
}
rep_builder.append(is_aref);
@ -387,7 +420,6 @@ pub fn read_ref<'a>(input: &'a [u8], cell_builder: &mut StructBuilder, tag: u16,
let (input, ()) = read_properties(input, props_builder)?;
ref_builder.append(true);
refs_builder.append(true);
Ok((input, ()))
}
@ -405,7 +437,6 @@ pub fn read_ref<'a>(input: &'a [u8], cell_builder: &mut StructBuilder, tag: u16,
/// propattr: -> propvalue mapping
///
pub fn read_properties<'a>(input: &'a [u8], props_builder: &mut DListBuilder) -> IResult<'a, ()> {
let prop_builder = props_builder.values().as_any_mut().downcast_mut::<StructBuilder>().unwrap();
let (mut input, mut header) = RecordHeader::read(input)?;
while header.tag != ENDEL::tag() {
@ -418,6 +449,7 @@ pub fn read_properties<'a>(input: &'a [u8], props_builder: &mut DListBuilder) ->
let value = String::from_utf8(value_bytes).unwrap();
//assert!(!properties.contains_key(&key), "Duplicate property key: {}", key);
let prop_builder = props_builder.values().as_any_mut().downcast_mut::<StructBuilder>().unwrap();
let key_builder = prop_builder.field_builder::<Int16Builder>(0).unwrap();
key_builder.append_value(key);