summary refs log tree commit diff
path: root/src/rustc/metadata
diff options
context:
space:
mode:
authorPatrick Walton <pcwalton@mimiga.net>2012-03-12 16:26:31 -0700
committerPatrick Walton <pcwalton@mimiga.net>2012-03-12 17:34:37 -0700
commitdd610a151bfde75e496d5bbaef95b63bd52bb822 (patch)
treea09b746e4a58d04bc0641f1a7fc3a7e88c2724e7 /src/rustc/metadata
parentd60813146d883d2b364817c2e5b6fd538b4b7819 (diff)
downloadrust-dd610a151bfde75e496d5bbaef95b63bd52bb822.tar.gz
rust-dd610a151bfde75e496d5bbaef95b63bd52bb822.zip
rustc: Add node IDs to AST types so we can associate them with region environments
Diffstat (limited to 'src/rustc/metadata')
-rw-r--r--src/rustc/metadata/astencode_gen.rs18
1 files changed, 12 insertions, 6 deletions
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: std::serialization::serializer>(s: S,
 /*syntax::ast::ty*/
 fn serialize_30<S: std::serialization::serializer>(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: std::serialization::deserializer>(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) }),}
                })