From 0d3cec71a3282a090903a919d418c638a3b1ebe6 Mon Sep 17 00:00:00 2001 From: Graydon Hoare Date: Thu, 10 Mar 2011 10:17:10 -0800 Subject: Fix eval typo (caught by Martin Hock). --- src/comp/front/eval.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/comp/front/eval.rs') diff --git a/src/comp/front/eval.rs b/src/comp/front/eval.rs index cae72b1e..ac4b704b 100644 --- a/src/comp/front/eval.rs +++ b/src/comp/front/eval.rs @@ -42,7 +42,7 @@ fn val_is_bool(val v) -> bool { fn val_is_int(val v) -> bool { alt (v) { - case (val_bool(_)) { ret true; } + case (val_int(_)) { ret true; } case (_) { } } ret false; -- cgit v1.2.3 From 4ca0259b20bfc2f33f23e8b82864908fbb3b8133 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20=C3=81vila=20de=20Esp=C3=ADndola?= Date: Thu, 10 Mar 2011 17:34:58 -0500 Subject: Update the current id when we create sub parsers. --- src/comp/front/eval.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/comp/front/eval.rs') diff --git a/src/comp/front/eval.rs b/src/comp/front/eval.rs index ac4b704b..efa9aa0d 100644 --- a/src/comp/front/eval.rs +++ b/src/comp/front/eval.rs @@ -393,9 +393,12 @@ impure fn eval_crate_directive(parser p, auto full_path = prefix + std.os.path_sep() + file_path; - auto p0 = new_parser(p.get_session(), e, 0, full_path); + auto start_id = p.next_def_id(); + auto p0 = new_parser(p.get_session(), e, start_id, full_path); auto m0 = parse_mod_items(p0, token.EOF); - auto im = ast.item_mod(id, m0, p.next_def_id()); + auto next_id = p0.next_def_id(); + p.set_def(next_id._1); + auto im = ast.item_mod(id, m0, next_id); auto i = @spanned(cdir.span, cdir.span, im); ast.index_item(index, i); append[@ast.item](items, i); -- cgit v1.2.3