---

yaml
---
r: 15867
b: refs/heads/try
c: 0eef34b
h: refs/heads/master
i:
  15865: 4ad6780
  15863: 1c4b558
v: v3

Author: paulstansifer

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: ac2faad26e2e252dd5596d9577388095ee7bdeee
+refs/heads/try: 0eef34bacb3cfe0c6bee9946ec1d85444fb7424a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/librustsyntax/ext/base.rs

@@ -53,6 +53,8 @@ fn syntax_expander_table() -> hashmap<str, syntax_extension> {
                             builtin(ext::source_util::expand_include));
     syntax_expanders.insert("include_str",
                             builtin(ext::source_util::expand_include_str));
+    syntax_expanders.insert("include_bin",
+                            builtin(ext::source_util::expand_include_bin));
     syntax_expanders.insert("mod",
                             builtin(ext::source_util::expand_mod));
     ret syntax_expanders;
@@ -173,6 +175,11 @@ fn make_new_lit(cx: ext_ctxt, sp: codemap::span, lit: ast::lit_) ->
     ret @{id: cx.next_id(), node: ast::expr_lit(sp_lit), span: sp};
 }
 
+fn make_new_expr(cx: ext_ctxt, sp: codemap::span, expr: ast::expr_) ->
+    @ast::expr {
+    ret @{id: cx.next_id(), node: expr, span: sp};
+}
+
 fn get_mac_args_no_max(cx: ext_ctxt, sp: span, arg: ast::mac_arg,
                        min: uint, name: str) -> [@ast::expr] {
     ret get_mac_args(cx, sp, arg, min, none, name);

branches/try/src/librustsyntax/ext/source_util.rs

@@ -10,6 +10,7 @@ export expand_stringify;
 export expand_mod;
 export expand_include;
 export expand_include_str;
+export expand_include_bin;
 
 /* #line(): expands to the current line number */
 fn expand_line(cx: ext_ctxt, sp: span, arg: ast::mac_arg,
@@ -73,6 +74,25 @@ fn expand_include_str(cx: ext_ctxt, sp: codemap::span, arg: ast::mac_arg,
     }
 }
 
+fn expand_include_bin(cx: ext_ctxt, sp: codemap::span, arg: ast::mac_arg,
+                      _body: ast::mac_body) -> @ast::expr {
+    let args = get_mac_args(cx,sp,arg,1u,option::some(1u),"include_bin");
+
+    let file = expr_to_str(cx, args[0], "#include_bin requires a string");
+
+    alt io::read_whole_file(res_rel_file(cx, sp, file)) {
+      result::ok(src) {
+        let u8_exprs = vec::map(src) { |char: u8|
+            make_new_lit(cx, sp, ast::lit_uint(char as u64, ast::ty_u8))
+        };
+        ret make_new_expr(cx, sp, ast::expr_vec(u8_exprs, ast::m_imm));
+      }
+      result::err(e) {
+        cx.parse_sess().span_diagnostic.handler().fatal(e)
+      }
+    }
+}
+
 fn res_rel_file(cx: ext_ctxt, sp: codemap::span, arg: path) -> path {
     // NB: relative paths are resolved relative to the compilation unit
     if !path::path_is_absolute(arg) {

branches/try/src/test/run-pass/syntax-extension-source-utils.rs

@@ -17,6 +17,10 @@ fn main() {
     assert(
         #include_str["syntax-extension-source-utils-files/includeme.fragment"]
         .starts_with("/* this is for "));
+    assert(
+        #include_bin["syntax-extension-source-utils-files/includeme.fragment"]
+        [1] == (42 as u8)); // '*'
     // The Windows tests are wrapped in an extra module for some reason
     assert(m1::m2::where_am_i().ends_with("m1::m2"));
+
 }