From 6758cd7da3b90174689fc5eadb0dec4169141022 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Sun, 18 May 2008 10:30:17 +0000 Subject: [PATCH] Changed the list concatenation operator to be ++ in Rain --- frontends/LexRain.x | 2 +- frontends/ParseRain.hs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/frontends/LexRain.x b/frontends/LexRain.x index 5fe9d09..55bb720 100644 --- a/frontends/LexRain.x +++ b/frontends/LexRain.x @@ -36,7 +36,7 @@ $hexDigit = [0-9 a-f A-F] | "+" | "-" | "*" | "/" | "%" | ">=" | "<=" | "<" | ">" - | ".." + | ".." | "++" | "process" | "function" | "pareach" | "seqeach" | "par" | "seq" | "run" | "return" | "now" diff --git a/frontends/ParseRain.hs b/frontends/ParseRain.hs index 2241506..6ae6b6a 100644 --- a/frontends/ParseRain.hs +++ b/frontends/ParseRain.hs @@ -103,6 +103,7 @@ dyadicArithOp <|> do {m <- reserved "*" ; return (m,A.Times) } <|> do {m <- reserved "/" ; return (m,A.Div) } <|> do {m <- reserved "%" ; return (m,A.Rem) } + <|> do {m <- reserved "++" ; return (m,A.Concat) } dyadicCompOp :: RainParser (Meta,A.DyadicOp) dyadicCompOp @@ -113,6 +114,7 @@ dyadicCompOp <|> do {m <- reserved "==" ; return (m,A.Eq) } <|> do {m <- reserved "<>" ; return (m,A.NotEq) } +-- TODO remove this in future, I think monadicArithOp :: RainParser (Meta,A.MonadicOp) monadicArithOp = do {m <- reserved "-" ; return (m,A.MonadicMinus) }