---

yaml
---
r: 104005
b: refs/heads/try
c: 6381daa
h: refs/heads/master
i:
  104003: f2d1acd
v: v3

Author: yuriks

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 62f1d68439dcfd509eaca29887afa97f22938373
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6e7f170fedd3c526a643c0b2d13863acd982be02
-refs/heads/try: 97078d43b20abc7510fde2e400500fed4c8b1eb3
+refs/heads/try: 6381daab773ca97ef6553d4d244cc9a8f49475a4
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libfourcc/lib.rs

@@ -76,10 +76,11 @@ pub fn expand_syntax_ext(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]) ->
     let (expr, endian) = parse_tts(cx, tts);
 
     let little = match endian {
-        None => target_endian_little(cx, sp),
+        None => false,
         Some(Ident{ident, span}) => match token::get_ident(ident.name).get() {
             "little" => true,
             "big" => false,
+            "target" => target_endian_little(cx, sp),
             _ => {
                 cx.span_err(span, "invalid endian directive in fourcc!");
                 target_endian_little(cx, sp)

branches/try/src/test/run-pass-fulldeps/syntax-extension-fourcc.rs

@@ -19,22 +19,25 @@
 extern mod fourcc;
 
 static static_val: u32 = fourcc!("foo ");
-static static_val_le: u32 = fourcc!("foo ", little);
 static static_val_be: u32 = fourcc!("foo ", big);
+static static_val_le: u32 = fourcc!("foo ", little);
+static static_val_target: u32 = fourcc!("foo ", target);
 
 fn main() {
-    let val = fourcc!("foo ");
-    let exp = if cfg!(target_endian = "big") { 0x666f6f20u32 } else { 0x206f6f66u32 };
-    assert_eq!(val, exp);
-
     let val = fourcc!("foo ", big);
     assert_eq!(val, 0x666f6f20u32);
+    assert_eq!(val, fourcc!("foo "));
 
     let val = fourcc!("foo ", little);
     assert_eq!(val, 0x206f6f66u32);
 
+    let val = fourcc!("foo ", target);
     let exp = if cfg!(target_endian = "big") { 0x666f6f20u32 } else { 0x206f6f66u32 };
-    assert_eq!(static_val, exp);
-    assert_eq!(static_val_le, 0x206f6f66u32);
+    assert_eq!(val, exp);
+
     assert_eq!(static_val_be, 0x666f6f20u32);
+    assert_eq!(static_val, static_val_be);
+    assert_eq!(static_val_le, 0x206f6f66u32);
+    let exp = if cfg!(target_endian = "big") { 0x666f6f20u32 } else { 0x206f6f66u32 };
+    assert_eq!(static_val_target, exp);
 }