about summary refs log tree commit diff
path: root/src/comp/syntax/parse/parser.rs
diff options
context:
space:
mode:
authorGraydon Hoare <graydon@mozilla.com>2011-12-07 13:12:05 -0800
committerGraydon Hoare <graydon@mozilla.com>2011-12-07 13:33:00 -0800
commit799690bea0dbcf427bf7a9a813fec163eedf217d (patch)
tree540b6eaeebfeb327462a143479830d0ce044b794 /src/comp/syntax/parse/parser.rs
parentdfd699a8521c6fecd49b260e541764134c54b591 (diff)
downloadrust-799690bea0dbcf427bf7a9a813fec163eedf217d.tar.gz
rust-799690bea0dbcf427bf7a9a813fec163eedf217d.zip
Remove stmt_crate_directive, it's vestigial and confusing.
Diffstat (limited to 'src/comp/syntax/parse/parser.rs')
-rw-r--r--src/comp/syntax/parse/parser.rs19
1 files changed, 1 insertions, 18 deletions
diff --git a/src/comp/syntax/parse/parser.rs b/src/comp/syntax/parse/parser.rs
index 23ed2485f69..2bf7865bf81 100644
--- a/src/comp/syntax/parse/parser.rs
+++ b/src/comp/syntax/parse/parser.rs
@@ -1525,18 +1525,6 @@ fn parse_let(p: parser) -> @ast::decl {
 }
 
 fn parse_stmt(p: parser) -> @ast::stmt {
-    if p.get_file_type() == SOURCE_FILE {
-        ret parse_source_stmt(p);
-    } else { ret parse_crate_stmt(p); }
-}
-
-fn parse_crate_stmt(p: parser) -> @ast::stmt {
-    let cdir = parse_crate_directive(p, []);
-    ret @spanned(cdir.span.lo, cdir.span.hi,
-                 ast::stmt_crate_directive(@cdir));
-}
-
-fn parse_source_stmt(p: parser) -> @ast::stmt {
     let lo = p.get_lo_pos();
     if eat_word(p, "let") {
         let decl = parse_let(p);
@@ -1642,10 +1630,6 @@ fn stmt_ends_with_semi(stmt: ast::stmt) -> bool {
       ast::stmt_expr(e, _) {
         ret expr_has_value(e);
       }
-      // We should not be calling this on a cdir.
-      ast::stmt_crate_directive(cdir) {
-        fail;
-      }
     }
 }
 
@@ -1707,8 +1691,7 @@ fn parse_block_tail(p: parser, lo: uint, s: ast::blk_check_mode) -> ast::blk {
                 // Not an expression statement.
                 stmts += [stmt];
 
-                if p.get_file_type() == SOURCE_FILE &&
-                       stmt_ends_with_semi(*stmt) {
+                if stmt_ends_with_semi(*stmt) {
                     expect(p, token::SEMI);
                 }
               }