From 96e1bbd4a0abd2c8e76e7e02b396c5319dea7a8d Mon Sep 17 00:00:00 2001 From: Patrick Walton Date: Mon, 12 Mar 2012 16:26:31 -0700 Subject: rustc: Add node IDs to AST types so we can associate them with region environments --- src/rustc/metadata/astencode_gen.rs | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'src/rustc/metadata') diff --git a/src/rustc/metadata/astencode_gen.rs b/src/rustc/metadata/astencode_gen.rs index 8aeefe084dc..7e7915262ba 100644 --- a/src/rustc/metadata/astencode_gen.rs +++ b/src/rustc/metadata/astencode_gen.rs @@ -3463,12 +3463,15 @@ fn serialize_31(s: S, /*syntax::ast::ty*/ fn serialize_30(s: S, v: syntax::ast::ty) { - s.emit_rec(/*syntax::ast::ty_*//*syntax::codemap::span*/ + s.emit_rec(/*syntax::ast::node_id*//*syntax::ast::ty_*/ + /*syntax::codemap::span*/ {|| { - s.emit_rec_field("node", 0u, + s.emit_rec_field("id", 0u, + {|| serialize_27(s, v.id) }); + s.emit_rec_field("node", 1u, {|| serialize_31(s, v.node) }); - s.emit_rec_field("span", 1u, + s.emit_rec_field("span", 2u, {|| serialize_19(s, v.span) }) } }); @@ -7325,15 +7328,18 @@ fn deserialize_30(s: S) -> s.read_rec( + /*syntax::ast::node_id*/ + /*syntax::ast::ty_*/ /*syntax::codemap::span*/ {|| - {node: - s.read_rec_field("node", 0u, {|| deserialize_31(s) }), + {id: s.read_rec_field("id", 0u, {|| deserialize_27(s) }), + node: + s.read_rec_field("node", 1u, {|| deserialize_31(s) }), span: - s.read_rec_field("span", 1u, + s.read_rec_field("span", 2u, {|| deserialize_19(s) }),} }) -- cgit 1.4.1-3-g733a5