diff options
| author |  Benjamin Barenblat <bbaren@mit.edu> | 2015-11-22 10:39:36 -0500 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@mit.edu> | 2015-11-22 10:39:36 -0500 |
| commit | bf037ce78c2c76a34ecca0fb8bafa5d5be38968a (patch) | |
| tree | 3e91b0d0e8e0fb704c7df444283b6c8c63351f95 /src/elab.sml | |
| parent | 7d861ea0debf944cb8e3e38d73a8c0197de574b3 (diff) | |
| parent | 638e838a81e1ccc6594fda1920df441eb21577ae (diff) | |
Merge branch 'upstream' into dfsg_clean20151122+dfsg
Diffstat (limited to 'src/elab.sml')
| -rw-r--r-- | src/elab.sml | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/elab.sml b/src/elab.sml index 249531f1..209d3307 100644 --- a/src/elab.sml +++ b/src/elab.sml @@ -138,13 +138,19 @@ and edecl' = withtype exp = exp' located and edecl = edecl' located +(* We have to be careful about crawling automatically generated signatures recursively, + * importing all type-class instances that we find. + * The reason is that selfification will add signatures of anonymous structures, + * and it's counterintuitive for instances to escape anonymous structures! *) +datatype import_mode = Import | Skip + datatype sgn_item' = SgiConAbs of string * int * kind | SgiCon of string * int * kind * con | SgiDatatype of (string * int * string list * (string * int * con option) list) list | SgiDatatypeImp of string * int * int * string list * string * string list * (string * int * con option) list | SgiVal of string * int * con - | SgiStr of string * int * sgn + | SgiStr of import_mode * string * int * sgn | SgiSgn of string * int * sgn | SgiConstraint of con * con | SgiClassAbs of string * int * kind |