Skip to content

Commit abdebc0

Browse files
authored
removed haskell sdk compile errors (#967)
1 parent 96cca89 commit abdebc0

File tree

3 files changed

+17
-19
lines changed

3 files changed

+17
-19
lines changed

sdk/haskell/src/ServerSentEventGenerator/Types.hs

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ instance Default Selector where
4444

4545
instance Prompt Selector where
4646
prompt (SEL x) = withDefault cSelector cDefaultSelector x
47-
47+
4848
-- | A sum of the possible Datastar specific events that can be sent
4949

5050
data EventType =
@@ -101,7 +101,7 @@ instance Prompt MergeMode where
101101
prompt UpsertAttributes = cUpsertAttributes
102102

103103
data FragmentOptions = FO {
104-
, useViewTransition :: Bool
104+
useViewTransition :: Bool
105105
} deriving (Show)
106106

107107
-- | the MergeFragments and RemoveFragment data types share these options
@@ -112,8 +112,8 @@ instance Default FragmentOptions where
112112
}
113113

114114
instance Prompt FragmentOptions where
115-
prompt (FO a b) = mconcat . buildLines $ [
116-
, withDefault cUseViewTransition (prompt cDefaultFragmentsUseViewTransitions) (prompt b)
115+
prompt (FO a) = mconcat . buildLines $ [
116+
withDefault cUseViewTransition (prompt cDefaultFragmentsUseViewTransitions) (prompt a)
117117
]
118118

119119
newtype AutoRemove = Auto Bool
@@ -138,12 +138,11 @@ bug :: Exception e => e -> a
138138
bug = throw
139139

140140
data ServerSentEventGeneratorExceptions =
141-
BuildLineDataIMissing
142-
| RemoveFragmentSelectorIsMissing
143-
| SignalsSelectorIsMissing
144-
| RemoveSignalsPathIsMissing
145-
| RemoveSignalsPathIsEmpty
146-
| ExecuteScriptIsMissing
141+
BuildLineDataIMissing
142+
| RemoveFragmentSelectorIsMissing
143+
| SignalsSelectorIsMissing
144+
| RemoveSignalsPathIsMissing
145+
| RemoveSignalsPathIsEmpty
146+
| ExecuteScriptIsMissing
147147

148148
instance Exception ServerSentEventGeneratorExceptions
149-

sdk/haskell/src/demo/Main.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ handlerSignals = do
6666

6767
handlerClear :: Snap ()
6868
handlerClear = send $ (mergeFragments "<div/>" (SEL "#signals") Inner def def)
69-
69+
7070
handlerFeed :: Snap ()
7171
handlerFeed = do
7272
runSSE (SSEapp f)
@@ -95,7 +95,7 @@ handlerFeed = do
9595
feedDstar :: Text -> Text
9696
feedDstar x = mergeFragments ("<div id=\"feed\"><b>" <> x <> "</b></div>") def def def def
9797
removeDstar :: Text
98-
removeDstar = removeFragments (SEL "#explain") (FO 5000 def) def
98+
removeDstar = removeFragments (SEL "#explain") (FO def) def
9999

100100
handlerKeats :: Snap ()
101101
handlerKeats = do
@@ -120,7 +120,7 @@ pause = threadDelay (10 * 100 * 100 `div` 2)
120120
sleep :: Int -> IO ()
121121
sleep n = threadDelay (n * 1000 * 1000)
122122

123-
textToHtml :: Text -> Text
123+
textToHtml :: Text -> Text
124124
textToHtml = T.concatMap escape
125125
where
126126
escape ' ' = T.pack "&nbsp;"

sdk/haskell/src/test/Main.hs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ main = do
3131
attributes1 = "type: text/javascript\nblocking: false"
3232
attributes2 = "type: module"
3333
test [
34-
mergeFragments "<div>Merge</div>" (SEL "div") Append (FO 1000 True) yourOptions
35-
, mergeFragments "<div>Merge</div>" def Morph (FO 1000 True) def
34+
mergeFragments "<div>Merge</div>" (SEL "div") Append (FO True) yourOptions
35+
, mergeFragments "<div>Merge</div>" def Morph (FO True) def
3636
, mergeFragments "<div>\n <span>Merge</span>\n</div>" def def def def
3737
, mergeFragments "<div>Merge</div>" def def def def
38-
, removeFragments (SEL "#target") (FO 2000 True) yourOptions
39-
, removeFragments (SEL "#target") (FO 300 False) def
38+
, removeFragments (SEL "#target") (FO True) yourOptions
39+
, removeFragments (SEL "#target") (FO False) def
4040
, removeFragments (SEL "#target") def def
4141
, mergeSignals oneTwo True yourOptions
4242
, mergeSignals firstSecond True def
@@ -47,4 +47,3 @@ main = do
4747
, executeScript script1 attributes2 (Auto True) def
4848
, executeScript script2 def def def
4949
]
50-

0 commit comments

Comments
 (0)