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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (159) hide show
  1. package/Cargo.toml +84 -81
  2. package/README.md +3 -2
  3. package/docs/CHANGELOG.md +41 -0
  4. package/docs/ROADMAP.md +3 -3
  5. package/examples/chain.deva +19 -0
  6. package/examples/plugin.deva +10 -10
  7. package/examples/routing.deva +23 -0
  8. package/out-tsc/bin/project-version.json +6 -0
  9. package/out-tsc/pkg/devalang_core_bg.wasm.d.ts +8 -8
  10. package/out-tsc/scripts/version/copy-to-binary.d.ts +1 -0
  11. package/out-tsc/scripts/version/copy-to-binary.js +79 -0
  12. package/package.json +23 -10
  13. package/project-version.json +3 -3
  14. package/rust/bindings/Cargo.toml +9 -0
  15. package/rust/bindings/src/lib.rs +86 -0
  16. package/rust/cli/addon/commands.rs +35 -0
  17. package/rust/cli/addon/download.rs +234 -0
  18. package/rust/cli/addon/install.rs +33 -0
  19. package/rust/cli/addon/list.rs +224 -0
  20. package/rust/cli/addon/metadata.rs +124 -0
  21. package/rust/cli/addon/mod.rs +8 -0
  22. package/rust/cli/addon/remove.rs +271 -0
  23. package/rust/cli/addon/update.rs +305 -0
  24. package/rust/cli/{install/addon.rs → addon/utils.rs} +109 -118
  25. package/rust/cli/build/commands.rs +153 -153
  26. package/rust/cli/build/process.rs +165 -165
  27. package/rust/cli/check/mod.rs +208 -208
  28. package/rust/cli/discover/commands.rs +275 -253
  29. package/rust/cli/discover/config.rs +109 -111
  30. package/rust/cli/discover/fs.rs +19 -19
  31. package/rust/cli/discover/install.rs +214 -103
  32. package/rust/cli/discover/metadata.rs +48 -48
  33. package/rust/cli/discover/mod.rs +5 -5
  34. package/rust/cli/me/commands.rs +52 -0
  35. package/rust/cli/me/mod.rs +1 -0
  36. package/rust/cli/mod.rs +12 -12
  37. package/rust/cli/parser.rs +30 -69
  38. package/rust/cli/play/commands.rs +375 -375
  39. package/rust/cli/play/process.rs +159 -159
  40. package/rust/core/audio/engine/driver.rs +19 -2
  41. package/rust/core/audio/engine/export.rs +169 -169
  42. package/rust/core/audio/engine/mod.rs +56 -56
  43. package/rust/core/audio/engine/notes/dsp.rs +88 -85
  44. package/rust/core/audio/engine/notes/mod.rs +53 -44
  45. package/rust/core/audio/engine/notes/params.rs +294 -294
  46. package/rust/core/audio/engine/sample/insert.rs +148 -47
  47. package/rust/core/audio/engine/sample/mod.rs +40 -40
  48. package/rust/core/audio/engine/sample/padding.rs +170 -170
  49. package/rust/core/audio/evaluator/condition.rs +61 -61
  50. package/rust/core/audio/evaluator/numeric.rs +152 -152
  51. package/rust/core/audio/evaluator/rhs.rs +16 -16
  52. package/rust/core/audio/evaluator/string_expr.rs +94 -94
  53. package/rust/core/audio/interpreter/driver.rs +574 -574
  54. package/rust/core/audio/interpreter/mod.rs +2 -2
  55. package/rust/core/audio/interpreter/statements/arrow_call/interprete.rs +9 -5
  56. package/rust/core/audio/interpreter/statements/arrow_call/methods/chord.rs +398 -384
  57. package/rust/core/audio/interpreter/statements/arrow_call/methods/effects.rs +323 -0
  58. package/rust/core/audio/interpreter/statements/arrow_call/methods/mod.rs +1 -0
  59. package/rust/core/audio/interpreter/statements/arrow_call/methods/note.rs +66 -11
  60. package/rust/core/audio/interpreter/statements/arrow_call/mod.rs +3 -3
  61. package/rust/core/audio/interpreter/statements/arrow_call/types/arp.rs +192 -192
  62. package/rust/core/audio/interpreter/statements/arrow_call/types/mod.rs +24 -24
  63. package/rust/core/audio/interpreter/statements/arrow_call/types/pad.rs +116 -116
  64. package/rust/core/audio/interpreter/statements/arrow_call/types/pluck.rs +97 -97
  65. package/rust/core/audio/interpreter/statements/arrow_call/types/sub.rs +100 -100
  66. package/rust/core/audio/interpreter/statements/automate.rs +16 -16
  67. package/rust/core/audio/interpreter/statements/call.rs +31 -1
  68. package/rust/core/audio/interpreter/statements/condition.rs +72 -72
  69. package/rust/core/audio/interpreter/statements/function.rs +24 -24
  70. package/rust/core/audio/interpreter/statements/let_.rs +36 -36
  71. package/rust/core/audio/interpreter/statements/load.rs +17 -17
  72. package/rust/core/audio/interpreter/statements/loop_.rs +115 -115
  73. package/rust/core/audio/interpreter/statements/spawn.rs +51 -2
  74. package/rust/core/audio/interpreter/statements/trigger.rs +242 -239
  75. package/rust/core/audio/loader/trigger.rs +98 -98
  76. package/rust/core/audio/player.rs +70 -70
  77. package/rust/core/audio/special/mod.rs +9 -9
  78. package/rust/core/builder/mod.rs +129 -129
  79. package/rust/core/debugger/lexer.rs +27 -27
  80. package/rust/core/debugger/logs.rs +52 -52
  81. package/rust/core/debugger/preprocessor.rs +27 -27
  82. package/rust/core/debugger/store.rs +38 -38
  83. package/rust/core/lexer/driver.rs +59 -59
  84. package/rust/core/lexer/handler/arrow.rs +82 -82
  85. package/rust/core/lexer/handler/at.rs +21 -21
  86. package/rust/core/lexer/handler/brace.rs +41 -41
  87. package/rust/core/lexer/handler/colon.rs +21 -21
  88. package/rust/core/lexer/handler/comment.rs +30 -30
  89. package/rust/core/lexer/handler/dot.rs +21 -21
  90. package/rust/core/lexer/handler/driver.rs +337 -337
  91. package/rust/core/lexer/handler/identifier.rs +47 -47
  92. package/rust/core/lexer/handler/indent.rs +66 -66
  93. package/rust/core/lexer/handler/mod.rs +15 -15
  94. package/rust/core/lexer/handler/newline.rs +23 -23
  95. package/rust/core/lexer/handler/number.rs +31 -31
  96. package/rust/core/lexer/handler/operator.rs +46 -46
  97. package/rust/core/lexer/handler/parenthesis.rs +41 -41
  98. package/rust/core/lexer/handler/slash.rs +21 -21
  99. package/rust/core/lexer/handler/string.rs +63 -63
  100. package/rust/core/lexer/mod.rs +3 -3
  101. package/rust/core/mod.rs +9 -9
  102. package/rust/core/parser/driver/block.rs +111 -111
  103. package/rust/core/parser/driver/cursor.rs +82 -82
  104. package/rust/core/parser/driver/driver_impl.rs +21 -1
  105. package/rust/core/parser/driver/mod.rs +6 -6
  106. package/rust/core/parser/driver/parse_array.rs +120 -120
  107. package/rust/core/parser/driver/parse_map.rs +247 -223
  108. package/rust/core/parser/driver/parser.rs +160 -160
  109. package/rust/core/parser/handler/arrow_call.rs +65 -14
  110. package/rust/core/parser/handler/identifier/synth.rs +171 -135
  111. package/rust/core/parser/handler/mod.rs +9 -9
  112. package/rust/core/parser/handler/pattern.rs +24 -1
  113. package/rust/core/plugin/loader.rs +137 -137
  114. package/rust/core/plugin/mod.rs +2 -2
  115. package/rust/core/plugin/runner/non_wasm.rs +481 -297
  116. package/rust/core/plugin/runner/wasm32.rs +1 -0
  117. package/rust/core/preprocessor/loader/inject.rs +313 -278
  118. package/rust/core/preprocessor/loader/loader_helpers.rs +110 -110
  119. package/rust/core/preprocessor/loader/mod.rs +235 -235
  120. package/rust/core/preprocessor/module.rs +55 -55
  121. package/rust/core/preprocessor/processor/handlers.rs +107 -107
  122. package/rust/core/preprocessor/resolver/bank.rs +49 -49
  123. package/rust/core/preprocessor/resolver/call.rs +124 -124
  124. package/rust/core/preprocessor/resolver/condition.rs +95 -95
  125. package/rust/core/preprocessor/resolver/driver.rs +324 -324
  126. package/rust/core/preprocessor/resolver/function.rs +69 -69
  127. package/rust/core/preprocessor/resolver/group.rs +122 -122
  128. package/rust/core/preprocessor/resolver/let_.rs +32 -32
  129. package/rust/core/preprocessor/resolver/loop_.rs +318 -318
  130. package/rust/core/preprocessor/resolver/mod.rs +16 -16
  131. package/rust/core/preprocessor/resolver/pattern.rs +95 -83
  132. package/rust/core/preprocessor/resolver/spawn.rs +99 -99
  133. package/rust/core/preprocessor/resolver/synth.rs +54 -54
  134. package/rust/core/preprocessor/resolver/tempo.rs +48 -48
  135. package/rust/core/preprocessor/resolver/trigger.rs +116 -116
  136. package/rust/core/preprocessor/resolver/value.rs +176 -176
  137. package/rust/core/store/global.rs +57 -57
  138. package/rust/lib.rs +323 -323
  139. package/rust/macros/Cargo.toml +14 -0
  140. package/rust/macros/src/lib.rs +52 -0
  141. package/rust/main.rs +311 -142
  142. package/rust/types/Cargo.toml +1 -1
  143. package/rust/types/src/addons.rs +3 -1
  144. package/rust/types/src/config.rs +1 -3
  145. package/rust/utils/Cargo.toml +5 -2
  146. package/rust/utils/src/file.rs +397 -14
  147. package/rust/utils/src/path.rs +31 -2
  148. package/rust/utils/src/version.rs +38 -7
  149. package/rust/web/auth.rs +5 -0
  150. package/rust/web/forge.rs +5 -0
  151. package/rust/web/mod.rs +5 -3
  152. package/typescript/scripts/version/copy-to-binary.ts +82 -0
  153. package/rust/cli/bank/api.rs +0 -122
  154. package/rust/cli/bank/commands.rs +0 -306
  155. package/rust/cli/bank/mod.rs +0 -29
  156. package/rust/cli/install/bank.rs +0 -72
  157. package/rust/cli/install/commands.rs +0 -35
  158. package/rust/cli/install/mod.rs +0 -4
  159. package/rust/cli/install/plugin.rs +0 -80
