Merge pull request #3 from Zelak312/dev

V0.1.3

.github/workflows/rust-clippy.yml

@@ -33,6 +33,9 @@ jobs:
             - name: Install required cargo
               run: cargo install clippy-sarif sarif-fmt
 
+            - name: Cache rust
+              uses: Swatinem/rust-cache@v2
+
             - name: Run rust-clippy
               run: cargo clippy
                   --all-features

.github/workflows/rust_build_test.yml

@@ -21,5 +21,7 @@ jobs:
             - uses: actions/checkout@v3
             - name: Build
               run: cargo build --verbose
+            - name: Cache rust
+              uses: Swatinem/rust-cache@v2
             - name: Run tests
               run: cargo test --verbose

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "nora"
-version = "0.1.1"
+version = "0.1.3"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

README.md

@@ -61,7 +61,7 @@ The interpreted block can have the following expressions
 
 -   [Ternary expression](#ternary-expression)
 -   [Math expression](#math-expression)
--   [String concatenation](#string-operation)
+-   [String operation](#string-operation)
 -   [Identifiers](#identifiers)
 -   [String conversion](#string-conversion)
 -   [Number conversion](#number-conversion)
@@ -156,10 +156,20 @@ This will give 30 since the left is a number and it will convert to string to a
 Example:
 
 ```
-["test" - "t"]
+["testes" - "te"]
 ```
 
-This will give the ouput `es`
+This will give the ouput `stes` which removes the first `te` found
+
+## Multiple Subtraction
+
+Example:
+
+```
+["testes" -- "te"]
+```
+
+This will give the ouput `ss` which removes all `te` found
 
 # Identifiers
 

src/ast/interpreter.rs

@@ -71,6 +71,7 @@ impl nodes::ExecutableNode for nodes::NodeBinaryOperator {
                 let inner_value = match self.operator {
                     TokenType::Addition => n.inner_value + rigth.inner_value,
                     TokenType::Subtraction => n.inner_value - rigth.inner_value,
+                    TokenType::DoubleSubtraction => n.inner_value + rigth.inner_value,
                     TokenType::Multiplication => n.inner_value * rigth.inner_value,
                     TokenType::Division => n.inner_value / rigth.inner_value,
                     TokenType::Power => n.inner_value.powf(rigth.inner_value),
@@ -85,6 +86,7 @@ impl nodes::ExecutableNode for nodes::NodeBinaryOperator {
                 let inner_value = match self.operator {
                     TokenType::Addition => n.inner_value + &rigth.inner_value,
                     TokenType::Subtraction => n.sub(&rigth).inner_value,
+                    TokenType::DoubleSubtraction => n.sub_multiple(&rigth).inner_value,
                     _ => panic!("Operation not found for string"),
                 };
 

src/ast/parser.rs

@@ -160,10 +160,11 @@ impl Parser {
         &mut self,
     ) -> Result<Rc<dyn nodes::ExecutableNode>, Box<dyn Error>> {
         let mut left = self.parse_binary_mul_div()?;
-        while let Ok(operator) = self
-            .base_parser
-            .expect_m(vec![TokenType::Addition, TokenType::Subtraction])
-        {
+        while let Ok(operator) = self.base_parser.expect_m(vec![
+            TokenType::Addition,
+            TokenType::Subtraction,
+            TokenType::DoubleSubtraction,
+        ]) {
             let right = self.parse_binary_mul_div()?;
             left = Rc::new(nodes::NodeBinaryOperator {
                 operator: operator.r#type,

src/lib/types/number.rs

@@ -27,7 +27,9 @@ impl TryInto<NBoolean> for NNumber {
         } else if self.inner_value == 0.0 {
             Ok(false)
         } else {
-            Err(BasicError::new("834572bhjer".to_owned()))
+            Err(BasicError::new(
+                "Couldn't convert number to boolean".to_owned(),
+            ))
         }?;
 
         Ok(NBoolean {

src/lib/types/string.rs

@@ -11,10 +11,14 @@ pub struct NString {
 
 impl NString {
     pub fn sub(&self, other: &NString) -> NString {
-        let mut new_string = self.inner_value.clone();
-        new_string.retain(|c| !other.inner_value.contains(c));
         NString {
-            inner_value: new_string,
+            inner_value: self.inner_value.replacen(&other.inner_value, "", 1),
+        }
+    }
+
+    pub fn sub_multiple(&self, other: &NString) -> NString {
+        NString {
+            inner_value: self.inner_value.replace(&other.inner_value, ""),
         }
     }
 }
@@ -25,7 +29,7 @@ impl TryInto<NNumber> for NString {
         let result = self
             .inner_value
             .parse::<f64>()
-            .map_err(|_| BasicError::new("dwjdi".to_owned()))?;
+            .map_err(|_| BasicError::new("couldn't convert string to number".to_owned()))?;
 
         Ok(NNumber {
             inner_value: result,

src/tokenizer/lexer.rs

@@ -86,6 +86,10 @@ impl Lexer {
                 '/' => Some(TokenType::Log),
                 _ => None,
             },
+            TokenType::Subtraction => match next_c {
+                '-' => Some(TokenType::DoubleSubtraction),
+                _ => None,
+            },
             _ => None,
         };
 

src/tokenizer/token.rs

@@ -32,6 +32,7 @@ pub enum TokenType {
     GreaterThanSign,
     GreaterThanEqualSign,
     QuestionMarkGreaterThan,
+    DoubleSubtraction,
 
     KeyNumber,
     KeyString,