---

yaml
---
r: 149027
b: refs/heads/try2
c: 6381daa
h: refs/heads/master
i:
  149025: 67e086a
  149023: 2e87924
v: v3

Author: yuriks

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 97078d43b20abc7510fde2e400500fed4c8b1eb3
+refs/heads/try2: 6381daab773ca97ef6553d4d244cc9a8f49475a4
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/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/try2/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);
 }