[svn] r6358: nemerle/trunk/tools/nemerlish: eval.n interp.n

[nazgul]

Log:
Make last void expression work in nemish

Author: nazgul
Date: Thu Jun  1 19:50:23 2006
New Revision: 6358

Modified:
   nemerle/trunk/tools/nemerlish/eval.n
   nemerle/trunk/tools/nemerlish/interp.n

Modified: nemerle/trunk/tools/nemerlish/eval.n
==============================================================================
--- nemerle/trunk/tools/nemerlish/eval.n	(original)
+++ nemerle/trunk/tools/nemerlish/eval.n	Thu Jun  1 19:50:23 2006
@@ -364,14 +364,16 @@
                   <[ ($(n : name) : System.Object) ]> :: acc
               }
             });
-            def exprty = ctx.TypeExpr (expr).MType;
-            match (exprty) {
-              | MType.Void => ()
+            def texpr = ctx.TypeExpr (expr);
+            match (texpr.MType) {
+              | MType.Void =>
+                <[ $(texpr : typed); [..$values] ]>
               | _ =>
-                Evaluator.locals = (false, "it", PrettyPrint.TyVarToParseTree (exprty)) :: Evaluator.locals;
+                Evaluator.locals = (false, "it", PrettyPrint.TyVarToParseTree (texpr.MType)) :: Evaluator.locals;
                 values ::= <[ $expr : System.Object ]>;
-            }
             <[ [..$values] ]>
+            }
+
           | _ => Util.ice ()
         }
       }

Modified: nemerle/trunk/tools/nemerlish/interp.n
==============================================================================
--- nemerle/trunk/tools/nemerlish/interp.n	(original)
+++ nemerle/trunk/tools/nemerlish/interp.n	Thu Jun  1 19:50:23 2006
@@ -35,12 +35,11 @@
   
     public Ref : string {
       get { 
-        FoldLeft (Tl (Evaluator.refr), "", fun (x, acc) { x + ", " + acc }).
-                 TrimEnd (array [',', ' ']) 
+        Tl (Evaluator.refr).ToString (", ")
       }
       set { 
         Evaluator.refr = interpassembly :: 
-                         Split (Replace (value, @"\s", ""), [','])
+                         Split (Replace (value, @"\s", ""), [',']);
       }
     }
   
@@ -61,7 +60,7 @@
         SC.WriteLine ("\nTyping '**' after a piece of code will show all\n"
                       "available possibilities to complete.\n"
                       "\tex.A**\n");
-        SC.WriteLine ("Use ^c (ctrl-c) to quit.\n")
+        SC.WriteLine ("Use ^c (ctrl-c) to quit.\n");
       }
     }
   }