Merge pull request #83 from behemehal/ahmtcn123/issue81

Ahmtcn123/issue81
behemehal · Jan 17, 2024 · d5b4f47 · d5b4f47
2 parents 9999530 + b6f6705
commit d5b4f47
Show file tree

Hide file tree

Showing 107 changed files with 5,739 additions and 5,295 deletions.
diff --git a/Ellie-Language.code-workspace b/Ellie-Language.code-workspace
@@ -33,5 +33,6 @@
 		"workbench.editor.labelFormat": "short",
 		"workbench.startupEditor": "readme",
 		"window.title": "Ellie-Language ${separator}${activeEditorShort}",
+		"rust-analyzer.imports.preferNoStd": true,
 	}
 }
diff --git a/ellie_engine/bytecode/src/assembler.rs b/ellie_engine/bytecode/src/assembler.rs
@@ -1,16 +1,18 @@
-use crate::instructions::Instruction;
-use crate::transpiler::Transpiler;
-use crate::utils::usize_to_le_bytes;
-use crate::{instruction_table, utils::limit_platform_size};
+use crate::{
+    instruction_table,
+    instructions::Instruction,
+    transpiler::Transpiler,
+    utils::{limit_platform_size, usize_to_le_bytes},
+};
 use alloc::{
     format,
     string::{String, ToString},
     vec::Vec,
 };
