nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-05 11:48:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

syntax::ast: Remove/Recover tests

Browse Source 
`xorpush_test` and `test_marksof` are at `syntax::ast_util`.

Fixes #7952
This commit is contained in:
klutzy 2014-01-14 18:47:29 +09:00
parent ec6aba37d7
commit b33d2fede8
2 changed files with 34 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
src/libsyntax/ast.rs
View File

@ -1195,123 +1195,32 @@ pub enum InlinedItem {
#[cfg(test)]
mod test {
use extra;
use codemap::*;
use super::*;
fn is_freeze<T: Freeze>() {}
// Assert that the AST remains Freeze (#10693).
#[test] fn ast_is_freeze() {
#[test]
fn ast_is_freeze() {
is_freeze::<Item>();
}
}
/* hold off on tests ... they appear in a later merge.
#[cfg(test)]
mod test {
use std::option::{None, Option, Some};
use std::uint;
use extra;
use codemap::*;
use super::*;
#[test] fn xorpush_test () {
let mut s = ~[];
xorPush(&mut s,14);
assert_eq!(s,~[14]);
xorPush(&mut s,14);
assert_eq!(s,~[]);
xorPush(&mut s,14);
assert_eq!(s,~[14]);
xorPush(&mut s,15);
assert_eq!(s,~[14,15]);
xorPush (&mut s,16);
assert_eq! (s,~[14,15,16]);
xorPush (&mut s,16);
assert_eq! (s,~[14,15]);
xorPush (&mut s,15);
assert_eq! (s,~[14]);
}
#[test] fn test_marksof () {
let stopname = uints_to_name(&~[12,14,78]);
assert_eq!(s,~[]);
xorPush(&mut s,14);
assert_eq!(s,~[14]);
xorPush(&mut s,15);
assert_eq!(s,~[14,15]);
xorPush (&mut s,16);
assert_eq! (s,~[14,15,16]);
xorPush (&mut s,16);
assert_eq! (s,~[14,15]);
xorPush (&mut s,15);
assert_eq! (s,~[14]);
}
#[test] fn test_marksof () {
let stopname = uints_to_name(&~[12,14,78]);
let name1 = uints_to_name(&~[4,9,7]);
assert_eq!(marksof (MT,stopname),~[]);
assert_eq! (marksof (Mark (4,@Mark(98,@MT)),stopname),~[4,98]);
// does xoring work?
assert_eq! (marksof (Mark (5, @Mark (5, @Mark (16,@MT))),stopname),
~[16]);
// does nested xoring work?
assert_eq! (marksof (Mark (5,
@Mark (10,
@Mark (10,
@Mark (5,
@Mark (16,@MT))))),
stopname),
~[16]);
// stop has no effect on marks
assert_eq! (marksof (Mark (9, @Mark (14, @Mark (12, @MT))),stopname),
~[9,14,12]);
// rename where stop doesn't match:
assert_eq! (marksof (Mark (9, @Rename
(name1,
@Mark (4, @MT),
uints_to_name(&~[100,101,102]),
@Mark (14, @MT))),
stopname),
~[9,14]);
// rename where stop does match
;
assert_eq! (marksof (Mark(9, @Rename (name1,
@Mark (4, @MT),
stopname,
@Mark (14, @MT))),
stopname),
~[9]);
}
// are ASTs encodable?
#[test] fn check_asts_encodable() {
let bogus_span = span {lo:BytePos(10),
hi:BytePos(20),
expn_info:None};
let e : crate =
spanned{
node: crate_{
module: Mod {view_items: ~[], items: ~[]},
attrs: ~[],
config: ~[]
#[test]
fn check_asts_encodable() {
let e = Crate {
module: Mod {view_items: ~[], items: ~[]},
attrs: ~[],
config: ~[],
span: Span {
lo: BytePos(10),
hi: BytePos(20),
expn_info: None,
},
span: bogus_span};
};
// doesn't matter which encoder we use....
let _f = (@e as @extra::serialize::Encodable<extra::json::Encoder>);
}
}
*/
//
// Local Variables:
// mode: rust
// fill-column: 78;
// indent-tabs-mode: nil
// c-basic-offset: 4
// buffer-file-coding-system: utf-8-unix
// End:
//

36
src/libsyntax/ast_util.rs
View File

@ -872,9 +872,11 @@ pub fn marksof(ctxt: SyntaxContext, stopname: Name, table: &SCTable) -> ~[Mrk] {
table.get()[loopvar]
};
match table_entry {
EmptyCtxt => {return result;},
Mark(mark,tl) => {
xorPush(&mut result,mark);
EmptyCtxt => {
return result;
},
Mark(mark, tl) => {
xorPush(&mut result, mark);
loopvar = tl;
},
Rename(_,name,tl) => {
@ -980,20 +982,20 @@ mod test {
#[test] fn xorpush_test () {
let mut s = ~[];
xorPush(&mut s,14);
assert_eq!(s.clone(),~[14]);
xorPush(&mut s,14);
assert_eq!(s.clone(),~[]);
xorPush(&mut s,14);
assert_eq!(s.clone(),~[14]);
xorPush(&mut s,15);
assert_eq!(s.clone(),~[14,15]);
xorPush (&mut s,16);
assert_eq!(s.clone(),~[14,15,16]);
xorPush (&mut s,16);
assert_eq!(s.clone(),~[14,15]);
xorPush (&mut s,15);
assert_eq!(s.clone(),~[14]);
xorPush(&mut s, 14);
assert_eq!(s.clone(), ~[14]);
xorPush(&mut s, 14);
assert_eq!(s.clone(), ~[]);
xorPush(&mut s, 14);
assert_eq!(s.clone(), ~[14]);
xorPush(&mut s, 15);
assert_eq!(s.clone(), ~[14, 15]);
xorPush(&mut s, 16);
assert_eq!(s.clone(), ~[14, 15, 16]);
xorPush(&mut s, 16);
assert_eq!(s.clone(), ~[14, 15]);
xorPush(&mut s, 15);
assert_eq!(s.clone(), ~[14]);
}
fn id(n: Name, s: SyntaxContext) -> Ident {