---

yaml
---
r: 42361
b: refs/heads/master
c: b894347
h: refs/heads/master
i:
  42359: 41d59a8
v: v3

Author: veddan

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 42727658304b04babff6dd384637398c17331bbe
+refs/heads/master: b8943474dc4313c432ed791cebe9b76f89b0ad84
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/src/librustc/driver/driver.rs

@@ -521,9 +521,6 @@ pub fn build_session_options(+binary: ~str,
     } else {
         session::unknown_crate
     };
-    let static = opt_present(matches, ~"static");
-    let gc = opt_present(matches, ~"gc");
-
     let parse_only = opt_present(matches, ~"parse-only");
     let no_trans = opt_present(matches, ~"no-trans");
 
@@ -570,7 +567,6 @@ pub fn build_session_options(+binary: ~str,
         }
     }
 
-    let jit = opt_present(matches, ~"jit");
     let output_type =
         if parse_only || no_trans {
             link::output_type_none
@@ -584,8 +580,6 @@ pub fn build_session_options(+binary: ~str,
         } else if opt_present(matches, ~"emit-llvm") {
             link::output_type_bitcode
         } else { link::output_type_exe };
-    let extra_debuginfo = opt_present(matches, ~"xg");
-    let debuginfo = opt_present(matches, ~"g") || extra_debuginfo;
     let sysroot_opt = getopts::opt_maybe_str(matches, ~"sysroot");
     let sysroot_opt = sysroot_opt.map(|m| Path(*m));
     let target_opt = getopts::opt_maybe_str(matches, ~"target");
@@ -616,6 +610,12 @@ pub fn build_session_options(+binary: ~str,
             }
         } else { No }
     };
