From 95fc8a85dff70dfddc9743b89ef4554372daa87a Mon Sep 17 00:00:00 2001 From: Alek Ratzloff Date: Mon, 24 Jan 2022 18:10:21 -0800 Subject: [PATCH] Rename mod object->obj Also, object.rs got moved to a new directory in preparation for splitting members out into their own files Signed-off-by: Alek Ratzloff --- src/compile.rs | 2 +- src/main.rs | 2 +- src/{object.rs => obj/mod.rs} | 0 src/syn/ast.rs | 2 +- src/vm/builtins.rs | 2 +- src/vm/inst.rs | 2 +- src/vm/machine.rs | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) rename src/{object.rs => obj/mod.rs} (100%) diff --git a/src/compile.rs b/src/compile.rs index 70e204d..5d4fb39 100644 --- a/src/compile.rs +++ b/src/compile.rs @@ -1,4 +1,4 @@ -use crate::object::*; +use crate::obj::*; use crate::scope::*; use crate::syn::ast::*; use crate::vm::inst::*; diff --git a/src/main.rs b/src/main.rs index f806f32..64b52c0 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,5 @@ mod compile; -mod object; +mod obj; mod scope; mod syn; mod vm; diff --git a/src/object.rs b/src/obj/mod.rs similarity index 100% rename from src/object.rs rename to src/obj/mod.rs diff --git a/src/syn/ast.rs b/src/syn/ast.rs index dbb5745..60cbb07 100644 --- a/src/syn/ast.rs +++ b/src/syn/ast.rs @@ -1,4 +1,4 @@ -use crate::object::{Float, Int, Str}; +use crate::obj::{Float, Int, Str}; use crate::syn::span::*; /// A single statement, which may be a meta-expression or a normal expression. diff --git a/src/vm/builtins.rs b/src/vm/builtins.rs index c555b4d..92ea7ec 100644 --- a/src/vm/builtins.rs +++ b/src/vm/builtins.rs @@ -1,4 +1,4 @@ -use crate::object::{BuiltinExit, Obj, StrObj}; +use crate::obj::{BuiltinExit, Obj, StrObj}; use crate::vm::{error::RuntimeError, machine::MachineBuilder}; impl MachineBuilder { diff --git a/src/vm/inst.rs b/src/vm/inst.rs index 9683b95..17d3188 100644 --- a/src/vm/inst.rs +++ b/src/vm/inst.rs @@ -1,4 +1,4 @@ -use crate::object::ObjPtr; +use crate::obj::ObjPtr; use crate::scope::Word; use crate::syn::span::Spanned; diff --git a/src/vm/machine.rs b/src/vm/machine.rs index febeafe..8e08d57 100644 --- a/src/vm/machine.rs +++ b/src/vm/machine.rs @@ -1,5 +1,5 @@ use crate::compile::Compile; -use crate::object::*; +use crate::obj::*; use crate::scope::*; use crate::syn::{ast::SpStmt, span::Span}; use crate::vm::{error::*, inst::*};