programmerjake/fayalite
1
0
Fork 0
forked from libre-chip/fayalite
Code Pull requests Activity

rename FixedType->StaticType, fixed_type()->static_type(), hdl(fixed_type)->hdl(static), IsFixedLen->IsStaticLen

Browse source
This commit is contained in:
Jacob Lifshay 2024-07-30 20:16:00 -07:00
parent c19a6821cf
commit 2dce478d48
Signed by: programmerjake
SSH key fingerprint: SHA256:B1iRVvUJkvd7upMIiMqn6OyxvD2SgJkAH3ZnUOj6z+c
20 changed files with 165 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/fayalite-proc-macros-impl/src/module/transform_body.rs
View file

@ -1003,10 +1003,10 @@ fn wrap_ty_with_expr(ty: impl ToTokens) -> Type {
}
}
fn unwrap_or_fixed_type(expr: Option<impl ToTokens>, span: Span) -> TokenStream {
fn unwrap_or_static_type(expr: Option<impl ToTokens>, span: Span) -> TokenStream {
expr.map(ToTokens::into_token_stream).unwrap_or_else(|| {
quote_spanned! {span=>
::fayalite::ty::FixedType::fixed_type()
::fayalite::ty::StaticType::static_type()
}
})
}
@ -1109,7 +1109,7 @@ impl Visitor {
let m = hdl_let.kind.m;
let dot = hdl_let.kind.dot_token;
let kind = hdl_let.kind.kind;
let ty_expr = unwrap_or_fixed_type(hdl_let.kind.ty_expr.as_ref(), kind.span());
let ty_expr = unwrap_or_static_type(hdl_let.kind.ty_expr.as_ref(), kind.span());
let mut expr = quote! {#m #dot #kind};
hdl_let.kind.paren.surround(&mut expr, |expr| {
let name_str = ImplicitName {
@ -1214,7 +1214,7 @@ impl Visitor {
paren,
ty_expr,
} => {
let ty_expr = unwrap_or_fixed_type(ty_expr.as_ref(), reg_builder.span());
let ty_expr = unwrap_or_static_type(ty_expr.as_ref(), reg_builder.span());
dot_token.to_tokens(&mut expr);
no_reset.to_tokens(&mut expr);
paren.surround(&mut expr, |expr| ty_expr.to_tokens(expr));
@ -1248,7 +1248,7 @@ impl Visitor {
let dot = hdl_let.kind.dot_token;
let wire = hdl_let.kind.wire;
self.require_normal_module(wire);
let ty_expr = unwrap_or_fixed_type(hdl_let.kind.ty_expr.as_ref(), wire.span());
let ty_expr = unwrap_or_static_type(hdl_let.kind.ty_expr.as_ref(), wire.span());
let mut expr = quote! {#m #dot #wire};
hdl_let.kind.paren.surround(&mut expr, |expr| {
let name_str = ImplicitName {
@ -1290,14 +1290,14 @@ impl Visitor {
memory,
paren,
ty_expr,
} => (paren, unwrap_or_fixed_type(ty_expr.as_ref(), memory.span())),
} => (paren, unwrap_or_static_type(ty_expr.as_ref(), memory.span())),
MemoryFn::MemoryArray {
memory_array,
paren,
ty_expr,
} => (
paren,
unwrap_or_fixed_type(ty_expr.as_ref(), memory_array.span()),
unwrap_or_static_type(ty_expr.as_ref(), memory_array.span()),
),
MemoryFn::MemoryWithInit {
memory_with_init: _,