Skip to content

Commit 0164325

Browse files
cryogeniancryogenian
authored
Merge pull request #77 from justinwoo/compiler/0.12
changes for 0.12
2 parents 41f2b02 + 2909c3d commit 0164325

31 files changed

+137
-130
lines changed

‎.travis.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,21 @@
11
language: node_js
22
dist: trusty
33
sudo: required
4-
node_js: 6
4+
node_js: stable
5+
env:
6+
- PATH=$HOME/purescript:$PATH
57
install:
8+
- TAG=$(wget -q -O - https://github.com/purescript/purescript/releases/latest --server-response --max-redirect 0 2>&1 | sed -n -e 's/.*Location:.*tag\///p')
9+
- wget -O $HOME/purescript.tar.gz https://github.com/purescript/purescript/releases/download/$TAG/linux64.tar.gz
10+
- tar -xvf $HOME/purescript.tar.gz -C $HOME/
11+
- chmod a+x $HOME/purescript
612
- npm install -g bower
713
- npm install
814
script:
915
- bower install --production
1016
- npm run -s build
1117
- bower install
12-
- npm -s test
18+
- npm test
1319
after_success:
1420
- >-
1521
test $TRAVIS_TAG &&

‎bower.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@
2121
"tests"
2222
],
2323
"dependencies": {
24-
"purescript-generics": "^4.0.0",
25-
"purescript-nonempty": "^4.0.0",
26-
"purescript-profunctor": "^3.0.0",
27-
"purescript-strings": "^3.0.0",
28-
"purescript-these": "^3.0.0",
29-
"purescript-transformers": "^3.2.0",
30-
"purescript-colors": "3.x - 4.x",
31-
"purescript-console": "^3.0.0"
24+
"purescript-generics-rep": "^6.0.0",
25+
"purescript-nonempty": "^5.0.0",
26+
"purescript-profunctor": "^4.0.0",
27+
"purescript-strings": "^4.0.0",
28+
"purescript-these": "^4.0.0",
29+
"purescript-transformers": "^4.1.0",
30+
"purescript-colors": "^5.0.0",
31+
"purescript-console": "^4.1.0"
3232
},
3333
"devDependencies": {
34-
"purescript-exceptions": "^3.0.0"
34+
"purescript-exceptions": "^4.0.0"
3535
}
3636
}

‎package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
"test": "pulp test"
77
},
88
"devDependencies": {
9-
"pulp": "^11.0.2",
10-
"purescript-psa": "^0.5.1",
11-
"purescript": "^0.11.6",
12-
"rimraf": "^2.6.1"
9+
"pulp": "^12.2.0",
10+
"purescript-psa": "^0.6.0",
11+
"purescript": "slamdata/node-purescript#0.12",
12+
"rimraf": "^2.6.2"
1313
}
1414
}

‎src/CSS/Animation.purs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ import CSS.Stylesheet (CSS, key)
77
import CSS.Time (Time)
88
import CSS.Transition (TimingFunction)
99
import Data.Foldable (for_)
10-
import Data.Generic (class Generic)
10+
import Data.Generic.Rep (class Generic)
1111
import Data.Tuple.Nested (tuple7)
1212

1313
newtype AnimationDirection = AnimationDirection Value
1414

1515
derive instance eqAnimationDirection :: Eq AnimationDirection
1616
derive instance ordAnimationDirection :: Ord AnimationDirection
17-
derive instance genericAnimationDirection :: Generic AnimationDirection
17+
derive instance genericAnimationDirection :: Generic AnimationDirection _
1818

1919
instance valAnimationDirection :: Val AnimationDirection where
2020
value (AnimationDirection v) = v
@@ -35,7 +35,7 @@ newtype IterationCount = IterationCount Value
3535

3636
derive instance eqIterationCount :: Eq IterationCount
3737
derive instance ordIterationCount :: Ord IterationCount
38-
derive instance genericIterationCount :: Generic IterationCount
38+
derive instance genericIterationCount :: Generic IterationCount _
3939

4040
instance valIterationCount :: Val IterationCount where
4141
value (IterationCount v) = v
@@ -50,7 +50,7 @@ newtype FillMode = FillMode Value
5050

5151
derive instance eqFillMode :: Eq FillMode
5252
derive instance ordFillMode :: Ord FillMode
53-
derive instance genericFillMode :: Generic FillMode
53+
derive instance genericFillMode :: Generic FillMode _
5454

5555
instance valFillMode :: Val FillMode where
5656
value (FillMode v) = v
@@ -77,7 +77,7 @@ newtype AnimationName = AnimationName Value
7777

