minor restructure

Author: mxgordon

src/builtins.rs

@@ -1,10 +1,6 @@
 pub mod object;
-pub mod pyint;
-pub mod range;
-pub mod str;
 pub mod function_utils;
 pub mod globals;
-pub mod pyfloat;
 pub mod structure;
 pub mod functions;
-pub mod pybool;
+pub mod types;

src/builtins/functions/print.rs

@@ -1,4 +1,4 @@
-use crate::builtins::str::py_str_tmp;
+use crate::builtins::types::str::py_str_tmp;
 use crate::builtins::structure::pyobject::{FuncReturnType, PyObject};
 use crate::pyarena::PyArena;
 

src/builtins/globals.rs

@@ -3,10 +3,10 @@ use std::rc::Rc;
 use ahash::AHashMap;
 use crate::builtins::object::{get_object_class};
 use crate::builtins::functions::print::{py_print};
-use crate::builtins::pybool::get_bool_class;
-use crate::builtins::pyfloat::get_float_class;
-use crate::builtins::pyint::{get_int_class};
-use crate::builtins::range::{get_range_class, get_range_iterator_class};
+use crate::builtins::types::pybool::get_bool_class;
+use crate::builtins::types::pyfloat::get_float_class;
+use crate::builtins::types::pyint::{get_int_class};
+use crate::builtins::types::range::{get_range_class, get_range_iterator_class};
 use crate::builtins::structure::pyclass::PyClass;
 use crate::builtins::structure::pyobject::{ManyArgFuncType, PyInternalFunction, PyObject};
 

src/builtins/types.rs

@@ -0,0 +1,5 @@
+pub mod pybool;
+pub mod pyfloat;
+pub mod pyint;
+pub mod range;
+pub mod str;

src/builtins/types/range.rs

@@ -3,7 +3,7 @@ use std::fmt::{Debug};
 use std::rc::Rc;
 use ahash::AHashMap;
 use crate::builtins::function_utils::init_internal_class;
-use crate::builtins::pyint::expect_int;
+use crate::builtins::types::pyint::expect_int;
 use crate::builtins::structure::magic_methods::{py_magic_methods_defaults, PyMagicMethods};
 use crate::builtins::structure::pyclass::PyClass;
 use crate::builtins::structure::pyinstance::{PyInstance, PyInstanceInternal};