@devaloop/devalang 0.0.1-beta.1 → 0.0.1-beta.2

package/rust/core/parser/handler/mod.rs

@@ -1,9 +1,9 @@
-pub mod arrow_call;
-pub mod at;
-pub mod bank;
-pub mod condition;
-pub mod dot;
-pub mod identifier;
-pub mod loop_;
-pub mod pattern;
-pub mod tempo;
+pub mod arrow_call;
+pub mod at;
+pub mod bank;
+pub mod condition;
+pub mod dot;
+pub mod identifier;
+pub mod loop_;
+pub mod pattern;
+pub mod tempo;

package/rust/core/parser/handler/pattern.rs

@@ -3,7 +3,7 @@ use devalang_types::Value;
 use crate::core::{
     lexer::token::TokenKind,
     parser::{
-        driver::Parser,
+        driver::parser::Parser,
         statement::{Statement, StatementKind},
     },
     store::global::GlobalStore,

package/rust/core/parser/handler/tempo.rs

@@ -1,57 +1,105 @@
-use crate::core::{
-    lexer::token::TokenKind,
-    parser::{
-        driver::Parser,
-        statement::{Statement, StatementKind},
-    },
-    store::global::GlobalStore,
-};
-use devalang_types::Value;
-
-pub fn parse_tempo_token(parser: &mut Parser, _global_store: &mut GlobalStore) -> Statement {
-    parser.advance(); // consume 'bpm'
-
-    let Some(tempo_token) = parser.previous_clone() else {
-        return Statement::unknown();
-    };
-
-    // Expect a number or identifier
-    let Some(value_token) = parser.peek_clone() else {
-        return Statement::error_with_pos(
-            tempo_token.indent,
-            tempo_token.line,
-            tempo_token.column,
-            "Expected a number or identifier after 'bpm'".to_string(),
-        );
-    };
-
-    let value = match value_token.kind {
-        TokenKind::Number => {
-            parser.advance();
-            Value::Number(value_token.lexeme.parse().unwrap_or(0.0))
-        }
-        TokenKind::Identifier => {
-            parser.advance();
-            Value::Identifier(value_token.lexeme.clone())
-        }
-        _ => {
-            return Statement::error_with_pos(
-                value_token.indent,
-                value_token.line,
-                value_token.column,
-                format!(
-                    "Expected a number or identifier after 'bpm', got {:?}",
-                    value_token.kind
-                ),
-            );
-        }
-    };
-
-    Statement {
-        kind: StatementKind::Tempo,
-        value,
-        indent: tempo_token.indent,
-        line: tempo_token.line,
-        column: tempo_token.column,
-    }
-}
+use crate::core::{
+    lexer::token::TokenKind,
+    parser::{
+        driver::parser::Parser,
+        statement::{Statement, StatementKind},
+    },
+    store::global::GlobalStore,
+};
+use devalang_types::Value;
+
+pub fn parse_tempo_token(parser: &mut Parser, _global_store: &mut GlobalStore) -> Statement {
+    parser.advance(); // consume 'bpm'
+
+    let Some(tempo_token) = parser.previous_clone() else {
+        return Statement::unknown();
+    };
+
+    // Expect a number or identifier
+    let Some(value_token) = parser.peek_clone() else {
+        return Statement::error_with_pos(
+            tempo_token.indent,
+            tempo_token.line,
+            tempo_token.column,
+            "Expected a number or identifier after 'bpm'".to_string(),
+        );
+    };
+
+    let value = match value_token.kind {
+        TokenKind::Number => {
+            // support decimals and fraction forms
+            let mut num = value_token.lexeme.clone();
+            parser.advance();
+            if let Some(dot) = parser.peek_clone() {
+                if dot.kind == TokenKind::Dot {
+                    if let Some(next) = parser.peek_nth(1).cloned() {
+                        if next.kind == TokenKind::Number {
+                            parser.advance();
+                            parser.advance();
+                            num.push('.');
+                            num.push_str(&next.lexeme);
+                        }
+                    }
+                }
+            }
+
+            if let Some(slash) = parser.peek_clone() {
+                if slash.kind == TokenKind::Slash {
+                    parser.advance();
+                    if let Some(den) = parser.peek_clone() {
+                        if den.kind == TokenKind::Number || den.kind == TokenKind::Identifier {
+                            let frac = format!("{}/{}", num, den.lexeme);
+                            parser.advance();
+                            Value::Duration(devalang_types::Duration::Beat(frac))
+                        } else {
+                            return Statement::error_with_pos(
+                                slash.indent,
+                                slash.line,
+                                slash.column,
+                                "Expected denominator after '/' in bpm".to_string(),
+                            );
+                        }
+                    } else {
+                        return Statement::error_with_pos(
+                            slash.indent,
+                            slash.line,
+                            slash.column,
+                            "Expected denominator after '/' in bpm".to_string(),
+                        );
+                    }
+                } else {
+                    Value::Number(num.parse().unwrap_or(0.0))
+                }
+            } else {
+                Value::Number(num.parse().unwrap_or(0.0))
+            }
+        }
+        TokenKind::Identifier => {
+            parser.advance();
+            Value::Identifier(value_token.lexeme.clone())
+        }
+        TokenKind::String => {
+            parser.advance();
+            Value::String(value_token.lexeme.clone())
+        }
+        _ => {
+            return Statement::error_with_pos(
+                value_token.indent,
+                value_token.line,
+                value_token.column,
+                format!(
+                    "Expected a number, string or identifier after 'bpm', got {:?}",
+                    value_token.kind
+                ),
+            );
+        }
+    };
+
+    Statement {
+        kind: StatementKind::Tempo,
+        value,
+        indent: tempo_token.indent,
+        line: tempo_token.line,
+        column: tempo_token.column,
+    }
+}

package/rust/core/parser/statement.rs

@@ -1,11 +1,10 @@
-use crate::core::lexer::token::Token;
-
-pub use devalang_types::{Duration, Statement, StatementKind, Value};
-
-pub fn unknown_from_token(token: &Token) -> Statement {
-    Statement::unknown_with_pos(token.indent, token.line, token.column)
-}
-
-pub fn error_from_token(token: Token, message: String) -> Statement {
-    Statement::error_with_pos(token.indent, token.line, token.column, message)
-}
+use crate::core::lexer::token::Token;
+pub use devalang_types::{Duration, Statement, StatementKind, Value};
+
+pub fn unknown_from_token(token: &Token) -> Statement {
+    Statement::unknown_with_pos(token.indent, token.line, token.column)
+}
+
+pub fn error_from_token(token: Token, message: String) -> Statement {
+    Statement::error_with_pos(token.indent, token.line, token.column, message)
+}

package/rust/core/plugin/loader.rs

@@ -1,4 +1,4 @@
-use devalang_types::{PluginExport, PluginInfo as SharedPluginInfo};
+use devalang_types::{plugin::PluginExport, plugin::PluginInfo as SharedPluginInfo};
 use devalang_utils::path as path_utils;
 use serde::Deserialize;
 use toml::Value as TomlValue;

package/rust/core/plugin/mod.rs

@@ -1,2 +1,2 @@
-pub mod loader;
-pub mod runner;
+pub mod loader;
+pub mod runner;

package/rust/core/plugin/runner/mod.rs

@@ -0,0 +1,11 @@
+#[cfg(not(target_arch = "wasm32"))]
+mod non_wasm;
+
+#[cfg(target_arch = "wasm32")]
+mod wasm32;
+
+#[cfg(not(target_arch = "wasm32"))]
+pub use non_wasm::WasmPluginRunner;
+
+#[cfg(target_arch = "wasm32")]
+pub use wasm32::WasmPluginRunner;