suzanne.soy/tock-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed the rain parser to use ListLiteral for strings

Browse Source
This commit is contained in:
Neil Brown 2008-03-19 15:59:23 +00:00
parent 9d0459cb75
commit 45c2619307
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/TestUtils.hs
View File

@ -234,10 +234,10 @@ makeAssignPattern v e = tag3 A.Assign DontCare [v] $ tag2 A.ExpressionList DontC
-- | Creates a literal string expression from the given 'String'. -- | Creates a literal string expression from the given 'String'.
makeLiteralStringRain :: String -> A.Expression makeLiteralStringRain :: String -> A.Expression
makeLiteralStringRain str = A.Literal emptyMeta (A.List A.Byte) (A.ArrayLiteral emptyMeta (map makeLiteralChar str)) makeLiteralStringRain str = A.Literal emptyMeta (A.List A.Byte) (A.ListLiteral emptyMeta (map makeLiteralChar str))
where where
makeLiteralChar :: Char -> A.ArrayElem makeLiteralChar :: Char -> A.Expression
makeLiteralChar c = A.ArrayElemExpr $ A.Literal emptyMeta A.Byte (A.ByteLiteral emptyMeta [c] {-(show (fromEnum c))-}) makeLiteralChar c = A.Literal emptyMeta A.Byte (A.ByteLiteral emptyMeta [c] {-(show (fromEnum c))-})
-- | Creates a 'Pattern' to match an 'A.Expression' instance. -- | Creates a 'Pattern' to match an 'A.Expression' instance.
-- @'assertPatternMatch' ('makeLiteralStringPattern' x) ('makeLiteralString' x)@ will always succeed. -- @'assertPatternMatch' ('makeLiteralStringPattern' x) ('makeLiteralString' x)@ will always succeed.

6
frontends/ParseRain.hs
View File

@ -171,12 +171,12 @@ variable = do {v <- name ; return $ A.Variable (findMeta v) v}
lvalue :: RainParser A.Variable lvalue :: RainParser A.Variable
lvalue = variable lvalue = variable
stringLiteral :: RainParser (A.LiteralRepr, A.Dimension) stringLiteral :: RainParser A.LiteralRepr
stringLiteral stringLiteral
= do (m,str) <- getToken testToken = do (m,str) <- getToken testToken
let processed = replaceEscapes str let processed = replaceEscapes str
let aes = [A.ArrayElemExpr $ A.Literal m A.Byte $ A.ByteLiteral m [c] | c <- processed] let aes = [A.ArrayElemExpr $ A.Literal m A.Byte $ A.ByteLiteral m [c] | c <- processed]
return (A.ArrayLiteral m aes, makeDimension m $ length processed) return (A.ArrayLiteral m aes, A.Dimension $ length processed)
<?> "string literal" <?> "string literal"
where where
testToken (L.TokStringLiteral str) = Just str testToken (L.TokStringLiteral str) = Just str
@ -207,7 +207,7 @@ integerLiteral :: RainParser A.Expression
integerLiteral = do {i <- integer ; return $ A.Literal (findMeta i) A.Int i} integerLiteral = do {i <- integer ; return $ A.Literal (findMeta i) A.Int i}
literal :: RainParser A.Expression literal :: RainParser A.Expression
literal = do {(lr, dim) <- stringLiteral ; return $ A.Literal (findMeta lr) (A.List A.Byte) lr } literal = do {lr <- stringLiteral ; return $ A.Literal (findMeta lr) (A.List A.Byte) lr }
<|> do {c <- literalCharacter ; return $ A.Literal (findMeta c) A.Byte c} <|> do {c <- literalCharacter ; return $ A.Literal (findMeta c) A.Byte c}
<|> integerLiteral <|> integerLiteral
<|> do {m <- reserved "true" ; return $ A.True m} <|> do {m <- reserved "true" ; return $ A.True m}