7878
derive instance eqAnimationName :: Eq AnimationName
7979
derive instance ordAnimationName :: Ord AnimationName
80-
derive instance genericAnimationName :: Generic AnimationName
80+
derive instance genericAnimationName :: Generic AnimationName _
8181

8282
instance valAnimationName :: Val AnimationName where
8383
value (AnimationName v) = v

‎src/CSS/Background.purs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ where
7575

7676
import Prelude
7777

78-
import Data.Generic (class Generic)
78+
import Data.Generic.Rep (class Generic)
7979
import Data.Tuple (Tuple(..))
8080

8181
import CSS.Box (BoxType)
@@ -135,7 +135,7 @@ newtype BackgroundPosition = BackgroundPosition Value
135135

136136
derive instance eqBackgroundPosition :: Eq BackgroundPosition
137137
derive instance ordBackgroundPosition :: Ord BackgroundPosition
138-
derive instance genericBackgroundPosition :: Generic BackgroundPosition
138+
derive instance genericBackgroundPosition :: Generic BackgroundPosition _
139139

140140
instance isStringBackgroundPosition :: IsString BackgroundPosition where
141141
fromString = BackgroundPosition <<< fromString
@@ -167,7 +167,7 @@ newtype BackgroundSize = BackgroundSize Value
167167

168168
derive instance eqBackgroundSize :: Eq BackgroundSize
169169
derive instance ordBackgroundSize :: Ord BackgroundSize
170-
derive instance genericBackgroundSize :: Generic BackgroundSize
170+
derive instance genericBackgroundSize :: Generic BackgroundSize _
171171

172172
instance isStringBackgroundSize :: IsString BackgroundSize where
173173
fromString = BackgroundSize <<< fromString
@@ -205,7 +205,7 @@ newtype BackgroundRepeat = BackgroundRepeat Value
205205

206206
derive instance eqBackgroundRepeat :: Eq BackgroundRepeat
207207
derive instance ordBackgroundRepeat :: Ord BackgroundRepeat
208-
derive instance genericBackgroundRepeat :: Generic BackgroundRepeat
208+
derive instance genericBackgroundRepeat :: Generic BackgroundRepeat _
209209

210210
instance isStringBackgroundRepeat :: IsString BackgroundRepeat where
211211
fromString = BackgroundRepeat <<< fromString
@@ -255,7 +255,7 @@ newtype BackgroundImage = BackgroundImage Value
255255

256256
derive instance eqBackgroundImage :: Eq BackgroundImage
257257
derive instance ordBackgroundImage :: Ord BackgroundImage
258-
derive instance genericBackgroundImage :: Generic BackgroundImage
258+
derive instance genericBackgroundImage :: Generic BackgroundImage _
259259

260260
instance isStringBackgroundImage :: IsString BackgroundImage where
261261
fromString = BackgroundImage <<< fromString
@@ -287,7 +287,7 @@ newtype BackgroundOrigin = BackgroundOrigin Value
287287

288288
derive instance eqBackgroundOrigin :: Eq BackgroundOrigin
289289
derive instance ordBackgroundOrigin :: Ord BackgroundOrigin
290-
derive instance genericBackgroundOrigin :: Generic BackgroundOrigin
290+
derive instance genericBackgroundOrigin :: Generic BackgroundOrigin _
291291

292292
instance isStringBackgroundOrigin :: IsString BackgroundOrigin where
293293
fromString = BackgroundOrigin <<< fromString
@@ -316,7 +316,7 @@ newtype BackgroundClip = BackgroundClip Value
316316

317317
derive instance eqBackgroundClip :: Eq BackgroundClip
318318
derive instance ordBackgroundClip :: Ord BackgroundClip
319-
derive instance genericBackgroundClip :: Generic BackgroundClip
319+
derive instance genericBackgroundClip :: Generic BackgroundClip _
320320

321321
instance isStringBackgroundClip :: IsString BackgroundClip where
322322
fromString = BackgroundClip <<< fromString
@@ -345,7 +345,7 @@ newtype BackgroundAttachment = BackgroundAttachment Value
345345

346346
derive instance eqBackgroundAttachment :: Eq BackgroundAttachment
347347
derive instance ordBackgroundAttachment :: Ord BackgroundAttachment
348-
derive instance genericBackgroundAttachment :: Generic BackgroundAttachment
348+
derive instance genericBackgroundAttachment :: Generic BackgroundAttachment _
349349

350350
instance isStringBackgroundAttachment :: IsString BackgroundAttachment where
351351
fromString = BackgroundAttachment <<< fromString
@@ -377,7 +377,7 @@ newtype Side = Side Value
377377

