Merge branch 'master' of github.com:dopefishh/fp1415

diff --git a/fp2/week45/camil/RefactorX.icl b/fp2/week45/camil/RefactorX.icl
index 9cbb6d7..a7bf909 100644 (file)
--- a/fp2/week45/camil/RefactorX.icl
+++ b/fp2/week45/camil/RefactorX.icl
@@ -58,19 +58,19 @@ remove_unused_lets x = x
 \r
 //     evaluator met tabel van naam-waarde paren:\r
 eval                                                           :: Expr -> Val\r
-eval e = fst (eval` e [])\r
+eval e = eval` e []\r
 where\r
-       eval` :: Expr [(Name, Val)] -> (Val, [(Name, Val)])\r
-       eval` (NR n) vs = (Result n, [])\r
-       eval` (VAR s) vs = (find s vs, [])\r
+       eval` :: Expr [(Name, Val)] -> Val\r
+       eval` (NR n) vs = Result n\r
+       eval` (VAR s) vs = find s vs\r
        where\r
                find :: Name [(Name, Val)] -> Val\r
                find _ [] = Undef\r
                find s [(t,v):vs]\r
                | s == t = v\r
                | otherwise = find s vs\r
-       eval` (LET s e1 e2) vs = eval` e2 [(s,fst (eval` e1 vs)):vs]\r
-       eval` (OP e1 o e2) vs = (op o (fst (eval` e1 vs)) (fst (eval` e2 vs)), [])\r
+       eval` (LET s e1 e2) vs = eval` e2 [(s,eval` e1 vs):vs]\r
+       eval` (OP e1 o e2) vs = op o (eval` e1 vs) (eval` e2 vs)\r
        where\r
                op :: Operator Val Val -> Val\r
                op _ Undef _ = Undef\r

diff --git a/fp2/week45/mart/RefactorX.dcl b/fp2/week45/mart/RefactorX.dcl
index e7fef07..393c097 100644 (file)
--- a/fp2/week45/mart/RefactorX.dcl
+++ b/fp2/week45/mart/RefactorX.dcl
@@ -1,3 +1,5 @@
+// Mart Lubbers s4109503, Camil Staps s4498062\r
+\r
 definition module RefactorX\r
 \r
 from StdClass import class toString\r

diff --git a/fp2/week45/mart/RefactorX.icl b/fp2/week45/mart/RefactorX.icl
index 1334aac..c74df08 100644 (file)
--- a/fp2/week45/mart/RefactorX.icl
+++ b/fp2/week45/mart/RefactorX.icl
@@ -1,3 +1,5 @@
+// Mart Lubbers s4109503, Camil Staps s4498062\r
+\r
 implementation module RefactorX\r
 \r
 import StdEnv\r

diff --git a/fp2/week45/week45.tar.gz b/fp2/week45/week45.tar.gz
new file mode 100644 (file)
index 0000000..690e838
Binary files /dev/null and b/fp2/week45/week45.tar.gz differ