+    let gc = debugging_opts & session::gc != 0;
+    let jit = debugging_opts & session::jit != 0;
+    let extra_debuginfo = debugging_opts & session::extra_debug_info != 0;
+    let debuginfo = debugging_opts & session::debug_info != 0 ||
+        extra_debuginfo;
+    let static = debugging_opts & session::static != 0;
     let target =
         match target_opt {
             None => host_triple(),
@@ -712,14 +712,11 @@ pub fn optgroups() -> ~[getopts::groups::OptGroup] {
                           environment", ~"SPEC"),
   optflag(~"",  ~"emit-llvm",
                         ~"Produce an LLVM bitcode file"),
-  optflag(~"g", ~"",    ~"Produce debug info (experimental)"),
-  optflag(~"",  ~"gc",  ~"Garbage collect shared data (experimental)"),
   optflag(~"h", ~"help",~"Display this message"),
   optmulti(~"L", ~"",   ~"Add a directory to the library search path",
                               ~"PATH"),
   optflag(~"",  ~"lib", ~"Compile a library crate"),
   optflag(~"",  ~"ls",  ~"List the symbols defined by a library crate"),
-  optflag(~"",  ~"jit", ~"Execute using JIT (experimental)"),
   optflag(~"", ~"no-trans",
                         ~"Run all passes except translation; no output"),
   optflag(~"O", ~"",    ~"Equivalent to --opt-level=2"),
@@ -739,13 +736,9 @@ pub fn optgroups() -> ~[getopts::groups::OptGroup] {
                           or identified (fully parenthesized,
                           AST nodes and blocks with IDs)", ~"TYPE"),
   optflag(~"S", ~"",    ~"Compile only; do not assemble or link"),
-  optflag(~"", ~"xg",   ~"Extra debugging info (experimental)"),
   optflag(~"", ~"save-temps",
                         ~"Write intermediate files (.bc, .opt.bc, .o)
                           in addition to normal output"),
-  optflag(~"", ~"static",
-                        ~"Use or produce static libraries or binaries
-                         (experimental)"),
   optopt(~"", ~"sysroot",
                         ~"Override the system root", ~"PATH"),
   optflag(~"", ~"test", ~"Build a test harness"),

trunk/src/librustc/driver/session.rs

@@ -75,6 +75,11 @@ pub const count_type_sizes: uint = 1 << 14;
 pub const meta_stats: uint = 1 << 15;
 pub const no_opt: uint = 1 << 16;
 pub const no_monomorphic_collapse: uint = 1 << 17;
+const gc: uint = 1 << 18;
+const jit: uint = 1 << 19;
+const debug_info: uint = 1 << 20;
+const extra_debug_info: uint = 1 << 21;
+const static: uint = 1 << 22;
 
 pub fn debugging_opts_map() -> ~[(~str, ~str, uint)] {
     ~[(~"verbose", ~"in general, enable more debug printouts", verbose),
@@ -102,6 +107,13 @@ pub fn debugging_opts_map() -> ~[(~str, ~str, uint)] {
      (~"no-opt", ~"do not optimize, even if -O is passed", no_opt),
      (~"no-monomorphic-collapse", ~"do not collapse template instantiations",
       no_monomorphic_collapse),
+     (~"gc", ~"Garbage collect shared data (experimental)", gc),
+     (~"jit", ~"Execute using JIT (experimental)", jit),
+     (~"extra-debug-info", ~"Extra debugging info (experimental)",
+      extra_debug_info),
+     (~"debug-info", ~"Produce debug info (experimental)", debug_info),
+     (~"static", ~"Use or produce static libraries or binaries " +
+      "(experimental)", static)
     ]
 }
 

trunk/src/libsyntax/ext/tt/transcribe.rs

@@ -39,8 +39,7 @@ type tt_frame = @{
     up: tt_frame_up,
 };
 
-pub type tt_reader = @tt_reader_;
-pub type tt_reader_ = {
+pub type tt_reader = @{
     sp_diag: span_handler,
     interner: @ident_interner,
     mut cur: tt_frame,
@@ -88,7 +87,7 @@ pure fn dup_tt_frame(&&f: tt_frame) -> tt_frame {
      }
 }
 
-pub pure fn dup_tt_reader(r: &tt_reader_) -> tt_reader {
+pub pure fn dup_tt_reader(&&r: tt_reader) -> tt_reader {
     @{sp_diag: r.sp_diag, interner: r.interner,
       mut cur: dup_tt_frame(r.cur),
       interpolations: r.interpolations,
@@ -97,7 +96,7 @@ pub pure fn dup_tt_reader(r: &tt_reader_) -> tt_reader {
 }
 
 
-pure fn lookup_cur_matched_by_matched(r: &tt_reader_,
+pure fn lookup_cur_matched_by_matched(r: tt_reader,
                                       start: @named_match) -> @named_match {
     pure fn red(+ad: @named_match, idx: &uint) -> @named_match {
         match *ad {
@@ -111,15 +110,15 @@ pure fn lookup_cur_matched_by_matched(r: &tt_reader_,
     vec::foldl(start, r.repeat_idx, red)
 }
 
-fn lookup_cur_matched(r: &tt_reader_, name: ident) -> @named_match {
+fn lookup_cur_matched(r: tt_reader, name: ident) -> @named_match {
     lookup_cur_matched_by_matched(r, r.interpolations.get(&name))
 }
 enum lis {
     lis_unconstrained, lis_constraint(uint, ident), lis_contradiction(~str)
 }
 
-fn lockstep_iter_size(t: token_tree, r: &tt_reader_) -> lis {
-    fn lis_merge(lhs: lis, rhs: lis, r: &tt_reader_) -> lis {
+fn lockstep_iter_size(t: token_tree, r: tt_reader) -> lis {
+    fn lis_merge(lhs: lis, rhs: lis, r: tt_reader) -> lis {
         match lhs {
           lis_unconstrained => rhs,
           lis_contradiction(_) => lhs,
@@ -151,7 +150,7 @@ fn lockstep_iter_size(t: token_tree, r: &tt_reader_) -> lis {
 }
 
 
-pub fn tt_next_token(r: &tt_reader_) -> TokenAndSpan {
+pub fn tt_next_token(&&r: tt_reader) -> TokenAndSpan {
     let ret_val = TokenAndSpan { tok: r.cur_tok, sp: r.cur_span };
     while r.cur.idx >= r.cur.readme.len() {
         /* done with this set; pop or repeat? */
@@ -200,26 +199,25 @@ pub fn tt_next_token(r: &tt_reader_) -> TokenAndSpan {
             return ret_val;
           }
           tt_seq(sp, ref tts, ref sep, zerok) => {
-              match lockstep_iter_size(tt_seq(sp, (*tts), (*sep), zerok), r) {
-                lis_unconstrained => {
-                  r.sp_diag.span_fatal(
+            match lockstep_iter_size(tt_seq(sp, (*tts), (*sep), zerok), r) {
+              lis_unconstrained => {
+                r.sp_diag.span_fatal(
                     sp, /* blame macro writer */
-                      ~"attempted to repeat an expression \
-                        containing no syntax \
-                        variables matched as repeating at this depth");
-                  }
-                  lis_contradiction(ref msg) => {
-                      /* FIXME #2887 blame macro invoker instead*/
-                      r.sp_diag.span_fatal(sp, (*msg));
-                  }
-                  lis_constraint(len, _) => {
-                    if len == 0 {
-                      if !zerok {
+                    ~"attempted to repeat an expression containing no syntax \
+                     variables matched as repeating at this depth");
+              }
+              lis_contradiction(ref msg) => {
+                /* FIXME #2887 blame macro invoker instead*/
+                r.sp_diag.span_fatal(sp, (*msg));
+              }
+              lis_constraint(len, _) => {
+                if len == 0 {
+                    if !zerok {
                         r.sp_diag.span_fatal(sp, /* FIXME #2887 blame invoker
-                        */
+                                                  */
                                              ~"this must repeat at least \
-                                               once");
-                          }
+                                              once");
+                    }
 
                     r.cur.idx += 1u;
                     return tt_next_token(r);