Merge pull request #1631 from j-clark/patch-2

Added to bad_expr_word_table reserved words

Author: brson

src/comp/syntax/parse/parser.rs

@@ -1,4 +1,3 @@
-
 import core::{vec, str, option, either, result};
 import std::{io, fs};
 import option::{some, none};
@@ -150,7 +149,9 @@ fn bad_expr_word_table() -> hashmap<str, ()> {
                  "cont", "ret", "be", "fail", "type", "resource", "check",
                  "assert", "claim", "native", "fn", "pure",
                  "unsafe", "import", "export", "let", "const",
-                 "log", "copy", "sendfn", "impl", "iface", "enum"] {
+                 "log", "copy", "sendfn", "impl", "iface", "enum",
+                 "m32", "m64", "m128", "f80", "f16", f128",
+                 "class", "trait"] {
         words.insert(word, ());
     }
     words