From da13c508d83032ca13679e1e122e96d25ac23283 Mon Sep 17 00:00:00 2001 From: Graydon Hoare Date: Tue, 2 Nov 2010 11:11:58 -0700 Subject: First pass on splitting stratum and opacity off of effects. WIP. --- src/boot/fe/pexp.ml | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'src/boot/fe/pexp.ml') diff --git a/src/boot/fe/pexp.ml b/src/boot/fe/pexp.ml index 85eb32c4..59cfaf75 100644 --- a/src/boot/fe/pexp.ml +++ b/src/boot/fe/pexp.ml @@ -140,12 +140,22 @@ and parse_optional_trailing_constrs (ps:pstate) : Ast.constrs = COLON -> (bump ps; parse_constrs ps) | _ -> [| |] +and parse_opacity (ps:pstate) : Ast.opacity = + match peek ps with + ABS -> bump ps; Ast.OPA_abstract + | _ -> Ast.OPA_transparent + +and parse_stratum (ps:pstate) : Ast.stratum = + match peek ps with + STATE -> bump ps; Ast.STRAT_state + | GC -> bump ps; Ast.STRAT_gc + | _ -> Ast.STRAT_value + and parse_effect (ps:pstate) : Ast.effect = match peek ps with - IO -> bump ps; Ast.IO - | STATE -> bump ps; Ast.STATE - | UNSAFE -> bump ps; Ast.UNSAFE - | _ -> Ast.PURE + IMPURE -> bump ps; Ast.EFF_impure + | UNSAFE -> bump ps; Ast.EFF_unsafe + | _ -> Ast.EFF_pure and parse_mutability (ps:pstate) : Ast.mutability = match peek ps with @@ -263,7 +273,9 @@ and parse_atomic_ty (ps:pstate) : Ast.ty = bump ps; Ast.TY_mach m - | IO | STATE | UNSAFE | OBJ | FN | ITER -> + | ABS | STATE | GC | IMPURE | UNSAFE | OBJ | FN | ITER -> + let _ = parse_opacity ps in + let _ = parse_stratum ps in let effect = parse_effect ps in begin match peek ps with -- cgit v1.2.3