From 639dc378cf232d6051cd0f695988c526dbdbdc9c Mon Sep 17 00:00:00 2001 From: ahmtcn123 Date: Wed, 5 Jan 2022 19:37:24 +0300 Subject: [PATCH] Format code --- core/src/definite/items/native_function.rs | 4 +- core/src/definite/types/mod.rs | 2 +- parser/src/parser.rs | 7 ++- parser/src/processors/mod.rs | 2 +- parser/src/processors/ret.rs | 52 +++++++++++----------- parser/src/processors/type_processor.rs | 20 ++++++--- parser/standard_rules/src/rules.rs | 2 +- src/lib.rs | 4 +- tokenizer/src/syntax/items/condition.rs | 4 +- tokenizer/src/syntax/items/definers.rs | 3 +- tokenizer/src/syntax/types/mod.rs | 2 +- 11 files changed, 58 insertions(+), 44 deletions(-) diff --git a/core/src/definite/items/native_function.rs b/core/src/definite/items/native_function.rs index e58fe081..6dff05a5 100644 --- a/core/src/definite/items/native_function.rs +++ b/core/src/definite/items/native_function.rs @@ -6,9 +6,9 @@ use serde::{Deserialize, Serialize}; #[derive(PartialEq, Debug, Clone, Serialize, Deserialize)] pub struct NativeFunction { - pub name: String, //NativeFunction Name string + pub name: String, //NativeFunction Name string pub parameters: Vec, //Parameter vector - pub return_type: definers::DefinerCollecting, //Return type from enum + pub return_type: definers::DefinerCollecting, //Return type from enum pub public: bool, pub name_pos: defs::Cursor, //Name position fn [test] ...... pub parameters_pos: defs::Cursor, diff --git a/core/src/definite/types/mod.rs b/core/src/definite/types/mod.rs index 707693cf..4d574871 100644 --- a/core/src/definite/types/mod.rs +++ b/core/src/definite/types/mod.rs @@ -1,4 +1,5 @@ pub mod array; +pub mod as_keyword; pub mod bool; pub mod brace_reference; pub mod class_call; @@ -15,7 +16,6 @@ pub mod reference; pub mod string; pub mod variable; pub mod vector; -pub mod as_keyword; use serde::{Deserialize, Serialize}; diff --git a/parser/src/parser.rs b/parser/src/parser.rs index a7e152c7..8af5e934 100644 --- a/parser/src/parser.rs +++ b/parser/src/parser.rs @@ -811,7 +811,12 @@ impl Parser { } } - pub fn parse(&mut self, module_name: String, module_description: String, ellie_version: defs::Version) -> Module { + pub fn parse( + &mut self, + module_name: String, + module_description: String, + ellie_version: defs::Version, + ) -> Module { self.process_page(self.initial_page); Module { name: module_name, diff --git a/parser/src/processors/mod.rs b/parser/src/processors/mod.rs index 4373d438..e4a8645c 100644 --- a/parser/src/processors/mod.rs +++ b/parser/src/processors/mod.rs @@ -5,9 +5,9 @@ pub mod definer_processor; pub mod file_key; pub mod function; pub mod import; +pub mod ret; pub mod type_processor; pub mod variable; -pub mod ret; pub trait Processor { fn process(self, parser: &mut Parser, page_id: u64); diff --git a/parser/src/processors/ret.rs b/parser/src/processors/ret.rs index 433eea24..7d463ab1 100644 --- a/parser/src/processors/ret.rs +++ b/parser/src/processors/ret.rs @@ -1,26 +1,26 @@ -use ellie_core::defs; -use ellie_tokenizer::syntax::items::ret::Ret; - -impl super::Processor for Ret { - fn process(self, parser: &mut super::Parser, page_id: u64) { - match super::type_processor::process(self.value.current, parser, page_id, None) { - Ok(value) => { - let unprocessed_page = parser.find_page(page_id).unwrap(); - unprocessed_page.unreachable = true; - unprocessed_page.unreachable_range.range_start = - defs::CursorPosition(self.pos.range_end.0 + 1, 0); - let page = parser.find_processed_page(page_id).unwrap(); - page.items - .push(ellie_core::definite::items::Collecting::Ret( - ellie_core::definite::items::ret::Ret { - value: value, - keyword_pos: self.keyword_pos, - value_position: self.value_position, - pos: self.pos, - }, - )); - } - Err(type_error) => parser.informations.extend(&type_error), - } - } -} +use ellie_core::defs; +use ellie_tokenizer::syntax::items::ret::Ret; + +impl super::Processor for Ret { + fn process(self, parser: &mut super::Parser, page_id: u64) { + match super::type_processor::process(self.value.current, parser, page_id, None) { + Ok(value) => { + let unprocessed_page = parser.find_page(page_id).unwrap(); + unprocessed_page.unreachable = true; + unprocessed_page.unreachable_range.range_start = + defs::CursorPosition(self.pos.range_end.0 + 1, 0); + let page = parser.find_processed_page(page_id).unwrap(); + page.items + .push(ellie_core::definite::items::Collecting::Ret( + ellie_core::definite::items::ret::Ret { + value: value, + keyword_pos: self.keyword_pos, + value_position: self.value_position, + pos: self.pos, + }, + )); + } + Err(type_error) => parser.informations.extend(&type_error), + } + } +} diff --git a/parser/src/processors/type_processor.rs b/parser/src/processors/type_processor.rs index 1e180e54..b38196fc 100644 --- a/parser/src/processors/type_processor.rs +++ b/parser/src/processors/type_processor.rs @@ -22,11 +22,12 @@ pub fn process( Vec::new(), 0, ); - if deep_search_result.found { match deep_search_result.found_item { - crate::parser::DeepSearchItems::Class(_) => todo!("class type not yet implemented"), + crate::parser::DeepSearchItems::Class(_) => { + todo!("class type not yet implemented") + } crate::parser::DeepSearchItems::Variable(e) => { Ok(types::Types::VariableType(types::variable::VariableType { value: e.name, @@ -34,8 +35,12 @@ pub fn process( pos: from.get_pos(), })) } - crate::parser::DeepSearchItems::Function(_) => todo!("function type not yet implemented"), - crate::parser::DeepSearchItems::ImportReference(_) => todo!("import reference type not yet implemented"), + crate::parser::DeepSearchItems::Function(_) => { + todo!("function type not yet implemented") + } + crate::parser::DeepSearchItems::ImportReference(_) => { + todo!("import reference type not yet implemented") + } crate::parser::DeepSearchItems::BrokenPageGraph => todo!(), crate::parser::DeepSearchItems::MixUp(_) => todo!(), crate::parser::DeepSearchItems::None => todo!(), @@ -79,7 +84,12 @@ pub fn process( Processors::Cloak(_) => todo!("cloak type not yet implemented"), Processors::Collective(_) => todo!("collective type not yet implemented"), Processors::AsKeyword(as_keyword) => { - match process(*as_keyword.data.target, parser, page_id, ignore_hash.clone()) { + match process( + *as_keyword.data.target, + parser, + page_id, + ignore_hash.clone(), + ) { Ok(resolved_types) => { match crate::processors::definer_processor::process( as_keyword.data.rtype.definer_type, diff --git a/parser/standard_rules/src/rules.rs b/parser/standard_rules/src/rules.rs index 525c8f9a..8a13e6c6 100644 --- a/parser/standard_rules/src/rules.rs +++ b/parser/standard_rules/src/rules.rs @@ -43,7 +43,7 @@ lazy_static! { }); (param_name == fixed, fixed) } - }; + }; pub static ref FUNCTION_PARAM_NAMING_ISSUE: Rule = Rule { warning_id: 0x02, worker: |param_name| { diff --git a/src/lib.rs b/src/lib.rs index 047e7703..955ece55 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -35,8 +35,8 @@ extern crate ellie_tokenizer; #[cfg(feature = "build-cli")] #[macro_use] extern crate lazy_static; -pub mod engine_constants; pub mod cli_outputs; pub mod cli_utils; pub mod compile_file; -pub mod view_module; \ No newline at end of file +pub mod engine_constants; +pub mod view_module; diff --git a/tokenizer/src/syntax/items/condition.rs b/tokenizer/src/syntax/items/condition.rs index b6a767cd..bc3626f0 100644 --- a/tokenizer/src/syntax/items/condition.rs +++ b/tokenizer/src/syntax/items/condition.rs @@ -1,8 +1,8 @@ +use crate::processors::items; +use crate::processors::types::{self, TypeProcessor}; use ellie_core::definite::Converter; use ellie_core::defs; use serde::{Deserialize, Serialize}; -use crate::processors::items; -use crate::processors::types::{self, TypeProcessor}; #[derive(PartialEq, Debug, Clone, Serialize, Deserialize)] pub enum ConditionType { diff --git a/tokenizer/src/syntax/items/definers.rs b/tokenizer/src/syntax/items/definers.rs index 81b97fec..28d23f24 100644 --- a/tokenizer/src/syntax/items/definers.rs +++ b/tokenizer/src/syntax/items/definers.rs @@ -130,8 +130,7 @@ impl definite::Converter fo DefinerTypes::Cloak(e) => { definite::definers::DefinerCollecting::Cloak(definite::definers::CloakType { rtype: e.entries.into_iter().map(|x| x.to_definite()).collect(), - pos: e.pos, - + pos: e.pos, }) } DefinerTypes::Array(e) => { diff --git a/tokenizer/src/syntax/types/mod.rs b/tokenizer/src/syntax/types/mod.rs index bbe3e344..4d90919c 100644 --- a/tokenizer/src/syntax/types/mod.rs +++ b/tokenizer/src/syntax/types/mod.rs @@ -1,4 +1,5 @@ pub mod array_type; +pub mod as_keyword; pub mod brace_reference_type; pub mod char_type; pub mod class_call_type; @@ -12,4 +13,3 @@ pub mod operator_type; pub mod reference_type; pub mod string_type; pub mod variable_type; -pub mod as_keyword; \ No newline at end of file