about summary refs log tree commit diff
path: root/src/comp
diff options
context:
space:
mode:
authorGraydon Hoare <graydon@mozilla.com>2012-01-19 19:29:21 -0800
committerGraydon Hoare <graydon@mozilla.com>2012-01-19 19:29:21 -0800
commit7b1a8f0a911ac3b22ece888440758b70542d77b7 (patch)
treec99302652b4bcc41ac9f097ba6eee5fea30756de /src/comp
parenta23f188bdbff224337ca6bdcd164bb924d273eb5 (diff)
downloadrust-7b1a8f0a911ac3b22ece888440758b70542d77b7.tar.gz
rust-7b1a8f0a911ac3b22ece888440758b70542d77b7.zip
Additional ; to , changes, disable "tag" and ";" in parser. Close #1430. Close #1428.
Diffstat (limited to 'src/comp')
-rw-r--r--src/comp/middle/trans_alt.rs4
-rw-r--r--src/comp/middle/trans_common.rs6
-rw-r--r--src/comp/syntax/parse/parser.rs2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/comp/middle/trans_alt.rs b/src/comp/middle/trans_alt.rs
index 816c82de1e2..efdcd613fed 100644
--- a/src/comp/middle/trans_alt.rs
+++ b/src/comp/middle/trans_alt.rs
@@ -20,8 +20,8 @@ import trans_common::*;
 // range)
 enum opt {
     lit(@ast::expr),
-    var(/* disr val */int, /* variant dids */{tg: def_id, var: def_id});
-    range(@ast::expr, @ast::expr);
+    var(/* disr val */int, /* variant dids */{tg: def_id, var: def_id}),
+    range(@ast::expr, @ast::expr)
 }
 fn opt_eq(a: opt, b: opt) -> bool {
     alt (a, b) {
diff --git a/src/comp/middle/trans_common.rs b/src/comp/middle/trans_common.rs
index 64ac02e3125..3e83f3da2f3 100644
--- a/src/comp/middle/trans_common.rs
+++ b/src/comp/middle/trans_common.rs
@@ -338,21 +338,21 @@ enum block_kind {
     // in the source language.  Since these blocks create variable scope, any
     // variables created in them that are still live at the end of the block
     // must be dropped and cleaned up when the block ends.
-    SCOPE_BLOCK;
+    SCOPE_BLOCK,
 
 
     // A basic block created from the body of a loop.  Contains pointers to
     // which block to jump to in the case of "continue" or "break", with the
     // "continue" block optional, because "while" and "do while" don't support
     // "continue" (TODO: is this intentional?)
-    LOOP_SCOPE_BLOCK(option::t<@block_ctxt>, @block_ctxt);
+    LOOP_SCOPE_BLOCK(option::t<@block_ctxt>, @block_ctxt),
 
 
     // A non-scope block is a basic block created as a translation artifact
     // from translating code that expresses conditional logic rather than by
     // explicit { ... } block structure in the source language.  It's called a
     // non-scope block because it doesn't introduce a new variable scope.
-    NON_SCOPE_BLOCK;
+    NON_SCOPE_BLOCK
 }
 
 
diff --git a/src/comp/syntax/parse/parser.rs b/src/comp/syntax/parse/parser.rs
index ae0cf5bef60..46b6c474363 100644
--- a/src/comp/syntax/parse/parser.rs
+++ b/src/comp/syntax/parse/parser.rs
@@ -2074,7 +2074,7 @@ fn parse_item_tag(p: parser, attrs: [ast::attribute]) -> @ast::item {
             }
 
             alt p.token {
-              token::SEMI | token::COMMA {
+              token::COMMA {
                 p.bump();
                 if p.token == token::RBRACE { done = true; }
               }