---

yaml
---
r: 12959
b: refs/heads/master
c: ed357af
h: refs/heads/master
i:
  12957: 49b4c85
  12955: 265452b
  12951: 9d2f966
  12943: b51380f
  12927: bc1d0bb
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 4f10c19215e4c234e25c25b57983eeb42774f873
+refs/heads/master: ed357af9801468142b961e8dd3f6349007260fd4
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/librustsyntax/codemap.rs

@@ -12,7 +12,6 @@ export new_filemap;
 export new_filemap_w_substr;
 export mk_substr_filename;
 export lookup_char_pos;
-export lookup_char_pos_adj;
 export adjust_span;
 export span_to_str;
 export span_to_filename;

trunk/src/librustsyntax/parse/comments.rs

@@ -1,5 +1,4 @@
 import io::reader_util;
-import io::println;//XXXXXXXXxxx
 import util::interner;
 import lexer::{ reader, new_reader, next_token, is_whitespace };
 
@@ -29,8 +28,7 @@ fn read_to_eol(rdr: reader) -> str {
 
 fn read_one_line_comment(rdr: reader) -> str {
     let val = read_to_eol(rdr);
-    assert ((val[0] == '/' as u8 && val[1] == '/' as u8) ||
-            (val[0] == '#' as u8 && val[1] == '!' as u8));
+    assert (val[0] == '/' as u8 && val[1] == '/' as u8);
     ret val;
 }
 
@@ -55,15 +53,6 @@ fn consume_whitespace_counting_blank_lines(rdr: reader, &comments: [cmnt]) {
     }
 }
 
-fn read_shebang_comment(rdr: reader, code_to_the_left: bool) -> cmnt {
-    #debug(">>> shebang comment");
-    let p = rdr.chpos;
-    #debug("<<< shebang comment");
-    ret {style: if code_to_the_left { trailing } else { isolated },
-         lines: [read_one_line_comment(rdr)],
-         pos: p};
-}
-
 fn read_line_comments(rdr: reader, code_to_the_left: bool) -> cmnt {
     #debug(">>> line comments");
     let p = rdr.chpos;
@@ -145,9 +134,8 @@ fn read_block_comment(rdr: reader, code_to_the_left: bool) -> cmnt {
 }
 
 fn peeking_at_comment(rdr: reader) -> bool {
-    ret ((rdr.curr == '/' && rdr.next() == '/') ||
-         (rdr.curr == '/' && rdr.next() == '*')) ||
-        (rdr.curr == '#' && rdr.next() == '!');
+    ret rdr.curr == '/' && rdr.next() == '/' ||
+            rdr.curr == '/' && rdr.next() == '*';
 }
 
 fn consume_comment(rdr: reader, code_to_the_left: bool, &comments: [cmnt]) {
@@ -156,8 +144,6 @@ fn consume_comment(rdr: reader, code_to_the_left: bool, &comments: [cmnt]) {
         comments += [read_line_comments(rdr, code_to_the_left)];
     } else if rdr.curr == '/' && rdr.next() == '*' {
         comments += [read_block_comment(rdr, code_to_the_left)];
-    } else if rdr.curr == '#' && rdr.next() == '!' {
-        comments += [read_shebang_comment(rdr, code_to_the_left)];
     } else { fail; }
     #debug("<<< consume comment");
 }

trunk/src/librustsyntax/parse/lexer.rs

@@ -119,16 +119,6 @@ fn consume_any_line_comment(rdr: reader) {
           '*' { rdr.bump(); rdr.bump(); ret consume_block_comment(rdr); }
           _ { ret; }
         }
-    } else if rdr.curr == '#' {
-        if rdr.next() == '!' {
-            let cmap = codemap::new_codemap();
-            (*cmap).files.push(rdr.filemap);
-            let loc = codemap::lookup_char_pos_adj(cmap, rdr.chpos);
-            if loc.line == 1u && loc.col == 0u {
-                while rdr.curr != '\n' && !rdr.is_eof() { rdr.bump(); }
-                ret consume_whitespace_and_comments(rdr);
-            }
-        }
     }
 }