From 5af96110c7cd156403a267f280da5221bb6fd483 Mon Sep 17 00:00:00 2001
From: Neil Brown <neil@twistedsquare.com>
Date: Wed, 26 Sep 2007 23:00:58 +0000
Subject: [PATCH] Rain: implemented the parsing of wait statements

---
 frontends/LexRain.x    |  1 +
 frontends/ParseRain.hs | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/frontends/LexRain.x b/frontends/LexRain.x
index 9705e91..5ad5850 100644
--- a/frontends/LexRain.x
+++ b/frontends/LexRain.x
@@ -41,6 +41,7 @@ $hexDigit = [0-9 a-f A-F]
           | "process" | "function" 
           | "pareach" | "seqeach" | "par" | "seq" 
           | "run" | "return" | "now"
+          | "wait" | "for" | "until"
           | "if" | "while" | "else"
           | "pri" | "alt"
           | "sint8" | "sint16" | "sint32" | "sint64"
diff --git a/frontends/ParseRain.hs b/frontends/ParseRain.hs
index 21d3071..df13ba5 100644
--- a/frontends/ParseRain.hs
+++ b/frontends/ParseRain.hs
@@ -90,6 +90,9 @@ sProcess = reserved "process"
 sFunction = reserved "function"
 sRun = reserved "run"
 sReturn = reserved "return"
+sWait = reserved "wait"
+sFor = reserved "for"
+sUntil = reserved "until"
 --}}}
 
 --{{{Operators
@@ -357,6 +360,17 @@ runProcess = do m <- sRun
     convertItem (A.ExprVariable _ v) = A.ActualVariable A.Original A.Any v
     convertItem e = A.ActualExpression A.Any e
 
+waitStatement :: Bool -> RainParser (Meta, A.WaitMode, A.Expression)
+waitStatement isAlt
+  = do { m <- sWait ;
+         do { sFor ; e <- expression ; possSemiColon ; return (m, A.WaitFor, e)}
+         <|> do { sUntil ; e <- expression ; possSemiColon ; return (m, A.WaitUntil, e)}
+         <?> "reserved word \"for\" or \"until\" should follow reserved word \"wait\""
+       }
+    where
+      possSemiColon :: RainParser ()
+      possSemiColon = if isAlt then return () else sSemiColon >> return ()
+
 statement :: RainParser A.Process
 statement 
   = do { m <- sWhile ; sLeftR ; exp <- expression ; sRightR ; st <- block ; return $ A.While m exp st}
@@ -368,6 +382,7 @@ statement
     <|> each
     <|> runProcess
     <|> do {m <- reserved "now" ; dest <- lvalue ; sSemiColon ; return $ A.GetTime m dest}
+    <|> do {(m,wm,exp) <- waitStatement False ; return $ A.Wait m wm exp}
     <|> try (comm False)
     <|> alt
     <|> try (do { lv <- lvalue ; op <- assignOp ; exp <- expression ; sSemiColon ;