@@ -1,52 +1,52 @@
1
- use devalang_types::{FunctionTable, VariableTable};
2
- use std::fs::create_dir_all;
3
-
4
- pub fn write_module_variable_log_file(
5
- output_dir: &str,
6
- module_path: &str,
7
- variable_table: &VariableTable,
8
- ) {
9
- let debugger = crate::core::debugger::Debugger::new();
10
- let mut content = String::new();
11
- let module_name = module_path
12
- .split('/')
13
- .next_back()
14
- .unwrap_or("index")
15
- .replace(".deva", "");
16
-
17
- let log_directory = format!("{}/logs/modules/{}", output_dir, module_name);
18
- create_dir_all(&log_directory).expect("Failed to create log directory");
19
-
20
- for (var_name, var_data) in &variable_table.variables {
21
- content.push_str(&format!("{:?} = {:?}\n", var_name, var_data));
22
- }
23
-
24
- content.push('\n');
25
-
26
- debugger.write_log_file(&log_directory, "variables.log", &content);
27
- }
28
-
29
- pub fn write_module_function_log_file(
30
- output_dir: &str,
31
- module_path: &str,
32
- function_table: &FunctionTable,
33
- ) {
34
- let debugger = crate::core::debugger::Debugger::new();
35
- let mut content = String::new();
36
- let module_name = module_path
37
- .split('/')
38
- .next_back()
39
- .unwrap_or("index")
40
- .replace(".deva", "");
41
-
42
- let log_directory = format!("{}/logs/modules/{}", output_dir, module_name);
43
- create_dir_all(&log_directory).expect("Failed to create log directory");
44
-
45
- for (func_name, func_data) in &function_table.functions {
46
- content.push_str(&format!("{:?} = {:?}\n", func_name, func_data));
47
- }
48
-
49
- content.push('\n');
50
-
51
- debugger.write_log_file(&log_directory, "functions.log", &content);
52
- }
1
+ use devalang_types::{FunctionTable, VariableTable};
2
+ use std::fs::create_dir_all;
3
+
4
+ pub fn write_module_variable_log_file(
5
+ output_dir: &str,
6
+ module_path: &str,
7
+ variable_table: &VariableTable,
8
+ ) {
9
+ let debugger = crate::core::debugger::Debugger::new();
10
+ let mut content = String::new();
11
+ let module_name = module_path
12
+ .split('/')
13
+ .next_back()
14
+ .unwrap_or("index")
15
+ .replace(".deva", "");
16
+
17
+ let log_directory = format!("{}/logs/modules/{}", output_dir, module_name);
18
+ create_dir_all(&log_directory).expect("Failed to create log directory");
19
+
20
+ for (var_name, var_data) in &variable_table.variables {
21
+ content.push_str(&format!("{:?} = {:?}\n", var_name, var_data));
22
+ }
23
+
24
+ content.push('\n');
25
+
26
+ debugger.write_log_file(&log_directory, "variables.log", &content);
27
+ }
28
+
29
+ pub fn write_module_function_log_file(
30
+ output_dir: &str,
31
+ module_path: &str,
32
+ function_table: &FunctionTable,
33
+ ) {
34
+ let debugger = crate::core::debugger::Debugger::new();
35
+ let mut content = String::new();
36
+ let module_name = module_path
37
+ .split('/')
38
+ .next_back()
39
+ .unwrap_or("index")
40
+ .replace(".deva", "");
41
+
42
+ let log_directory = format!("{}/logs/modules/{}", output_dir, module_name);
43
+ create_dir_all(&log_directory).expect("Failed to create log directory");
44
+
45
+ for (func_name, func_data) in &function_table.functions {
46
+ content.push_str(&format!("{:?} = {:?}\n", func_name, func_data));
47
+ }
48
+
49
+ content.push('\n');
50
+
51
+ debugger.write_log_file(&log_directory, "functions.log", &content);
52
+ }
@@ -1,27 +1,27 @@
1
- use crate::core::{debugger::Debugger, parser::statement::Statement};
2
- use std::{collections::HashMap, fs::create_dir_all};
3
-
4
- pub fn write_preprocessor_log_file(
5
- output_dir: &str,
6
- file_name: &str,
7
- modules: HashMap<String, Vec<Statement>>,
8
- ) {
9
- let debugger = Debugger::new();
10
- let mut content = String::new();
11
-
12
- let log_directory = format!("{}/logs", output_dir);
13
-
14
- create_dir_all(&log_directory).expect("Failed to create log directory");
15
-
16
- for (path, stmts) in modules {
17
- content.push_str(&format!("--- Resolved Statements for {} ---\n", path));
18
-
19
- for stmt in stmts {
20
- content.push_str(&format!("{:?}\n", stmt));
21
- }
22
-
23
- content.push('\n');
24
- }
25
-
26
- debugger.write_log_file(&log_directory, file_name, &content);
27
- }
1
+ use crate::core::{debugger::Debugger, parser::statement::Statement};
2
+ use std::{collections::HashMap, fs::create_dir_all};
3
+
4
+ pub fn write_preprocessor_log_file(
5
+ output_dir: &str,
6
+ file_name: &str,
7
+ modules: HashMap<String, Vec<Statement>>,
8
+ ) {
9
+ let debugger = Debugger::new();
10
+ let mut content = String::new();
11
+
12
+ let log_directory = format!("{}/logs", output_dir);
13
+
14
+ create_dir_all(&log_directory).expect("Failed to create log directory");
15
+
16
+ for (path, stmts) in modules {
17
+ content.push_str(&format!("--- Resolved Statements for {} ---\n", path));
18
+
19
+ for stmt in stmts {
20
+ content.push_str(&format!("{:?}\n", stmt));
21
+ }
22
+
23
+ content.push('\n');
24
+ }
25
+
26
+ debugger.write_log_file(&log_directory, file_name, &content);
27
+ }
@@ -1,38 +1,38 @@
1
- use crate::core::debugger::Debugger;
2
- use devalang_types::{FunctionTable, VariableTable};
3
- use std::fs::create_dir_all;
4
-
5
- pub fn write_variables_log_file(output_dir: &str, file_name: &str, variables: VariableTable) {
6
- let debugger = Debugger::new();
7
- let mut content = String::new();
8
-
9
- let log_directory = format!("{}/logs", output_dir);
10
- create_dir_all(&log_directory).expect("Failed to create log directory");
11
-
12
- for (var_name, var_data) in variables.variables {
13
- content.push_str(&format!("{:?} = {:?}\n", var_name, var_data));
14
- }
15
-
16
- content.push('\n');
17
-
18
- debugger.write_log_file(&log_directory, file_name, &content);
19
- }
20
-
21
- pub fn write_function_log_file(output_dir: &str, file_name: &str, functions: FunctionTable) {
22
- let debugger = Debugger::new();
23
- let mut content = String::new();
24
-
25
- let log_directory = format!("{}/logs", output_dir);
26
- create_dir_all(&log_directory).expect("Failed to create log directory");
27
-
28
- for (_index, function) in functions.functions {
29
- content.push_str(&format!(
30
- "'{}' = [{:?}] => {:?}\n",
31
- function.name, function.parameters, function.body
32
- ));
33
- }
34
-
35
- content.push('\n');
36
-
37
- debugger.write_log_file(&log_directory, file_name, &content);
38
- }
1
+ use crate::core::debugger::Debugger;
2
+ use devalang_types::{FunctionTable, VariableTable};
3
+ use std::fs::create_dir_all;
4
+
5
+ pub fn write_variables_log_file(output_dir: &str, file_name: &str, variables: VariableTable) {
6
+ let debugger = Debugger::new();
7
+ let mut content = String::new();
8
+
9
+ let log_directory = format!("{}/logs", output_dir);
10
+ create_dir_all(&log_directory).expect("Failed to create log directory");
11
+
12
+ for (var_name, var_data) in variables.variables {
13
+ content.push_str(&format!("{:?} = {:?}\n", var_name, var_data));
14
+ }
15
+
16
+ content.push('\n');
17
+
18
+ debugger.write_log_file(&log_directory, file_name, &content);
19
+ }
20
+
21
+ pub fn write_function_log_file(output_dir: &str, file_name: &str, functions: FunctionTable) {
22
+ let debugger = Debugger::new();
23
+ let mut content = String::new();
24
+
25
+ let log_directory = format!("{}/logs", output_dir);
26
+ create_dir_all(&log_directory).expect("Failed to create log directory");
27
+
28
+ for (_index, function) in functions.functions {
29
+ content.push_str(&format!(
30
+ "'{}' = [{:?}] => {:?}\n",
31
+ function.name, function.parameters, function.body
32
+ ));
33
+ }
34
+
35
+ content.push('\n');
36
+
37
+ debugger.write_log_file(&log_directory, file_name, &content);
38
+ }
@@ -1,59 +1,59 @@
1
- use crate::core::lexer::{handler::driver::handle_content_lexing, token::Token};
2
- use devalang_utils::path::normalize_path;
3
- use std::fs;
4
- use std::path::Path;
5
-
6
- pub struct Lexer {}
7
-
8
- impl Default for Lexer {
9
- fn default() -> Self {
10
- Self::new()
11
- }
12
- }
13
-
14
- impl Lexer {
15
- pub fn new() -> Self {
16
- Lexer {}
17
- }
18
-
19
- pub fn lex_from_source(&self, source: &str) -> Result<Vec<Token>, String> {
20
- handle_content_lexing(source.to_string())
21
- }
22
-
23
- pub fn lex_tokens(&self, entrypoint: &str) -> Result<Vec<Token>, String> {
24
- let path = normalize_path(entrypoint);
25
- let resolved_path = Self::resolve_entry_path(&path)?;
26
-
27
- let file_content = fs::read_to_string(&resolved_path).map_err(|e| {
28
- format!(
29
- "Failed to read the entrypoint file '{}': {}",
30
- resolved_path, e
31
- )
32
- })?;
33
-
34
- handle_content_lexing(file_content).map_err(|e| format!("Failed to lex the content: {}", e))
35
- }
36
-
37
- fn resolve_entry_path(path: &str) -> Result<String, String> {
38
- let candidate = Path::new(path);
39
-
40
- if candidate.is_dir() {
41
- let index_path = candidate.join("index.deva");
42
- if index_path.exists() {
43
- Ok(index_path.to_string_lossy().replace("\\", "/"))
44
- } else {
45
- Err(format!(
46
- "Expected 'index.deva' in directory '{}', but it was not found",
47
- path
48
- ))
49
- }
50
- } else if candidate.is_file() {
51
- return Ok(path.to_string());
52
- } else {
53
- return Err(format!(
54
- "Provided entrypoint '{}' is not a valid file or directory",
55
- path
56
- ));
57
- }
58
- }
59
- }
1
+ use crate::core::lexer::{handler::driver::handle_content_lexing, token::Token};
2
+ use devalang_utils::path::normalize_path;
3
+ use std::fs;
4
+ use std::path::Path;
5
+
6
+ pub struct Lexer {}
7
+
8
+ impl Default for Lexer {
9
+ fn default() -> Self {
10
+ Self::new()
11
+ }
12
+ }
13
+
14
+ impl Lexer {
15
+ pub fn new() -> Self {
16
+ Lexer {}
17
+ }
18
+
19
+ pub fn lex_from_source(&self, source: &str) -> Result<Vec<Token>, String> {
20
+ handle_content_lexing(source.to_string())
21
+ }
22
+
23
+ pub fn lex_tokens(&self, entrypoint: &str) -> Result<Vec<Token>, String> {
24
+ let path = normalize_path(entrypoint);
25
+ let resolved_path = Self::resolve_entry_path(&path)?;
26
+
27
+ let file_content = fs::read_to_string(&resolved_path).map_err(|e| {
28
+ format!(
29
+ "Failed to read the entrypoint file '{}': {}",
30
+ resolved_path, e
31
+ )
32
+ })?;
33
+
34
+ handle_content_lexing(file_content).map_err(|e| format!("Failed to lex the content: {}", e))
35
+ }
36
+
37
+ fn resolve_entry_path(path: &str) -> Result<String, String> {
38
+ let candidate = Path::new(path);
39
+
40
+ if candidate.is_dir() {
41
+ let index_path = candidate.join("index.deva");
42
+ if index_path.exists() {
43
+ Ok(index_path.to_string_lossy().replace("\\", "/"))
44
+ } else {
45
+ Err(format!(
46
+ "Expected 'index.deva' in directory '{}', but it was not found",
47
+ path
48
+ ))
49
+ }
50
+ } else if candidate.is_file() {
51
+ return Ok(path.to_string());
52
+ } else {
53
+ return Err(format!(
54
+ "Provided entrypoint '{}' is not a valid file or directory",
55
+ path
56
+ ));
57
+ }
58
+ }
59
+ }
@@ -1,82 +1,82 @@
1
- use crate::core::lexer::token::{Token, TokenKind};
2
-
3
- pub fn handle_arrow_lexer(
4
- ch: char,
5
- chars: &mut std::iter::Peekable<std::str::Chars>,
6
- current_indent: &mut usize,
7
- _indent_stack: &mut [usize],
8
- tokens: &mut Vec<Token>,
9
- line: &mut usize,
10
- column: &mut usize,
11
- ) {
12
- // If next char is '>', this is an arrow '->'.
13
- if let Some(&c) = chars.peek() {
14
- if c == '>' {
15
- let mut arrow_call = ch.to_string();
16
- chars.next();
17
- arrow_call.push(c);
18
- *column += 1;
19
-
20
- tokens.push(Token {
21
- kind: TokenKind::Arrow,
22
- lexeme: arrow_call,
23
- line: *line,
24
- column: *column,
25
- indent: *current_indent,
26
- });
27
- return;
28
- }
29
- }
30
-
31
- // Otherwise, treat '-' as the start of a negative number if followed by digits.
32
- let mut lexeme = String::from("-");
33
- if let Some(&next) = chars.peek() {
34
- if next.is_ascii_digit() {
35
- // consume digits
36
- while let Some(&d) = chars.peek() {
37
- if d.is_ascii_digit() {
38
- chars.next();
39
- lexeme.push(d);
40
- *column += 1;
41
- } else {
42
- break;
43
- }
44
- }
45
- // optional decimal part
46
- if let Some(&dot) = chars.peek() {
47
- if dot == '.' {
48
- chars.next();
49
- lexeme.push(dot);
50
- *column += 1;
51
- while let Some(&d) = chars.peek() {
52
- if d.is_ascii_digit() {
53
- chars.next();
54
- lexeme.push(d);
55
- *column += 1;
56
- } else {
57
- break;
58
- }
59
- }
60
- }
61
- }
62
-
63
- tokens.push(Token {
64
- kind: TokenKind::Number,
65
- lexeme,
66
- line: *line,
67
- column: *column,
68
- indent: *current_indent,
69
- });
70
- return;
71
- }
72
- }
73
-
74
- // Fallback: lone '-' not part of '->' or a number; emit Unknown to avoid mis-parsing as Arrow
75
- tokens.push(Token {
76
- kind: TokenKind::Unknown,
77
- lexeme: "-".to_string(),
78
- line: *line,
79
- column: *column,
80
- indent: *current_indent,
81
- });
82
- }
1
+ use crate::core::lexer::token::{Token, TokenKind};
2
+
3
+ pub fn handle_arrow_lexer(
4
+ ch: char,
5
+ chars: &mut std::iter::Peekable<std::str::Chars>,
6
+ current_indent: &mut usize,
7
+ _indent_stack: &mut [usize],
8
+ tokens: &mut Vec<Token>,
9
+ line: &mut usize,
10
+ column: &mut usize,
11
+ ) {
12
+ // If next char is '>', this is an arrow '->'.
13
+ if let Some(&c) = chars.peek() {
14
+ if c == '>' {
15
+ let mut arrow_call = ch.to_string();
16
+ chars.next();
17
+ arrow_call.push(c);
18
+ *column += 1;
19
+
20
+ tokens.push(Token {
21
+ kind: TokenKind::Arrow,
22
+ lexeme: arrow_call,
23
+ line: *line,
24
+ column: *column,
25
+ indent: *current_indent,
26
+ });
27
+ return;
28
+ }
29
+ }
30
+
31
+ // Otherwise, treat '-' as the start of a negative number if followed by digits.
32
+ let mut lexeme = String::from("-");
33
+ if let Some(&next) = chars.peek() {
34
+ if next.is_ascii_digit() {
35
+ // consume digits
36
+ while let Some(&d) = chars.peek() {
37
+ if d.is_ascii_digit() {
38
+ chars.next();
39
+ lexeme.push(d);
40
+ *column += 1;
41
+ } else {
42
+ break;
43
+ }
44
+ }
45
+ // optional decimal part
46
+ if let Some(&dot) = chars.peek() {
47
+ if dot == '.' {
48
+ chars.next();
49
+ lexeme.push(dot);
50
+ *column += 1;
51
+ while let Some(&d) = chars.peek() {
52
+ if d.is_ascii_digit() {
53
+ chars.next();
54
+ lexeme.push(d);
55
+ *column += 1;
56
+ } else {
57
+ break;
58
+ }
59
+ }
60
+ }
61
+ }
62
+
63
+ tokens.push(Token {
64
+ kind: TokenKind::Number,
65
+ lexeme,
66
+ line: *line,
67
+ column: *column,
68
+ indent: *current_indent,
69
+ });
70
+ return;
71
+ }
72
+ }
73
+
74
+ // Fallback: lone '-' not part of '->' or a number; emit Unknown to avoid mis-parsing as Arrow
75
+ tokens.push(Token {
76
+ kind: TokenKind::Unknown,
77
+ lexeme: "-".to_string(),
78
+ line: *line,
79
+ column: *column,
80
+ indent: *current_indent,
81
+ });
82
+ }
@@ -1,21 +1,21 @@
1
- use crate::core::lexer::token::{Token, TokenKind};
2
-
3
- pub fn handle_at_lexer(
4
- ch: char,
5
- _chars: &mut std::iter::Peekable<std::str::Chars>,
6
- current_indent: &mut usize,
7
- _indent_stack: &mut [usize],
8
- tokens: &mut Vec<Token>,
9
- line: &mut usize,
10
- column: &mut usize,
11
- ) {
12
- tokens.push(Token {
13
- kind: TokenKind::At,
14
- lexeme: ch.to_string(),
15
- line: *line,
16
- column: *column,
17
- indent: *current_indent,
18
- });
19
-
20
- *column += 1;
21
- }
1
+ use crate::core::lexer::token::{Token, TokenKind};
2
+
3
+ pub fn handle_at_lexer(
4
+ ch: char,
5
+ _chars: &mut std::iter::Peekable<std::str::Chars>,
6
+ current_indent: &mut usize,
7
+ _indent_stack: &mut [usize],
8
+ tokens: &mut Vec<Token>,
9
+ line: &mut usize,
10
+ column: &mut usize,
11
+ ) {
12
+ tokens.push(Token {
13
+ kind: TokenKind::At,
14
+ lexeme: ch.to_string(),
15
+ line: *line,
16
+ column: *column,
17
+ indent: *current_indent,
18
+ });
19
+
20
+ *column += 1;
21
+ }
@@ -1,41 +1,41 @@
1
- use crate::core::lexer::token::{Token, TokenKind};
2
-
3
- pub fn handle_rbrace_lexer(
4
- ch: char,
5
- _chars: &mut std::iter::Peekable<std::str::Chars>,
6
- current_indent: &mut usize,
7
- _indent_stack: &mut [usize],
8
- tokens: &mut Vec<Token>,
9
- line: &mut usize,
10
- column: &mut usize,
11
- ) {
12
- tokens.push(Token {
13
- kind: TokenKind::RBrace,
14
- lexeme: ch.to_string(),
15
- line: *line,
16
- column: *column,
17
- indent: *current_indent,
18
- });
19
-
20
- *column += 1;
21
- }
22
-
23
- pub fn handle_lbrace_lexer(
24
- ch: char,
25
- _chars: &mut std::iter::Peekable<std::str::Chars>,
26
- current_indent: &mut usize,
27
- _indent_stack: &mut [usize],
28
- tokens: &mut Vec<Token>,
29
- line: &mut usize,
30
- column: &mut usize,
31
- ) {
32
- tokens.push(Token {
33
- kind: TokenKind::LBrace,
34
- lexeme: ch.to_string(),
35
- line: *line,
36
- column: *column,
37
- indent: *current_indent,
38
- });
39
-
40
- *column += 1;
41
- }
1
+ use crate::core::lexer::token::{Token, TokenKind};
2
+
3
+ pub fn handle_rbrace_lexer(
4
+ ch: char,
5
+ _chars: &mut std::iter::Peekable<std::str::Chars>,
6
+ current_indent: &mut usize,
7
+ _indent_stack: &mut [usize],
8
+ tokens: &mut Vec<Token>,
9
+ line: &mut usize,
10
+ column: &mut usize,
11
+ ) {
12
+ tokens.push(Token {
13
+ kind: TokenKind::RBrace,
14
+ lexeme: ch.to_string(),
15
+ line: *line,
16
+ column: *column,
17
+ indent: *current_indent,
18
+ });
19
+
20
+ *column += 1;
21
+ }
22
+
23
+ pub fn handle_lbrace_lexer(
24
+ ch: char,
25
+ _chars: &mut std::iter::Peekable<std::str::Chars>,
26
+ current_indent: &mut usize,
27
+ _indent_stack: &mut [usize],
28
+ tokens: &mut Vec<Token>,
29
+ line: &mut usize,
30
+ column: &mut usize,
31
+ ) {
32
+ tokens.push(Token {
33
+ kind: TokenKind::LBrace,
34
+ lexeme: ch.to_string(),
35
+ line: *line,
36
+ column: *column,
37
+ indent: *current_indent,
38
+ });
39
+
40
+ *column += 1;
41
+ }