Run reformatter

greatgoogleymoogley · Oct 29, 2017 · 79577a6 · 79577a6
1 parent 381d7dd
commit 79577a6
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 49 deletions.
diff --git a/cmd/jsonnet.cpp b/cmd/jsonnet.cpp
@@ -741,8 +741,8 @@ int main(int argc, const char **argv)
 
                 // Write output JSON.
                 if (config.evalMulti) {
-                    if (!write_multi_output_files(vm, output, config.evalMultiOutputDir,
-                                                  config.outputFile)) {
+                    if (!write_multi_output_files(
+                            vm, output, config.evalMultiOutputDir, config.outputFile)) {
                         jsonnet_destroy(vm);
                         return EXIT_FAILURE;
                     }

diff --git a/core/desugarer.cpp b/core/desugarer.cpp
@@ -647,13 +647,13 @@ class Desugarer {
             // TODO(dcunnin): Abstract this into a template function if it becomes more common.
             AST *file = ast->file;
             desugar(file, obj_level);
-            ast->file = dynamic_cast<LiteralString*>(file);
+            ast->file = dynamic_cast<LiteralString *>(file);
 
         } else if (auto *ast = dynamic_cast<Importstr *>(ast_)) {
             // TODO(dcunnin): Abstract this into a template function if it becomes more common.
             AST *file = ast->file;
             desugar(file, obj_level);
-            ast->file = dynamic_cast<LiteralString*>(file);
+            ast->file = dynamic_cast<LiteralString *>(file);
 
         } else if (auto *ast = dynamic_cast<InSuper *>(ast_)) {
             desugar(ast->element, obj_level);

diff --git a/core/json.h b/core/json.h
@@ -38,7 +38,9 @@ struct JsonnetJsonValue {
     JsonnetJsonValue(JsonnetJsonValue&&) = default;
 
     JsonnetJsonValue(Kind kind, std::string string, double number)
-        : kind(kind), string(string), number(number) {}
+        : kind(kind), string(string), number(number)
+    {
+    }
 
     Kind kind;
     std::string string;

diff --git a/core/lexer.cpp b/core/lexer.cpp
@@ -80,9 +80,7 @@ static void lex_ws(const char *&c, unsigned &new_lines, unsigned &indent, const
                 line_start = c + 1;
                 break;
 
-            case ' ':
-                indent += 1;
-                break;
+            case ' ': indent += 1; break;
 
             // This only works for \t at the beginning of lines, but we strip it everywhere else
             // anyway.  The only case where this will cause a problem is spaces followed by \t

diff --git a/core/parser.cpp b/core/parser.cpp
@@ -688,8 +688,7 @@ class Parser {
 
             case Token::TRUE: return alloc->make<LiteralBoolean>(span(tok), tok.fodder, true);
 
-            case Token::NULL_LIT:
-                return alloc->make<LiteralNull>(span(tok), tok.fodder);
+            case Token::NULL_LIT: return alloc->make<LiteralNull>(span(tok), tok.fodder);
 
             // Variables
             case Token::DOLLAR: return alloc->make<Dollar>(span(tok), tok.fodder);

diff --git a/core/string_utils.h b/core/string_utils.h
@@ -22,7 +22,6 @@ limitations under the License.
 /** Unparse the string. */
 UString jsonnet_string_unparse(const UString &str, bool single);
 
-
 // Note that the following two functions do not handle the quoting of ' and "
 // inside verbatim strings because that quoting is reversible.  Thus, that
 // quoting is done at lexing time and undone again at pretty-printing time.

diff --git a/core/vm.cpp b/core/vm.cpp
@@ -2086,23 +2086,15 @@ class Interpreter {
 
                                 case Value::BOOLEAN:
                                     args2.emplace_back(
-                                        JsonnetJsonValue::BOOL,
-                                        "",
-                                        arg.v.b ? 1.0 : 0.0);
+                                        JsonnetJsonValue::BOOL, "", arg.v.b ? 1.0 : 0.0);
                                     break;
 
                                 case Value::NUMBER:
-                                    args2.emplace_back(
-                                        JsonnetJsonValue::NUMBER,
-                                        "",
-                                        arg.v.d);
+                                    args2.emplace_back(JsonnetJsonValue::NUMBER, "", arg.v.d);
                                     break;
 
                                 case Value::NULL_TYPE:
-                                    args2.emplace_back(
-                                        JsonnetJsonValue::NULL_KIND,
-                                        "",
-                                        0);
+                                    args2.emplace_back(JsonnetJsonValue::NULL_KIND, "", 0);
                                     break;
 
                                 default:
@@ -2256,7 +2248,8 @@ class Interpreter {
                         long sz = array->elements.size();
                         if (index < 0 || index >= sz) {
                             std::stringstream ss;
-                            ss << "Array bounds error: " << index << " not within [0, " << sz << ")";
+                            ss << "Array bounds error: " << index << " not within [0, " << sz
+                               << ")";
                             throw makeError(ast.location, ss.str());
                         }
                         if (scratch.v.d != index) {

diff --git a/stdlib/to_c_array.cpp b/stdlib/to_c_array.cpp
@@ -7,35 +7,36 @@
 #include <iostream>
 #include <iterator>
 
-int main(int argc, char *argv[]) {
-  if (argc < 3) {
-    std::cerr << "usage: to_c_array <infile> <outfile>\n";
-    return 1;
-  }
+int main(int argc, char *argv[])
+{
+    if (argc < 3) {
+        std::cerr << "usage: to_c_array <infile> <outfile>\n";
+        return 1;
+    }
 
-  std::ifstream in_file(argv[1]);
-  if (!in_file.is_open()) {
-    std::cerr << "Can't open input file.";
-    return 1;
-  }
+    std::ifstream in_file(argv[1]);
+    if (!in_file.is_open()) {
+        std::cerr << "Can't open input file.";
+        return 1;
+    }
 
-  std::ofstream out_file(argv[2]);
-  if (!out_file.is_open()) {
-    std::cerr << "Can't open output file.";
-    return 1;
-  }
+    std::ofstream out_file(argv[2]);
+    if (!out_file.is_open()) {
+        std::cerr << "Can't open output file.";
+        return 1;
+    }
 
-  char c;
-  bool first_character = true;
-  while (in_file.get(c)) {
-    if (first_character) {
-      first_character = false;
-    } else {
-      out_file << ",";
+    char c;
+    bool first_character = true;
+    while (in_file.get(c)) {
+        if (first_character) {
+            first_character = false;
+        } else {
+            out_file << ",";
+        }
+        // Write byte value of c to stdout.
+        out_file << (int)c;
     }
-    // Write byte value of c to stdout.
-    out_file << (int)c;
-  }
 
-  return 0;
+    return 0;
 }