Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

small refactoring around match #612

Merged
merged 5 commits into from
Jun 4, 2024
Merged

small refactoring around match #612

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
81ad7e0
small refactoring around match
tcoratger May 20, 2024
1bca751
Merge branch 'main' into match-refac
tcoratger Jun 4, 2024
14d3f2f
fix
tcoratger Jun 4, 2024
6469ae8
Merge branch 'main' into match-refac
igaray Jun 4, 2024
ecc072a
Merge branch 'main' into match-refac
igaray Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 3 additions & 17 deletions src/executor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -631,8 +631,9 @@ fn parse_result(
libc::free(ptr.cast().as_ptr());
value
},
CoreTypeConcrete::EcPoint(_) => JitValue::from_jit(return_ptr.unwrap(), type_id, registry),
CoreTypeConcrete::EcState(_) => JitValue::from_jit(return_ptr.unwrap(), type_id, registry),
CoreTypeConcrete::EcPoint(_) | CoreTypeConcrete::EcState(_) => {
JitValue::from_jit(return_ptr.unwrap(), type_id, registry)
}
CoreTypeConcrete::Felt252(_)
| CoreTypeConcrete::StarkNet(
StarkNetTypeConcrete::ClassHash(_)
Expand Down Expand Up @@ -715,7 +716,6 @@ fn parse_result(
value
}
},
CoreTypeConcrete::Uninitialized(_) => todo!(),
CoreTypeConcrete::Enum(info) => {
let (_, tag_layout, variant_layouts) =
crate::types::r#enum::get_layout_for_variants(registry, &info.variants).unwrap();
Expand Down Expand Up @@ -802,24 +802,10 @@ fn parse_result(
registry,
),
},
CoreTypeConcrete::Felt252DictEntry(_) => todo!(),
igaray marked this conversation as resolved.
Show resolved Hide resolved
CoreTypeConcrete::SquashedFelt252Dict(_) => todo!(),
CoreTypeConcrete::Span(_) => todo!(),
CoreTypeConcrete::Snapshot(_) => todo!(),
CoreTypeConcrete::Bytes31(_) => todo!(),
CoreTypeConcrete::Bitwise(_) => todo!(),
CoreTypeConcrete::Const(_) => todo!(),
CoreTypeConcrete::EcOp(_) => todo!(),
CoreTypeConcrete::GasBuiltin(_) => JitValue::Struct {
fields: Vec::new(),
debug_name: type_id.debug_name.as_deref().map(ToString::to_string),
},
CoreTypeConcrete::BuiltinCosts(_) => todo!(),
CoreTypeConcrete::RangeCheck(_) => todo!(),
CoreTypeConcrete::Pedersen(_) => todo!(),
CoreTypeConcrete::Poseidon(_) => todo!(),
CoreTypeConcrete::SegmentArena(_) => todo!(),
CoreTypeConcrete::BoundedInt(_) => todo!(),
_ => todo!(),
}
}
11 changes: 3 additions & 8 deletions tests/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ pub fn compare_outputs(
Some(&type_size) => type_size,
None => {
let type_size = match registry.get_type(ty).unwrap() {
CoreTypeConcrete::Array(_info) => 2,
CoreTypeConcrete::Array(_) | CoreTypeConcrete::EcPoint(_) => 2,
CoreTypeConcrete::Felt252(_)
| CoreTypeConcrete::Uint128(_)
| CoreTypeConcrete::Uint64(_)
Expand All @@ -324,7 +324,8 @@ pub fn compare_outputs(
| CoreTypeConcrete::Sint64(_)
| CoreTypeConcrete::Sint32(_)
| CoreTypeConcrete::Sint16(_)
| CoreTypeConcrete::Sint8(_) => 1,
| CoreTypeConcrete::Sint8(_)
| CoreTypeConcrete::Nullable(_) => 1,
CoreTypeConcrete::Enum(info) => {
1 + info
.variants
Expand All @@ -338,9 +339,7 @@ pub fn compare_outputs(
.iter()
.map(|member_ty| map_vm_sizes(size_cache, registry, member_ty))
.sum(),
CoreTypeConcrete::Nullable(_) => 1,
CoreTypeConcrete::NonZero(info) => map_vm_sizes(size_cache, registry, &info.ty),
CoreTypeConcrete::EcPoint(_) => 2,
CoreTypeConcrete::EcState(_) => 4,
x => todo!("vm size not yet implemented: {:?}", x.info()),
};
Expand Down Expand Up @@ -503,10 +502,6 @@ pub fn compare_outputs(
Felt::from_bytes_le(&values[3].to_le_bytes()),
)
}
CoreTypeConcrete::Bytes31(_) => todo!(),
CoreTypeConcrete::Const(_) => todo!(),
CoreTypeConcrete::BoundedInt(_) => todo!(),
CoreTypeConcrete::Coupon(_) => todo!(),
x => {
todo!("vm value not yet implemented: {:?}", x.info())
}
Expand Down
Loading