393337f · elk · git.iko.soy

git.iko.soy/elk

Rename Var.ADT to Var.Union

commit393337f023b6fdeea852fe87ab98fa79d0e12082 authorEvan Czaplicki <info@elm-lang.org> dateSun 23 Nov 2014, 21:39 (12 years ago) parent966c381

7 files changed+24−20

compare with master

unifiedsplit

src/AST/Variable.hs+4−4 src/Generate/JavaScript.hs+7−3 src/Parse/Module.hs+1−1 src/Transform/AddDefaultImports.hs+3−3 src/Transform/Canonicalize.hs+5−5 src/Transform/Canonicalize/Setup.hs+1−1 src/Transform/Interface.hs+3−3

src/AST/Variable.hs+4−4

@@ -129,7 +129,7 @@ openListing =

129129data Value

130130 = Value !String

131131 | Alias !String

132− | ADT !String !(Listing String)

132+ | Union !String !(Listing String)

133133 deriving (Eq,Ord,Show)

134134

135135

@@ -155,7 +155,7 @@ instance Pretty Value where

155155 case portable of

156156 Value name -> P.text name

157157 Alias name -> P.text name

158− ADT name ctors ->

158+ Union name ctors ->

159159 P.text name <> pretty (ctors { _explicits = map P.text (_explicits ctors) })

160160

161161

@@ -181,13 +181,13 @@ instance Binary Value where

181181 case portable of

182182 Value name -> putWord8 0 >> put name

183183 Alias name -> putWord8 1 >> put name

184− ADT name ctors -> putWord8 2 >> put name >> put ctors

184+ Union name ctors -> putWord8 2 >> put name >> put ctors

185185

186186 get = do tag <- getWord8

187187 case tag of

188188 0 -> Value <$> get

189189 1 -> Alias <$> get

190− 2 -> ADT <$> get <*> get

190+ 2 -> Union <$> get <*> get

191191 _ -> error "Error reading valid import/export information from serialized string"

192192

193193

src/Generate/JavaScript.hs+7−3

@@ -352,9 +352,13 @@ generate modul =

352352 extract value =

353353 case value of

354354 Var.Alias _ -> []

355− Var.Value x | Help.isOp x -> []

356− | otherwise -> [Var.varName x]

357− Var.ADT _ (Var.Listing ctors _) -> map Var.varName ctors

355+

356+ Var.Value x

357+ | Help.isOp x -> []

358+ | otherwise -> [Var.varName x]

359+

360+ Var.Union _ (Var.Listing ctors _) ->

361+ map Var.varName ctors

358362

359363 assign path expr =

360364 case path of

src/Parse/Module.hs+1−1

@@ -85,4 +85,4 @@ value = val <|> tipe

8585 maybeCtors <- optionMaybe (listing capVar)

8686 case maybeCtors of

8787 Nothing -> return (Var.Alias name)

88− Just ctors -> return (Var.ADT name ctors)

88+ Just ctors -> return (Var.Union name ctors)

src/Transform/AddDefaultImports.hs+3−3

@@ -30,17 +30,17 @@ defaultImports =

3030

3131maybe :: Var.Value

3232maybe =

33− Var.ADT "Maybe" Var.openListing

33+ Var.Union "Maybe" Var.openListing

3434

3535

3636result :: Var.Value

3737result =

38− Var.ADT "Result" Var.openListing

38+ Var.Union "Result" Var.openListing

3939

4040

4141signal :: Var.Value

4242signal =

43− Var.ADT "Signal" (Var.Listing [] False)

43+ Var.Union "Signal" (Var.Listing [] False)

4444

4545

4646-- ADDING DEFAULT IMPORTS TO A MODULE

src/Transform/Canonicalize.hs+5−5

@@ -107,16 +107,16 @@ resolveExports fullList (Var.Listing partialList open) =

107107 case List.find (\(name, _ctors) -> name == alias) allAdts of

108108 Nothing -> notFound [alias]

109109 Just (name, _ctor) ->

110− return [Var.ADT name (Var.Listing [] False)]

110+ return [Var.Union name (Var.Listing [] False)]

111111

112112 getAdtExport (name, Var.Listing ctors open) =

113113 case lookup name allAdts of

114114 Nothing -> notFound [name]

115115 Just (Var.Listing allCtors _)

116− | open -> return $ Var.ADT name (Var.Listing allCtors False)

116+ | open -> return $ Var.Union name (Var.Listing allCtors False)

117117 | otherwise ->

118118 case filter (`notElem` allCtors) ctors of

119− [] -> return $ Var.ADT name (Var.Listing ctors False)

119+ [] -> return $ Var.Union name (Var.Listing ctors False)

120120 unfoundCtors -> notFound unfoundCtors

121121

122122 notFound xs =

@@ -141,7 +141,7 @@ splitValues mixedValues =

141141 Var.Alias name ->

142142 (values, name : aliases, adts)

143143

144− Var.ADT name listing ->

144+ Var.Union name listing ->

145145 (values, aliases, (name, listing) : adts)

146146

147147

@@ -153,7 +153,7 @@ declToValue decl =

153153 map Var.Value (P.boundVarList pattern)

154154

155155 D.Datatype name _tvs ctors ->

156− [ Var.ADT name (Var.Listing (map fst ctors) False) ]

156+ [ Var.Union name (Var.Listing (map fst ctors) False) ]

157157

158158 D.TypeAlias name _ tipe ->

159159 case tipe of

src/Transform/Canonicalize/Setup.hs+1−1

@@ -118,7 +118,7 @@ addValue moduleName interface env value =

118118 Just (_,_) ->

119119 return $ env { _adts = insert' x (_adts env) }

120120

121− Var.ADT x (Var.Listing xs open) ->

121+ Var.Union x (Var.Listing xs open) ->

122122 case Map.lookup x (iAdts interface) of

123123 Nothing -> notFound x

124124 Just (_tvars, ctors) ->

src/Transform/Interface.hs+3−3

@@ -30,7 +30,7 @@ filterExports interface =

3030 case value of

3131 Var.Value x -> getType x

3232 Var.Alias _ -> []

33− Var.ADT _ (Var.Listing ctors _) -> concatMap getType ctors

33+ Var.Union _ (Var.Listing ctors _) -> concatMap getType ctors

3434

3535 getType :: String -> [(String, Type.CanonicalType)]

3636 getType name =

@@ -41,14 +41,14 @@ filterExports interface =

4141 case value of

4242 Var.Value _ -> []

4343 Var.Alias name -> get (Module.iAliases interface) name

44− Var.ADT _ _ -> []

44+ Var.Union _ _ -> []

4545

4646 getAdts :: Var.Value -> [(String, Module.AdtInfo String)]

4747 getAdts value =

4848 case value of

4949 Var.Value _ -> []

5050 Var.Alias _ -> []

51− Var.ADT name (Var.Listing exportedCtors _) ->

51+ Var.Union name (Var.Listing exportedCtors _) ->

5252 case Map.lookup name (Module.iAdts interface) of

5353 Nothing -> []

5454 Just (tvars, ctors) ->