From 660fbe2e398107f93f9b23da7d3b43c915d1d52c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hozda?= <luk.hozda@gmail.com>
Date: Mon, 2 Oct 2017 08:46:35 +0200
Subject: [PATCH] [BREAKING CHANGE] change variable keyword to 'let' from 'var'

---
 scripts/array.rhai      |  2 +-
 scripts/assignment.rhai |  2 +-
 scripts/if1.rhai        |  4 ++--
 scripts/speed_test.rhai |  2 +-
 scripts/while.rhai      |  2 +-
 src/engine.rs           | 22 +++++++++++-----------
 src/parser.rs           |  2 +-
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/scripts/array.rhai b/scripts/array.rhai
index 77c186cf..87343a6a 100644
--- a/scripts/array.rhai
+++ b/scripts/array.rhai
@@ -1,4 +1,4 @@
-var x = [1, 2, 3];
+let x = [1, 2, 3];
 print(x[1]);
 x[1] = 5;
 print(x[1]);
diff --git a/scripts/assignment.rhai b/scripts/assignment.rhai
index 039fe37d..ea76f5a6 100644
--- a/scripts/assignment.rhai
+++ b/scripts/assignment.rhai
@@ -1,2 +1,2 @@
-var x = 78
+let x = 78
 print(x)
diff --git a/scripts/if1.rhai b/scripts/if1.rhai
index 61ed6cbf..b45cbde2 100644
--- a/scripts/if1.rhai
+++ b/scripts/if1.rhai
@@ -1,5 +1,5 @@
-var a = true;
+let a = true;
 if (a) {
-    var x = 56;
+    let x = 56;
     print(x);
 }
diff --git a/scripts/speed_test.rhai b/scripts/speed_test.rhai
index 134c17d6..505b6f52 100644
--- a/scripts/speed_test.rhai
+++ b/scripts/speed_test.rhai
@@ -1,4 +1,4 @@
-var x = 1000000;
+let x = 1000000;
 while x > 0 {
     x = x - 1;
 }
diff --git a/scripts/while.rhai b/scripts/while.rhai
index 0e5c9dab..d0f788f3 100644
--- a/scripts/while.rhai
+++ b/scripts/while.rhai
@@ -1,4 +1,4 @@
-var x = 10;
+let x = 10;
 
 while x > 0 {
     print(x);
diff --git a/src/engine.rs b/src/engine.rs
index 96b0e62c..4f9279b1 100644
--- a/src/engine.rs
+++ b/src/engine.rs
@@ -1438,7 +1438,7 @@ fn test_bool_op2() {
 fn test_op_prec() {
     let mut engine = Engine::new();
 
-    if let Ok(result) = engine.eval::<i64>("var x = 0; if x == 10 || true { x = 1} x") {
+    if let Ok(result) = engine.eval::<i64>("let x = 0; if x == 10 || true { x = 1} x") {
         assert_eq!(result, 1);
     } else {
         assert!(false);
@@ -1472,7 +1472,7 @@ fn test_if() {
 fn test_while() {
     let mut engine = Engine::new();
 
-    if let Ok(result) = engine.eval::<i64>("var x = 0; while x < 10 { x = x + 1; if x > 5 { \
+    if let Ok(result) = engine.eval::<i64>("let x = 0; while x < 10 { x = x + 1; if x > 5 { \
                                             break } } x") {
         assert_eq!(result, 6);
     } else {
@@ -1485,7 +1485,7 @@ fn test_var_scope() {
     let mut engine = Engine::new();
     let mut scope: Scope = Vec::new();
 
-    if let Ok(_) = engine.eval_with_scope::<()>(&mut scope, "var x = 4 + 5") {
+    if let Ok(_) = engine.eval_with_scope::<()>(&mut scope, "let x = 4 + 5") {
     } else {
         assert!(false);
     }
@@ -1507,7 +1507,7 @@ fn test_var_scope() {
         assert!(false);
     }
 
-    if let Ok(_) = engine.eval_with_scope::<()>(&mut scope, "{var x = 3}") {
+    if let Ok(_) = engine.eval_with_scope::<()>(&mut scope, "{let x = 3}") {
     } else {
         assert!(false);
     }
@@ -1543,7 +1543,7 @@ fn test_method_call() {
     engine.register_fn("update", TestStruct::update);
     engine.register_fn("new_ts", TestStruct::new);
 
-    if let Ok(result) = engine.eval::<TestStruct>("var x = new_ts(); x.update(); x") {
+    if let Ok(result) = engine.eval::<TestStruct>("let x = new_ts(); x.update(); x") {
         assert_eq!(result.x, 1001);
     } else {
         assert!(false);
@@ -1579,7 +1579,7 @@ fn test_get_set() {
     engine.register_get_set("x", TestStruct::get_x, TestStruct::set_x);
     engine.register_fn("new_ts", TestStruct::new);
 
-    if let Ok(result) = engine.eval::<i64>("var a = new_ts(); a.x = 500; a.x") {
+    if let Ok(result) = engine.eval::<i64>("let a = new_ts(); a.x = 500; a.x") {
         assert_eq!(result, 500);
     } else {
         assert!(false);
@@ -1636,7 +1636,7 @@ fn test_big_get_set() {
 
     engine.register_fn("new_tp", TestParent::new);
 
-    if let Ok(result) = engine.eval::<i64>("var a = new_tp(); a.child.x = 500; a.child.x") {
+    if let Ok(result) = engine.eval::<i64>("let a = new_tp(); a.child.x = 500; a.child.x") {
         assert_eq!(result, 500);
     } else {
         assert!(false);
@@ -1693,13 +1693,13 @@ fn test_string() {
 fn test_arrays() {
     let mut engine = Engine::new();
 
-    if let Ok(result) = engine.eval::<i64>("var x = [1, 2, 3]; x[1]") {
+    if let Ok(result) = engine.eval::<i64>("let x = [1, 2, 3]; x[1]") {
         assert_eq!(result, 2);
     } else {
         assert!(false);
     }
 
-    if let Ok(result) = engine.eval::<i64>("var y = [1, 2, 3]; y[1] = 5; y[1]") {
+    if let Ok(result) = engine.eval::<i64>("let y = [1, 2, 3]; y[1] = 5; y[1]") {
         assert_eq!(result, 5);
     } else {
         assert!(false);
@@ -1739,13 +1739,13 @@ fn test_array_with_structs() {
     engine.register_fn("update", TestStruct::update);
     engine.register_fn("new_ts", TestStruct::new);
 
-    if let Ok(result) = engine.eval::<i64>("var a = [new_ts()]; a[0].x") {
+    if let Ok(result) = engine.eval::<i64>("let a = [new_ts()]; a[0].x") {
         assert_eq!(result, 1);
     } else {
         assert!(false);
     }
 
-    if let Ok(result) = engine.eval::<i64>("var a = [new_ts()]; a[0].x = 100; a[0].update(); \
+    if let Ok(result) = engine.eval::<i64>("let a = [new_ts()]; a[0].x = 100; a[0].update(); \
                                             a[0].x") {
         assert_eq!(result, 1100);
     } else {
diff --git a/src/parser.rs b/src/parser.rs
index 5293579a..8ed0a41a 100644
--- a/src/parser.rs
+++ b/src/parser.rs
@@ -313,7 +313,7 @@ impl<'a> Iterator for TokenIterator<'a> {
                         return Some(Token::True);
                     } else if out == "false" {
                         return Some(Token::False);
-                    } else if out == "var" {
+                    } else if out == "let" {
                         return Some(Token::Var);
                     } else if out == "if" {
                         return Some(Token::If);