@devaloop/devalang 0.0.1-alpha.9 → 0.0.1-beta.1

package/rust/core/lexer/mod.rs

@@ -1,51 +1,3 @@
-pub mod handler;
-pub mod token;
-
-use std::fs;
-use std::path::{Path, PathBuf};
-use crate::core::{
-    lexer::{ handler::driver::handle_content_lexing, token::Token },
-    utils::path::normalize_path,
-};
-
-pub struct Lexer {}
-
-impl Lexer {
-    pub fn new() -> Self {
-        Lexer {}
-    }
-
-    pub fn lex_from_source(&self, source: &str) -> Result<Vec<Token>, String> {
-        handle_content_lexing(source.to_string())
-    }
-
-    pub fn lex_tokens(&self, entrypoint: &str) -> Vec<Token> {
-        let path = normalize_path(entrypoint);
-        let resolved_path = Self::resolve_entry_path(&path);
-
-        let file_content =
-            fs::read_to_string(&resolved_path).expect("Failed to read the entrypoint file");
-
-        handle_content_lexing(file_content).expect("Failed to lex the content")
-    }
-
-    fn resolve_entry_path(path: &str) -> String {
-        let candidate = Path::new(path);
-
-        if candidate.is_dir() {
-            let index_path = candidate.join("index.deva");
-            if index_path.exists() {
-                return index_path.to_string_lossy().replace("\\", "/");
-            } else {
-                panic!(
-                    "Expected 'index.deva' in directory '{}', but it was not found",
-                    path
-                );
-            }
-        } else if candidate.is_file() {
-            return path.to_string();
-        } else {
-            panic!("Provided entrypoint '{}' is not a valid file or directory", path);
-        }
-    }
-}
+pub mod driver;
+pub mod handler;
+pub mod token;

package/rust/core/lexer/token.rs

@@ -1,4 +1,4 @@
-use serde::{ Deserialize, Serialize };
+use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct Token {
@@ -11,14 +11,7 @@ pub struct Token {
 
 impl Token {
     pub fn is_error(&self) -> bool {
-        match &self.kind {
-            TokenKind::Error(_) => {
-                return true;
-            }
-            _ => {
-                return false;
-            }
-        };
+        matches!(&self.kind, TokenKind::Error(_))
     }
 }
 
@@ -28,7 +21,12 @@ pub enum TokenKind {
     At,
     Tempo,
     Bank,
+    Pattern,
     Loop,
+    Function,
+    As,
+    On,
+    Emit,
 
     // ───── Instruments ─────
     Synth,
@@ -49,6 +47,10 @@ pub enum TokenKind {
     Comma,
     Equals,
     Dot,
+    Slash,
+    Plus,
+    Asterisk,
+    Minus,
 
     // ───── Operators ─────
     DoubleEquals,
@@ -59,13 +61,15 @@ pub enum TokenKind {
     Less,
 
     // ───── Brackets ─────
-    LBrace, // {
-    RBrace, // }
+    LBrace,   // {
+    RBrace,   // }
     LBracket, // [
     RBracket, // ]
+    LParen,   // (
+    RParen,   // )
 
     // ───── Quotes ─────
-    Quote, // '
+    Quote,   // '
     DbQuote, // "
 
     // ───── Formatting ─────
@@ -80,6 +84,7 @@ pub enum TokenKind {
     ElseIf,
 
     // ───── Special / Internal ─────
+    Whitespace,
     Unknown,
     Error(String),
     EOF,

package/rust/core/mod.rs

@@ -1,10 +1,10 @@
-pub mod lexer;
-pub mod preprocessor;
-pub mod store;
-pub mod parser;
-pub mod shared;
-pub mod debugger;
-pub mod utils;
-pub mod builder;
-pub mod error;
-pub mod audio;
+pub mod audio;
+pub mod builder;
+pub mod debugger;
+pub mod error;
+pub mod lexer;
+pub mod parser;
+pub mod plugin;
+pub mod preprocessor;
+pub mod store;
+pub mod utils;