diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_01_09_2024,_17_06_[Changes]1/shelved.patch b/.idea/shelf/Uncommitted_changes_before_Checkout_at_01_09_2024,_17_06_[Changes]1/shelved.patch deleted file mode 100644 index 264a26a..0000000 --- a/.idea/shelf/Uncommitted_changes_before_Checkout_at_01_09_2024,_17_06_[Changes]1/shelved.patch +++ /dev/null @@ -1,207 +0,0 @@ -Index: src/root/shared/new_types.rs -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== -diff --git a/src/root/shared/new_types.rs b/src/root/shared/new_types.rs -new file mode 100644 ---- /dev/null -+++ b/src/root/shared/new_types.rs -@@ -0,0 +1,46 @@ -+use std::collections::HashMap; -+use either::Either; -+use itertools::Itertools; -+use crate::root::parser::location::Location; -+ -+pub struct GlobalTable { -+ type_templates: HashMap, -+ cached_types: HashMap -+} -+ -+#[derive(Eq, PartialEq, Hash)] -+pub enum TypeID { -+ User { id: usize, parameters: Vec, array_count: usize }, -+ Builtin { id: usize } -+} -+ -+ -+#[derive(Eq, PartialEq)] -+pub struct TraitID(usize); -+ -+pub struct UserTypeTemplate { -+ location: Location, -+ parameters: Vec>, -+ attributes: Vec<(String, Either)> // (Name, Either) -+} -+ -+impl UserTypeTemplate { -+ pub fn fill<'a>(&'a self, parameters: &'a [TypeID]) -> UserType { -+ UserType { -+ location: &self.location, -+ size: 0, -+ attributes: self.attributes.iter().map(|(name, t)| { -+ match t { -+ Either::Left(t) => (0, name.as_str(), t), -+ Either::Right(i) => (0, name.as_str(), ¶meters[*i]) -+ } -+ }).collect_vec() -+ } -+ } -+} -+ -+pub struct UserType<'a> { -+ location: &'a Location, -+ size: usize, -+ attributes: Vec<(usize, &'a str, &'a TypeID)> -+} -\ No newline at end of file -Index: .idea/workspace.xml -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP -<+>\n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n {\n "lastFilter": {\n "state": "OPEN",\n "assignee": "Robert-M-Lucas"\n }\n}\n \n \n \n {\n "selectedUrlAndAccountId": {\n "url": "https://github.com/Robert-M-Lucas/whython-8",\n "accountId": "5325d154-08ff-47af-a3ea-1a4a5e1c240e"\n }\n}\n \n \n \n \n {\n "customColor": "",\n "associatedIndex": 4\n}\n \n \n \n {\n "keyToString": {\n "Cargo.Build `Run whython-8`.executor": "Run",\n "Cargo.Run whython-8.executor": "Run",\n "Cargo.Test whython-8.executor": "Run",\n "RunOnceActivity.OpenProjectViewOnStart": "true",\n "RunOnceActivity.ShowReadmeOnStart": "true",\n "RunOnceActivity.rust.reset.selective.auto.import": "true",\n "Shell Script.Test Asm.executor": "Run",\n "git-widget-placeholder": "dev",\n "ignore.virus.scanning.warn.message": "true",\n "last_opened_file_path": "/home/robert/RustroverProjects/whython-8",\n "node.js.detected.package.eslint": "true",\n "node.js.detected.package.tslint": "true",\n "node.js.selected.package.eslint": "(autodetect)",\n "node.js.selected.package.tslint": "(autodetect)",\n "nodejs_package_manager_path": "npm",\n "org.rust.cargo.project.model.PROJECT_DISCOVERY": "true",\n "org.rust.cargo.project.model.impl.CargoExternalSystemProjectAware.subscribe.first.balloon": "",\n "org.rust.first.attach.projects": "true",\n "settings.editor.selected.configurable": "preferences.pluginManager",\n "vue.rearranger.settings.migration": "true"\n },\n "keyToStringList": {\n "com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File": [\n "Rust"\n ]\n }\n}\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n 1714088144106\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== -diff --git a/.idea/workspace.xml b/.idea/workspace.xml ---- a/.idea/workspace.xml (revision 61cc3af4f0f06c1b7513a3acd51a55917b913396) -+++ b/.idea/workspace.xml (date 1725203864854) -@@ -8,34 +8,8 @@ - - - -- -- -- -- -- -- -- -- -- - -- -- -- -- -- -- -- -- -- - -- -- -- -- -- -- -- -- - - - { - "selectedUrlAndAccountId": { -- "url": "https://github.com/Robert-M-Lucas/whython-8.git", -- "accountId": "dcb8df19-0b39-47e1-9073-4a54f7034be8" -+ "url": "https://github.com/Robert-M-Lucas/whython-8", -+ "accountId": "0946bbf7-cdaf-442e-a90b-fef6fb160966" - } - } - -@@ -110,35 +84,35 @@ - -- { -+ "keyToString": { -+ "Cargo.Build `Run whython-8`.executor": "Run", -+ "Cargo.Run whython-8.executor": "Run", -+ "Cargo.Test whython-8.executor": "Run", -+ "RunOnceActivity.OpenProjectViewOnStart": "true", -+ "RunOnceActivity.ShowReadmeOnStart": "true", -+ "RunOnceActivity.rust.reset.selective.auto.import": "true", -+ "Shell Script.Test Asm.executor": "Run", -+ "git-widget-placeholder": "dev", -+ "ignore.virus.scanning.warn.message": "true", -+ "last_opened_file_path": "/home/robert/RustroverProjects/whython-8", -+ "node.js.detected.package.eslint": "true", -+ "node.js.detected.package.tslint": "true", -+ "node.js.selected.package.eslint": "(autodetect)", -+ "node.js.selected.package.tslint": "(autodetect)", -+ "nodejs_package_manager_path": "npm", -+ "org.rust.cargo.project.model.PROJECT_DISCOVERY": "true", -+ "org.rust.cargo.project.model.impl.CargoExternalSystemProjectAware.subscribe.first.balloon": "", -+ "org.rust.first.attach.projects": "true", -+ "settings.editor.selected.configurable": "preferences.pluginManager", -+ "vue.rearranger.settings.migration": "true" - }, -- "keyToStringList": { -- "com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File": [ -- "Rust" -+ "keyToStringList": { -+ "com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File": [ -+ "Rust" - ] - } --}]]> -+} - - - -@@ -314,23 +288,10 @@ - - - -- -- -- -- -- -- - - -- - -@@ -765,7 +742,6 @@ - - - -- - - - -@@ -789,6 +765,7 @@ - - - -+ - - diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_01_09_2024,_17_07_[Changes]/shelved.patch b/.idea/shelf/Uncommitted_changes_before_Update_at_01_09_2024,_17_07_[Changes]/shelved.patch deleted file mode 100644 index c326ed5..0000000 --- a/.idea/shelf/Uncommitted_changes_before_Update_at_01_09_2024,_17_07_[Changes]/shelved.patch +++ /dev/null @@ -1,71 +0,0 @@ -Index: src/root/shared/new_types.rs -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== -diff --git a/src/root/shared/new_types.rs b/src/root/shared/new_types.rs -new file mode 100644 ---- /dev/null (date 1725206804893) -+++ b/src/root/shared/new_types.rs (date 1725206804893) -@@ -0,0 +1,46 @@ -+use std::collections::HashMap; -+use either::Either; -+use itertools::Itertools; -+use crate::root::parser::location::Location; -+ -+pub struct GlobalTable { -+ type_templates: HashMap, -+ cached_types: HashMap -+} -+ -+#[derive(Eq, PartialEq, Hash)] -+pub enum TypeID { -+ User { id: usize, parameters: Vec, array_count: usize }, -+ Builtin { id: usize } -+} -+ -+ -+#[derive(Eq, PartialEq)] -+pub struct TraitID(usize); -+ -+pub struct UserTypeTemplate { -+ location: Location, -+ parameters: Vec>, -+ attributes: Vec<(String, Either)> // (Name, Either) -+} -+ -+impl UserTypeTemplate { -+ pub fn fill<'a>(&'a self, parameters: &'a [TypeID]) -> UserType { -+ UserType { -+ location: &self.location, -+ size: 0, -+ attributes: self.attributes.iter().map(|(name, t)| { -+ match t { -+ Either::Left(t) => (0, name.as_str(), t), -+ Either::Right(i) => (0, name.as_str(), ¶meters[*i]) -+ } -+ }).collect_vec() -+ } -+ } -+} -+ -+pub struct UserType<'a> { -+ location: &'a Location, -+ size: usize, -+ attributes: Vec<(usize, &'a str, &'a TypeID)> -+} -\ No newline at end of file -Index: src/root/shared/mod.rs -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP -<+>pub(crate) mod common;\npub mod types;\n -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== -diff --git a/src/root/shared/mod.rs b/src/root/shared/mod.rs ---- a/src/root/shared/mod.rs (revision 49f4fdbbcb63757a1d88ee6db34e3d0b9d001f3e) -+++ b/src/root/shared/mod.rs (date 1725206807305) -@@ -1,2 +1,3 @@ - pub(crate) mod common; - pub mod types; -+mod new_types; diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_01_09_2024__16_17__Changes_.xml b/.idea/shelf/Uncommitted_changes_before_Update_at_01_09_2024__16_17__Changes_.xml deleted file mode 100644 index 2779229..0000000 --- a/.idea/shelf/Uncommitted_changes_before_Update_at_01_09_2024__16_17__Changes_.xml +++ /dev/null @@ -1,4 +0,0 @@ - - \ No newline at end of file diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_20_10_2024,_02_30_[Changes]/shelved.patch b/.idea/shelf/Uncommitted_changes_before_Update_at_20_10_2024,_02_30_[Changes]/shelved.patch new file mode 100644 index 0000000..c996b01 --- /dev/null +++ b/.idea/shelf/Uncommitted_changes_before_Update_at_20_10_2024,_02_30_[Changes]/shelved.patch @@ -0,0 +1,549 @@ +Index: .idea/shelf/Uncommitted_changes_before_Update_at_01_09_2024__16_17__Changes_.xml +=================================================================== +diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_01_09_2024__16_17__Changes_.xml b/.idea/shelf/Uncommitted_changes_before_Update_at_01_09_2024__16_17__Changes_.xml +deleted file mode 100644 +--- a/.idea/shelf/Uncommitted_changes_before_Update_at_01_09_2024__16_17__Changes_.xml (revision d9ba9762f503c798ff6dc9e4aef0dc1517fb3188) ++++ /dev/null (revision d9ba9762f503c798ff6dc9e4aef0dc1517fb3188) +@@ -1,4 +0,0 @@ +- +- +\ No newline at end of file +Index: .idea/shelf/Uncommitted_changes_before_Update_at_01_09_2024,_16_17_[Changes]/shelved.patch +=================================================================== +diff --git a/.idea/shelf/Uncommitted_changes_before_Update_at_01_09_2024,_16_17_[Changes]/shelved.patch b/.idea/shelf/Uncommitted_changes_before_Update_at_01_09_2024,_16_17_[Changes]/shelved.patch +deleted file mode 100644 +--- a/.idea/shelf/Uncommitted_changes_before_Update_at_01_09_2024,_16_17_[Changes]/shelved.patch (revision d9ba9762f503c798ff6dc9e4aef0dc1517fb3188) ++++ /dev/null (revision d9ba9762f503c798ff6dc9e4aef0dc1517fb3188) +@@ -1,205 +0,0 @@ +-Index: src/root/compiler/evaluation/type_only.rs +-IDEA additional info: +-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +-<+>use crate::root::compiler::evaluation::function_only;\nuse crate::root::compiler::global_tracker::GlobalTracker;\nuse crate::root::compiler::local_variable_table::LocalVariableTable;\nuse crate::root::errors::evaluable_errors::EvalErrs;\nuse crate::root::errors::evaluable_errors::EvalErrs::ExpectedReference;\nuse crate::root::errors::name_resolver_errors::NRErrs;\nuse crate::root::errors::WErr;\nuse crate::root::name_resolver::name_resolvers::{GlobalTable, NameResult};\nuse crate::root::parser::parse_function::parse_evaluable::{EvaluableToken, EvaluableTokens};\nuse crate::root::parser::parse_function::parse_operator::{OperatorTokens, PrefixOrInfixEx};\nuse crate::root::parser::parse_name::SimpleNameToken;\nuse crate::root::shared::common::{FunctionID, Indirection, TypeRef};\n\nfn handle_name_result(name: &SimpleNameToken, name_result: NameResult) -> Result {\n Ok(match name_result {\n NameResult::Function(_) => {\n return WErr::ne(\n EvalErrs::FunctionMustBeCalled(name.name().clone()),\n name.location().clone(),\n )\n }\n NameResult::Type(t) => {\n t.immediate_single()\n // println!(\"> {}\", name.name());\n // std::process::exit(123);\n // return WErr::ne(\n // EvalErrs::CannotEvalStandaloneType(name.name().clone()),\n // name.location().clone(),\n // )\n }\n NameResult::Variable(address) => address.type_ref().clone(),\n NameResult::File(_) => {\n return WErr::ne(\n EvalErrs::ExpectedTypeNotImportedFile(name.name().clone()),\n name.location().clone(),\n )\n }\n })\n}\n\n/// Evaluates the type `et` evaluates to. Does not generate any assembly.\npub fn compile_evaluable_type_only(\n fid: FunctionID,\n et: &EvaluableToken,\n local_variables: &mut LocalVariableTable,\n global_table: &mut GlobalTable,\n global_tracker: &mut GlobalTracker,\n) -> Result {\n let ets = et.token();\n\n Ok(match ets {\n EvaluableTokens::Name(name, containing_class) => handle_name_result(\n name,\n global_table.resolve_name(\n name,\n None,\n containing_class.as_ref(),\n local_variables,\n global_tracker,\n )?,\n )?,\n EvaluableTokens::Literal(literal) => {\n let tid = literal.literal().default_type();\n // TODO: Don't use 0 here\n TypeRef::new(tid, 0, Indirection(0))\n }\n EvaluableTokens::InfixOperator(lhs, op, _) => {\n // if op.is_prefix_opt_t() {\n // return Err(WErr::n(EvalErrs::FoundPrefixNotInfixOp(op.operator().to_str().to_string()), op.location().clone()));\n // }\n\n // let (mut code, lhs) = compile_evaluable(fid, lhs, local_variables, global_table, global_tracker)?;\n let lhs_type = compile_evaluable_type_only(\n fid,\n lhs,\n local_variables,\n global_table,\n global_tracker,\n )?;\n\n // code += \"\\n\";\n let op_fn = global_table.get_operator_function(\n *lhs_type.type_id(),\n op,\n PrefixOrInfixEx::Infix,\n )?;\n let signature = global_table.get_function_signature(op_fn);\n signature.return_type().as_ref().unwrap().clone()\n }\n EvaluableTokens::PrefixOperator(op, lhs) => {\n let lhs_type = compile_evaluable_type_only(\n fid,\n lhs,\n local_variables,\n global_table,\n global_tracker,\n )?;\n\n match op.operator() {\n OperatorTokens::Reference => return Ok(lhs_type.plus_one_indirect()),\n OperatorTokens::Multiply => {\n if !lhs_type.indirection().has_indirection() {\n return WErr::ne(\n ExpectedReference(global_table.get_type_name(&lhs_type)),\n lhs.location().clone(),\n );\n }\n return Ok(lhs_type.minus_one_indirect());\n }\n _ => {}\n };\n\n // code += \"\\n\";\n let op_fn = global_table.get_operator_function(\n *lhs_type.type_id(),\n op,\n PrefixOrInfixEx::Prefix,\n )?;\n let signature = global_table.get_function_signature(op_fn);\n signature.return_type().as_ref().unwrap().clone()\n }\n EvaluableTokens::DynamicAccess {\n parent: inner,\n section: access,\n } => {\n let t = compile_evaluable_type_only(\n fid,\n inner,\n local_variables,\n global_table,\n global_tracker,\n )?;\n\n let t = global_table.get_type(*t.type_id());\n let attribs = t.get_attributes(access.location())?;\n\n let mut out = None;\n\n for (_, name, t) in attribs {\n if name.name() == access.name() {\n out = Some(t.clone());\n break;\n }\n }\n\n if let Some(out) = out {\n out.plus_one_indirect()\n } else {\n return WErr::ne(\n EvalErrs::TypeDoesntHaveAttribute(\n global_table.get_type_name(&t.id().immediate_single()),\n access.name().clone(),\n ),\n access.location().clone(),\n );\n }\n }\n EvaluableTokens::StaticAccess {\n parent: p,\n section: n,\n } => {\n match p.token() {\n EvaluableTokens::Name(file_name, containing_class) => {\n if let Some(file) = global_table.get_imported_file(file_name, global_tracker) {\n return handle_name_result(\n n,\n global_table.resolve_name(\n n,\n Some(file),\n containing_class.as_ref(),\n local_variables,\n global_tracker,\n )?,\n );\n };\n }\n EvaluableTokens::StaticAccess {\n parent,\n section: file_name,\n } => {\n if let EvaluableTokens::Name(folder_name, containing_class) = parent.token() {\n if let Some(file) = global_table.get_file_from_folder(\n folder_name.name(),\n file_name.name(),\n global_tracker,\n ) {\n return handle_name_result(\n n,\n global_table.resolve_name(\n n,\n Some(file),\n containing_class.as_ref(),\n local_variables,\n global_tracker,\n )?,\n );\n }\n }\n }\n _ => (),\n }\n\n return WErr::ne(\n NRErrs::CannotFindConstantAttribute(n.name().clone()),\n n.location().clone(),\n );\n } // Accessed methods must be called\n EvaluableTokens::FunctionCall {\n function: inner,\n args: _args,\n } => {\n let (_slf, ifid, _) = function_only::compile_evaluable_function_only(\n fid,\n inner,\n local_variables,\n global_table,\n global_tracker,\n )?;\n\n let signature = global_table.get_function_signature(ifid);\n let Some(return_type) = signature.return_type().clone() else {\n return WErr::ne(EvalErrs::ExpectedNotNone, et.location().clone());\n };\n return_type\n }\n EvaluableTokens::StructInitialiser(struct_init) => {\n let mut t = global_table.resolve_to_type_ref(struct_init.name(), None)?;\n if *struct_init.heap_alloc() {\n t = t.plus_one_indirect();\n }\n t\n }\n EvaluableTokens::None => {\n return WErr::ne(EvalErrs::ExpectedNotNone, et.location().clone());\n }\n })\n}\n +-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +-<+>UTF-8 +-=================================================================== +-diff --git a/src/root/compiler/evaluation/type_only.rs b/src/root/compiler/evaluation/type_only.rs +---- a/src/root/compiler/evaluation/type_only.rs (revision 61cc3af4f0f06c1b7513a3acd51a55917b913396) +-+++ b/src/root/compiler/evaluation/type_only.rs (date 1723917091750) +-@@ -182,6 +182,7 @@ +- if let Some(file) = global_table.get_file_from_folder( +- folder_name.name(), +- file_name.name(), +-+ +- global_tracker, +- ) { +- return handle_name_result( +-Index: .idea/workspace.xml +-IDEA additional info: +-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +-<+>\n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n {\n "lastFilter": {\n "state": "OPEN",\n "assignee": "Robert-M-Lucas"\n }\n}\n \n \n \n {\n "selectedUrlAndAccountId": {\n "url": "https://github.com/Robert-M-Lucas/whython-8.git",\n "accountId": "dcb8df19-0b39-47e1-9073-4a54f7034be8"\n }\n}\n \n \n \n \n {\n "customColor": "",\n "associatedIndex": 4\n}\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n 1714088144106\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n +-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +-<+>UTF-8 +-=================================================================== +-diff --git a/.idea/workspace.xml b/.idea/workspace.xml +---- a/.idea/workspace.xml +-+++ b/.idea/workspace.xml +-@@ -7,9 +7,11 @@ +- +- +- +-- +-+ +-+ +- +-- +-+ +-+ +- +- +-- { +-- "keyToString": { +-- "Cargo.Build `Run whython-8`.executor": "Run", +-- "Cargo.Run whython-8.executor": "Run", +-- "Cargo.Test whython-8.executor": "Run", +-- "RunOnceActivity.OpenProjectViewOnStart": "true", +-- "RunOnceActivity.ShowReadmeOnStart": "true", +-- "RunOnceActivity.rust.reset.selective.auto.import": "true", +-- "Shell Script.Test Asm.executor": "Run", +-- "git-widget-placeholder": "dev", +-- "ignore.virus.scanning.warn.message": "true", +-- "last_opened_file_path": "/home/robert/RustroverProjects/whython-8", +-- "node.js.detected.package.eslint": "true", +-- "node.js.detected.package.tslint": "true", +-- "node.js.selected.package.eslint": "(autodetect)", +-- "node.js.selected.package.tslint": "(autodetect)", +-- "nodejs_package_manager_path": "npm", +-- "org.rust.cargo.project.model.PROJECT_DISCOVERY": "true", +-- "org.rust.cargo.project.model.impl.CargoExternalSystemProjectAware.subscribe.first.balloon": "", +-- "org.rust.first.attach.projects": "true", +-- "settings.editor.selected.configurable": "preferences.pluginManager", +-- "vue.rearranger.settings.migration": "true" +-+ +-+}]]> +- +- +- +-@@ -292,14 +294,6 @@ +- +- +- +-- +-- +-- +- +- +-- +- +-@@ -742,7 +744,6 @@ +- +- +- +-- +- +- +- +-@@ -767,7 +768,8 @@ +- +- +- +-- +- +- +-Index: src/root/shared/mod.rs +-IDEA additional info: +-Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +-<+>pub(crate) mod common;\npub mod types;\n +-Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +-<+>UTF-8 +-=================================================================== +-diff --git a/src/root/shared/mod.rs b/src/root/shared/mod.rs +---- a/src/root/shared/mod.rs +-+++ b/src/root/shared/mod.rs +-@@ -1,2 +1,3 @@ +- pub(crate) mod common; +- pub mod types; +-+mod new_types; +Index: .idea/shelf/Uncommitted_changes_before_Checkout_at_01_09_2024__17_06__Changes_1.xml +=================================================================== +diff --git a/.idea/shelf/Uncommitted_changes_before_Checkout_at_01_09_2024__17_06__Changes_1.xml b/.idea/shelf/Uncommitted_changes_before_Checkout_at_01_09_2024__17_06__Changes_1.xml +deleted file mode 100644 +--- a/.idea/shelf/Uncommitted_changes_before_Checkout_at_01_09_2024__17_06__Changes_1.xml (revision d9ba9762f503c798ff6dc9e4aef0dc1517fb3188) ++++ /dev/null (revision d9ba9762f503c798ff6dc9e4aef0dc1517fb3188) +@@ -1,4 +0,0 @@ +- +- +\ No newline at end of file +Index: .idea/workspace.xml +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP +<+>\n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n {\n "lastFilter": {\n "state": "OPEN",\n "assignee": "Robert-M-Lucas"\n }\n}\n \n \n \n {\n "selectedUrlAndAccountId": {\n "url": "https://github.com/Robert-M-Lucas/whython-8",\n "accountId": "5325d154-08ff-47af-a3ea-1a4a5e1c240e"\n }\n}\n \n \n \n \n {\n "customColor": "",\n "associatedIndex": 4\n}\n \n \n \n {\n "keyToString": {\n "Cargo.Build `Run whython-8`.executor": "Run",\n "Cargo.Run whython-8.executor": "Run",\n "Cargo.Test whython-8.executor": "Run",\n "RunOnceActivity.OpenProjectViewOnStart": "true",\n "RunOnceActivity.ShowReadmeOnStart": "true",\n "RunOnceActivity.rust.reset.selective.auto.import": "true",\n "Shell Script.Test Asm.executor": "Run",\n "git-widget-placeholder": "dev",\n "ignore.virus.scanning.warn.message": "true",\n "last_opened_file_path": "/home/robert/RustroverProjects/whython-8",\n "node.js.detected.package.eslint": "true",\n "node.js.detected.package.tslint": "true",\n "node.js.selected.package.eslint": "(autodetect)",\n "node.js.selected.package.tslint": "(autodetect)",\n "nodejs_package_manager_path": "npm",\n "org.rust.cargo.project.model.PROJECT_DISCOVERY": "true",\n "org.rust.cargo.project.model.impl.CargoExternalSystemProjectAware.subscribe.first.balloon": "",\n "org.rust.first.attach.projects": "true",\n "settings.editor.selected.configurable": "preferences.pluginManager",\n "vue.rearranger.settings.migration": "true"\n },\n "keyToStringList": {\n "com.intellij.ide.scratch.ScratchImplUtil$2/New Scratch File": [\n "Rust"\n ]\n }\n}\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n 1714088144106\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n