Skip to content

Commit 1bad446

Browse files
committed
---
yaml --- r: 3004 b: refs/heads/master c: 54d34be h: refs/heads/master v: v3
1 parent 1a2651b commit 1bad446

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 1cc3fe567cfbddb5d68a6b884d77b3873ad74b6a
2+
refs/heads/master: 54d34bec59f75e9675f8e79ca471e729763aff6d

trunk/src/comp/front/ast.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,8 @@ tag ty_ {
346346
ty_obj(vec[ty_method]);
347347
ty_path(path, ann);
348348
ty_type;
349+
ty_ivec(@ty); // interior vector
350+
ty_istr; // interior string
349351
ty_constr(@ty, vec[@constr]);
350352
}
351353

trunk/src/comp/front/parser.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,7 @@ fn parse_ty(&parser p) -> @ast::ty {
485485
else if (eat_word(p, "uint")) { t = ast::ty_uint; }
486486
else if (eat_word(p, "float")) { t = ast::ty_float; }
487487
else if (eat_word(p, "str")) { t = ast::ty_str; }
488+
else if (eat_word(p, "istr")) { t = ast::ty_istr; }
488489
else if (eat_word(p, "char")) { t = ast::ty_char; }
489490
else if (eat_word(p, "task")) { t = ast::ty_task; }
490491
else if (eat_word(p, "i8")) { t = ast::ty_machine(common::ty_i8); }
@@ -570,6 +571,11 @@ fn parse_ty(&parser p) -> @ast::ty {
570571
t = ast::ty_chan(parse_ty(p));
571572
hi = p.get_hi_pos();
572573
expect(p, token::RBRACKET);
574+
} else if (eat_word(p, "ivec")) {
575+
expect(p, token::LBRACKET);
576+
t = ast::ty_ivec(parse_ty(p));
577+
hi = p.get_hi_pos();
578+
expect(p, token::RBRACKET);
573579
} else if (eat_word(p, "mutable")) {
574580
p.get_session().span_warn(p.get_span(),
575581
"ignoring deprecated 'mutable' type constructor");

0 commit comments

Comments
 (0)