f53384a · elk · git.iko.soy

git.iko.soy/elk

Merge branch 'dev' into topic/best_practice_webgl

commitf53384acaec68f6a1c80afaf031490fa3140306b authorJohn P Mayer Jr <john.p.mayer.jr@gmail.com> dateSat 23 Nov 2013, 04:18 (13 years ago) parent2a954d7 e32eab0

6 files changed+12−10

compare with master

unifiedsplit

compiler/Generate/JavaScript.hs+2−2 compiler/Generate/Markdown.hs+6 compiler/Generate/Noscript.hs+2−2 compiler/Parse/Declaration.hs−1 compiler/Parse/Expression.hs+1−3 compiler/SourceSyntax/Expression.hs+1−2

compiler/Generate/JavaScript.hs+2−2

@@ -6,9 +6,9 @@ import Control.Monad.State

66import qualified Data.List as List

77import qualified Data.Map as Map

88import qualified Data.Set as Set

9−import qualified Text.Pandoc as Pan

109

1110import qualified Generate.Cases as Case

11+import qualified Generate.Markdown as MD

1212import SourceSyntax.Everything

1313import SourceSyntax.Location

1414import qualified Transform.SortDefinitions as SD

@@ -193,7 +193,7 @@ expression (L span expr) =

193193 return $ obj "Text.markdown" `call` (string md : string uid : es')

194194 where

195195 pad = "<div style=\"height:0;width:0;\"> </div>"

196− md = pad ++ Pan.writeHtmlString Pan.def doc ++ pad

196+ md = pad ++ MD.toHtml doc ++ pad

197197

198198definition :: Def () () -> State Int [Statement ()]

199199definition def =

compiler/Generate/Markdown.hsnew file+6

@@ -0,0 +1,6 @@

1+module Generate.Markdown where

3+import Text.Pandoc

5+toHtml :: String -> String

6+toHtml = writeHtmlString def . readMarkdown def

compiler/Generate/Noscript.hs+2−2

@@ -2,7 +2,7 @@ module Generate.Noscript (noscript) where

33import Data.List (isInfixOf)

44import SourceSyntax.Everything

5−import qualified Text.Pandoc as Pan

5+import qualified Generate.Markdown as MD

77noscript :: Module t v -> String

88noscript modul = concat (extract modul)

@@ -49,7 +49,7 @@ instance Extract (Expr t v) where

4949 Case e cases -> concatMap (f . snd) cases

5050 Data _ es -> concatMap f es

5151 MultiIf es -> concatMap (f . snd) es

52− Markdown _ doc _ -> [ Pan.writeHtmlString Pan.def doc ]

52+ Markdown _ md _ -> [ MD.toHtml md ]

5353 _ -> []

5454

5555extractLink src txt =

compiler/Parse/Declaration.hs−1

@@ -6,7 +6,6 @@ import qualified Data.List as List

66import qualified Data.Set as Set

77import Text.Parsec hiding (newline,spaces)

88import Text.Parsec.Indent

9−import qualified Text.Pandoc as Pan

109

1110import Parse.Helpers

1211import qualified Parse.Expression as Expr

compiler/Parse/Expression.hs+1−3

@@ -5,7 +5,6 @@ import Control.Applicative ((<$>), (<*>))

55import Data.List (foldl')

66import Text.Parsec hiding (newline,spaces)

77import Text.Parsec.Indent

8−import qualified Text.Pandoc as Pan

109import Parse.Helpers

1110import qualified Parse.Pattern as Pattern

@@ -58,8 +57,7 @@ listTerm = markdown' <|> braces (try range <|> ExplicitList <$> commaSep expr)

5857 pos <- getPosition

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

6059 (rawText, exprs) <- markdown (interpolation uid)

61− let md = Pan.readMarkdown Pan.def (filter (/='\r') rawText)

62− return (Markdown uid md exprs)

60+ return (Markdown uid (filter (/='\r') rawText) exprs)

6361

6462 span uid index =

6563 "<span id=\"md-" ++ uid ++ "-" ++ show index ++ "\"></span>"

compiler/SourceSyntax/Expression.hs+1−2

@@ -3,7 +3,6 @@ module SourceSyntax.Expression where

44import Data.Data

55import Data.List (intercalate)

6−import qualified Text.Pandoc as Pandoc

76import SourceSyntax.PrettyPrint

87import Text.PrettyPrint as P

98import qualified SourceSyntax.Helpers as Help

@@ -30,7 +29,7 @@ data Expr t v

3029 | Insert (LExpr t v) String (LExpr t v)

3130 | Modify (LExpr t v) [(String, LExpr t v)]

3231 | Record [(String, LExpr t v)]

33− | Markdown String Pandoc.Pandoc [LExpr t v]

32+ | Markdown String String [LExpr t v]

3433 deriving (Eq, Show, Data, Typeable)

3534

3635data Def tipe var