about summary refs log tree commit diff
path: root/src/comp/syntax
diff options
context:
space:
mode:
authorEric Holk <eholk@mozilla.com>2011-08-16 10:57:44 -0700
committerEric Holk <eholk@mozilla.com>2011-08-16 10:59:49 -0700
commit862bc521a16ac764bee4446f60858459c6e04860 (patch)
tree70bb0c06171ae662599773efa80ff57364201214 /src/comp/syntax
parentf05a91a0dca0bcbb9d9e20584923803df827e35b (diff)
Removing tasks, ports and chans from the compiler.
Diffstat (limited to 'src/comp/syntax')
-rw-r--r--src/comp/syntax/ast.rs5
-rw-r--r--src/comp/syntax/fold.rs14
-rw-r--r--src/comp/syntax/parse/parser.rs20
-rw-r--r--src/comp/syntax/print/pprust.rs34
-rw-r--r--src/comp/syntax/visit.rs8
5 files changed, 0 insertions, 81 deletions
diff --git a/src/comp/syntax/ast.rs b/src/comp/syntax/ast.rs
index bed8ce31c4c..53e00e8c6b4 100644
--- a/src/comp/syntax/ast.rs
+++ b/src/comp/syntax/ast.rs
@@ -298,7 +298,6 @@ tag expr_ {
     expr_tup([@expr]);
     expr_self_method(ident);
     expr_bind(@expr, [option::t[@expr]]);
-    expr_spawn(spawn_dom, option::t[str], @expr, [@expr]);
     expr_binary(binop, @expr, @expr);
     expr_unary(unop, @expr);
     expr_lit(@lit);
@@ -321,8 +320,6 @@ tag expr_ {
     expr_assign(@expr, @expr);
     expr_swap(@expr, @expr);
     expr_assign_op(binop, @expr, @expr);
-    expr_send(@expr, @expr);
-    expr_recv(@expr, @expr);
     expr_field(@expr, ident);
     expr_index(@expr, @expr);
     expr_path(path);
@@ -340,8 +337,6 @@ tag expr_ {
     /* FIXME Would be nice if expr_check desugared
        to expr_if_check. */
     expr_if_check(@expr, blk, option::t[@expr]);
-    expr_port(@ty);
-    expr_chan(@expr);
     expr_anon_obj(anon_obj);
     expr_mac(mac);
     expr_uniq(@expr);
diff --git a/src/comp/syntax/fold.rs b/src/comp/syntax/fold.rs
index 94dca5ef4cf..9cf9bf3e8b4 100644
--- a/src/comp/syntax/fold.rs
+++ b/src/comp/syntax/fold.rs
@@ -357,10 +357,6 @@ fn noop_fold_expr(e: &expr_, fld: ast_fold) -> expr_ {
             let opt_map_se = bind option::map(fld.fold_expr, _);
             expr_bind(fld.fold_expr(f), vec::map(opt_map_se, args))
           }
-          expr_spawn(spawn_dom, name, f, args) {
-            expr_spawn(spawn_dom, name, fld.fold_expr(f),
-                       fld.map_exprs(fld.fold_expr, args))
-          }
           expr_binary(binop, lhs, rhs) {
             expr_binary(binop, fld.fold_expr(lhs), fld.fold_expr(rhs))
           }
@@ -409,12 +405,6 @@ fn noop_fold_expr(e: &expr_, fld: ast_fold) -> expr_ {
           expr_assign_op(op, el, er) {
             expr_assign_op(op, fld.fold_expr(el), fld.fold_expr(er))
           }
-          expr_send(el, er) {
-            expr_send(fld.fold_expr(el), fld.fold_expr(er))
-          }
-          expr_recv(el, er) {
-            expr_recv(fld.fold_expr(el), fld.fold_expr(er))
-          }
           expr_field(el, id) {
             expr_field(fld.fold_expr(el), fld.fold_ident(id))
           }
@@ -435,10 +425,6 @@ fn noop_fold_expr(e: &expr_, fld: ast_fold) -> expr_ {
             expr_if_check(fld.fold_expr(cond), fld.fold_block(tr),
                           option::map(fld.fold_expr, fl))
           }
-          expr_port(t) {
-            expr_port(fld.fold_ty(t))
-          }
-          expr_chan(e) { expr_chan(fld.fold_expr(e)) }
           expr_anon_obj(ao) { expr_anon_obj(fold_anon_obj(ao)) }
           expr_mac(mac) { expr_mac(fold_mac(mac)) }
           expr_uniq(e) { expr_uniq(fld.fold_expr(e)) }
diff --git a/src/comp/syntax/parse/parser.rs b/src/comp/syntax/parse/parser.rs
index 2d61f6b214a..780d67b4b27 100644
--- a/src/comp/syntax/parse/parser.rs
+++ b/src/comp/syntax/parse/parser.rs
@@ -1351,21 +1351,6 @@ fn parse_alt_expr(p: &parser) -> @ast::expr {
     ret mk_expr(p, lo, hi, ast::expr_alt(discriminant, arms));
 }
 
-fn parse_spawn_expr(p: &parser) -> @ast::expr {
-    let lo = p.get_last_lo_pos();
-    // FIXME: Parse domain and name
-    // FIXME: why no full expr?
-
-    let fn_expr = parse_bottom_expr(p);
-    let es =
-        parse_seq(token::LPAREN, token::RPAREN, some(token::COMMA),
-                  parse_expr, p);
-    let hi = es.span.hi;
-    ret mk_expr(p, lo, hi,
-                ast::expr_spawn(ast::dom_implicit, option::none, fn_expr,
-                                es.node));
-}
-
 fn parse_expr(p: &parser) -> @ast::expr {
     ret parse_expr_res(p, UNRESTRICTED);
 }
@@ -1614,7 +1599,6 @@ fn stmt_ends_with_semi(stmt: &ast::stmt) -> bool {
               ast::expr_call(_, _) { true }
               ast::expr_self_method(_) { false }
               ast::expr_bind(_, _) { true }
-              ast::expr_spawn(_, _, _, _) { true }
               ast::expr_binary(_, _, _) { true }
               ast::expr_unary(_, _) { true }
               ast::expr_lit(_) { true }
@@ -1632,8 +1616,6 @@ fn stmt_ends_with_semi(stmt: &ast::stmt) -> bool {
               ast::expr_assign(_, _) { true }
               ast::expr_swap(_, _) { true }
               ast::expr_assign_op(_, _, _) { true }
-              ast::expr_send(_, _) { true }
-              ast::expr_recv(_, _) { true }
               ast::expr_field(_, _) { true }
               ast::expr_index(_, _) { true }
               ast::expr_path(_) { true }
@@ -1647,8 +1629,6 @@ fn stmt_ends_with_semi(stmt: &ast::stmt) -> bool {
               ast::expr_log(_, _) { true }
               ast::expr_check(_, _) { true }
               ast::expr_if_check(_, _, _) { false }
-              ast::expr_port(_) { true }
-              ast::expr_chan(_) { true }
               ast::expr_anon_obj(_) { false }
               ast::expr_assert(_) { true }
             }
diff --git a/src/comp/syntax/print/pprust.rs b/src/comp/syntax/print/pprust.rs
index 437b9652261..c3291314c70 100644
--- a/src/comp/syntax/print/pprust.rs
+++ b/src/comp/syntax/print/pprust.rs
@@ -783,13 +783,6 @@ fn print_expr(s: &ps, expr: &@ast::expr) {
         commasep(s, inconsistent, args, print_opt);
         pclose(s);
       }
-      ast::expr_spawn(_, _, e, es) {
-        word_nbsp(s, "spawn");
-        print_expr(s, e);
-        popen(s);
-        commasep_exprs(s, inconsistent, es);
-        pclose(s);
-      }
       ast::expr_binary(op, lhs, rhs) {
         let prec = operator_prec(op);
         print_maybe_parens(s, lhs, prec);
@@ -928,18 +921,6 @@ fn print_expr(s: &ps, expr: &@ast::expr) {
         word_space(s, "=");
         print_expr(s, rhs);
       }
-      ast::expr_send(lhs, rhs) {
-        print_expr(s, lhs);
-        space(s.s);
-        word_space(s, "<|");
-        print_expr(s, rhs);
-      }
-      ast::expr_recv(lhs, rhs) {
-        print_expr(s, lhs);
-        space(s.s);
-        word_space(s, "|>");
-        print_expr(s, rhs);
-      }
       ast::expr_field(expr, id) {
         print_expr_parens_if_unary(s, expr);
         word(s.s, ".");
@@ -997,21 +978,6 @@ fn print_expr(s: &ps, expr: &@ast::expr) {
         pclose(s);
       }
       ast::expr_mac(m) { print_mac(s, m); }
-      ast::expr_port(t) {
-        word(s.s, "port");
-        alt t.node {
-          ast::ty_infer. { }
-          _ { word(s.s, "["); print_type(s, t); word(s.s, "]"); }
-        }
-        popen(s);
-        pclose(s);
-      }
-      ast::expr_chan(expr) {
-        word(s.s, "chan");
-        popen(s);
-        print_expr(s, expr);
-        pclose(s);
-      }
       ast::expr_anon_obj(anon_obj) {
         head(s, "obj");
 
diff --git a/src/comp/syntax/visit.rs b/src/comp/syntax/visit.rs
index c4f6395c72f..2f259ddcc30 100644
--- a/src/comp/syntax/visit.rs
+++ b/src/comp/syntax/visit.rs
@@ -262,10 +262,6 @@ fn visit_expr[E](ex: &@expr, e: &E, v: &vt[E]) {
         v.visit_expr(callee, e, v);
         for eo: option::t[@expr] in args { visit_expr_opt(eo, e, v); }
       }
-      expr_spawn(_, _, callee, args) {
-        v.visit_expr(callee, e, v);
-        visit_exprs(args, e, v);
-      }
       expr_binary(_, a, b) { v.visit_expr(a, e, v); v.visit_expr(b, e, v); }
       expr_unary(_, a) { v.visit_expr(a, e, v); }
       expr_lit(_) { }
@@ -306,8 +302,6 @@ fn visit_expr[E](ex: &@expr, e: &E, v: &vt[E]) {
         v.visit_expr(b, e, v);
         v.visit_expr(a, e, v);
       }
-      expr_send(a, b) { v.visit_expr(a, e, v); v.visit_expr(b, e, v); }
-      expr_recv(a, b) { v.visit_expr(a, e, v); v.visit_expr(b, e, v); }
       expr_field(x, _) { v.visit_expr(x, e, v); }
       expr_index(a, b) { v.visit_expr(a, e, v); v.visit_expr(b, e, v); }
       expr_path(p) { for tp: @ty in p.node.types { v.visit_ty(tp, e, v); } }
@@ -320,8 +314,6 @@ fn visit_expr[E](ex: &@expr, e: &E, v: &vt[E]) {
       expr_log(_, x) { v.visit_expr(x, e, v); }
       expr_check(_, x) { v.visit_expr(x, e, v); }
       expr_assert(x) { v.visit_expr(x, e, v); }
-      expr_port(t) { v.visit_ty(t, e, v); }
-      expr_chan(x) { v.visit_expr(x, e, v); }
       expr_anon_obj(anon_obj) {
         alt anon_obj.fields {
           none. { }