45c65c9 · elk · git.iko.soy

elm-compiler.cabal−5

compare with master

unifiedsplit

@@ -69,7 +69,6 @@ Library

69 Generate.JavaScript.Helpers,

70 Generate.JavaScript.Ports,

71 Generate.JavaScript.Variable,

72− Generate.Markdown,

73 Generate.Cases,

72 Generate.Cases,

74 Transform.AddDefaultImports,

73 Transform.AddDefaultImports,

75 Transform.Canonicalize,

74 Transform.Canonicalize,

@@ -115,12 +114,10 @@ Library

115 blaze-html >= 0.5 && < 0.8,

114 blaze-html >= 0.5 && < 0.8,

116 blaze-markup >= 0.5.1 && < 0.7,

115 blaze-markup >= 0.5.1 && < 0.7,

117 bytestring >= 0.9 && < 0.11,

116 bytestring >= 0.9 && < 0.11,

118− cheapskate >= 0.1 && < 0.2,

119 cmdargs >= 0.7 && < 0.11,

117 cmdargs >= 0.7 && < 0.11,

120 containers >= 0.3 && < 0.6,

118 containers >= 0.3 && < 0.6,

121 directory >= 1.0 && < 2.0,

119 directory >= 1.0 && < 2.0,

122 filepath >= 1 && < 2.0,

120 filepath >= 1 && < 2.0,

123− highlighting-kate >= 0.5 && < 0.6,

124 indents >= 0.3 && < 0.4,

121 indents >= 0.3 && < 0.4,

125 language-ecmascript >=0.15 && < 0.17,

122 language-ecmascript >=0.15 && < 0.17,

126 language-glsl >= 0.0.2 && < 0.2,

123 language-glsl >= 0.0.2 && < 0.2,

@@ -217,14 +214,12 @@ Test-Suite compiler-tests

217 blaze-html >= 0.5 && < 0.8,

214 blaze-html >= 0.5 && < 0.8,

218 blaze-markup >= 0.5.1 && < 0.7,

215 blaze-markup >= 0.5.1 && < 0.7,

219 bytestring >= 0.9 && < 0.11,

216 bytestring >= 0.9 && < 0.11,

220− cheapskate >= 0.1 && < 0.2,

221 cmdargs >= 0.7 && < 0.11,

217 cmdargs >= 0.7 && < 0.11,

222 containers >= 0.3 && < 0.6,

218 containers >= 0.3 && < 0.6,

223 directory >= 1.0 && < 2.0,

219 directory >= 1.0 && < 2.0,

224 elm-compiler,

220 elm-compiler,

225 filemanip >= 0.3.5 && < 0.4,

221 filemanip >= 0.3.5 && < 0.4,

226 filepath >= 1 && < 2.0,

222 filepath >= 1 && < 2.0,

227− highlighting-kate >= 0.5 && < 0.6,

228 indents >= 0.3 && < 0.4,

223 indents >= 0.3 && < 0.4,

229 language-ecmascript >=0.15 && < 0.17,

224 language-ecmascript >=0.15 && < 0.17,

230 language-glsl >= 0.0.2 && < 0.2,

225 language-glsl >= 0.0.2 && < 0.2,

src/AST/Expression/General.hs−3

@@ -55,7 +55,6 @@ data Expr' ann def var

55 | Insert (Expr ann def var) String (Expr ann def var)

56 | Modify (Expr ann def var) [(String, Expr ann def var)]

57 | Record [(String, Expr ann def var)]

58− | Markdown String String

59 -- for type checking and code gen only

58 -- for type checking and code gen only

60 | PortIn String (Type var)

59 | PortIn String (Type var)

61 | PortOut String (Type var) (Expr ann def var)

60 | PortOut String (Type var) (Expr ann def var)

