Merge pull request #14 from coco33920/add_functions

Add functions

README.md

@@ -67,14 +67,15 @@ cargo install mini-calc
 - [X] Config
     - [X] Config colours
     - [X] Config prompt
-- [ ] Add more operations
+- [X] Add more operations
   - [X] exponent
-- [ ] Add support for functions
-    - [ ] exp
-    - [ ] ln
-    - [ ] log base a
-    - [ ] cos/sin/tan
-    - [ ] cosh/sinh/tanh
+- [X] Add support for functions
+    - [X] exp
+    - [X] ln
+    - [X] log base a
+    - [X] cos/sin/tan
+    - [X] cosh/sinh/tanh
+    - [X] atan/acos/asin
 - [ ] For later
     - [ ] Defining your own functions
     - [ ] Add RPN mode
@@ -131,4 +132,31 @@ Configuration:
 
 It looks like: 
 
-![img.png](docs/assets/config_looks.png)
+![img.png](docs/assets/config_looks.png)
+
+## Functions
+
+The following functions are available
+
+- sin
+- cos
+- tan
+- sinh
+- cosh
+- tanh
+- asin
+- acos
+- atan
+- exp
+- ln
+- log (alias of ln)
+
+### Trigonometry
+
+For trigonometry, the input are assumed to be in radian, if not, you have to put "false" or "true" as second argument, example shown bellow
+![img.png](docs/assets/trigo.png)
+
+### Exp/ln
+
+If you use the exp function you can pass a second argument for the base you are using, if no second arguments are passed this is assumed to be in natural base
+![img.png](docs/assets/expln.png)

src/configuration/loader.rs

@@ -119,7 +119,7 @@ pub fn load_color(string: String) -> Color {
 
 pub fn replace_variable(str: String) -> String {
     str.replace("%author%", "Charlotte Thomas")
-        .replace("%version%", "v2.2.2")
+        .replace("%version%", "v2.3.0")
         .to_string()
 }
 

src/interpreting/function.rs

@@ -71,6 +71,12 @@ pub fn add(i: Parameters, i2: Parameters, ram: Option<&HashMap<String, Parameter
         (Parameters::Identifier(s), Parameters::Int(i)) => {
             apply_operator(Parameters::Identifier(s), Parameters::Int(i), ram, add)
         }
+        (Parameters::Null, Parameters::Identifier(s)) => {
+            apply_operator(Parameters::Identifier(s), Parameters::Null, ram, add)
+        }
+        (Parameters::Identifier(s), Parameters::Null) => {
+            apply_operator(Parameters::Identifier(s), Parameters::Null, ram, add)
+        }
         (Parameters::Int(i), Parameters::Identifier(s)) => {
             apply_operator(Parameters::Identifier(s), Parameters::Int(i), ram, add)
         }
@@ -107,6 +113,12 @@ pub fn minus(
         (Parameters::Identifier(s), Parameters::Int(i)) => {
             apply_operator(Parameters::Identifier(s), Parameters::Int(i), ram, minus)
         }
+        (Parameters::Null, Parameters::Identifier(s)) => {
+            apply_operator(Parameters::Identifier(s), Parameters::Null, ram, minus)
+        }
+        (Parameters::Identifier(s), Parameters::Null) => {
+            apply_operator(Parameters::Identifier(s), Parameters::Null, ram, minus)
+        }
         (Parameters::Int(i), Parameters::Identifier(s)) => {
             let v = apply_operator(Parameters::Identifier(s), Parameters::Int(i), ram, minus);
             match v {
@@ -154,6 +166,12 @@ pub fn mult(
         (Parameters::Int(i), Parameters::Identifier(s)) => {
             apply_operator(Parameters::Identifier(s), Parameters::Int(i), ram, mult)
         }
+        (Parameters::Null, Parameters::Identifier(s)) => {
+            apply_operator(Parameters::Identifier(s), Parameters::Null, ram, mult)
+        }
+        (Parameters::Identifier(s), Parameters::Null) => {
+            apply_operator(Parameters::Identifier(s), Parameters::Null, ram, mult)
+        }
         (Parameters::Identifier(s), Parameters::Float(i)) => {
             apply_operator(Parameters::Identifier(s), Parameters::Float(i), ram, mult)
         }
@@ -194,6 +212,12 @@ pub fn divide(
                 _ => Parameters::Null,
             }
         }
+        (Parameters::Null, Parameters::Identifier(s)) => {
+            apply_operator(Parameters::Identifier(s), Parameters::Null, ram, divide)
+        }
+        (Parameters::Identifier(s), Parameters::Null) => {
+            apply_operator(Parameters::Identifier(s), Parameters::Null, ram, divide)
+        }
         (Parameters::Identifier(s), Parameters::Float(i)) => {
             apply_operator(Parameters::Identifier(s), Parameters::Float(i), ram, divide)
         }
@@ -237,6 +261,12 @@ pub fn expo(
         (Parameters::Identifier(s), Parameters::Float(i)) => {
             apply_operator(Parameters::Identifier(s), Parameters::Float(i), ram, expo)
         }
+        (Parameters::Identifier(s), Parameters::Null) => {
+            apply_operator(Parameters::Identifier(s), Parameters::Null, ram, expo)
+        }
+        (Parameters::Null, Parameters::Identifier(s)) => {
+            apply_operator(Parameters::Identifier(s), Parameters::Null, ram, expo)
+        }
         (Parameters::Float(i), Parameters::Identifier(s)) => {
             apply_operator_reverse(Parameters::Float(i), Parameters::Identifier(s), ram, expo)
         }

src/interpreting/interpreter.rs

@@ -1,6 +1,7 @@
 use std::collections::HashMap;
 
 use crate::interpreting::function::{add, assign, divide, expo, minus, mult};
+use crate::interpreting::stdlib::exec;
 use crate::parsing::ast::{Ast, Parameters};
 
 pub fn interpret(ast: Ast, mut ram: &mut HashMap<String, Parameters>) -> Parameters {
@@ -29,10 +30,15 @@ pub fn interpret(ast: Ast, mut ram: &mut HashMap<String, Parameters>) -> Paramet
                 Parameters::Float(f) => Parameters::Float(f),
                 Parameters::Int(i) => Parameters::Int(i),
                 Parameters::Identifier(s) => Parameters::Identifier(s),
+                Parameters::Call(s) => Parameters::Identifier(s),
                 Parameters::Null => Parameters::Null,
             };
             last.clone()
         }
+        Ast::Call { name: n, lst: list } => {
+            let v: Vec<Parameters> = list.iter().map(|x| interpret(x.clone(), ram)).collect();
+            exec(n, v, Some(&ram))
+        }
     }
 }
 

src/interpreting/mod.rs

@@ -1,2 +1,3 @@
 mod function;
 pub(crate) mod interpreter;
+mod stdlib;