clean up @marchaefner's #197

michaelficarra · May 7, 2013 · 1a9361b · 1a9361b
1 parent 37a7cef
commit 1a9361b
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 14 deletions.
diff --git a/lib/compiler.js b/lib/compiler.js
diff --git a/lib/nodes.js b/lib/nodes.js
diff --git a/lib/parser.js b/lib/parser.js
diff --git a/src/compiler.coffee b/src/compiler.coffee
@@ -500,8 +500,8 @@ class exports.Compiler
       cases
     ]
     [CS.Try, ({body, catchAssignee, catchBody, finallyBody}) ->
-      finallyBlock = if @hasFinally then forceBlock finallyBody else null
-      if @hasCatch or not @hasFinally
+      finallyBlock = if @finallyBody? then forceBlock finallyBody else null
+      if @catchBody? or not @finallyBody?
         e = genSym 'e'
         catchBlock = forceBlock catchBody
         if catchAssignee?

diff --git a/src/grammar.pegjs b/src/grammar.pegjs
@@ -691,7 +691,7 @@ loop
 
 try
   = TRY body:tryBody c:catchClause? f:finallyClause? {
-      return rp(new CS.Try(!!c, !!f, body.block, c ? c.assignee : null, c ? c.block : null, f ? f.block : null));
+      return rp(new CS.Try(body.block, c ? c.assignee : null, c ? c.block : null, f ? f.block : null));
     }
   tryBody = b:functionBody { return {block: b}; }
   catchClause

diff --git a/src/nodes.coffee b/src/nodes.coffee
@@ -152,7 +152,7 @@ createNodes
     ForOf: [['isOwn', 'keyAssignee', 'valAssignee', 'target', 'filter', 'body']] # :: bool -> Assignable -> Maybe Assignable -> Exprs -> Maybe Exprs -> Maybe Exprs -> ForOf
     Switch: [['expression', 'cases', 'alternate']] # :: Maybe Exprs -> [SwitchCase] -> Maybe Exprs -> Switch
     SwitchCase: [['conditions', 'consequent']] # :: [Exprs] -> Maybe Expr -> SwitchCase
-    Try: [['hasCatch', 'hasFinally', 'body', 'catchAssignee', 'catchBody', 'finallyBody']] # :: bool -> bool -> Exprs -> Maybe Assignable -> Maybe Exprs -> Maybe Exprs -> Try
+    Try: [['body', 'catchAssignee', 'catchBody', 'finallyBody']] # :: Exprs -> Maybe Assignable -> Maybe Exprs -> Maybe Exprs -> Try
     While: [['condition', 'body']] # :: Exprs -> Maybe Exprs -> While
 
     ArrayInitialiser: [['members']] # :: [ArrayInitialiserMembers] -> ArrayInitialiser
@@ -203,7 +203,7 @@ createNodes
   ArrayInitialiser, ObjectInitialiser, NegatedConditional, Conditional,
   Identifier, ForOf, Functions, While, Class, Block, NewOp, Bool,
   FunctionApplications, RegExps, RegExp, HeregExp, Super, Slice, Switch,
-  Identifiers, SwitchCase, GenSym, Try
+  Identifiers, SwitchCase, GenSym
 } = exports
 
 
@@ -273,7 +273,6 @@ handlePrimitives Range, 'isInclusive'
 handlePrimitives RegExp, 'data', 'flags'
 handlePrimitives Slice, 'isInclusive'
 handlePrimitives StaticMemberAccessOps, 'memberName'
-handlePrimitives Try, 'hasCatch', 'hasFinally'
 
 
 ## Nodes that contain list properties