Skip to content

Commit b5e240b

Browse files
committed
---
yaml --- r: 31198 b: refs/heads/dist-snap c: 6247a52 h: refs/heads/master v: v3
1 parent 70f3144 commit b5e240b

File tree

2 files changed

+22
-3
lines changed

2 files changed

+22
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
99
refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
10-
refs/heads/dist-snap: eaf8b7675ea3989cce9ecfe845c44e13c135d1d0
10+
refs/heads/dist-snap: 6247a529e3af664f885ac0bb05bf6be2c102ec6a
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/libsyntax/parse/parser.rs

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1696,14 +1696,33 @@ class parser {
16961696
token::AT {
16971697
self.bump();
16981698
let sub = self.parse_pat();
1699-
pat = pat_box(sub);
17001699
hi = sub.span.hi;
1700+
// HACK: parse @"..." as a literal of a vstore @str
1701+
pat = alt sub.node {
1702+
pat_lit(e@@{node: expr_lit(@{node: lit_str(_), span: _}), _}) {
1703+
let vst = @{id: self.get_id(), callee_id: self.get_id(),
1704+
node: expr_vstore(e, vstore_box),
1705+
span: mk_sp(lo, hi)};
1706+
pat_lit(vst)
1707+
}
1708+
_ { pat_box(sub) }
1709+
};
17011710
}
17021711
token::TILDE {
17031712
self.bump();
17041713
let sub = self.parse_pat();
1705-
pat = pat_uniq(sub);
17061714
hi = sub.span.hi;
1715+
// HACK: parse ~"..." as a literal of a vstore ~str
1716+
pat = alt sub.node {
1717+
pat_lit(e@@{node: expr_lit(@{node: lit_str(_), span: _}), _}) {
1718+
let vst = @{id: self.get_id(), callee_id: self.get_id(),
1719+
node: expr_vstore(e, vstore_uniq),
1720+
span: mk_sp(lo, hi)};
1721+
pat_lit(vst)
1722+
}
1723+
_ { pat_uniq(sub) }
1724+
};
1725+
17071726
}
17081727
token::LBRACE {
17091728
self.bump();

0 commit comments

Comments
 (0)