From 1db8378f60f573c0016f89b83336555ab18a6322 Mon Sep 17 00:00:00 2001 From: pca006132 Date: Thu, 12 Aug 2021 16:36:23 +0800 Subject: [PATCH] formatting --- nac3core/src/codegen/mod.rs | 71 +++++++++++++++------------ nac3core/src/symbol_resolver.rs | 11 +++-- nac3core/src/typecheck/typedef/mod.rs | 6 ++- 3 files changed, 53 insertions(+), 35 deletions(-) diff --git a/nac3core/src/codegen/mod.rs b/nac3core/src/codegen/mod.rs index 9ca1cb583..de9ff9485 100644 --- a/nac3core/src/codegen/mod.rs +++ b/nac3core/src/codegen/mod.rs @@ -62,44 +62,53 @@ fn get_llvm_type<'ctx>( use TypeEnum::*; // we assume the type cache should already contain primitive types, // and they should be passed by value instead of passing as pointer. - type_cache.get(&unifier.get_representative(ty)).cloned().unwrap_or_else(|| match &*unifier.get_ty(ty) { - TObj { obj_id, fields, .. } => { - // a struct with fields in the order of declaration - let defs = top_level.definitions.read(); - let definition = defs.get(obj_id.0).unwrap(); - let ty = if let TopLevelDef::Class { fields: fields_list, .. } = &*definition.read() { - let fields = fields.borrow(); - let fields = fields_list + type_cache.get(&unifier.get_representative(ty)).cloned().unwrap_or_else(|| { + match &*unifier.get_ty(ty) { + TObj { obj_id, fields, .. } => { + // a struct with fields in the order of declaration + let defs = top_level.definitions.read(); + let definition = defs.get(obj_id.0).unwrap(); + let ty = if let TopLevelDef::Class { fields: fields_list, .. } = &*definition.read() + { + let fields = fields.borrow(); + let fields = fields_list + .iter() + .map(|f| get_llvm_type(ctx, unifier, top_level, type_cache, fields[&f.0])) + .collect_vec(); + ctx.struct_type(&fields, false).ptr_type(AddressSpace::Generic).into() + } else { + unreachable!() + }; + ty + } + TTuple { ty } => { + // a struct with fields in the order present in the tuple + let fields = ty .iter() - .map(|f| get_llvm_type(ctx, unifier, top_level, type_cache, fields[&f.0])) + .map(|ty| get_llvm_type(ctx, unifier, top_level, type_cache, *ty)) .collect_vec(); ctx.struct_type(&fields, false).ptr_type(AddressSpace::Generic).into() - } else { - unreachable!() - }; - ty + } + TList { ty } => { + // a struct with an integer and a pointer to an array + let element_type = get_llvm_type(ctx, unifier, top_level, type_cache, *ty); + let fields = + [ctx.i32_type().into(), element_type.ptr_type(AddressSpace::Generic).into()]; + ctx.struct_type(&fields, false).ptr_type(AddressSpace::Generic).into() + } + TVirtual { .. } => unimplemented!(), + _ => unreachable!(), } - TTuple { ty } => { - // a struct with fields in the order present in the tuple - let fields = ty - .iter() - .map(|ty| get_llvm_type(ctx, unifier, top_level, type_cache, *ty)) - .collect_vec(); - ctx.struct_type(&fields, false).ptr_type(AddressSpace::Generic).into() - } - TList { ty } => { - // a struct with an integer and a pointer to an array - let element_type = get_llvm_type(ctx, unifier, top_level, type_cache, *ty); - let fields = - [ctx.i32_type().into(), element_type.ptr_type(AddressSpace::Generic).into()]; - ctx.struct_type(&fields, false).ptr_type(AddressSpace::Generic).into() - } - TVirtual { .. } => unimplemented!(), - _ => unreachable!(), }) } -pub fn gen_func<'ctx>(context: &'ctx Context, builder: Builder<'ctx>, module: Module<'ctx>, task: CodeGenTask, top_level_ctx: Arc) -> Module<'ctx> { +pub fn gen_func<'ctx>( + context: &'ctx Context, + builder: Builder<'ctx>, + module: Module<'ctx>, + task: CodeGenTask, + top_level_ctx: Arc, +) -> Module<'ctx> { // unwrap_or(0) is for unit tests without using rayon let (mut unifier, primitives) = { let unifiers = top_level_ctx.unifiers.read(); diff --git a/nac3core/src/symbol_resolver.rs b/nac3core/src/symbol_resolver.rs index 3063eaabc..e539ef144 100644 --- a/nac3core/src/symbol_resolver.rs +++ b/nac3core/src/symbol_resolver.rs @@ -95,15 +95,20 @@ pub fn parse_type_annotation( Subscript { value, slice, .. } => { if let Name { id, .. } = &value.node { if id == "virtual" { - let ty = parse_type_annotation(resolver, top_level, unifier, primitives, slice)?; + let ty = + parse_type_annotation(resolver, top_level, unifier, primitives, slice)?; Ok(unifier.add_ty(TypeEnum::TVirtual { ty })) } else { let types = if let Tuple { elts, .. } = &slice.node { elts.iter() - .map(|v| parse_type_annotation(resolver, top_level, unifier, primitives, v)) + .map(|v| { + parse_type_annotation(resolver, top_level, unifier, primitives, v) + }) .collect::, _>>()? } else { - vec![parse_type_annotation(resolver, top_level, unifier, primitives, slice)?] + vec![parse_type_annotation( + resolver, top_level, unifier, primitives, slice, + )?] }; let obj_id = resolver diff --git a/nac3core/src/typecheck/typedef/mod.rs b/nac3core/src/typecheck/typedef/mod.rs index 979213add..d2e75c8ab 100644 --- a/nac3core/src/typecheck/typedef/mod.rs +++ b/nac3core/src/typecheck/typedef/mod.rs @@ -696,7 +696,11 @@ impl Unifier { let fields = self .subst_map(&fields.borrow(), mapping) .unwrap_or_else(|| fields.borrow().clone()); - Some(self.add_ty(TypeEnum::TObj { obj_id, params: params.into(), fields: fields.into() })) + Some(self.add_ty(TypeEnum::TObj { + obj_id, + params: params.into(), + fields: fields.into(), + })) } else { None }