@@ -179,8 +178,6 @@ instance (Pretty def, Pretty var, Var.ToString var) => Pretty (Expr' ann def var

179 field (field, value) =

178 field (field, value) =

180 variable field <+> P.equals <+> pretty value

179 variable field <+> P.equals <+> pretty value

181

180

182− Markdown _ _ -> P.text "[markdown| ... |]"

183−

184 GLShader _ _ _ -> P.text "[glsl| ... |]"

181 GLShader _ _ _ -> P.text "[glsl| ... |]"

185

182

186 PortIn name _ -> P.text $ "<port:" ++ name ++ ">"

183 PortIn name _ -> P.text $ "<port:" ++ name ++ ">"

src/Generate/JavaScript.hs−13

@@ -13,7 +13,6 @@ import Generate.JavaScript.Helpers as Help

13import qualified Generate.Cases as Case

14import qualified Generate.JavaScript.Ports as Port

15import qualified Generate.JavaScript.Variable as Var

16−import qualified Generate.Markdown as MD

17

16

18import AST.Annotation

17import AST.Annotation

19import AST.Module

18import AST.Module

@@ -192,18 +191,6 @@ expression (A region expr) =

192 ctor = (prop "ctor", string name)

191 ctor = (prop "ctor", string name)

193 fields = zipWith (\n e -> (prop ("_" ++ show n), e)) [0..]

192 fields = zipWith (\n e -> (prop ("_" ++ show n), e)) [0..]

194

193

195− Markdown uid doc ->

196− let text =

197− obj ["Elm","Text","make"] <| ref localRuntime

198−

199− pad =

200− "<div style=\"height:0;width:0;\"> </div>"

201−

202− md =

203− pad ++ MD.toHtml doc ++ pad

204− in

205− return (DotRef () text (var "markdown") `call` [ string md, string uid ])

206−

207 GLShader _uid src _tipe ->

194 GLShader _uid src _tipe ->

208 return $ ObjectLit () [(PropString () "src", literal (Str src))]

195 return $ ObjectLit () [(PropString () "src", literal (Str src))]

209

196

src/Generate/Markdown.hsdeleted−39

@@ -1,39 +0,0 @@

1−{-# OPTIONS_GHC -Wall #-}

2−module Generate.Markdown where

3−

4−import qualified Cheapskate as CS

5−import qualified Cheapskate.Html as CS

6−import qualified Data.Text as Text

7−import qualified Text.Blaze.Html.Renderer.String as Blaze

8−import qualified Text.Highlighting.Kate as Kate

9−import Elm.Utils ((|>))

10−

11−

12−toHtml :: String -> String

13−toHtml rawMarkdown =

14− Text.pack rawMarkdown

15− |> CS.markdown options

16− |> CS.walk highlightCode

17− |> CS.renderDoc

18− |> Blaze.renderHtml

19−

20−options :: CS.Options

21−options =

22− CS.Options

23− { CS.sanitize = False

24− , CS.allowRawHtml = True

25− , CS.preserveHardBreaks = False

26− , CS.debug = False

27− }

28−

29−highlightCode :: CS.Block -> CS.Block

30−highlightCode block =

31− case block of

32− CS.CodeBlock (CS.CodeAttr lang _info) src ->

33− Kate.highlightAs (Text.unpack lang) (Text.unpack src)

34− |> Kate.formatHtmlBlock Kate.defaultFormatOpts

35− |> Blaze.renderHtml

36− |> Text.pack

37− |> CS.HtmlBlock

38−

39− _ -> block

src/Parse/Expression.hs+1−7

@@ -49,19 +49,13 @@ negative = do

49-------- Complex Terms --------

50

51listTerm :: IParser Source.Expr'

52−listTerm = markdown' <|> shader' <|> braces (try range <|> E.ExplicitList <$> commaSep expr)

52+listTerm = shader' <|> braces (try range <|> E.ExplicitList <$> commaSep expr)

53 where

54 range = do

55 lo <- expr

56 padded (string "..")

57 E.Range lo <$> expr

58

59− markdown' = do

60− pos <- getPosition

61− let uid = show (sourceLine pos) ++ ":" ++ show (sourceColumn pos)

62− rawText <- Help.markdown

63− return (E.Markdown uid (filter (/='\r') rawText))

64−

65 shader' = do

59 shader' = do

66 pos <- getPosition

60 pos <- getPosition

67 let uid = show (sourceLine pos) ++ ":" ++ show (sourceColumn pos)

61 let uid = show (sourceLine pos) ++ ":" ++ show (sourceColumn pos)

src/Parse/Helpers.hs−15

@@ -381,7 +381,6 @@ ignoreUntil end =

381 choice

382 [ try (ignore chr) <|> ignore str

383 , ignore multiComment

384− , ignore markdown

385 , ignore anyChar

384 , ignore anyChar

386 ]

385 ]

387

386

@@ -425,20 +424,6 @@ anyUntilPos pos =

425

424

426-- BASIC LANGUAGE LITERALS

425-- BASIC LANGUAGE LITERALS

427

426

428−markdown :: IParser String

429−markdown =

430− do try (string "[markdown|")

431− closeMarkdown id

432− where

433− closeMarkdown markdownBuilder =

434− choice

435− [ do try (string "|]")

436− return (markdownBuilder "")

437− , do c <- anyChar

438− closeMarkdown (markdownBuilder . (c:))

439− ]

440−

441−

442shader :: IParser (String, L.GLShaderTipe)

427shader :: IParser (String, L.GLShaderTipe)

443shader =

428shader =

444 do try (string "[glsl|")

429 do try (string "[glsl|")

src/Transform/Canonicalize.hs−4

@@ -282,10 +282,6 @@ expression env (A.A ann expr) =

282 (,) <$> format (pattern env p)

283 <*> expression (update p env) b

284

285− Markdown uid md ->

286− do Env.uses ["Text"]

287− return (Markdown uid md)

288−

289 PortIn name st ->

285 PortIn name st ->

290 PortIn name <$> tipe' env st

286 PortIn name <$> tipe' env st

291

287

src/Transform/Expression.hs−3

@@ -85,9 +85,6 @@ crawl portInCheck portOutCheck defsTransform =

85 Record fields ->

86 Record <$> mapM (\(k,v) -> (,) k <$> go v) fields

87

88− Markdown uid md ->

89− return $ Markdown uid md

90−

91 Let defs body ->

88 Let defs body ->

92 Let <$> defsTransform defs <*> go body

89 Let <$> defsTransform defs <*> go body

93

90

src/Transform/SortDefinitions.hs−2

@@ -97,8 +97,6 @@ reorder (A ann expr) =

97 Record fields ->

98 Record <$> mapM (\(k,v) -> (,) k <$> reorder v) fields

99

100− Markdown uid md -> return $ Markdown uid md

101−

102 GLShader _ _ _ -> return expr

100 GLShader _ _ _ -> return expr

103

101

104 PortOut name st signal -> PortOut name st <$> reorder signal

102 PortOut name st signal -> PortOut name st <$> reorder signal

src/Transform/Substitute.hs−2

@@ -79,8 +79,6 @@ subst old new expression =

79

80 Literal _ -> expression

81

82− Markdown _ _ -> expression

83−

84 GLShader _ _ _ -> expression

82 GLShader _ _ _ -> expression

85

83

86 PortIn name st ->

84 PortIn name st ->

src/Type/Constrain/Expression.hs−3

@@ -151,9 +151,6 @@ constrain env (A region expr) tipe =

151 recordType = record fields' (termN EmptyRecord1)

152 return . ex vars . and $ tipe === recordType : cs

153

154− Markdown _ _ ->

155− return ("Text.markdown" <? tipe)

156−

157 Let defs body ->

154 Let defs body ->

158 do c <- constrain env body tipe

155 do c <- constrain env body tipe

159 (schemes, rqs, fqs, header, c2, c1) <-

156 (schemes, rqs, fqs, header, c2, c1) <-