diff options
| author | John Clements <clements@racket-lang.org> | 2013-06-04 14:56:33 -0700 |
|---|---|---|
| committer | John Clements <clements@racket-lang.org> | 2013-06-05 12:01:40 -0700 |
| commit | 5a158f1d19d93af4223fea2da49209e73a3ed002 (patch) | |
| tree | f79fda064ff81ff3c3f5b7f7d69b9c1cf8fbad5b /src/libsyntax/parse | |
| parent | ecdb6e472218ea6f542e4b95e1e3ce48a7e78056 (diff) | |
| download | rust-5a158f1d19d93af4223fea2da49209e73a3ed002.tar.gz rust-5a158f1d19d93af4223fea2da49209e73a3ed002.zip | |
add hygiene support functions
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/mod.rs | 34 |
1 files changed, 12 insertions, 22 deletions
diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs index 7f7e607d37f..d7248204e1c 100644 --- a/src/libsyntax/parse/mod.rs +++ b/src/libsyntax/parse/mod.rs @@ -347,7 +347,7 @@ mod test { use parse::token::{intern, str_to_ident}; use util::parser_testing::{string_to_tts_and_sess, string_to_parser}; use util::parser_testing::{string_to_expr, string_to_item}; - use util::parser_testing::{string_to_stmt}; + use util::parser_testing::{string_to_stmt, strs_to_idents}; // map a string to tts, return the tt without its parsesess fn string_to_tts_only(source_str : @~str) -> ~[ast::token_tree] { @@ -368,22 +368,12 @@ mod test { span{lo:BytePos(a),hi:BytePos(b),expn_info:None} } - // compose new_ident and intern: - fn intern_ident(str : &str) -> ast::ident { - new_ident(intern(str)) - } - - // convert a vector of uints to a vector of ast::idents - fn ints_to_idents(ids: ~[~str]) -> ~[ast::ident] { - ids.map(|u| intern_ident(*u)) - } - #[test] fn path_exprs_1 () { assert_eq!(string_to_expr(@~"a"), @ast::expr{id:1, node:ast::expr_path(@ast::Path {span:sp(0,1), global:false, - idents:~[intern_ident("a")], + idents:~[str_to_ident("a")], rp:None, types:~[]}), span:sp(0,1)}) @@ -395,7 +385,7 @@ mod test { node:ast::expr_path( @ast::Path {span:sp(0,6), global:true, - idents:ints_to_idents(~[~"a",~"b"]), + idents:strs_to_idents(~["a","b"]), rp:None, types:~[]}), span:sp(0,6)}) @@ -445,7 +435,7 @@ mod test { node:ast::expr_path( @ast::Path{span:sp(7,8), global:false, - idents:~[intern_ident("d")], + idents:~[str_to_ident("d")], rp:None, types:~[] }), @@ -462,7 +452,7 @@ mod test { @ast::Path{ span:sp(0,1), global:false, - idents:~[intern_ident("b")], + idents:~[str_to_ident("b")], rp:None, types: ~[]}), span: sp(0,1)}, @@ -483,7 +473,7 @@ mod test { @ast::Path{ span:sp(0,1), global:false, - idents:~[intern_ident("b")], + idents:~[str_to_ident("b")], rp: None, types: ~[]}, None // no idea @@ -502,7 +492,7 @@ mod test { span:sp(4,4), // this is bizarre... // check this in the original parser? global:false, - idents:~[intern_ident("int")], + idents:~[str_to_ident("int")], rp: None, types: ~[]}, 2), @@ -512,7 +502,7 @@ mod test { @ast::Path{ span:sp(0,1), global:false, - idents:~[intern_ident("b")], + idents:~[str_to_ident("b")], rp: None, types: ~[]}, None // no idea @@ -528,7 +518,7 @@ mod test { // assignment order of the node_ids. assert_eq!(string_to_item(@~"fn a (b : int) { b; }"), Some( - @ast::item{ident:intern_ident("a"), + @ast::item{ident:str_to_ident("a"), attrs:~[], id: 9, // fixme node: ast::item_fn(ast::fn_decl{ @@ -538,7 +528,7 @@ mod test { node: ast::ty_path(@ast::Path{ span:sp(10,13), global:false, - idents:~[intern_ident("int")], + idents:~[str_to_ident("int")], rp: None, types: ~[]}, 2), @@ -549,7 +539,7 @@ mod test { @ast::Path{ span:sp(6,7), global:false, - idents:~[intern_ident("b")], + idents:~[str_to_ident("b")], rp: None, types: ~[]}, None // no idea @@ -579,7 +569,7 @@ mod test { @ast::Path{ span:sp(17,18), global:false, - idents:~[intern_ident("b")], + idents:~[str_to_ident("b")], rp:None, types: ~[]}), span: sp(17,18)}, |