diff options
| author | Graydon Hoare <[email protected]> | 2011-05-02 16:24:09 -0700 |
|---|---|---|
| committer | Graydon Hoare <[email protected]> | 2011-05-02 17:35:33 -0700 |
| commit | d08b443fffb1181d8d45ae5d061412f202dd4118 (patch) | |
| tree | ad75b4e4fc9407aa1201f9068012f30664d17b64 /src/boot | |
| parent | Add a regression test that exports can expose unexported items (diff) | |
| download | rust-d08b443fffb1181d8d45ae5d061412f202dd4118.tar.xz rust-d08b443fffb1181d8d45ae5d061412f202dd4118.zip | |
Revert "Use different syntax for checks that matter to typestate"
This reverts commit aa25f22f197682de3b18fc4c8ba068d1feda220f. It broke stage2, not sure why yet.
Diffstat (limited to 'src/boot')
| -rw-r--r-- | src/boot/fe/item.ml | 8 | ||||
| -rw-r--r-- | src/boot/fe/lexer.mll | 1 | ||||
| -rw-r--r-- | src/boot/fe/token.ml | 2 |
3 files changed, 0 insertions, 11 deletions
diff --git a/src/boot/fe/item.ml b/src/boot/fe/item.ml index 70e59be3..6b232e7e 100644 --- a/src/boot/fe/item.ml +++ b/src/boot/fe/item.ml @@ -199,14 +199,6 @@ and parse_stmts_including_none (ps:pstate) : Ast.stmt array = bump ps; expect ps SEMI; [| span ps apos (lexpos ps) Ast.STMT_cont |] - | ASSERT -> - bump ps; - let (stmts, expr) = - ctxt "stmts: check value" parse_expr ps - in - expect ps SEMI; - spans ps stmts apos (Ast.STMT_check_expr expr) -(* leaving check as it is; adding assert as a synonym for the "old" check *) | CHECK -> bump ps; begin diff --git a/src/boot/fe/lexer.mll b/src/boot/fe/lexer.mll index a65acba1..b375b874 100644 --- a/src/boot/fe/lexer.mll +++ b/src/boot/fe/lexer.mll @@ -92,7 +92,6 @@ ("type", TYPE); ("check", CHECK); - ("assert", ASSERT); ("claim", CLAIM); ("prove", PROVE); diff --git a/src/boot/fe/token.ml b/src/boot/fe/token.ml index 27cb399b..0b157983 100644 --- a/src/boot/fe/token.ml +++ b/src/boot/fe/token.ml @@ -77,7 +77,6 @@ type token = (* Type and type-state keywords *) | TYPE | CHECK - | ASSERT | CLAIM | PROVE @@ -238,7 +237,6 @@ let rec string_of_tok t = (* Type and type-state keywords *) | TYPE -> "type" | CHECK -> "check" - | ASSERT -> "assert" | CLAIM -> "claim" | PROVE -> "prove" |