Merge pull request #64 from behemehal/dev

v0.6.0

Author: ahmetcanaksu

CHANGELOG.md

@@ -13,3 +13,10 @@
   - [TECHNICAL] Save function's parameter name and type cursor positions separately [5ab7849dd09407baea6a39a47803a3c6e953314b](https://github.com/behemehal/Ellie-Language/commit/5ab7849dd09407baea6a39a47803a3c6e953314b)
   - Fix the situation that ret cant be void. [97e877e5d08ca800e1c3c0394e09a158276a2d50](https://github.com/behemehal/Ellie-Language/commit/97e877e5d08ca800e1c3c0394e09a158276a2d50)
   - [Major] Fix cursor issues with cli. [3ea4d25726beae6fcecb00c477358cc6989055a3](https://github.com/behemehal/Ellie-Language/commit/3ea4d25726beae6fcecb00c477358cc6989055a3)
+
+# v0.6.0
+
+- Parser v0.4.0
+
+  - Implement conditions [0253d6898ed0a1447392652b422cec2759358413](https://github.com/behemehal/Ellie-Language/commit/0253d6898ed0a1447392652b422cec2759358413)
+  - Implement for loop [bfdb7d90e5a5cec14d42164634c546b78a804493](https://github.com/behemehal/Ellie-Language/commit/bfdb7d90e5a5cec14d42164634c546b78a804493)

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "ellie_engine"
 version_code = "BeautifulTropicalFish"
-version = "0.5.5"
+version = "0.6.0"
 authors = ["Ahmetcan Aksu <ahmetcanaksu@behemehal.net>", "Behemehal <info@behemehal.net>"]
 edition = "2021"
 license-file = "LICENSE"

bytecode/src/assembler.rs

@@ -377,14 +377,15 @@ impl Assembler {
                     ellie_core::definite::items::Collecting::Generic(_) => {
                         std::println!("[Assembler,Ignore,Element] Generic")
                     }
-                    ellie_core::definite::items::Collecting::NativeClass => todo!(),
                     ellie_core::definite::items::Collecting::GetterCall(_) => todo!(),
                     ellie_core::definite::items::Collecting::SetterCall(_) => todo!(),
                     ellie_core::definite::items::Collecting::Enum(_) => todo!(),
                     ellie_core::definite::items::Collecting::NativeFunction(_) => {
                         std::println!("[Assembler,Ignore,Element] NativeFunction")
                     }
                     ellie_core::definite::items::Collecting::None => todo!(),
+                    ellie_core::definite::items::Collecting::Brk(_) => todo!(),
+                    ellie_core::definite::items::Collecting::Go(_) => todo!(),
                 }
             }
             for dependency in &processed_page.dependencies {

core/src/definite/definers.rs

@@ -160,10 +160,40 @@ impl DefinerCollecting {
                     false
                 }
             }
-            DefinerCollecting::Cloak(_) => todo!(),
-            DefinerCollecting::Collective(_) => todo!(),
-            DefinerCollecting::Nullable(_) => todo!(),
-            DefinerCollecting::Dynamic => todo!(),
+            DefinerCollecting::Cloak(cloak) => {
+                if let DefinerCollecting::Cloak(other_cloak) = other {
+                    cloak.rtype.len() == other_cloak.rtype.len()
+                        && cloak
+                            .rtype
+                            .iter()
+                            .zip(other_cloak.rtype.iter())
+                            .all(|(a, b)| a.same_as(b.clone()))
+                } else {
+                    false
+                }
+            }
+            DefinerCollecting::Collective(e) => {
+                //Check if the key and value are the same
+                if let DefinerCollecting::Collective(other_e) = other {
+                    e.key.same_as(*other_e.key.clone()) && e.value.same_as(*other_e.value.clone())
+                } else {
+                    false
+                }
+            }
+            DefinerCollecting::Nullable(e) => {
+                if let DefinerCollecting::Nullable(other_e) = other {
+                    e.value.same_as(*other_e.value.clone())
+                } else {
+                    false
+                }
+            }
+            DefinerCollecting::Dynamic => {
+                if let DefinerCollecting::Dynamic = other {
+                    true
+                } else {
+                    false
+                }
+            }
         }
     }
 }

core/src/definite/items/brk.rs

@@ -0,0 +1,7 @@
+use crate::defs;
+use serde::{Deserialize, Serialize};
+
+#[derive(PartialEq, Debug, Clone, Serialize, Deserialize)]
+pub struct Brk {
+    pub pos: defs::Cursor,
+}

