From 2abe75d1f4af772a5afbab67b4580f6ce13681fb Mon Sep 17 00:00:00 2001 From: lyken Date: Mon, 17 Jun 2024 10:47:49 +0800 Subject: [PATCH] core: remove code dup with `make_exception_fields` --- nac3core/src/toplevel/builtins.rs | 56 ++++++++++--------------------- nac3core/src/toplevel/helper.rs | 34 ++++++++++++------- 2 files changed, 39 insertions(+), 51 deletions(-) diff --git a/nac3core/src/toplevel/builtins.rs b/nac3core/src/toplevel/builtins.rs index 8c0c3969..6413d999 100644 --- a/nac3core/src/toplevel/builtins.rs +++ b/nac3core/src/toplevel/builtins.rs @@ -1,6 +1,6 @@ use std::iter::once; -use helper::{debug_assert_prim_is_allowed, PrimDefDetails}; +use helper::{debug_assert_prim_is_allowed, make_exception_fields, PrimDefDetails}; use indexmap::IndexMap; use inkwell::{ attributes::{Attribute, AttributeLoc}, @@ -42,17 +42,7 @@ pub fn get_exn_constructor( let int32 = primitives.int32; let int64 = primitives.int64; let string = primitives.str; - let exception_fields = vec![ - ("__name__".into(), int32, true), - ("__file__".into(), string, true), - ("__line__".into(), int32, true), - ("__col__".into(), int32, true), - ("__func__".into(), string, true), - ("__message__".into(), string, true), - ("__param0__".into(), int64, true), - ("__param1__".into(), int64, true), - ("__param2__".into(), int64, true), - ]; + let exception_fields = make_exception_fields(int32, int64, string); let exn_cons_args = vec![ FuncArg { name: "msg".into(), @@ -65,7 +55,11 @@ pub fn get_exn_constructor( ]; let exn_type = unifier.add_ty(TypeEnum::TObj { obj_id: DefinitionId(class_id), - fields: exception_fields.iter().map(|(a, b, c)| (*a, (*b, *c))).collect(), + fields: exception_fields + .clone() + .into_iter() + .map(|(name, ty, mutable)| (name, (ty, mutable))) + .collect(), params: VarMap::default(), }); let signature = unifier.add_ty(TypeEnum::TFunc(FunSignature { @@ -596,31 +590,17 @@ impl<'a> BuiltinBuilder<'a> { let PrimitiveStore { int32, int64, str, .. } = *self.primitives; match prim { - PrimDef::Exception => { - let exception_fields: Vec<(StrRef, Type, bool)> = vec![ - ("__name__".into(), int32, true), - ("__file__".into(), str, true), - ("__line__".into(), int32, true), - ("__col__".into(), int32, true), - ("__func__".into(), str, true), - ("__message__".into(), str, true), - ("__param0__".into(), int64, true), - ("__param1__".into(), int64, true), - ("__param2__".into(), int64, true), - ]; - - TopLevelDef::Class { - name: prim.name().into(), - object_id: prim.id(), - type_vars: Vec::default(), - fields: exception_fields, - methods: Vec::default(), - ancestors: vec![], - constructor: None, - resolver: None, - loc: None, - } - } + PrimDef::Exception => TopLevelDef::Class { + name: prim.name().into(), + object_id: prim.id(), + type_vars: Vec::default(), + fields: make_exception_fields(int32, int64, str), + methods: Vec::default(), + ancestors: vec![], + constructor: None, + resolver: None, + loc: None, + }, _ => unreachable!(), } } diff --git a/nac3core/src/toplevel/helper.rs b/nac3core/src/toplevel/helper.rs index 0c37d1e8..2fcc24c4 100644 --- a/nac3core/src/toplevel/helper.rs +++ b/nac3core/src/toplevel/helper.rs @@ -269,6 +269,23 @@ pub fn debug_assert_prim_is_allowed(prim: PrimDef, allowlist: &[PrimDef]) { } } +/// Construct the fields of class `Exception` +/// See [`TypeEnum::TObj::fields`] and [`TopLevelDef::Class::fields`] +#[must_use] +pub fn make_exception_fields(int32: Type, int64: Type, str: Type) -> Vec<(StrRef, Type, bool)> { + vec![ + ("__name__".into(), int32, true), + ("__file__".into(), str, true), + ("__line__".into(), int32, true), + ("__col__".into(), int32, true), + ("__func__".into(), str, true), + ("__message__".into(), str, true), + ("__param0__".into(), int64, true), + ("__param1__".into(), int64, true), + ("__param2__".into(), int64, true), + ] +} + impl TopLevelDef { pub fn to_string(&self, unifier: &mut Unifier) -> String { match self { @@ -347,19 +364,10 @@ impl TopLevelComposer { }); let exception = unifier.add_ty(TypeEnum::TObj { obj_id: PrimDef::Exception.id(), - fields: vec![ - ("__name__".into(), (int32, true)), - ("__file__".into(), (str, true)), - ("__line__".into(), (int32, true)), - ("__col__".into(), (int32, true)), - ("__func__".into(), (str, true)), - ("__message__".into(), (str, true)), - ("__param0__".into(), (int64, true)), - ("__param1__".into(), (int64, true)), - ("__param2__".into(), (int64, true)), - ] - .into_iter() - .collect::>(), + fields: make_exception_fields(int32, int64, str) + .into_iter() + .map(|(name, ty, mutable)| (name, (ty, mutable))) + .collect(), params: VarMap::new(), }); let uint32 = unifier.add_ty(TypeEnum::TObj {