Converted fourcc! to loadable syntax extension

2 files changed, 1 insertions, 110 deletions

diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs
index bf240d8b47c..d22a1d697fc 100644
--- a/src/libsyntax/ext/base.rs
+++ b/src/libsyntax/ext/base.rs
@@ -1,4 +1,4 @@
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// 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.
 //
@@ -194,9 +194,6 @@ pub fn syntax_expander_table() -> SyntaxEnv {
     syntax_expanders.insert(intern("bytes"),
                             builtin_normal_expander(
                                     ext::bytes::expand_syntax_ext));
-    syntax_expanders.insert(intern("fourcc"),
-                            builtin_normal_tt_no_ctxt(
-                                    ext::fourcc::expand_syntax_ext));
     syntax_expanders.insert(intern("concat_idents"),
                             builtin_normal_expander(
                                     ext::concat_idents::expand_syntax_ext));
diff --git a/src/libsyntax/ext/fourcc.rs b/src/libsyntax/ext/fourcc.rs
deleted file mode 100644
index dd5452535a2..00000000000
--- a/src/libsyntax/ext/fourcc.rs
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2013 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.
-
-/* The compiler code necessary to support the fourcc! extension. */
-
-// fourcc!() is called with a single 4-character string, and an optional ident
-// that is either `big` or `little`. If the ident is omitted it is assumed to
-// be the platform-native value. It returns a u32.
-
-use ast;
-use attr::contains;
-use codemap::{Span, mk_sp};
-use ext::base::*;
-use ext::base;
-use ext::build::AstBuilder;
-use parse;
-use parse::token;
-
-use std::ascii::AsciiCast;
-
-pub fn expand_syntax_ext(cx: @ExtCtxt, sp: Span, tts: &[ast::token_tree]) -> base::MacResult {
-    let (expr, endian) = parse_tts(cx, tts);
-
-    let little = match endian {
-        None => target_endian_little(cx, sp),
-        Some(Ident{ident, span}) => match cx.str_of(ident).as_slice() {
-            "little" => true,
-            "big" => false,
-            _ => {
-                cx.span_err(span, "invalid endian directive in fourcc!");
-                target_endian_little(cx, sp)
-            }
-        }
-    };
-
-    let s = match expr.node {
-        // expression is a literal
-        ast::ExprLit(lit) => match lit.node {
-            // string literal
-            ast::lit_str(s) => {
-                if !s.is_ascii() {
-                    cx.span_err(expr.span, "non-ascii string literal in fourcc!");
-                } else if s.len() != 4 {
-                    cx.span_err(expr.span, "string literal with len != 4 in fourcc!");
-                }
-                s
-            }
-            _ => {
-                cx.span_err(expr.span, "unsupported literal in fourcc!");
-                return MRExpr(cx.expr_lit(sp, ast::lit_uint(0u64, ast::ty_u32)));
-            }
-        },
-        _ => {
-            cx.span_err(expr.span, "non-literal in fourcc!");
-            return MRExpr(cx.expr_lit(sp, ast::lit_uint(0u64, ast::ty_u32)));
-        }
-    };
-
-    let mut val = 0u32;
-    if little {
-        for byte in s.byte_rev_iter().take(4) {
-            val = (val << 8) | (byte as u32);
-        }
-    } else {
-        for byte in s.byte_iter().take(4) {
-            val = (val << 8) | (byte as u32);
-        }
-    }
-    let e = cx.expr_lit(sp, ast::lit_uint(val as u64, ast::ty_u32));
-    MRExpr(e)
-}
-
-struct Ident {
-    ident: ast::Ident,
-    span: Span
-}
-
-fn parse_tts(cx: @ExtCtxt, tts: &[ast::token_tree]) -> (@ast::Expr, Option<Ident>) {
-    let p = parse::new_parser_from_tts(cx.parse_sess(), cx.cfg(), tts.to_owned());
-    let ex = p.parse_expr();
-    let id = if *p.token == token::EOF {
-        None
-    } else {
-        p.expect(&token::COMMA);
-        let lo = p.span.lo;
-        let ident = p.parse_ident();
-        let hi = p.last_span.hi;
-        Some(Ident{ident: ident, span: mk_sp(lo, hi)})
-    };
-    if *p.token != token::EOF {
-        p.unexpected();
-    }
-    (ex, id)
-}
-
-fn target_endian_little(cx: @ExtCtxt, sp: Span) -> bool {
-    let meta = cx.meta_name_value(sp, @"target_endian", ast::lit_str(@"little"));
-    contains(cx.cfg(), meta)
-}