git.iko.soy/elk
on master help sign in
Add Strings as a primitive in the compiler
76b2e56Evan Czaplicki
compiler/Transform/Canonicalize.hs+1−1
compare with master
unifiedsplit
@@ -89,7 +89,7 @@ metadataModule ifaces modul =
89
89
90 pair n = (n,n)
90 pair n = (n,n)
91 localEnv = map pair (map get1 (aliases modul) ++ map get1 (datatypes modul))
91 localEnv = map pair (map get1 (aliases modul) ++ map get1 (datatypes modul))
92− globalEnv = map pair $ ["_List",saveEnvName,"::","[]","Int","Float","Char","Bool"] ++
92+ globalEnv = map pair $ ["_List",saveEnvName,"::","[]","Int","Float","Char","Bool","String"] ++
93 map (\n -> "_Tuple" ++ show n) [0..9]
93 map (\n -> "_Tuple" ++ show n) [0..9]
94 realImports = filter (not . List.isPrefixOf "Native." . fst) (imports modul)
94 realImports = filter (not . List.isPrefixOf "Native." . fst) (imports modul)
95 initialEnv = Map.fromList (concatMap canon realImports ++ localEnv ++ globalEnv)
95 initialEnv = Map.fromList (concatMap canon realImports ++ localEnv ++ globalEnv)
compiler/Type/Constrain/Literal.hs+5−5
@@ -10,12 +10,12 @@ constrain env span literal tipe =
10 do tipe' <- litType
10 do tipe' <- litType
11 return . L span $ CEqual tipe tipe'
11 return . L span $ CEqual tipe tipe'
12 where
12 where
13− prim name = Env.get env Env.types name
13+ prim name = return (Env.get env Env.types name)
14
14
15 litType =
15 litType =
16 case literal of
16 case literal of
17 IntNum _ -> VarN `fmap` var (Is Number)
17 IntNum _ -> VarN `fmap` var (Is Number)
18− FloatNum _ -> return (prim "Float")
18+ FloatNum _ -> prim "Float"
19− Chr _ -> return (prim "Char")
19+ Chr _ -> prim "Char"
20− Str _ -> return (TermN (App1 (prim "_List") (prim "Char")))
20+ Str _ -> prim "String"
21− Boolean _ -> return (prim "Bool")
21+ Boolean _ -> prim "Bool"
compiler/Type/Environment.hs+1−4
@@ -55,7 +55,7 @@ makeTypes datatypes =
55 builtins :: [(String,Int)]
55 builtins :: [(String,Int)]
56 builtins = concat [ map tuple [0..9]
56 builtins = concat [ map tuple [0..9]
57 , kind 1 ["_List"]
57 , kind 1 ["_List"]
58− , kind 0 ["Int","Float","Char","Bool"]
58+ , kind 0 ["Int","Float","Char","String","Bool"]
59 ]
59 ]
60
60
61
61
@@ -143,9 +143,6 @@ instantiator env sourceType = go sourceType
143 | "appendable" `isPrefixOf` x = Is Appendable
143 | "appendable" `isPrefixOf` x = Is Appendable
144 | otherwise = Flexible
144 | otherwise = Flexible
145
145
146− Src.Data "String" [] ->
147− return (get env types "_List" <| get env types "Char")
148−
149 Src.Data name ts -> do
146 Src.Data name ts -> do
150 ts' <- mapM go ts
147 ts' <- mapM go ts
151 case (Map.lookup name (types env), Map.lookup name (aliases env)) of
148 case (Map.lookup name (types env), Map.lookup name (aliases env)) of
compiler/Type/Unify.hs+2−2
@@ -82,10 +82,10 @@ actuallyUnify span variable1 variable2 = do
82
82
83 comparableError str = TS.addError span (str ++ msg) variable1 variable2
83 comparableError str = TS.addError span (str ++ msg) variable1 variable2
84 where msg = "Expecting something comparable such as an\n" ++
84 where msg = "Expecting something comparable such as an\n" ++
85− "Int, Float, Char, or a list or tuple of comparables."
85+ "Int, Float, Char, String, or a list or tuple of comparables."
86
86
87 unifyComparable var name
87 unifyComparable var name
88− | name `elem` ["Int","Float","Char","comparable"] = flexAndUnify var
88+ | name `elem` ["Int","Float","Char","String","comparable"] = flexAndUnify var
89 | otherwise = comparableError ""
89 | otherwise = comparableError ""
90
90
91 unifyComparableStructure varSuper varFlex =
91 unifyComparableStructure varSuper varFlex =