rustc: Add region def ids to the AST

Author: pcwalton

src/rustc/metadata/astencode.rs

@@ -434,6 +434,7 @@ impl of tr for ast::def {
           ast::def_class_method(did0, did1) {
             ast::def_class_method(did0.tr(xcx), did1.tr(xcx))
           }
+          ast::def_region(nid) { ast::def_region(xcx.tr_id(nid)) }
         }
     }
 }
@@ -1004,4 +1005,4 @@ fn test_simplification() {
       }
       _ { fail; }
     }
-}
+}

src/rustc/metadata/astencode_gen.rs

@@ -8212,6 +8212,7 @@ fn serialize_164<S: std::serialization::serializer>(s: S,
                 /*syntax::ast::def_id*/
                 /*syntax::ast::def_id*//*syntax::ast::def_id*/
                 /*syntax::ast::def_id*//*syntax::ast::def_id*/
+                /*syntax::ast::node_id*/
                 {||
                     alt v {
                       syntax::ast::def_fn(v0, v1) {
@@ -8470,6 +8471,19 @@ fn serialize_164<S: std::serialization::serializer>(s: S,
                                                 }
                                             })
                       }
+                      syntax::ast::def_region(v0) {
+                        s.emit_enum_variant("syntax::ast::def_region", 17u,
+                                            1u,
+                                            {||
+                                                {
+                                                    s.emit_enum_variant_arg(0u,
+                                                                            {||
+                                                                                serialize_27(s,
+                                                                                             v0)
+                                                                            })
+                                                }
+                                            })
+                      }
                     }
                 });
 }
@@ -8590,6 +8604,8 @@ fn deserialize_164<S: std::serialization::deserializer>(s: S) ->
                 /*syntax::ast::def_id*//*syntax::ast::def_id*/
 
                 /*syntax::ast::def_id*//*syntax::ast::def_id*/
+
+                /*syntax::ast::node_id*/
                 {||
                     s.read_enum_variant({|v_id|
                                             alt check v_id {
@@ -8731,6 +8747,12 @@ fn deserialize_164<S: std::serialization::deserializer>(s: S) ->
                                                                                                           deserialize_165(s)
                                                                                                       }))
                                               }
+                                              17u {
+                                                syntax::ast::def_region(s.read_enum_variant_arg(0u,
+                                                                                                {||
+                                                                                                    deserialize_27(s)
+                                                                                                }))
+                                              }
                                             }
                                         })
                 })

src/rustc/middle/resolve.rs

@@ -1713,6 +1713,7 @@ fn ns_for_def(d: def) -> namespace {
       ast::def_ty(_) | ast::def_binding(_) | ast::def_use(_) |
       ast::def_ty_param(_, _) | ast::def_prim_ty(_) | ast::def_class(_)
       { ns_type }
+      ast::def_region(_) { fail "regions are not handled by this pass" }
     }
 }
 

src/rustc/syntax/ast.rs

@@ -50,7 +50,8 @@ enum def {
     def_class_field(def_id, def_id),
     // No purity allowed for now, I guess
     // (simpler this way, b/c presumably methods read mutable state)
-    def_class_method(def_id, def_id)
+    def_class_method(def_id, def_id),
+    def_region(node_id)
 }
 
 // The set of meta_items that define the compilation environment of the crate,

src/rustc/syntax/ast_util.rs

@@ -42,7 +42,7 @@ fn def_id_of_def(d: def) -> def_id {
       def_class(id) | def_class_field(_, id) | def_class_method(_, id) { id }
 
       def_arg(id, _) | def_local(id, _) | def_self(id) |
-      def_upvar(id, _, _) | def_binding(id) {
+      def_upvar(id, _, _) | def_binding(id) | def_region(id) {
         local_def(id)
       }