aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/cjr.sml
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adamc@hcoop.net>2009-04-16 14:49:25 -0400
committerGravatar Adam Chlipala <adamc@hcoop.net>2009-04-16 14:49:25 -0400
commit6d021ead0f73c5a28080b50a1bd08b1ab72590c9 (patch)
tree1560f6013ce6de0388180550168c20e9756eaa2c /src/cjr.sml
parent6d06bc0105d704373295c749aa65cc92488ac56c (diff)
Label exported symbols by effect-ness; factor out some common datatypes
Diffstat (limited to 'src/cjr.sml')
-rw-r--r--src/cjr.sml7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/cjr.sml b/src/cjr.sml
index 3844ccad..9d43f14a 100644
--- a/src/cjr.sml
+++ b/src/cjr.sml
@@ -29,7 +29,7 @@ structure Cjr = struct
type 'a located = 'a ErrorMsg.located
-datatype datatype_kind = datatype Mono.datatype_kind
+datatype datatype_kind = datatype DatatypeKind.datatype_kind
datatype typ' =
TFun of typ * typ
@@ -120,6 +120,9 @@ datatype sidedness =
| ServerAndPull
| ServerAndPullAndPush
-type file = decl list * (Core.export_kind * string * int * typ list * typ * sidedness) list
+datatype effect = datatype Export.effect
+datatype export_kind = datatype Export.export_kind
+
+type file = decl list * (export_kind * string * int * typ list * typ * sidedness) list
end