e852ae2 · elk · git.iko.soy

on master help sign in

Add field to MetadataModule for datatypes

e852ae2Evan Czaplicki13 years ago

compiler/Initialize.hs+1

@@ -38,6 +38,7 @@ buildFromSource noPrelude src =

38 imports = ims,

39 defs = fst . SD.flattenLets [] . SD.sortDefs . dummyLet $ TcDecl.toExpr decls,

40 types = Map.empty,

41+ datatypes = [ (name, vars, ctors) | Datatype name vars ctors <- decls ],

41 fixities = [ (assoc,level,op) | Fixity assoc level op <- decls ],

42 fixities = [ (assoc,level,op) | Fixity assoc level op <- decls ],

42 aliases = [ (name,tvs,tipe) | TypeAlias name tvs tipe <- decls ],

43 aliases = [ (name,tvs,tipe) | TypeAlias name tvs tipe <- decls ],

43 foreignImports = [ (evt,v,name,typ) | ImportEvent evt v name typ <- decls ],

44 foreignImports = [ (evt,v,name,typ) | ImportEvent evt v name typ <- decls ],

compiler/SourceSyntax/Module.hs+9−8

@@ -22,14 +22,15 @@ data ImportMethod = As String | Importing [String] | Hiding [String]

22 deriving (Eq, Ord, Show, Data, Typeable)

24data MetadataModule t v = MetadataModule {

25− names :: [String],

25+ names :: [String],

26− path :: FilePath,

26+ path :: FilePath,

27− exports :: [String],

27+ exports :: [String],

28− imports :: [(String, ImportMethod)],

28+ imports :: [(String, ImportMethod)],

29− defs :: [Def t v],

29+ defs :: [Def t v],

30− types :: Map.Map String T.Variable,

30+ types :: Map.Map String T.Variable,

31− fixities :: [(Assoc, Int, String)],

31+ fixities :: [(Assoc, Int, String)],

32+ aliases :: [(String, [String], Type)],

32− aliases :: [(String, [String], Type)],

33+ datatypes :: [ (String, [String], [(String,[Type])]) ],

33 foreignImports :: [(String, LExpr t v, String, Type)],

34 foreignImports :: [(String, LExpr t v, String, Type)],

34 foreignExports :: [(String, String, Type)]

35 foreignExports :: [(String, String, Type)]

35}

36}