work on the vars and new tokenizer

snippets/simple-code.f90 → fragments/simple-code.f90

@@ -6,7 +6,9 @@ program nearlyuseless
 
     temperature = 98.6
     cows        = 9
+    name        = "           dadsfdfadsfa                                      &
+    & . fsdafasdfasdd"
 
     print *, "There are ", cows, " cows outside."
-    print *, "You are probably ", temperature, " right now"
+    print *, "You are probably ",temperature, " right now"
 end program

src/helpers/cli.rs

@@ -3,7 +3,7 @@ use clap::{Parser, Subcommand};
 use std::path::Path;
 
 /// This struct is used to parse the arguments passed to the program.
-#[derive(Debug, Parser, Clone)]
+#[derive(Parser, Clone)]
 #[command(author, version, about)]
 #[command(subcommand_required = true)]
 pub struct Cli {
@@ -38,7 +38,7 @@ pub enum Commands {
         file: String,
 
         /// Threat `Warning` as `Error`
-        #[arg(long)]
+        #[arg(long, short = 'W')]
         werror: bool,
 
         /// Print the comment during the execution of the program
@@ -57,13 +57,14 @@ impl Cli {
     }
 
     /// This function returns the value of the `verbose` argument.
-    // pub fn get_verbose(&self) -> bool {
-    //     self.verbose
-    //         || match &self.command {
-    //             Commands::Run { verbose, .. } => *verbose,
-    //             Commands::Check { verbose, .. } => *verbose,
-    //         }
-    // }
+    #[allow(dead_code)]
+    pub fn get_verbose(&self) -> bool {
+        self.verbose
+            || match &self.command {
+                Commands::Run { verbose, .. } => *verbose,
+                Commands::Check { verbose, .. } => *verbose,
+            }
+    }
 
     /// This function returns the value of the `werror` argument.
     pub fn get_werror(&self) -> bool {
@@ -78,6 +79,8 @@ impl Cli {
         &self.command
     }
 
+    /// This function prints the `Cli` struct for debug purposes.
+    /// Not available in release mode.
     pub fn debug(&self) {
         println!("Cli {{");
         println!("    command: {:?}", self.get_command());

src/helpers/errors.rs

@@ -11,9 +11,10 @@ pub enum Error {
     UnknownToken,
     UnexpectedToken,
     Critical,
+    TooCharacters,
 }
 
-fn error_to_string(error: Error) -> String {
+fn error_to_string(error: &Error) -> &'static str {
     match error {
         Error::Syntax => "Syntax",
         Error::NotImplemented => "NotImplemented",
@@ -22,11 +23,11 @@ fn error_to_string(error: Error) -> String {
         Error::UnknownToken => "UnknownToken",
         Error::UnexpectedToken => "UnexpectedToken",
         Error::Critical => "Critical",
+        Error::TooCharacters => "TooCharacters",
     }
-    .to_string()
 }
 
-fn get_code_number(kind: Error) -> i32 {
+fn get_code_number(kind: Error) -> u8 {
     match kind {
         Error::Syntax => 1,
         Error::NotImplemented => 2,
@@ -35,10 +36,11 @@ fn get_code_number(kind: Error) -> i32 {
         Error::UnknownToken => 1,
         Error::UnexpectedToken => 1,
         Error::Critical => 2,
+        Error::TooCharacters => 1,
     }
 }
 
-fn header(program: Program, kind: Error, is_warning: bool) -> String {
+fn header(program: &Program, kind: &Error, is_warning: bool) -> String {
     let kind_colored = if is_warning {
         error_to_string(kind).yellow()
     } else {
@@ -59,14 +61,14 @@ fn header(program: Program, kind: Error, is_warning: bool) -> String {
 }
 
 pub fn raise(program: &Program, kind: Error, message: String) {
-    let header: String = header(program.clone(), kind.clone(), false);
+    let header: String = header(program, &kind, false);
     let code = get_code_number(kind);
     eprintln!("{} [Code {}]\nDetails: {}", header, code, message);
     // std::process::exit();
 }
 
 pub fn warn(program: &Program, kind: Error, message: String) {
-    let header: String = header(program.clone(), kind.clone(), true);
-    let code = get_code_number(kind);
+    let header: String = header(program, &kind, true);
+    let code: u8 = get_code_number(kind);
     println!("{} [Code {}]\nDetails: {}", header, code, message);
 }

src/lexer.rs

@@ -3,9 +3,9 @@
 //! The lexer is the first step of the compilation process. It takes the source code and converts it into tokens.
 use crate::{
     helpers::errors::{self, Error},
-    print::print_to_stdout,
     program::Program,
     tokens::Token,
+    utils::print::print_to_stdout,
     variables, VERBOSE,
 };
 use colored::Colorize;
@@ -41,7 +41,7 @@ pub fn lexer(program: &mut Program) {
                             Error::UnexpectedToken,
                             format!(
                                 "Expected `END {}`, got `END {}`",
-                                stack.last().unwrap().get_name().to_ascii_uppercase(),
+                                stack.last().unwrap().debug().to_ascii_uppercase(),
                                 line.get(index + 1)
                                     .unwrap()
                                     .get_value()
@@ -58,11 +58,7 @@ pub fn lexer(program: &mut Program) {
                 _ => errors::warn(
                     program,
                     Error::UnexpectedToken,
-                    format!(
-                        "Unexpected token {} `{}`",
-                        token.get_name(),
-                        token.get_value()
-                    ),
+                    format!("Unexpected token {} `{}`", token.debug(), token.get_value()),
                 ),
             }
         }

src/main.rs

@@ -22,9 +22,10 @@ mod ast;
 mod helpers;
 mod lexer;
 mod parser;
-mod print;
 mod program;
+mod tokenizer;
 mod tokens;
+mod utils;
 mod variables;
 mod verbose;
 
@@ -34,7 +35,7 @@ use clap::Parser;
 static VERBOSE: bool = true;
 
 fn main() {
-    let args: cli::Cli = cli::Cli::parse();
+    let args = cli::Cli::parse();
 
     if VERBOSE {
         args.debug();
@@ -55,6 +56,12 @@ fn main() {
         file.debug();
     }
 
+    let tokenized = tokenizer::tokenizer(&file);
+
+    if VERBOSE {
+        tokenized.debug();
+    }
+
     let mut program = parser::parser(file);
 
     if VERBOSE {