firefly-compiler 0.4.78 → 0.4.80

package/compiler/Builder.ff

@@ -145,11 +145,11 @@ check(
                 } else {
                     compiler.resolve(resolvedDependencies.mainPackagePair, localFile.dropLast(".ff".size()))
                 }
-            } catch {| CompileError(_, _) @ c, error =>
+            } tryCatch {| CompileError(_, _) @ c, error =>
                 errors.push(c)
             } catch {| CompileErrors(compileErrors), error =>
                 errors.pushList(compileErrors)
-            } grab()
+            }
         }
         cache.mergeVersions(compiler.cache)
     }

package/compiler/Compiler.ff

@@ -168,7 +168,7 @@ extend self: Compiler {
             } catch {| CompileError(_, _) @ e, error =>
                 let newError = CompileError(import.at, "Parse error in imported module: " + import.package.groupName() + "/" + newModuleName)
                 throw(CompileErrors([e, newError]))
-            } grab()
+            }
         }
     }
 

package/compiler/Inference.ff

@@ -479,7 +479,8 @@ extend self: Inference {
                                     | a => a
                                 })
                             | ECall e {e.target | DynamicCall c} {c.function | EField f} {
-                                f.field == "else" || f.field == "elseIf" || f.field == "grab" ||
+                                f.field == "else" || f.field == "elseIf" ||
+                                f.field == "tryCatch" || f.field == "tryCatchAny" || f.field == "tryFinally" ||
                                 f.field == "catch" || f.field == "catchAny" || f.field == "finally"
                             } =>
                                 e.ECall(target = c.DynamicCall(function = f.EField(record = semicolonUnit(f.record))))

package/compiler/JsEmitter.ff

@@ -86,7 +86,7 @@ extend self: JsEmitter {
             body()
         } finally {
             self.emittingAsync = False
-        } grab()
+        }
     }
 
     emitRun(functions: List[DFunction], mainPackagePair: PackagePair, bootstrapping: Bool): List[String] {
@@ -533,22 +533,16 @@ extend self: JsEmitter {
                 let d = self.emitDictionary(dictionary)
                 let a = self.emitArgument(at, argument, async)
                 "throw Object.assign(new Error(), {ffException: ff_core_Any.toAny_(" + a + ", " + d + ")})"
-            | ECall(at, StaticCall("ff:core/Core.try", _, _), _, _, _, _) {!last} =>
-                throw(CompileError(at, "Statements can't be a try without a grab"))
-            | ECall(at, StaticCall("ff:core/Try.Try_map", _, _), _, _, _, _) {!last} =>
-                throw(CompileError(at, "Statements can't be a map without a grab"))
-            | ECall(at, StaticCall("ff:core/Try.Try_flatMap", _, _), _, _, _, _) {!last} =>
-                throw(CompileError(at, "Statements can't be a flatMap without a grab"))
-            | ECall(at, StaticCall("ff:core/Try.Try_flatten", _, _), _, _, _, _) {!last} =>
-                throw(CompileError(at, "Statements can't be a flatten without a grab"))
-            | ECall(at, StaticCall("ff:core/Try.Try_catch", _, _), _, _, _, _) {!last} =>
-                throw(CompileError(at, "Statements can't be a catch without a grab"))
-            | ECall(at, StaticCall("ff:core/Try.Try_catchAny", _, _), _, _, _, _) {!last} =>
-                throw(CompileError(at, "Statements can't be a catchAny without a grab"))
-            | ECall(at, StaticCall("ff:core/Try.Try_finally", _, _), _, _, _, _) {!last} =>
-                throw(CompileError(at, "Statements can't be a finally without a grab"))
-            | ECall(at, StaticCall("ff:core/Try.Try_grab", _, _), _, _, [argument], _) {
-                self.emitTryCatchFinally(argument.value, last, async) | Some(code)
+            | ECall(at, StaticCall("ff:core/Try.Try_catch", _, _), _, _, _, _) {
+                self.emitTryCatchFinally(term, last, async) | Some(code)
+            } =>
+                code
+            | ECall(at, StaticCall("ff:core/Try.Try_catchAny", _, _), _, _, _, _) {
+                self.emitTryCatchFinally(term, last, async) | Some(code)
+            } =>
+                code
+            | ECall(at, StaticCall("ff:core/Try.Try_finally", _, _), _, _, _, _) {
+                self.emitTryCatchFinally(term, last, async) | Some(code)
             } =>
                 code
             | ECall(at, StaticCall("ff:unsafejs/UnsafeJs.throwIfCancelled", _, _), _, _, [], _) =>

package/compiler/Main.ff

@@ -148,9 +148,9 @@ main(system: NodeSystem): Unit {
     try {
         let command = parseCommandLine(system.arguments())
         runCommand(command)
-    } catch {| CommandLineError(message), _ =>
+    } tryCatch {| CommandLineError(message), _ =>
         Log.debug(message)
-    } catch {| CompileError(at, message), _ =>
+    } tryCatch {| CompileError(at, message), _ =>
         Log.debug(message)
         Log.debug(" at " + at.file.replace("./", "") + ":" + at.line + ":" + at.column)
     } catch {| CompileErrors(errors), _ =>
@@ -158,7 +158,7 @@ main(system: NodeSystem): Unit {
             Log.debug(message)
             Log.debug(" at " + at.file.replace("./", "") + ":" + at.line + ":" + at.column)
         }
-    } grab()
+    }
 }
 
 usageString = """

package/compiler/ModuleCache.ff

@@ -150,7 +150,7 @@ extend self: ModuleCache {
         } catchAny {error =>
             self.emittedModules = self.emittedModules.remove(path.absolute())
             error.rethrow()
-        } grab()
+        }
     }
     
 }

package/compiler/Tokenizer.ff

@@ -268,7 +268,7 @@ tokenize(file: String, code: String, completionAt: Option[Location], attemptFixe
         }
     } catch {| GrabException e, error =>
         throw(CompileError(Location(file, line, i - lineOffset), "Unexpected end of file"))
-    } grab()
+    }
 
     List.range(5).each {_ => emitToken(LEnd, i, i) }
 

package/compiler/Unification.ff

@@ -67,7 +67,7 @@ extend self: Unification {
             body()
         } finally {
             self.instances = oldInstances
-        } grab()
+        }
     }
 
     freshUnificationVariable(at: Location): Type {