From 68027501f844bc46f3aac2ca3cbb99c92914c50c Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Tue, 13 Dec 2011 17:29:08 -0500
Subject: [PATCH] make ; a hard delimiter for multi-commands.  fixes #270

---
 main/Main.scala | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/main/Main.scala b/main/Main.scala
index 81b31b19d..ee0cc0a1a 100644
--- a/main/Main.scala
+++ b/main/Main.scala
@@ -268,7 +268,11 @@ object BuiltinCommands
 	}
 
 	def multiParser(s: State): Parser[Seq[String]] =
-		( token(';' ~> OptSpace) flatMap { _ => combinedLax(s, charClass(_ != ';').+) <~ token(OptSpace) } map (_.trim) ).+
+	{
+		val nonSemi = token(charClass(_ != ';').+, hide= const(true))
+		( token(';' ~> OptSpace) flatMap { _ => matched((s.combinedParser&nonSemi) | nonSemi) <~ token(OptSpace) } map (_.trim) ).+
+	}
+
 	def multiApplied(s: State) = 
 		Command.applyEffect( multiParser(s) )( _ ::: s )