Merge branch 'development' into main

erhanbaris · Mar 5, 2022 · d0c39e6 · d0c39e6
2 parents 6db5e05 + 9c3fa33
commit d0c39e6
Show file tree

Hide file tree

Showing 59 changed files with 60 additions and 60 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "smartcalc"
 description = "Text based calculator for peoples"
-version = "1.0.4"
+version = "1.0.5"
 authors = ["Erhan BARIS <[email protected]>"]
 edition = "2018"
 license = "GPL-2.0"

diff --git a/build.rs b/build.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/examples/console/src/main.rs b/examples/console/src/main.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/app.rs b/src/app.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/compiler/date.rs b/src/compiler/date.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/compiler/date_time.rs b/src/compiler/date_time.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/compiler/duration.rs b/src/compiler/duration.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/compiler/memory.rs b/src/compiler/memory.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/compiler/mod.rs b/src/compiler/mod.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/compiler/money.rs b/src/compiler/money.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/compiler/number.rs b/src/compiler/number.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/compiler/percent.rs b/src/compiler/percent.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/compiler/time.rs b/src/compiler/time.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/config.rs b/src/config.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/constants.rs b/src/constants.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/formatter/mod.rs b/src/formatter/mod.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/lib.rs b/src/lib.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/logger/mod.rs b/src/logger/mod.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/syntax/assignment.rs b/src/syntax/assignment.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/syntax/binary.rs b/src/syntax/binary.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/syntax/mod.rs b/src/syntax/mod.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/syntax/primative.rs b/src/syntax/primative.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/syntax/statement.rs b/src/syntax/statement.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/syntax/unary.rs b/src/syntax/unary.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/syntax/util.rs b/src/syntax/util.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/tests/executer_test.rs b/src/tests/executer_test.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/tests/general_test.rs b/src/tests/general_test.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/tests/mod.rs b/src/tests/mod.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/tests/variable_test.rs b/src/tests/variable_test.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/token/mod.rs b/src/token/mod.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/token/ui_token.rs b/src/token/ui_token.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/tokinizer/atom.rs b/src/tokinizer/atom.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/tokinizer/comment.rs b/src/tokinizer/comment.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/tokinizer/field.rs b/src/tokinizer/field.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/tokinizer/memory.rs b/src/tokinizer/memory.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/tokinizer/mod.rs b/src/tokinizer/mod.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */
@@ -331,7 +331,7 @@ impl<'a> Tokinizer<'a> {
         }
 
         if cfg!(feature="debug-rules") {
-            log::debug!("Updated token_infos: {:?}", self.session.borrow().token_infos);
+            log::debug!("Updated token_infos: {:?}", session_mut.token_infos);
         }
     }
 

diff --git a/src/tokinizer/money.rs b/src/tokinizer/money.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/tokinizer/month.rs b/src/tokinizer/month.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/tokinizer/number.rs b/src/tokinizer/number.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/tokinizer/operator.rs b/src/tokinizer/operator.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/tokinizer/percent.rs b/src/tokinizer/percent.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/tokinizer/text.rs b/src/tokinizer/text.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/tokinizer/time.rs b/src/tokinizer/time.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/tokinizer/timezone.rs b/src/tokinizer/timezone.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/tokinizer/whitespace.rs b/src/tokinizer/whitespace.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/tools.rs b/src/tools.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/types.rs b/src/types.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/worker/mod.rs b/src/worker/mod.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/worker/rule.rs b/src/worker/rule.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/worker/rules/cleanup_rules.rs b/src/worker/rules/cleanup_rules.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/worker/rules/date_rules.rs b/src/worker/rules/date_rules.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/worker/rules/date_time_rules.rs b/src/worker/rules/date_time_rules.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/worker/rules/duration_rules.rs b/src/worker/rules/duration_rules.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/worker/rules/memory_rules.rs b/src/worker/rules/memory_rules.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */

diff --git a/src/worker/rules/mod.rs b/src/worker/rules/mod.rs
@@ -1,5 +1,5 @@
 /*
- * smartcalc v1.0.4
+ * smartcalc v1.0.5
  * Copyright (c) Erhan BARIS (Ruslan Ognyanov Asenov)
  * Licensed under the GNU General Public License v2.0.
  */