core/src/definite/items/condition.rs

@@ -1,4 +1,4 @@
-use crate::alloc::boxed::Box;
+use crate::{alloc::boxed::Box, definite::definers::DefinerCollecting};
 use crate::alloc::vec::Vec;
 use crate::definite::types;
 use crate::defs;
@@ -22,5 +22,6 @@ pub struct ConditionChain {
 #[derive(PartialEq, Debug, Clone, Serialize, Deserialize)]
 pub struct Condition {
     pub chains: Vec<ConditionChain>,
+    pub returns: Option<DefinerCollecting>,
     pub pos: defs::Cursor,
 }

core/src/definite/items/for_loop.rs

@@ -1,15 +1,15 @@
-use super::Collecting;
 use crate::definite::types;
 use crate::defs;
-use alloc::vec::Vec;
 use serde::{Deserialize, Serialize};
 
 #[derive(PartialEq, Debug, Clone, Serialize, Deserialize)]
 pub struct ForLoop {
     pub variable: types::Types,
     pub iterator: types::Types,
     pub parameter: defs::Cursor,
+    pub variable_pos: defs::Cursor,
+    pub iterator_pos: defs::Cursor,
     pub body_pos: defs::Cursor,
-    pub body: Vec<Collecting>,
+    pub inner_page_id: u64,
     pub pos: defs::Cursor,
 }

core/src/definite/items/go.rs

@@ -0,0 +1,7 @@
+use crate::defs;
+use serde::{Deserialize, Serialize};
+
+#[derive(PartialEq, Debug, Clone, Serialize, Deserialize)]
+pub struct Go {
+    pub pos: defs::Cursor,
+}

core/src/definite/items/mod.rs

@@ -19,6 +19,9 @@ pub mod variable;
 pub mod native_function;
 pub mod ret;
 
+pub mod brk;
+pub mod go;
+
 #[derive(PartialEq, Debug, Clone, Serialize, Deserialize)]
 pub enum Collecting {
     Variable(variable::Variable),
@@ -27,13 +30,14 @@ pub enum Collecting {
     Condition(condition::Condition),
     Class(class::Class),
     Ret(ret::Ret),
+    Brk(brk::Brk),
+    Go(go::Go),
     Constructor(constructor::Constructor),
     Import(import::Import),
     FileKey(file_key::FileKey),
     Getter(getter::Getter),
     Setter(setter::Setter),
     Generic(generic::Generic),
-    NativeClass,
     GetterCall(getter_call::GetterCall),
     SetterCall(setter_call::SetterCall),
     Enum(enum_type::EnumType),
@@ -69,8 +73,9 @@ impl Collecting {
             },
             Collecting::Enum(e) => e.pos,
             Collecting::NativeFunction(e) => e.pos,
-            Collecting::None => todo!(),
-            Collecting::NativeClass => todo!(),
+            Collecting::None => unreachable!(),
+            Collecting::Brk(e) => e.pos,
+            Collecting::Go(e) => e.pos,
         }
     }
 
@@ -87,13 +92,14 @@ impl Collecting {
             Collecting::FileKey(_) => false,
             Collecting::Getter(e) => e.public,
             Collecting::Setter(e) => e.public,
-            Collecting::NativeClass => true,
             Collecting::GetterCall(_) => false,
             Collecting::SetterCall(_) => false,
             Collecting::Enum(e) => e.public,
             Collecting::NativeFunction(e) => e.public,
             Collecting::None => false,
             Collecting::Generic(_) => false,
+            Collecting::Brk(_) => false,
+            Collecting::Go(_) => false,
         }
     }
 }

core/src/error/error_list.rs

@@ -79,7 +79,7 @@ lazy_static! {
     pub static ref ERROR_S13: error::Error = error::Error {
         code: 0x12,
         title: "SyntaxError".to_owned(),
-        message: "Expected operator found '$token'".to_owned(),
+        message: "'$token' and '$token1' has incompatible type returns".to_owned(),
         ..Default::default()
     };
     pub static ref ERROR_S14: error::Error = error::Error {
@@ -164,7 +164,7 @@ lazy_static! {
     pub static ref ERROR_S27: error::Error = error::Error {
         code: 0x26,
         title: "TypeError".to_owned(),
-        message: "Cannot apply data to generic type".to_owned(),
+        message: "Un-Assignable type".to_owned(),
         ..Default::default()
     };
     pub static ref ERROR_S28: error::Error = error::Error {