From 5561bef6d8aac5b8f0a658a470ef75ba643190de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw=20Barzowski?= <sbarzowski@google.com>
Date: Fri, 21 Jul 2017 15:17:13 -0400
Subject: [PATCH] Treat TRY/CATCH macros as block start and end

---
 .clang-format       |  4 ++--
 core/libjsonnet.cpp | 50 +++++++++++++++++++++++++++------------------
 2 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/.clang-format b/.clang-format
index 13df42c10..090d7883c 100644
--- a/.clang-format
+++ b/.clang-format
@@ -52,8 +52,8 @@ IndentWrappedFunctionNames: false
 JavaScriptQuotes: Leave
 JavaScriptWrapImports: true
 KeepEmptyLinesAtTheStartOfBlocks: false
-MacroBlockBegin: ''
-MacroBlockEnd:   ''
+MacroBlockBegin: '^TRY$'
+MacroBlockEnd:   '^CATCH$'
 MaxEmptyLinesToKeep: 1
 NamespaceIndentation: None
 PenaltyBreakAssignment: 2
diff --git a/core/libjsonnet.cpp b/core/libjsonnet.cpp
index 8f6d688c8..e979739d6 100644
--- a/core/libjsonnet.cpp
+++ b/core/libjsonnet.cpp
@@ -284,14 +284,16 @@ const char *jsonnet_version(void)
 
 JsonnetVm *jsonnet_make(void)
 {
-    TRY return new JsonnetVm();
+    TRY
+        return new JsonnetVm();
     CATCH("jsonnet_make")
     return nullptr;
 }
 
 void jsonnet_destroy(JsonnetVm *vm)
 {
-    TRY delete vm;
+    TRY
+        delete vm;
     CATCH("jsonnet_destroy")
 }
 
@@ -444,25 +446,27 @@ static char *jsonnet_fmt_snippet_aux(JsonnetVm *vm, const char *filename, const
 
 char *jsonnet_fmt_file(JsonnetVm *vm, const char *filename, int *error)
 {
-    TRY std::ifstream f;
-    f.open(filename);
-    if (!f.good()) {
-        std::stringstream ss;
-        ss << "Opening input file: " << filename << ": " << strerror(errno);
-        *error = true;
-        return from_string(vm, ss.str());
-    }
-    std::string input;
-    input.assign(std::istreambuf_iterator<char>(f), std::istreambuf_iterator<char>());
+    TRY
+        std::ifstream f;
+        f.open(filename);
+        if (!f.good()) {
+            std::stringstream ss;
+            ss << "Opening input file: " << filename << ": " << strerror(errno);
+            *error = true;
+            return from_string(vm, ss.str());
+        }
+        std::string input;
+        input.assign(std::istreambuf_iterator<char>(f), std::istreambuf_iterator<char>());
 
-    return jsonnet_fmt_snippet_aux(vm, filename, input.c_str(), error);
+        return jsonnet_fmt_snippet_aux(vm, filename, input.c_str(), error);
     CATCH("jsonnet_fmt_file")
     return nullptr;  // Never happens.
 }
 
 char *jsonnet_fmt_snippet(JsonnetVm *vm, const char *filename, const char *snippet, int *error)
 {
-    TRY return jsonnet_fmt_snippet_aux(vm, filename, snippet, error);
+    TRY
+        return jsonnet_fmt_snippet_aux(vm, filename, snippet, error);
     CATCH("jsonnet_fmt_snippet")
     return nullptr;  // Never happens.
 }
@@ -621,28 +625,32 @@ static char *jsonnet_evaluate_file_aux(JsonnetVm *vm, const char *filename, int
 
 char *jsonnet_evaluate_file(JsonnetVm *vm, const char *filename, int *error)
 {
-    TRY return jsonnet_evaluate_file_aux(vm, filename, error, REGULAR);
+    TRY
+        return jsonnet_evaluate_file_aux(vm, filename, error, REGULAR);
     CATCH("jsonnet_evaluate_file")
     return nullptr;  // Never happens.
 }
 
 char *jsonnet_evaluate_file_multi(JsonnetVm *vm, const char *filename, int *error)
 {
-    TRY return jsonnet_evaluate_file_aux(vm, filename, error, MULTI);
+    TRY
+        return jsonnet_evaluate_file_aux(vm, filename, error, MULTI);
     CATCH("jsonnet_evaluate_file_multi")
     return nullptr;  // Never happens.
 }
 
 char *jsonnet_evaluate_file_stream(JsonnetVm *vm, const char *filename, int *error)
 {
-    TRY return jsonnet_evaluate_file_aux(vm, filename, error, STREAM);
+    TRY
+        return jsonnet_evaluate_file_aux(vm, filename, error, STREAM);
     CATCH("jsonnet_evaluate_file_stream")
     return nullptr;  // Never happens.
 }
 
 char *jsonnet_evaluate_snippet(JsonnetVm *vm, const char *filename, const char *snippet, int *error)
 {
-    TRY return jsonnet_evaluate_snippet_aux(vm, filename, snippet, error, REGULAR);
+    TRY
+        return jsonnet_evaluate_snippet_aux(vm, filename, snippet, error, REGULAR);
     CATCH("jsonnet_evaluate_snippet")
     return nullptr;  // Never happens.
 }
@@ -650,7 +658,8 @@ char *jsonnet_evaluate_snippet(JsonnetVm *vm, const char *filename, const char *
 char *jsonnet_evaluate_snippet_multi(JsonnetVm *vm, const char *filename, const char *snippet,
                                      int *error)
 {
-    TRY return jsonnet_evaluate_snippet_aux(vm, filename, snippet, error, MULTI);
+    TRY
+        return jsonnet_evaluate_snippet_aux(vm, filename, snippet, error, MULTI);
     CATCH("jsonnet_evaluate_snippet_multi")
     return nullptr;  // Never happens.
 }
@@ -658,7 +667,8 @@ char *jsonnet_evaluate_snippet_multi(JsonnetVm *vm, const char *filename, const
 char *jsonnet_evaluate_snippet_stream(JsonnetVm *vm, const char *filename, const char *snippet,
                                       int *error)
 {
-    TRY return jsonnet_evaluate_snippet_aux(vm, filename, snippet, error, STREAM);
+    TRY
+        return jsonnet_evaluate_snippet_aux(vm, filename, snippet, error, STREAM);
     CATCH("jsonnet_evaluate_snippet_stream")
     return nullptr;  // Never happens.
 }