diff options
| author | Mart Lubbers | 2015-05-12 19:32:11 +0200 |
|---|---|---|
| committer | Mart Lubbers | 2015-05-12 19:32:11 +0200 |
| commit | 04fdced12be9722608dbff8b46fd2c6663599dc0 (patch) | |
| tree | af9c21e1f5018244f2d760beb4b0a4d279f2d8b2 | |
| parent | removed binary (diff) | |
small update fix
| -rw-r--r-- | fp2/week45/mart/RefactorX.dcl | 2 | ||||
| -rw-r--r-- | fp2/week45/mart/RefactorX.icl | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/fp2/week45/mart/RefactorX.dcl b/fp2/week45/mart/RefactorX.dcl index e71f36b..e7fef07 100644 --- a/fp2/week45/mart/RefactorX.dcl +++ b/fp2/week45/mart/RefactorX.dcl @@ -1,5 +1,6 @@ definition module RefactorX
+from StdClass import class toString
import StdEnv
:: Expr = NR Int | VAR Name | OP Expr Operator Expr | LET Name Expr Expr
@@ -7,7 +8,6 @@ import StdEnv :: Operator = PLUS | MIN | MUL | DIV
:: Val = Result Int | Undef
-from StdClass import class toString
instance toString Expr
free :: Expr -> [Name]
diff --git a/fp2/week45/mart/RefactorX.icl b/fp2/week45/mart/RefactorX.icl index 3898c14..1334aac 100644 --- a/fp2/week45/mart/RefactorX.icl +++ b/fp2/week45/mart/RefactorX.icl @@ -57,9 +57,8 @@ apply o (Result e1) (Result e2) = Result (apply` o e1 e2) apply` MUL = *
apply` DIV = /
-
eval:: Expr -> Val
-eval e = eval` (remove_unused_lets e) []
+eval e = eval` e []
where
eval`:: Expr [(Name, Val)] -> Val
eval` (NR n) _ = Result n
|