core: move toplevel/{numpy.rs -> prim_types.rs}

nac3artiq/src/symbol_resolver.rs

@@ -4,7 +4,7 @@ use nac3core::{
     symbol_resolver::{StaticValue, SymbolResolver, SymbolValue, ValueEnum},
     toplevel::{
         helper::PrimDef,
-        numpy::{make_ndarray_ty, unpack_ndarray_params},
+        prim_types::{make_ndarray_ty, unpack_ndarray_params},
         DefinitionId, TopLevelDef,
     },
     typecheck::{

nac3core/src/codegen/builtin_fns.rs

@@ -8,7 +8,7 @@ use crate::codegen::numpy::ndarray_elementwise_unaryop_impl;
 use crate::codegen::stmt::gen_for_callback_incrementing;
 use crate::codegen::{extern_fns, irrt, llvm_intrinsics, numpy, CodeGenContext, CodeGenerator};
 use crate::toplevel::helper::PrimDef;
-use crate::toplevel::numpy::unpack_ndarray_params;
+use crate::toplevel::prim_types::unpack_ndarray_params;
 use crate::typecheck::typedef::Type;
 
 /// Shorthand for [`unreachable!()`] when a type of argument is not supported.

nac3core/src/codegen/expr.rs

@@ -17,7 +17,7 @@ use crate::{
     symbol_resolver::{SymbolValue, ValueEnum},
     toplevel::{
         helper::PrimDef,
-        numpy::{make_ndarray_ty, unpack_ndarray_params},
+        prim_types::{make_ndarray_ty, unpack_ndarray_params},
         DefinitionId, TopLevelDef,
     },
     typecheck::{

nac3core/src/codegen/mod.rs

@@ -1,7 +1,7 @@
 use crate::{
     codegen::classes::{ListType, NDArrayType, ProxyType, RangeType},
     symbol_resolver::{StaticValue, SymbolResolver},
-    toplevel::{helper::PrimDef, numpy::unpack_ndarray_params, TopLevelContext, TopLevelDef},
+    toplevel::{helper::PrimDef, prim_types::unpack_ndarray_params, TopLevelContext, TopLevelDef},
     typecheck::{
         type_inferencer::{CodeLocation, PrimitiveStore},
         typedef::{CallId, FuncArg, Type, TypeEnum, Unifier},

nac3core/src/codegen/numpy.rs

@@ -19,7 +19,7 @@ use crate::{
     symbol_resolver::ValueEnum,
     toplevel::{
         helper::PrimDef,
-        numpy::{make_ndarray_ty, unpack_ndarray_params},
+        prim_types::{make_ndarray_ty, unpack_ndarray_params},
         DefinitionId,
     },
     typecheck::typedef::{FunSignature, Type, TypeEnum},

nac3core/src/codegen/stmt.rs

@@ -10,7 +10,7 @@ use crate::{
         expr::gen_binop_expr,
         gen_in_range_check,
     },
-    toplevel::{helper::PrimDef, numpy::unpack_ndarray_params, DefinitionId, TopLevelDef},
+    toplevel::{helper::PrimDef, prim_types::unpack_ndarray_params, DefinitionId, TopLevelDef},
     typecheck::typedef::{FunSignature, Type, TypeEnum},
 };
 use inkwell::{

nac3core/src/toplevel/builtins.rs

@@ -24,7 +24,7 @@ use crate::{
         stmt::exn_constructor,
     },
     symbol_resolver::SymbolValue,
-    toplevel::{helper::PrimDef, numpy::make_ndarray_ty},
+    toplevel::{helper::PrimDef, prim_types::make_ndarray_ty},
     typecheck::typedef::{into_var_map, TypeVar, VarMap},
 };
 

nac3core/src/toplevel/helper.rs

@@ -1,7 +1,7 @@
 use std::convert::TryInto;
 
 use crate::symbol_resolver::SymbolValue;
-use crate::toplevel::numpy::unpack_ndarray_params;
+use crate::toplevel::prim_types::unpack_ndarray_params;
 use crate::typecheck::typedef::{into_var_map, Mapping, TypeVar, TypeVarId, VarMap};
 use nac3parser::ast::{Constant, Location};
 use strum::IntoEnumIterator;

nac3core/src/toplevel/mod.rs

@@ -30,7 +30,7 @@ pub struct DefinitionId(pub usize);
 pub mod builtins;
 pub mod composer;
 pub mod helper;
-pub mod numpy;
+pub mod prim_types;
 pub mod type_annotation;
 use composer::*;
 use type_annotation::*;

nac3core/src/typecheck/magic_methods.rs

@@ -1,6 +1,6 @@
 use crate::symbol_resolver::SymbolValue;
 use crate::toplevel::helper::PrimDef;
-use crate::toplevel::numpy::{make_ndarray_ty, unpack_ndarray_params};
+use crate::toplevel::prim_types::{make_ndarray_ty, unpack_ndarray_params};
 use crate::typecheck::{
     type_inferencer::*,
     typedef::{FunSignature, FuncArg, Type, TypeEnum, Unifier, VarMap},

nac3core/src/typecheck/type_inferencer/mod.rs

@@ -12,7 +12,7 @@ use crate::{
     symbol_resolver::{SymbolResolver, SymbolValue},
     toplevel::{
         helper::{arraylike_flatten_element_type, arraylike_get_ndims, PrimDef},
-        numpy::{make_ndarray_ty, unpack_ndarray_params},
+        prim_types::{make_ndarray_ty, unpack_ndarray_params},
         TopLevelContext,
     },
 };