-use ellie_core::defs::{
-    DebugHeader, DebugHeaderType, ModuleMap, NativeCallTrace, PlatformArchitecture,
+use ellie_core::{
+    defs::{DebugHeader, DebugHeaderType, ModuleMap, NativeCallTrace, PlatformArchitecture},
+    utils::ExportPage,
 };
-use ellie_core::utils::ExportPage;
 use ellie_parser::parser::Module;
 use std::{io::Write, panic};
 

diff --git a/ellie_engine/bytecode/src/instruction_table.rs b/ellie_engine/bytecode/src/instruction_table.rs
@@ -1,7 +1,6 @@
 //Auto builded from `instructions.json` by `reAssembler.js` rev: 3
 use crate::instructions::Instruction;
-use alloc::string::String;
-use alloc::{vec, vec::Vec};
+use alloc::{string::String, vec, vec::Vec};
 use ellie_core::defs::PlatformArchitecture;
 
 #[derive(Clone, Debug, PartialEq)]

diff --git a/ellie_engine/bytecode/src/transpiler/setter_call.rs b/ellie_engine/bytecode/src/transpiler/setter_call.rs
@@ -1,13 +1,12 @@
 use super::type_resolver::resolve_type;
-use crate::addressing_modes::AddressingModes;
-use crate::instruction_table;
-use crate::instructions;
-use crate::utils::limit_platform_size;
-use alloc::string::ToString;
-use alloc::vec;
-use ellie_core::definite::items::setter_call;
-use ellie_core::defs::DebugHeader;
-use ellie_core::defs::DebugHeaderType;
+use crate::{
+    addressing_modes::AddressingModes, instruction_table, instructions, utils::limit_platform_size,
+};
+use alloc::{string::ToString, vec};
+use ellie_core::{
+    definite::items::setter_call,
+    defs::{DebugHeader, DebugHeaderType},
+};
 
 impl super::Transpiler for setter_call::SetterCall {
     fn transpile(

diff --git a/ellie_engine/bytecode/src/transpiler/type_resolver.rs b/ellie_engine/bytecode/src/transpiler/type_resolver.rs
@@ -1,7 +1,6 @@
-use alloc::vec;
-use alloc::vec::Vec;
+use alloc::{vec, vec::Vec};
 use ellie_core::{
-    definite::{types::class_instance::AttributeType, types::operator, types::Types as CoreTypes},
+    definite::types::{class_instance::AttributeType, operator, Types as CoreTypes},
     defs::PlatformArchitecture,
 };
 

diff --git a/ellie_engine/core/src/definite/definers.rs b/ellie_engine/core/src/definite/definers.rs
@@ -1,8 +1,5 @@
 use crate::{definite::types::Types, defs};
-use alloc::format;
-use alloc::string::String;
-use alloc::vec::Vec;
-use alloc::{borrow::ToOwned, boxed::Box};
+use alloc::{borrow::ToOwned, boxed::Box, format, string::String, vec::Vec};
 use enum_as_inner::EnumAsInner;
 use serde::{Deserialize, Serialize};
 

diff --git a/ellie_engine/core/src/definite/items/condition.rs b/ellie_engine/core/src/definite/items/condition.rs
@@ -1,7 +1,8 @@
-use crate::alloc::vec::Vec;
-use crate::definite::types;
-use crate::defs;
-use crate::{alloc::boxed::Box, definite::definers::DefinerCollecting};
+use crate::{
+    alloc::{boxed::Box, vec::Vec},
+    definite::{definers::DefinerCollecting, types},
+    defs,
+};
 use serde::{Deserialize, Serialize};
 
 #[derive(PartialEq, Debug, Clone, Serialize, Deserialize)]

diff --git a/ellie_engine/core/src/definite/items/constructor.rs b/ellie_engine/core/src/definite/items/constructor.rs
@@ -1,6 +1,5 @@
 use crate::defs;
-use alloc::string::String;
-use alloc::vec::Vec;
+use alloc::{string::String, vec::Vec};
 use serde::{Deserialize, Serialize};
 
 #[derive(PartialEq, Debug, Clone, Serialize, Deserialize)]

diff --git a/ellie_engine/core/src/definite/items/constructor_parameter.rs b/ellie_engine/core/src/definite/items/constructor_parameter.rs
@@ -1,8 +1,6 @@
-use crate::definite::definers::DefinerCollecting;
-use crate::defs;
+use crate::{definite::definers::DefinerCollecting, defs};
 use alloc::string::String;
-use serde::Deserialize;
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 
 #[derive(PartialEq, Debug, Clone, Serialize, Deserialize)]
 pub struct ConstructorParameter {

diff --git a/ellie_engine/core/src/definite/items/enum_type.rs b/ellie_engine/core/src/definite/items/enum_type.rs
@@ -1,6 +1,5 @@
 use crate::definite::definers;
-use alloc::string::String;
-use alloc::vec::Vec;
+use alloc::{string::String, vec::Vec};
 use serde::{Deserialize, Serialize};
 
 use super::file_key::FileKey;

diff --git a/ellie_engine/core/src/definite/items/file_key.rs b/ellie_engine/core/src/definite/items/file_key.rs
@@ -1,5 +1,4 @@
-use crate::definite::types;
-use crate::defs;
+use crate::{definite::types, defs};
 use alloc::string::String;
 use serde::{Deserialize, Serialize};
 

diff --git a/ellie_engine/core/src/definite/items/for_loop.rs b/ellie_engine/core/src/definite/items/for_loop.rs
@@ -1,5 +1,4 @@
-use crate::definite::types;
-use crate::defs;
+use crate::{definite::types, defs};
 use serde::{Deserialize, Serialize};
 
 #[derive(PartialEq, Debug, Clone, Serialize, Deserialize)]

diff --git a/ellie_engine/core/src/definite/items/function.rs b/ellie_engine/core/src/definite/items/function.rs
@@ -1,7 +1,5 @@
-use crate::definite::definers;
-use crate::defs;
-use alloc::string::String;
-use alloc::vec::Vec;
+use crate::{definite::definers, defs};
+use alloc::{string::String, vec::Vec};
 use serde::{Deserialize, Serialize};
 
 use super::file_key::FileKey;

diff --git a/ellie_engine/core/src/definite/items/function_parameter.rs b/ellie_engine/core/src/definite/items/function_parameter.rs
@@ -1,8 +1,6 @@
-use crate::definite::definers;
-use crate::defs;
+use crate::{definite::definers, defs};
 use alloc::string::String;
-use serde::Deserialize;
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 
 #[derive(PartialEq, Debug, Clone, Serialize, Deserialize)]
 pub struct FunctionParameter {

diff --git a/ellie_engine/core/src/definite/items/getter.rs b/ellie_engine/core/src/definite/items/getter.rs
@@ -1,5 +1,4 @@
-use crate::definite::definers;
-use crate::defs;
+use crate::{definite::definers, defs};
 use alloc::{string::String, vec::Vec};
 use serde::{Deserialize, Serialize};
 

diff --git a/ellie_engine/core/src/definite/items/native_function.rs b/ellie_engine/core/src/definite/items/native_function.rs
@@ -1,7 +1,5 @@
-use crate::definite::definers;
-use crate::defs;
-use alloc::string::String;
-use alloc::vec::Vec;
+use crate::{definite::definers, defs};
+use alloc::{string::String, vec::Vec};
 use serde::{Deserialize, Serialize};
 
 use super::file_key::FileKey;

diff --git a/ellie_engine/core/src/definite/items/ret.rs b/ellie_engine/core/src/definite/items/ret.rs
@@ -1,5 +1,4 @@
-use crate::definite::types;
-use crate::defs;
+use crate::{definite::types, defs};
 use serde::{Deserialize, Serialize};
 
 #[derive(PartialEq, Debug, Clone, Serialize, Deserialize)]

diff --git a/ellie_engine/core/src/definite/items/self_item.rs b/ellie_engine/core/src/definite/items/self_item.rs
@@ -1,5 +1,4 @@
-use serde::Deserialize;
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 
 use crate::defs::Cursor;
 

diff --git a/ellie_engine/core/src/definite/items/setter.rs b/ellie_engine/core/src/definite/items/setter.rs
@@ -1,5 +1,4 @@
-use crate::definite::definers;
-use crate::defs;
+use crate::{definite::definers, defs};
 use alloc::{string::String, vec::Vec};
 use serde::{Deserialize, Serialize};
 

diff --git a/ellie_engine/core/src/definite/items/variable.rs b/ellie_engine/core/src/definite/items/variable.rs
@@ -1,7 +1,8 @@
-use crate::definite::{definers, types};
-use crate::defs;
-use alloc::string::String;
-use alloc::vec::Vec;
+use crate::{
+    definite::{definers, types},
+    defs,
+};
+use alloc::{string::String, vec::Vec};
 use serde::{Deserialize, Serialize};
 
 use super::file_key::FileKey;

diff --git a/ellie_engine/core/src/definite/mod.rs b/ellie_engine/core/src/definite/mod.rs
@@ -1,5 +1,4 @@
-use crate::alloc::string::String;
-use crate::alloc::vec::Vec;
+use crate::alloc::{string::String, vec::Vec};
 pub mod definers;
 pub mod items;
 pub mod types;

diff --git a/ellie_engine/core/src/definite/types/array.rs b/ellie_engine/core/src/definite/types/array.rs
@@ -1,5 +1,4 @@
-use crate::definite::types;
-use crate::defs;
+use crate::{definite::types, defs};
 use alloc::vec::Vec;
 use serde::{Deserialize, Serialize};
 

diff --git a/ellie_engine/core/src/definite/types/class_call.rs b/ellie_engine/core/src/definite/types/class_call.rs
@@ -1,8 +1,8 @@
-use crate::definite::definers::DefinerCollecting;
-use crate::definite::{definers, types};
-use crate::defs;
-use alloc::boxed::Box;
-use alloc::vec::Vec;
+use crate::{
+    definite::{definers, definers::DefinerCollecting, types},
+    defs,
+};
+use alloc::{boxed::Box, vec::Vec};
 use serde::{Deserialize, Serialize};
 
 #[derive(PartialEq, Debug, Clone, Serialize, Deserialize)]

diff --git a/ellie_engine/core/src/definite/types/cloak.rs b/ellie_engine/core/src/definite/types/cloak.rs
@@ -1,5 +1,4 @@
-use crate::definite::types;
-use crate::defs;
+use crate::{definite::types, defs};
 use alloc::vec::Vec;
 use serde::{Deserialize, Serialize};
 

diff --git a/ellie_engine/core/src/definite/types/collective.rs b/ellie_engine/core/src/definite/types/collective.rs
@@ -1,5 +1,4 @@
-use crate::definite::types;
-use crate::defs;
+use crate::{definite::types, defs};
 use alloc::{string::String, vec::Vec};
 use serde::{Deserialize, Serialize};
 

diff --git a/ellie_engine/core/src/definite/types/function.rs b/ellie_engine/core/src/definite/types/function.rs
@@ -1,7 +1,8 @@
-use crate::definite::{definers, items::Collecting};
-use crate::defs;
-use alloc::string::String;
-use alloc::vec::Vec;
+use crate::{
+    definite::{definers, items::Collecting},
+    defs,
+};
+use alloc::{string::String, vec::Vec};
 use serde::{Deserialize, Serialize};
 
 #[derive(PartialEq, Debug, Clone, Serialize, Deserialize)]

diff --git a/ellie_engine/core/src/definite/types/function_call.rs b/ellie_engine/core/src/definite/types/function_call.rs
@@ -1,6 +1,7 @@
-use crate::definite::definers;
-use crate::definite::{definers::DefinerCollecting, types};
-use crate::defs;
+use crate::{
+    definite::{definers, definers::DefinerCollecting, types},
+    defs,
+};
 use alloc::{boxed::Box, vec::Vec};
 use serde::{Deserialize, Serialize};
 

diff --git a/ellie_engine/core/src/definite/types/operator.rs b/ellie_engine/core/src/definite/types/operator.rs
@@ -1,5 +1,4 @@
-use crate::definite::types;
-use crate::defs;
+use crate::{definite::types, defs};
 use serde::{Deserialize, Serialize};
 
 #[derive(PartialEq, Debug, Clone, Serialize, Deserialize)]

diff --git a/ellie_engine/core/src/definite/types/reference.rs b/ellie_engine/core/src/definite/types/reference.rs
@@ -1,10 +1,7 @@
-use crate::definite::types;
-use crate::defs;
+use crate::{definite::types, defs};
 use serde::{Deserialize, Serialize};
 
-use alloc::boxed::Box;
-use alloc::string::String;
-use alloc::vec::Vec;
+use alloc::{boxed::Box, string::String, vec::Vec};
 
 use super::class_instance::AttributeType;
 

diff --git a/ellie_engine/core/src/error/error_list.rs b/ellie_engine/core/src/error/error_list.rs
@@ -1,5 +1,4 @@
-use crate::alloc::borrow::ToOwned;
-use crate::error;
+use crate::{alloc::borrow::ToOwned, error};
 
 lazy_static! {
     pub static ref ERROR_S1: error::Error = error::Error {
@@ -335,7 +334,7 @@ lazy_static! {
     pub static ref ERROR_S55: error::Error = error::Error {
         code: 0x54,
         title: "TypeError".to_owned(),
-        message: "Consider giving this a type".to_owned(),
+        message: "Consider giving a type to this".to_owned(),
         ..Default::default()
     };
     pub static ref ERROR_S56: error::Error = error::Error {
@@ -408,4 +407,10 @@ lazy_static! {
         full_assist: true,
         ..Default::default()
     };
+    pub static ref ERROR_S66: error::Error = error::Error {
+        code: 0x65,
+        title: "ReferenceError".to_owned(),
+        message: "Cannot apply unary operator".to_owned(),
+        ..Default::default()
+    };
 }
diff --git a/ellie_engine/core/src/error/mod.rs b/ellie_engine/core/src/error/mod.rs
@@ -1,6 +1,8 @@
 use crate::alloc::borrow::ToOwned;
-use alloc::string::{String, ToString};
-use alloc::vec::Vec;
+use alloc::{
+    string::{String, ToString},
+    vec::Vec,
+};
 use core::clone::Clone;
 use serde::{Deserialize, Serialize};
 #[doc(hidden)]

diff --git a/ellie_engine/core/src/information.rs b/ellie_engine/core/src/information.rs
@@ -1,6 +1,5 @@
 use alloc::vec::Vec;
-use core::any::Any;
-use core::clone::Clone;
+use core::{any::Any, clone::Clone};
 use serde::{Deserialize, Serialize};
 
 /// Parser's output colider, it contains a list of warnings and errors and implements some of the [`Vec`] methods

diff --git a/ellie_engine/core/src/utils/mod.rs b/ellie_engine/core/src/utils/mod.rs
@@ -1,18 +1,21 @@
 use core::ops::{Index, IndexMut};
 
-use alloc::borrow::ToOwned;
-use alloc::string::{String, ToString};
-use alloc::vec;
-use alloc::vec::Vec;
+use alloc::{
+    borrow::ToOwned,
+    string::{String, ToString},
+    vec,
+    vec::Vec,
+};
 use rand;
 use serde::{Deserialize, Serialize};
 
-use crate::definite::types::operator::Operators;
-use crate::definite::types::operator::{
-    assignment_operator_to_string, comparison_operator_to_string, logical_operator_to_string,
-    ArithmeticOperators, AssignmentOperators,
+use crate::{
+    definite::types::operator::{
+        assignment_operator_to_string, comparison_operator_to_string, logical_operator_to_string,
+        ArithmeticOperators, AssignmentOperators, Operators,
+    },
+    defs, error,
 };
-use crate::{defs, error};
 
 /// Response of [`reliable_name_range`] function
 /// ## Fields
@@ -363,14 +366,14 @@ pub fn operator_control(
                     | ("float", "double")
                     | ("double", "double")
                     | ("double", "float") => None,
-                    | ("dyn", _) => None,
-                    | (_, "dyn") => None,
+                    ("dyn", _) => None,
+                    (_, "dyn") => None,
                     (a, b) => {
                         if a == b {
                             return None;
                         }
                         Some(comparison_operator_to_string(operator))
-                    },
+                    }
                 }
             }
             crate::definite::types::operator::ComparisonOperators::GreaterThan

diff --git a/ellie_engine/core/src/warning/warning_list.rs b/ellie_engine/core/src/warning/warning_list.rs
@@ -1,5 +1,4 @@
-use crate::alloc::borrow::ToOwned;
-use crate::warning;
+use crate::{alloc::borrow::ToOwned, warning};
 
 lazy_static! {
     pub static ref WARNING_S1: warning::Warning = warning::Warning {