From 2e90bd94de32c739733966bfac96cf35e9a08655 Mon Sep 17 00:00:00 2001 From: Tim Chevalier Date: Wed, 6 Apr 2011 17:56:44 -0700 Subject: Continued sketching out code for checking states against preconditions. It's still sketchy. I added a typestate annotation field to statements tagged stmt_decl or stmt_expr, because a stmt_decl statement has a typestate that's different from that of its child node. This necessitated trivial changes to a bunch of other files all over to the compiler. I also added a few small standard library functions, some of which I didn't actually end up using but which I thought might be useful anyway. --- src/comp/middle/resolve.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/comp/middle/resolve.rs') diff --git a/src/comp/middle/resolve.rs b/src/comp/middle/resolve.rs index 20e60971..28ae07dc 100644 --- a/src/comp/middle/resolve.rs +++ b/src/comp/middle/resolve.rs @@ -6,6 +6,7 @@ import front.creader; import driver.session; import util.common.new_def_hash; import util.common.span; +import util.typestate_ann.ts_ann; import std.map.hashmap; import std.list.list; import std.list.nil; @@ -348,7 +349,7 @@ fn lookup_name_wrapped(&env e, ast.ident i, namespace ns) fn found_decl_stmt(@ast.stmt s, namespace ns) -> def_wrap { alt (s.node) { - case (ast.stmt_decl(?d)) { + case (ast.stmt_decl(?d,_)) { alt (d.node) { case (ast.decl_local(?loc)) { auto t = ast.def_local(loc.id); -- cgit v1.2.3