Add basic support for variables

Author: killertux

Cargo.lock

@@ -13,7 +13,7 @@ readme = "readme.md"
 
 [dependencies]
 slim_protocol = { path = "../slim_protocol" }
-convert_case = "0.6.0"
+convert_case = "0.6"
 rust_slim_macros = { path = "../rust_slim_macros", optional = true }
 thiserror = "1"
 

rust_slim/Cargo.toml

@@ -8,9 +8,9 @@ description = "Macros for the RustSlim server"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-convert_case = "0.6.0"
-proc-macro2 = "1.0.69"
-quote = "1.0.33"
+convert_case = "0.6"
+proc-macro2 = "1"
+quote = "1"
 syn = { version = "2", features = ["extra-traits", "full"] }
 
 [lib]

rust_slim_macros/Cargo.toml

@@ -10,4 +10,4 @@ description = "General Slim Protocol stuff. Used internally by rust_slim and Tem
 [dependencies]
 ulid = "1"
 thiserror = "1"
-read_char = "0.1.1"
+read_char = "0.1"

slim_protocol/Cargo.toml

@@ -160,6 +160,34 @@ impl FromSlimReader for Instruction {
                     args: data,
                 })
             }
+            "callAndAssign" => {
+                let symbol = data
+                    .pop()
+                    .ok_or(FromSlimReaderError::Other("Expected symbol".into()))?;
+                let instance = data
+                    .pop()
+                    .ok_or(FromSlimReaderError::Other("Expected instance".into()))?;
+                let function = data
+                    .pop()
+                    .ok_or(FromSlimReaderError::Other("Expected function".into()))?;
+                data.reverse();
+                Ok(Instruction::CallAndAssign {
+                    id,
+                    instance,
+                    function,
+                    symbol,
+                    args: data,
+                })
+            }
+            "assign" => {
+                let symbol = data
+                    .pop()
+                    .ok_or(FromSlimReaderError::Other("Expected symbol".into()))?;
+                let value = data
+                    .pop()
+                    .ok_or(FromSlimReaderError::Other("Expected value".into()))?;
+                Ok(Instruction::Assign { id, symbol, value })
+            }
             other => todo!("Not implemented {other}"),
         }
     }

slim_protocol/src/slim_deserialize.rs

@@ -11,15 +11,15 @@ readme = "readme.md"
 
 [dependencies]
 anyhow = "1"
-chrono = "0.4.31"
+chrono = "0.4"
 clap = { version = "4", features = ["derive"] }
-convert_case = "0.6.0"
-markdown = "1.0.0-alpha.14"
-toml = "0.8.8"
+convert_case = "0.6"
+markdown = "1.0.0-alpha.15"
+toml = "0.8"
 ulid = "1"
 slim_protocol = { path = "../slim_protocol" }
-regex = "1.10.5"
-rand = "0.8.5"
+regex = "1"
+rand = "0.8"
 
 [dev-dependencies]
 rust_slim = { path = "../rust_slim/", features = ["macros"] }

temoc/Cargo.toml

@@ -32,4 +32,14 @@ And we still need to implement exponential:
 | 1  | 2   | 1    |
 | 2  | 2   | 4    |
 | 3  | 2   | 9    |
-| 3  | 3   | 27   |
+| 3  | 3   | 27   |
+
+Variables:
+
+[//]: # (decisionTable Calculator.Fixtures.CalculatorFixture )
+
+| a  | b | sum? |
+|----|---|------|
+| 1  | 2 | $V=  |
+| $V | 2 | 5    |
+| 2  | 1 | $V   |

temoc/examples/calculator_2.md

@@ -1,5 +1,5 @@
 use crate::processor::{
-    execute_instructions_and_print_result, process_markdown_into_instructions, Filter,
+    execute_instructions_and_print_result, process_markdown_into_instructions, Filter, State,
 };
 use crate::slim_server_connector::SlimServerConnector;
 use anyhow::Result;
@@ -97,13 +97,15 @@ impl App {
             return Ok(false);
         }
         let mut slim_server = self.slim_server_connector.start_and_connect()?;
+        let mut state = State::default();
         let mut connection = SlimConnection::new(slim_server.reader()?, slim_server.writer()?)?;
         let fail = execute_instructions_and_print_result(
             &mut connection,
             &file.as_ref().to_string_lossy(),
             instructions,
             expected_result,
             self.show_snoozed,
+            &mut state,
         )?;
         connection.close()?;
         slim_server.close()?;

temoc/src/app.rs

@@ -11,6 +11,7 @@ use anyhow::{anyhow, Result};
 use markdown::mdast::Node;
 use regex::Regex;
 use slim_protocol::{Instruction, SlimConnection};
+use std::collections::HashMap;
 use std::{
     fs::read_to_string,
     io::{Read, Write},
@@ -21,6 +22,21 @@ mod markdown_commands;
 mod slim_instructions_from_commands;
 mod validate_result;
 
+#[derive(Debug, Default)]
+pub struct State {
+    symbols: HashMap<String, String>,
+}
+
+impl State {
+    pub fn set_symbol(&mut self, key: String, value: String) {
+        self.symbols.insert(key, value);
+    }
+
+    pub fn get_symbol(&self, key: &str) -> Option<&String> {
+        self.symbols.get(key)
+    }
+}
+
 #[derive(Debug, Clone)]
 pub struct Filter {
     filters: Vec<FilterType>,
@@ -91,9 +107,10 @@ pub fn execute_instructions_and_print_result<R: Read, W: Write>(
     instructions: Vec<Instruction>,
     expected_result: Vec<ExpectedResulWithSnooze>,
     show_snoozed: bool,
+    state: &mut State,
 ) -> Result<bool> {
     let result = connection.send_instructions(&instructions)?;
-    let failures = validate_result(file_path, expected_result, result)?;
+    let failures = validate_result(file_path, expected_result, result, state)?;
     print_fail_or_ok(show_snoozed, failures)
 }