on master help sign in
Fix kernel symbol lookup for new parsing code
21cf408Evan Czaplicki
src/Parse/Kernel.hs+2−2
@@ -56,7 +56,7 @@ parserHelp table enums chunks =
56 Parse.KernelImport var ->
56 Parse.KernelImport var ->
57 case Map.lookup var table of
57 case Map.lookup var table of
58 Nothing ->
58 Nothing ->
59− error $ show $ "could not find " <> var <> " when parsing kernel code"
59+ error ("Bad kernel symbol: " ++ Text.unpack var)
60
60
61 Just (home, name) ->
61 Just (home, name) ->
62 parserHelp table enums (Kernel.Var home name : Kernel.JS javascript : chunks)
62 parserHelp table enums (Kernel.Var home name : Kernel.JS javascript : chunks)
@@ -112,7 +112,7 @@ importToTable (A.A _ ( A.A _ fullName, Module.ImportMethod maybeAlias exposed ))
112 fullName
112 fullName
113
113
114 toEntry value =
114 toEntry value =
115− ( "__" <> shortName <> "_" <> value, ( fullName, value ) )
115+ ( shortName <> "_" <> value, ( fullName, value ) )
116 in
116 in
117 Map.fromList $ map toEntry $
117 Map.fromList $ map toEntry $
118 concatMap entryToValues $ getExplicits exposed
118 concatMap entryToValues $ getExplicits exposed