on master help sign in
add Data.NonEmptyList.singleton
commit9da3c617a7540b1d38849543fa4bdc65812283e7 authorEvan Czaplicki <evancz@users.noreply.github.com> dateMon 3 Jun 2019, 11:06 (7 years ago) parent83aae2e
2 files changed+9−4
compiler/src/Data/NonEmptyList.hs+6 compiler/src/Parse/Shader.hs+3−4
compiler/src/Data/NonEmptyList.hs+6
@@ -1,5 +1,6 @@
11module Data.NonEmptyList
22 ( List(..)
3+ , singleton
34 , toList
45 , sortBy
56 )
@@ -19,6 +20,11 @@ data List a =
1920 List a [a]
2021
2122
23+singleton :: a -> List a
24+singleton a =
25+ List a []
26+
27+
2228toList :: List a -> [a]
2329toList (List x xs) =
2430 x:xs
compiler/src/Parse/Shader.hs+3−4
@@ -32,17 +32,16 @@ import qualified Reporting.Error.Syntax as E
3232shader :: A.Position -> Parser E.Expr Src.Expr
3333shader start@(A.Position row col) =
3434 do block <- parseBlock
35− shdr <- parseGlsl row col block
35+ shdr <- parseGlsl row col src
3636 end <- P.getPosition
37− let src = List.intercalate "\\n" (lines block)
38− return (A.at start end (Src.Shader (Utf8.fromChars src) shdr))
37+ return (A.at start end (Src.Shader (Shader.fromChars src) shdr))
3938
4039
4140
4241-- BLOCK
4342
4443
45−parseBlock :: Parser E.Expr String
44+parseBlock :: Parser E.Expr P.Snippet
4645parseBlock =
4746 P.Parser $ \(P.State src pos end indent row col) cok _ cerr eerr ->
4847 let