git.iko.soy/elk
on master help sign in
Add more NOINLINE names
commit5c0addd811d6637306a8c9a6431d87bd5343a4e8 authorEvan Czaplicki <evancz@users.noreply.github.com> dateThu 30 Nov 2017, 15:05 (9 years ago) parentddb7c79
2 files changed+34−9
compare with master
unifiedsplit
src/AST/Module/Name.hs+17−7 src/Elm/Name.hs+17−2
src/AST/Module/Name.hs+17−7
@@ -2,7 +2,7 @@
22{-# LANGUAGE OverloadedStrings #-}
33module AST.Module.Name
44 ( Canonical(..)
5− , basics, char, string
5+ , basics, char, string, debug
66 , maybe, list, array
77 , platform, cmd, sub
88 , jsonDecode, jsonEncode
@@ -32,7 +32,12 @@ data Canonical =
3232 { _package :: !Pkg.Name
3333 , _module :: !N.Name
3434 }
35− deriving (Eq, Ord)
35+ deriving (Ord)
36+
37+
38+instance Eq Canonical where
39+ (==) (Canonical pkg home) (Canonical pkg' home') =
40+ home == home' && pkg == pkg'
3641
3742
3843
@@ -46,12 +51,17 @@ basics = Canonical Pkg.core "Basics"
4651
4752{-# NOINLINE char #-}
4853char :: Canonical
49−char = Canonical Pkg.core "Char"
54+char = Canonical Pkg.core N.char
5055
5156
5257{-# NOINLINE string #-}
5358string :: Canonical
54−string = Canonical Pkg.core "String"
59+string = Canonical Pkg.core N.string
60+
61+
62+{-# NOINLINE debug #-}
63+debug :: Canonical
64+debug = Canonical Pkg.core N.debug
5565
5666
5767
@@ -60,17 +70,17 @@ string = Canonical Pkg.core "String"
6070
6171{-# NOINLINE maybe #-}
6272maybe :: Canonical
63−maybe = Canonical Pkg.core "Maybe"
73+maybe = Canonical Pkg.core N.maybe
6474
6575
6676{-# NOINLINE list #-}
6777list :: Canonical
68−list = Canonical Pkg.core "List"
78+list = Canonical Pkg.core N.list
6979
7080
7181{-# NOINLINE array #-}
7282array :: Canonical
73−array = Canonical Pkg.core "Array"
83+array = Canonical Pkg.core N.array
7484
7585
7686
src/Elm/Name.hs+17−2
@@ -6,12 +6,12 @@ module Elm.Name
66 , int, float, bool, char, string
77 , maybe, list, array
88 , task, router, cmd, sub
9− , shader
9+ , shader, debug, utils, negate
1010 )
1111 where
1212
1313
14−import Prelude hiding (maybe)
14+import Prelude hiding (maybe, negate)
1515import qualified Data.Text as Text
1616
1717
@@ -90,3 +90,18 @@ sub = "Sub"
9090{-# NOINLINE shader #-}
9191shader :: Name
9292shader = "Shader"
93+
94+
95+{-# NOINLINE debug #-}
96+debug :: Name
97+debug = "Debug"
98+
99+
100+{-# NOINLINE utils #-}
101+utils :: Name
102+utils = "Utils"
103+
104+
105+{-# NOINLINE negate #-}
106+negate :: Name
107+negate = "negate"