A bunch of 1-indexing fixes. Can't claim to have found them all.

rdaum · Jul 23, 2023 · a91adec · a91adec
1 parent 1066301
commit a91adec
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 14 deletions.
diff --git a/moor-lib/src/var/mod.rs b/moor-lib/src/var/mod.rs
@@ -422,13 +422,15 @@ impl Var {
             }
             Variant::List(l) => {
                 let len = l.len() as i64;
-                if from <= 0 || from > len + 1 || to < 1 || to > len {
+                if to < from {
+                    return Ok(v_list(Vec::new()));
+                }
+                if from <= 0 || from > len + 1 || to < 1 || to > len  {
                     return Ok(v_err(E_RANGE));
                 }
-                let (from, to) = (from as usize, to as usize);
-                let mut res = Vec::with_capacity(to - from + 1);
+                let mut res = Vec::with_capacity((to - from + 1) as usize);
                 for i in from..=to {
-                    res.push(l[i - 1].clone());
+                    res.push(l[(i - 1) as usize].clone());
                 }
                 Ok(v_list(res))
             }

diff --git a/moor-lib/src/vm/execute.rs b/moor-lib/src/vm/execute.rs
@@ -370,6 +370,8 @@ impl VM {
             // above)
             if let FinallyReason::Return(value) = why {
                 self.push(&value);
+                trace!("Unwinding stack, pushing return value: {} back to verb {}",
+                          value, self.top().verb_name());
                 return Ok(ExecutionResult::More);
             }
         }
@@ -745,16 +747,20 @@ impl VM {
 
                 let nval = match (list.variant(), index.variant()) {
                     (Variant::List(l), Variant::Int(i)) => {
-                        if *i < 0 || !*i < l.len() as i64 {
+                        // Adjust for 1 indexing.
+                        let i = *i - 1;
+                        if i < 0 || i >= l.len() as i64 {
                             return self.push_error(E_RANGE);
                         }
 
                         let mut nval = l.clone();
-                        nval[*i as usize] = value;
+                        nval[i as usize] = value;
                         v_list(nval)
                     }
                     (Variant::Str(s), Variant::Int(i)) => {
-                        if *i < 0 || !*i < s.len() as i64 {
+                        // Adjust for 1 indexing.
+                        let i = *i - 1;
+                        if i < 0 || i >= s.len() as i64 {
                             return self.push_error(E_RANGE);
                         }
 
@@ -766,7 +772,7 @@ impl VM {
                             return self.push_error(E_INVARG);
                         }
 
-                        let i = *i as usize;
+                        let i = i as usize;
                         let (mut head, tail) = (String::from(&s[0..i]), &s[i + 1..]);
                         head.push_str(&value[0..1]);
                         head.push_str(tail);
@@ -878,10 +884,15 @@ impl VM {
                 let (index, list) = (peek[1].clone(), peek[0].clone());
                 let v = match (index.variant(), list.variant()) {
                     (Variant::Int(index), Variant::List(list)) => {
-                        if *index <= 0 || !*index < list.len() as i64 {
+                        // MOO is 1-indexed, it's easier if we adjust in advance.
+                        if *index < 1 {
+                            return self.push_error(E_RANGE);
+                        }
+                        let index = ((*index) - 1) as usize;
+                        if index >= list.len() {
                             return self.push_error(E_RANGE);
                         } else {
-                            list[*index as usize].clone()
+                            list[index].clone()
                         }
                     }
                     (_, _) => return self.push_error(E_TYPE),
@@ -904,9 +915,14 @@ impl VM {
             Op::RangeRef => {
                 let (to, from, base) = (self.pop(), self.pop(), self.pop());
                 match (to.variant(), from.variant()) {
-                    (Variant::Int(to), Variant::Int(from)) => match base.range(*from, *to) {
-                        Err(e) => return self.push_error(e),
-                        Ok(v) => self.push(&v),
+                    (Variant::Int(to), Variant::Int(from)) => {
+                        // MOO is 1-indexed. Adjust.
+                        match base.range(*from, *to) {
+                            Err(e) => {
+                                return self.push_error(e)
+                            },
+                            Ok(v) => self.push(&v),
+                        }
                     },
                     (_, _) => return self.push_error(E_TYPE),
                 };
@@ -916,7 +932,9 @@ impl VM {
                 match (to.variant(), from.variant()) {
                     (Variant::Int(to), Variant::Int(from)) => {
                         match base.rangeset(value, *from, *to) {
-                            Err(e) => return self.push_error(e),
+                            Err(e) => {
+                                return self.push_error(e)
+                            },
                             Ok(v) => self.push(&v),
                         }
                     }