378378
derive instance eqSide :: Eq Side
379379
derive instance ordSide :: Ord Side
380-
derive instance genericSide :: Generic Side
380+
derive instance genericSide :: Generic Side _
381381

382382
instance isStringSide :: IsString Side where
383383
fromString = Side <<< fromString
@@ -418,7 +418,7 @@ newtype Direction = Direction Value
418418

419419
derive instance eqDirection :: Eq Direction
420420
derive instance ordDirection :: Ord Direction
421-
derive instance genericDirection :: Generic Direction
421+
derive instance genericDirection :: Generic Direction _
422422

423423
instance valDirection :: Val Direction where
424424
value (Direction v) = v
@@ -436,7 +436,7 @@ newtype Location = Location Value
436436

437437
derive instance eqLocation :: Eq Location
438438
derive instance ordLocation :: Ord Location
439-
derive instance genericLocation :: Generic Location
439+
derive instance genericLocation :: Generic Location _
440440

441441
instance valLocation :: Val Location where
442442
value (Location v) = v

‎src/CSS/Border.purs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module CSS.Border where
22

33
import Prelude
44

5-
import Data.Generic (class Generic)
5+
import Data.Generic.Rep (class Generic)
66
import Data.Tuple.Nested (tuple3, tuple4)
77

88
import CSS.Color (Color)
@@ -15,7 +15,7 @@ newtype Stroke = Stroke Value
1515

1616
derive instance eqStroke :: Eq Stroke
1717
derive instance ordStroke :: Ord Stroke
18-
derive instance genericStroke :: Generic Stroke
18+
derive instance genericStroke :: Generic Stroke _
1919

2020
instance valStroke :: Val Stroke where
2121
value (Stroke v) = v

‎src/CSS/Box.purs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ where
99

1010
import Prelude
1111

12-
import Data.Generic (class Generic)
12+
import Data.Generic.Rep (class Generic)
1313

1414
import CSS.Border (Stroke)
1515
import CSS.Color (Color)
@@ -25,7 +25,7 @@ newtype BoxType = BoxType Value
2525

2626
derive instance eqBoxType :: Eq BoxType
2727
derive instance ordBoxType :: Ord BoxType
28-
derive instance genericBoxType :: Generic BoxType
28+
derive instance genericBoxType :: Generic BoxType _
2929

3030
instance isStringBoxType :: IsString BoxType where
3131
fromString = BoxType <<< fromString

‎src/CSS/Common.purs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
module CSS.Common where
88

99
import Prelude
10-
11-
import Data.Monoid (class Monoid)
1210
import Data.Tuple (Tuple(..))
1311

1412
import CSS.Property (Prefixed(..), Value)
@@ -47,7 +45,7 @@ instance normalValue :: Normal Value where normal = fromString "normal"
4745
instance noneValue :: None Value where none = fromString "none"
4846
instance visibleValue :: Visible Value where visible = fromString "visible"
4947
instance hiddenValue :: Hidden Value where hidden = fromString "hidden"
50-
instance otherValue :: Other Value where other = id
48+
instance otherValue :: Other Value where other = identity
5149
instance initialValue :: Initial Value where initial = fromString "initial"
5250
instance unsetValue :: Unset Value where unset = fromString "unset"
5351
instance topValue :: Top Value where top = fromString "top"

‎src/CSS/Display.purs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
module CSS.Display where
22

33
import Prelude
4+
45
import CSS.Common (class Inherit, class None)
56
import CSS.Property (class Val, Value)
67
import CSS.String (fromString)
78
import CSS.Stylesheet (CSS, key)
8-
import Data.Generic (class Generic, gShow)
9+
import Data.Generic.Rep (class Generic)
10+
import Data.Generic.Rep.Show (genericShow)
911

1012
newtype Position = Position Value
1113

1214
derive instance eqPosition :: Eq Position
1315
derive instance ordPosition :: Ord Position
14-
derive instance genericPosition :: Generic Position
16+
derive instance genericPosition :: Generic Position _
1517

1618
instance valPosition :: Val Position where
1719
value (Position v) = v
@@ -35,7 +37,7 @@ newtype Display = Display Value
3537

3638
derive instance eqDisplay :: Eq Display
3739
derive instance ordDisplay :: Ord Display
38-
derive instance genericDisplay :: Generic Display
40+
derive instance genericDisplay :: Generic Display _
3941

4042
instance valDisplay :: Val Display where
4143
value (Display v) = v
@@ -109,10 +111,10 @@ display = key $ fromString "display"
109111
data Float = FloatLeft | FloatRight | FloatNone
110112

