1 files changed, 8 insertions, 4 deletions

diff --git a/src/yuescript/yue_parser.cpp b/src/yuescript/yue_parser.cpp
index 3d12190..8325366 100755
--- a/src/yuescript/yue_parser.cpp
+++ b/src/yuescript/yue_parser.cpp
@@ -29,7 +29,8 @@ std::unordered_set<std::string> Keywords = {
         "until", "while", // Lua keywords
         "as", "class", "continue", "export", "extends",
         "from", "global", "import", "is", "macro",
-        "switch", "unless", "using", "when", "with" // Yue keywords
+        "switch", "try", "unless", "using", "when",
+        "with" // Yue keywords
 };
 
 YueParser::YueParser() {
@@ -229,8 +230,8 @@ YueParser::YueParser() {
         SwitchBlock = *EmptyLine >>
                 Advance >> Seperator >>
                 SwitchCase >>
-                *(+SpaceBreak >> SwitchCase) >>
-                -(+SpaceBreak >> SwitchElse) >>
+                *(Break >> *EmptyLine >> CheckIndent >> SwitchCase) >>
+                -(Break >> *EmptyLine >> CheckIndent >> SwitchElse) >>
                 PopIndent;
 
         Switch = Space >> key("switch") >> disable_do(Exp) >> -(Space >> key("do"))
@@ -299,6 +300,9 @@ YueParser::YueParser() {
                 return true;
         });
 
+        catch_block = Break >> *EmptyLine >> CheckIndent >> Space >> key("catch") >> Space >> Variable >> InBlock;
+        Try = Space >> key("try") >> (InBlock | Exp) >> -catch_block;
+
         Comprehension = sym('[') >> Exp >> Space >> CompInner >> sym(']');
         comp_value = sym(',') >> Exp;
         TblComprehension = sym('{') >> Exp >> -comp_value >> Space >> CompInner >> sym('}');
@@ -609,7 +613,7 @@ YueParser::YueParser() {
         const_value = (expr("nil") | expr("true") | expr("false")) >> not_(AlphaNum);
 
         SimpleValue = Space >> (const_value |
-                If | Switch | With | ClassDecl | ForEach | For | While | Do |
+                If | Switch | Try | With | ClassDecl | ForEach | For | While | Do |
                 unary_value | TblComprehension | TableLit | Comprehension |
                 FunLit | Num);