From b6f00d07e8e81310ea8f3ecaf7d395843e5c7f7b Mon Sep 17 00:00:00 2001
From: JT <jonathan.d.turner@gmail.com>
Date: Fri, 30 Jul 2021 19:30:11 +1200
Subject: [PATCH] Fix var decl. improve for loop

---
 src/eval.rs   |  5 ++---
 src/main.rs   |  2 +-
 src/parser.rs | 18 ++----------------
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/src/eval.rs b/src/eval.rs
index 50a0b1241c..79b6011df4 100644
--- a/src/eval.rs
+++ b/src/eval.rs
@@ -157,7 +157,7 @@ fn eval_call(state: &State, stack: Stack, call: &Call) -> Result<Value, ShellErr
 
         let rhs = eval_expression(state, stack.clone(), keyword_expr)?;
 
-        println!("Adding: {:?} to {}", rhs, var_id);
+        //println!("Adding: {:?} to {}", rhs, var_id);
 
         StackFrame::add_var(stack, var_id, rhs);
         Ok(Value::Unknown)
@@ -250,8 +250,7 @@ fn eval_call(state: &State, stack: Stack, call: &Call) -> Result<Value, ShellErr
             if curr == end_val {
                 break;
             } else {
-                let block_stack = StackFrame::enter_scope(stack.clone());
-                eval_block(state, block_stack, block)?;
+                eval_block(state, stack.clone(), block)?;
 
                 StackFrame::add_var(
                     stack.clone(),
diff --git a/src/main.rs b/src/main.rs
index eb4aa8134b..53dcdc0ed8 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -26,7 +26,7 @@ fn main() -> std::io::Result<()> {
         working_set.add_decl(sig.into());
 
         let sig = Signature::build("let")
-            .required("var_name", SyntaxShape::Variable, "variable name")
+            .required("var_name", SyntaxShape::VarWithOptType, "variable name")
             .required(
                 "initial_value",
                 SyntaxShape::Keyword(b"=".to_vec(), Box::new(SyntaxShape::Expression)),
diff --git a/src/parser.rs b/src/parser.rs
index 4fefd9cbd7..b3217a9dc4 100644
--- a/src/parser.rs
+++ b/src/parser.rs
@@ -1212,21 +1212,19 @@ impl<'a> ParserWorkingSet<'a> {
                 let type_bytes = self.get_span_contents(spans[*spans_idx]);
 
                 let ty = self.parse_type(type_bytes);
-                *spans_idx += 1;
 
                 let id = self.add_variable(bytes[0..(bytes.len() - 1)].to_vec(), ty.clone());
 
                 (
                     Expression {
                         expr: Expr::Var(id),
-                        span: span(&spans[*spans_idx - 2..*spans_idx]),
+                        span: span(&spans[*spans_idx - 1..*spans_idx + 1]),
                         ty,
                     },
                     None,
                 )
             } else {
                 let id = self.add_variable(bytes[0..(bytes.len() - 1)].to_vec(), Type::Unknown);
-                *spans_idx += 1;
                 (
                     Expression {
                         expr: Expr::Var(id),
@@ -1238,12 +1236,11 @@ impl<'a> ParserWorkingSet<'a> {
             }
         } else {
             let id = self.add_variable(bytes, Type::Unknown);
-            *spans_idx += 1;
 
             (
                 Expression {
                     expr: Expr::Var(id),
-                    span: span(&spans[*spans_idx - 1..*spans_idx]),
+                    span: span(&spans[*spans_idx..*spans_idx + 1]),
                     ty: Type::Unknown,
                 },
                 None,
@@ -2093,17 +2090,6 @@ impl<'a> ParserWorkingSet<'a> {
         }
     }
 
-    pub fn parse_keyword(&self, span: Span, keyword: &[u8]) -> Option<ParseError> {
-        if self.get_span_contents(span) == keyword {
-            None
-        } else {
-            Some(ParseError::Mismatch(
-                String::from_utf8_lossy(keyword).to_string(),
-                span,
-            ))
-        }
-    }
-
     pub fn parse_def(&mut self, spans: &[Span]) -> (Statement, Option<ParseError>) {
         let mut error = None;
         let name = self.get_span_contents(spans[0]);