111113
derive instance eqFloat :: Eq Float
112-
derive instance genericFloat :: Generic Float
114+
derive instance genericFloat :: Generic Float _
113115

114116
instance showFloat :: Show Float where
115-
show = gShow
117+
show = genericShow
116118

117119
instance valFloat :: Val (Float) where
118120
value (FloatLeft) = fromString "left"
@@ -141,10 +143,10 @@ data ClearFloat
141143
| ClearFloatInlineEnd
142144

143145
derive instance eqClearFloat :: Eq ClearFloat
144-
derive instance genericClearFloat :: Generic ClearFloat
146+
derive instance genericClearFloat :: Generic ClearFloat _
145147

146148
instance showClearFloat :: Show ClearFloat where
147-
show = gShow
149+
show = genericShow
148150

149151
instance valClearFloat :: Val (ClearFloat) where
150152
value (ClearFloatLeft) = fromString "left"

‎src/CSS/Flexbox.purs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module CSS.Flexbox where
44

55
import Prelude
66

7-
import Data.Generic (class Generic)
7+
import Data.Generic.Rep (class Generic)
88

99
import CSS.Common (class Center, class Inherit, class Other, class Baseline, class Auto)
1010
import CSS.Property (class Val, Value, value, (!))
@@ -48,7 +48,7 @@ newtype AlignContentValue = AlignContentValue Value
4848

4949
derive instance eqAlignContentValue :: Eq AlignContentValue
5050
derive instance ordAlignContentValue :: Ord AlignContentValue
51-
derive instance genericAlignContentValue :: Generic AlignContentValue
51+
derive instance genericAlignContentValue :: Generic AlignContentValue _
5252

5353
instance isStringAlignContentValue :: IsString AlignContentValue where
5454
fromString = AlignContentValue <<< fromString
@@ -89,7 +89,7 @@ newtype AlignItemsValue = AlignItemsValue Value
8989

9090
derive instance eqAlignItemsValue :: Eq AlignItemsValue
9191
derive instance ordAlignItemsValue :: Ord AlignItemsValue
92-
derive instance genericAlignItemsValue :: Generic AlignItemsValue
92+
derive instance genericAlignItemsValue :: Generic AlignItemsValue _
9393

9494
instance isStringAlignItemsValue :: IsString AlignItemsValue where
9595
fromString = AlignItemsValue <<< fromString
@@ -127,7 +127,7 @@ newtype AlignSelfValue = AlignSelfValue Value
127127

128128
derive instance eqAlignSelfValue :: Eq AlignSelfValue
129129
derive instance ordAlignSelfValue :: Ord AlignSelfValue
130-
derive instance genericAlignSelfValue :: Generic AlignSelfValue
130+
derive instance genericAlignSelfValue :: Generic AlignSelfValue _
131131

132132
instance isStringAlignSelfValue :: IsString AlignSelfValue where
133133
fromString = AlignSelfValue <<< fromString
@@ -180,7 +180,7 @@ newtype FlexDirection = FlexDirection Value
180180

181181
derive instance eqFlexDirection :: Eq FlexDirection
182182
derive instance ordFlexDirection :: Ord FlexDirection
183-
derive instance genericFlexDirection :: Generic FlexDirection
183+
derive instance genericFlexDirection :: Generic FlexDirection _
184184

185185
instance valFlexDirection :: Val FlexDirection where
186186
value (FlexDirection v) = v
@@ -222,7 +222,7 @@ newtype FlexWrap = FlexWrap Value
222222

223223
derive instance eqFlexWrap :: Eq FlexWrap
224224
derive instance ordFlexWrap :: Ord FlexWrap
225-
derive instance genericFlexWrap :: Generic FlexWrap
225+
derive instance genericFlexWrap :: Generic FlexWrap _
226226

227227
instance valFlexWrap :: Val FlexWrap where
228228
value (FlexWrap v) = v
@@ -248,7 +248,7 @@ newtype JustifyContentValue = JustifyContentValue Value
248248

249249
derive instance eqJustifyContentValue :: Eq JustifyContentValue
250250
derive instance ordJustifyContentValue :: Ord JustifyContentValue
251-
derive instance genericJustifyContentValue :: Generic JustifyContentValue
251+
derive instance genericJustifyContentValue :: Generic JustifyContentValue _
252252

253253
instance isStringJustifyContentValue :: IsString JustifyContentValue where
254254
fromString = JustifyContentValue <<< fromString

0 commit comments

Comments
 (0)