Update Rust code to the current Rust nightly

Lots of changes! Hopefully everything is still semantically equivalent (tests
still pass)

1 files changed, 0 insertions, 129 deletions

diff --git a/rust/src/step2_eval.rs b/rust/src/step2_eval.rs
deleted file mode 100644
index 2cf7897..0000000
--- a/rust/src/step2_eval.rs
+++ /dev/null
@@ -1,129 +0,0 @@
-// support precompiled regexes in reader.rs
-#![feature(phase)]
-#[phase(plugin)]
-extern crate regex_macros;
-extern crate regex;
-
-use std::collections::HashMap;
-
-use types::{MalVal,MalRet,MalError,ErrString,ErrMalVal,err_str,
-            Int,Sym,List,Vector,Hash_Map,
-            _nil,_int,list,vector,hash_map,func};
-mod readline;
-mod types;
-mod reader;
-mod printer;
-mod env; // because types uses env
-
-// read
-fn read(str: String) -> MalRet {
-    reader::read_str(str)
-}
-
-// eval
-fn eval_ast(ast: MalVal, env: &HashMap<String,MalVal>) -> MalRet {
-    match *ast {
-        Sym(ref sym) => {
-            match env.find_copy(sym) {
-                Some(mv) => Ok(mv),
-                None     => Ok(_nil()),
-            }
-        },
-        List(ref a,_) | Vector(ref a,_) => {
-            let mut ast_vec : Vec<MalVal> = vec![];
-            for mv in a.iter() {
-                match eval(mv.clone(), env) {
-                    Ok(mv) => ast_vec.push(mv),
-                    Err(e) => return Err(e),
-                }
-            }
-            Ok(match *ast { List(_,_) => list(ast_vec),
-                            _         => vector(ast_vec) })
-        },
-        Hash_Map(ref hm,_) => {
-            let mut new_hm: HashMap<String,MalVal> = HashMap::new();
-            for (key, value) in hm.iter() {
-                match eval(value.clone(), env) {
-                    Ok(mv) => { new_hm.insert(key.to_string(), mv); },
-                    Err(e) => return Err(e),
-                }
-            }
-            Ok(hash_map(new_hm))
-        },
-        _ => {
-            Ok(ast.clone())
-        }
-    }
-}
-
-fn eval(ast: MalVal, env: &HashMap<String,MalVal>) -> MalRet {
-    let ast2 = ast.clone();
-    match *ast2 {
-        List(_,_) => (),  // continue
-        _ => return eval_ast(ast2, env),
-    }
-
-    // apply list
-    match eval_ast(ast, env) {
-        Err(e) => Err(e),
-        Ok(el) => {
-            match *el {
-                List(ref args,_) => {
-                    let ref f = args.clone()[0];
-                    f.apply(args.slice(1,args.len()).to_vec())
-                }
-                _ => err_str("Invalid apply"),
-            }
-        }
-    }
-}
-
-// print
-fn print(exp: MalVal) -> String {
-    exp.pr_str(true)
-}
-
-fn rep(str: &str, env: &HashMap<String,MalVal>) -> Result<String,MalError> {
-    match read(str.to_string()) {
-        Err(e) => Err(e),
-        Ok(ast) => {
-            //println!("read: {}", ast);
-            match eval(ast, env) {
-                Err(e)  => Err(e),
-                Ok(exp) => Ok(print(exp)),
-            }
-        }
-    }
-}
-
-fn int_op(f: |i:int,j:int|-> int, a:Vec<MalVal>) -> MalRet {
-    match *a[0] {
-        Int(a0) => match *a[1] {
-            Int(a1) => Ok(_int(f(a0,a1))),
-            _ => err_str("second arg must be an int"),
-        },
-        _ => err_str("first arg must be an int"),
-    }
-}
-fn add(a:Vec<MalVal>) -> MalRet { int_op(|i,j| { i+j }, a) }
-fn sub(a:Vec<MalVal>) -> MalRet { int_op(|i,j| { i-j }, a) }
-fn mul(a:Vec<MalVal>) -> MalRet { int_op(|i,j| { i*j }, a) }
-fn div(a:Vec<MalVal>) -> MalRet { int_op(|i,j| { i/j }, a) }
-
-fn main() {
-    let mut repl_env : HashMap<String,MalVal> = HashMap::new();
-    repl_env.insert("+".to_string(), func(add));
-    repl_env.insert("-".to_string(), func(sub));
-    repl_env.insert("*".to_string(), func(mul));
-    repl_env.insert("/".to_string(), func(div));
-
-    loop {
-        let line = readline::mal_readline("user> ");
-        match line { None => break, _ => () }
-        match rep(line.unwrap().as_slice(), &repl_env) {
-            Ok(str)  => println!("{}", str),
-            Err(ErrMalVal(_)) => (),  // Blank line
-            Err(ErrString(s)) => println!("Error: {}", s),
-        }
-    }
-}