---

yaml
---
r: 956
b: refs/heads/master
c: 78ec077
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9769b612261d6000b969ce466c4033f8445d3474
+refs/heads/master: 78ec07790a90813cf4f42df0246ea9c27892745f

trunk/src/comp/front/ast.rs

@@ -7,7 +7,6 @@ import util.common.spanned;
 import util.common.ty_mach;
 
 type ident = str;
-type ty_param = ident;
 
 type name_ = rec(ident ident, vec[@ty] types);
 type name = spanned[name_];
@@ -17,6 +16,8 @@ type crate_num = int;
 type def_num = int;
 type def_id = tup(crate_num, def_num);
 
+type ty_param = rec(ident ident, def_id id);
+
 // Annotations added during successive passes.
 tag ann {
     ann_none;

trunk/src/comp/front/parser.rs

@@ -1039,10 +1039,15 @@ impure fn parse_block(parser p) -> ast.block {
     ret spanned(stmts.span, stmts.span, b);
 }
 
+impure fn parse_ty_param(parser p) -> ast.ty_param {
+    auto ident = parse_ident(p);
+    ret rec(ident=ident, id=p.next_def_id());
+}
+
 impure fn parse_ty_params(parser p) -> vec[ast.ty_param] {
     let vec[ast.ty_param] ty_params = vec();
     if (p.peek() == token.LBRACKET) {
-        auto f = parse_ident;   // FIXME: pass as lval directly
+        auto f = parse_ty_param;   // FIXME: pass as lval directly
         ty_params = parse_seq[ast.ty_param](token.LBRACKET, token.RBRACKET,
                                             some(token.COMMA), f, p).node;
     }