fix: constant variables are usable now

src/modules/statement/stmt.rs

@@ -1,7 +1,6 @@
 use heraclitus_compiler::prelude::*;
 use itertools::Itertools;
 use crate::docs::module::DocumentationModule;
-use crate::modules::variable::constinit::ConstInit;
 use crate::utils::metadata::{ParserMetadata, TranslateMetadata};
 use crate::modules::expression::expr::{Expr, ExprType};
 use crate::translate::module::TranslateModule;
@@ -71,8 +70,7 @@ pub enum StatementType {
     Exit(Exit),
     CommandModifier(CommandModifier),
     Comment(Comment),
-    CommentDoc(CommentDoc),
-    ConstInit(ConstInit),
+    CommentDoc(CommentDoc)
 }
 
 #[derive(Debug, Clone)]
@@ -91,7 +89,7 @@ impl Statement {
         // Conditions
         IfChain, IfCondition,
         // Variables
-        VariableInit, VariableSet, ConstInit,
+        VariableInit, VariableSet,
         // Short hand
         ShorthandAdd, ShorthandSub,
         ShorthandMul, ShorthandDiv,

src/modules/variable/init.rs

@@ -11,13 +11,18 @@ pub struct VariableInit {
     name: String,
     expr: Box<Expr>,
     global_id: Option<usize>,
-    is_fun_ctx: bool
+    is_fun_ctx: bool,
+    is_const: bool
 }
 
 impl VariableInit {
-    fn handle_add_variable(&mut self, meta: &mut ParserMetadata, name: &str, kind: Type, tok: Option<Token>) -> SyntaxResult {
-        handle_identifier_name(meta, name, tok)?;
-        self.global_id = meta.add_var(name, kind, false);
+    fn handle_add_variable(
+        &mut self,
+        meta: &mut ParserMetadata,
+        tok: Option<Token>
+    ) -> SyntaxResult {
+        handle_identifier_name(meta, &self.name, tok)?;
+        self.global_id = meta.add_var(&self.name, self.expr.get_type(), self.is_const);
         Ok(())
     }
 }
@@ -30,20 +35,22 @@ impl SyntaxModule<ParserMetadata> for VariableInit {
             name: String::new(),
             expr: Box::new(Expr::new()),
             global_id: None,
-            is_fun_ctx: false
+            is_fun_ctx: false,
+            is_const: false
         }
     }
 
     fn parse(&mut self, meta: &mut ParserMetadata) -> SyntaxResult {
-        token(meta, "let")?;
+        let keyword = token_by(meta, |word| ["let", "const"].contains(&word.as_str()))?;
+        self.is_const = keyword == "const";
         // Get the variable name
         let tok = meta.get_current_token();
         self.name = variable(meta, variable_name_extensions())?;
         context!({
             token(meta, "=")?;
             syntax(meta, &mut *self.expr)?;
             // Add a variable to the memory
-            self.handle_add_variable(meta, &self.name.clone(), self.expr.get_type(), tok)?;
+            self.handle_add_variable(meta, tok)?;
             self.is_fun_ctx = meta.context.is_fun_ctx;
             Ok(())
         }, |position| {

src/modules/variable/mod.rs

@@ -8,7 +8,6 @@ use super::expression::expr::Expr;
 pub mod init;
 pub mod set;
 pub mod get;
-pub mod constinit;
 
 pub fn variable_name_extensions() -> Vec<char> {
     vec!['_']

src/tests/validity/variable_constant_condition.ab

@@ -0,0 +1,22 @@
+// Output
+// Outer: 42
+// If: 12
+// Else: 24
+
+main {
+    const x = 42
+    echo "Outer: {x}"
+
+    if x > 12 {
+        const x = 12
+        echo "If: {x}"
+    }
+
+    if x < 12 {
+        const x = 12
+        echo "If: {x}"
+    } else {
+        const x = 24
+        echo "Else: {x}"
+    }
+}

src/tests/validity/variable_constant_function.ab

@@ -0,0 +1,14 @@
+// Output
+// 12
+// 42
+
+const x = 42
+
+fun foo() {
+    const test = 12
+    echo test
+}
+
+foo()
+
+echo x

src/tests/validity/variable_constant_loop.ab

@@ -0,0 +1,15 @@
+// Output
+// 42
+// 1
+// 2
+// 3
+
+main {
+    const x = 42
+    echo x
+
+    for i in [1, 2, 3] {
+        const x = i
+        echo x
+    }
+}