Skip to content

Commit

Permalink
Rollup merge of rust-lang#24718 - tamird:fix-quote-tests, r=alexcrichton
Browse files Browse the repository at this point in the history
Sniped from @rprichard's work in rust-lang#24537. r? @alexcrichton
  • Loading branch information
Manishearth committed Apr 24, 2015
2 parents 5b2633d + a8b2382 commit e3c35d6
Show file tree
Hide file tree
Showing 6 changed files with 171 additions and 203 deletions.
27 changes: 14 additions & 13 deletions src/librustc/middle/astencode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1835,29 +1835,31 @@ fn decode_item_ast(par_doc: rbml::Doc) -> ast::Item {
}

#[cfg(test)]
trait fake_ext_ctxt {
trait FakeExtCtxt {
fn call_site(&self) -> codemap::Span;
fn cfg(&self) -> ast::CrateConfig;
fn parse_sess<'a>(&'a self) -> &'a parse::ParseSess;
fn call_site(&self) -> Span;
fn ident_of(&self, st: &str) -> ast::Ident;
fn name_of(&self, st: &str) -> ast::Name;
fn parse_sess(&self) -> &parse::ParseSess;
}

#[cfg(test)]
impl fake_ext_ctxt for parse::ParseSess {
fn cfg(&self) -> ast::CrateConfig {
Vec::new()
}
fn parse_sess<'a>(&'a self) -> &'a parse::ParseSess { self }
fn call_site(&self) -> Span {
impl FakeExtCtxt for parse::ParseSess {
fn call_site(&self) -> codemap::Span {
codemap::Span {
lo: codemap::BytePos(0),
hi: codemap::BytePos(0),
expn_id: codemap::NO_EXPANSION
expn_id: codemap::NO_EXPANSION,
}
}
fn cfg(&self) -> ast::CrateConfig { Vec::new() }
fn ident_of(&self, st: &str) -> ast::Ident {
token::str_to_ident(st)
parse::token::str_to_ident(st)
}
fn name_of(&self, st: &str) -> ast::Name {
parse::token::intern(st)
}
fn parse_sess(&self) -> &parse::ParseSess { self }
}

#[cfg(test)]
Expand All @@ -1883,15 +1885,14 @@ fn test_basic() {
fn foo() {}
));
}
/* NOTE: When there's a snapshot, update this (yay quasiquoter!)

#[test]
fn test_smalltalk() {
let cx = mk_ctxt();
roundtrip(quote_item!(&cx,
fn foo() -> isize { 3 + 4 } // first smalltalk program ever executed.
));
}
*/

#[test]
fn test_more() {
Expand Down
58 changes: 58 additions & 0 deletions src/test/compile-fail-fulldeps/qquote.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// ignore-cross-compile

#![feature(quote, rustc_private)]

extern crate syntax;

use syntax::ast;
use syntax::codemap;
use syntax::parse;
use syntax::print::pprust;

trait FakeExtCtxt {
fn call_site(&self) -> codemap::Span;
fn cfg(&self) -> ast::CrateConfig;
fn ident_of(&self, st: &str) -> ast::Ident;
fn name_of(&self, st: &str) -> ast::Name;
fn parse_sess(&self) -> &parse::ParseSess;
}

impl FakeExtCtxt for parse::ParseSess {
fn call_site(&self) -> codemap::Span {
codemap::Span {
lo: codemap::BytePos(0),
hi: codemap::BytePos(0),
expn_id: codemap::NO_EXPANSION,
}
}
fn cfg(&self) -> ast::CrateConfig { Vec::new() }
fn ident_of(&self, st: &str) -> ast::Ident {
parse::token::str_to_ident(st)
}
fn name_of(&self, st: &str) -> ast::Name {
parse::token::intern(st)
}
fn parse_sess(&self) -> &parse::ParseSess { self }
}

fn main() {
let cx = parse::new_parse_sess();

quote_expr!(&cx, 23).and_then(|expr| {
assert_eq!(pprust::expr_to_string(&expr), "23")
});

quote_expr!(&cx, 2 - $abcd + 7).and_then(|expr| { //~ ERROR unresolved name: abcd
assert_eq!(pprust::expr_to_string(&expr), "2 - $abcd + 7")
});
}
70 changes: 0 additions & 70 deletions src/test/parse-fail/qquote-1.rs

This file was deleted.

63 changes: 0 additions & 63 deletions src/test/parse-fail/qquote-2.rs

This file was deleted.

60 changes: 60 additions & 0 deletions src/test/run-fail/qquote.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// ignore-cross-compile

// error-pattern:expected identifier, found keyword `let`

#![feature(quote, rustc_private)]

extern crate syntax;

use syntax::ast;
use syntax::codemap;
use syntax::parse;
use syntax::print::pprust;

trait FakeExtCtxt {
fn call_site(&self) -> codemap::Span;
fn cfg(&self) -> ast::CrateConfig;
fn ident_of(&self, st: &str) -> ast::Ident;
fn name_of(&self, st: &str) -> ast::Name;
fn parse_sess(&self) -> &parse::ParseSess;
}

impl FakeExtCtxt for parse::ParseSess {
fn call_site(&self) -> codemap::Span {
codemap::Span {
lo: codemap::BytePos(0),
hi: codemap::BytePos(0),
expn_id: codemap::NO_EXPANSION,
}
}
fn cfg(&self) -> ast::CrateConfig { Vec::new() }
fn ident_of(&self, st: &str) -> ast::Ident {
parse::token::str_to_ident(st)
}
fn name_of(&self, st: &str) -> ast::Name {
parse::token::intern(st)
}
fn parse_sess(&self) -> &parse::ParseSess { self }
}

fn main() {
let cx = parse::new_parse_sess();

quote_expr!(&cx, 23).and_then(|expr| {
assert_eq!(pprust::expr_to_string(&expr), "23")
});

quote_expr!(&cx, let x isize = 20;).and_then(|expr| {
assert_eq!(pprust::expr_to_string(&expr), "let x isize = 20;")
});
}
Loading

0 comments on commit e3c35d6

Please sign in to comment.