Braces style: Linux -> WebKit

.clang-format

@@ -21,7 +21,7 @@ AlwaysBreakTemplateDeclarations: true
 BinPackArguments: false
 BinPackParameters: true
 BreakBeforeBinaryOperators: None
-BreakBeforeBraces: Linux
+BreakBeforeBraces: WebKit
 BreakBeforeInheritanceComma: false
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: false

core/ast.h

@@ -893,8 +893,7 @@ struct Var : public AST {
 
 /** Allocates ASTs on demand, frees them in its destructor.
  */
-class Allocator
-{
+class Allocator {
     std::map<UString, const Identifier *> internedIdentifiers;
     ASTs allocated;
 
@@ -941,8 +940,7 @@ class Allocator
     }
 };
 
-namespace
-{
+namespace {
 // Precedences used by various compilation units are defined here.
 const int APPLY_PRECEDENCE = 2;         // Function calls and indexing.
 const int UNARY_PRECEDENCE = 4;         // Logical and bitwise negation, unary + -

core/desugarer.cpp

@@ -82,8 +82,7 @@ static constexpr char STD_CODE[] = {
  * Temporary variables introduced here should be prefixed with $ to ensure they do not clash with
  * variables used in user code.
  */
-class Desugarer
-{
+class Desugarer {
     Allocator *alloc;
 
     template <class T, class... Args>
@@ -316,8 +315,7 @@ class Desugarer
          *
          * Returns all variables and original expressions via super_vars.
          */
-        class SubstituteSelfSuper : public CompilerPass
-        {
+        class SubstituteSelfSuper : public CompilerPass {
             Desugarer *desugarer;
             SuperVars &superVars;
             unsigned &counter;

core/formatter.cpp

@@ -123,8 +123,7 @@ static void fodder_count(unsigned &column, const Fodder &fodder, bool space_befo
         column++;
 }
 
-class Unparser
-{
+class Unparser {
    public:
    private:
     std::ostream &o;
@@ -640,17 +639,15 @@ static void fodder_move_front(Fodder &a, Fodder &b)
 
 /** A generic Pass that does nothing but can be extended to easily define real passes.
  */
-class FmtPass : public CompilerPass
-{
+class FmtPass : public CompilerPass {
    protected:
     FmtOpts opts;
 
    public:
     FmtPass(Allocator &alloc, const FmtOpts &opts) : CompilerPass(alloc), opts(opts) {}
 };
 
-class EnforceStringStyle : public FmtPass
-{
+class EnforceStringStyle : public FmtPass {
     using FmtPass::visit;
 
    public:
@@ -685,8 +682,7 @@ class EnforceStringStyle : public FmtPass
     }
 };
 
-class EnforceCommentStyle : public FmtPass
-{
+class EnforceCommentStyle : public FmtPass {
    public:
     bool firstFodder;
     EnforceCommentStyle(Allocator &alloc, const FmtOpts &opts)
@@ -726,8 +722,7 @@ class EnforceCommentStyle : public FmtPass
     }
 };
 
-class EnforceMaximumBlankLines : public FmtPass
-{
+class EnforceMaximumBlankLines : public FmtPass {
    public:
     EnforceMaximumBlankLines(Allocator &alloc, const FmtOpts &opts) : FmtPass(alloc, opts) {}
     void fodderElement(FodderElement &f)
@@ -738,8 +733,7 @@ class EnforceMaximumBlankLines : public FmtPass
     }
 };
 
-class StripComments : public FmtPass
-{
+class StripComments : public FmtPass {
    public:
     StripComments(Allocator &alloc, const FmtOpts &opts) : FmtPass(alloc, opts) {}
     void fodder(Fodder &fodder)
@@ -753,8 +747,7 @@ class StripComments : public FmtPass
     }
 };
 
-class StripEverything : public FmtPass
-{
+class StripEverything : public FmtPass {
    public:
     StripEverything(Allocator &alloc, const FmtOpts &opts) : FmtPass(alloc, opts) {}
     void fodder(Fodder &fodder)
@@ -763,8 +756,7 @@ class StripEverything : public FmtPass
     }
 };
 
-class StripAllButComments : public FmtPass
-{
+class StripAllButComments : public FmtPass {
    public:
     StripAllButComments(Allocator &alloc, const FmtOpts &opts) : FmtPass(alloc, opts) {}
     Fodder comments;
@@ -814,8 +806,7 @@ bool contains_newline(const Fodder &fodder)
 }
 
 /* Commas should appear at the end of an object/array only if the closing token is on a new line. */
-class FixTrailingCommas : public FmtPass
-{
+class FixTrailingCommas : public FmtPass {
     using FmtPass::visit;
 
    public:
@@ -889,8 +880,7 @@ class FixTrailingCommas : public FmtPass
 };
 
 /* Remove nested parens. */
-class FixParens : public FmtPass
-{
+class FixParens : public FmtPass {
     using FmtPass::visit;
 
    public:
@@ -908,8 +898,7 @@ class FixParens : public FmtPass
 };
 
 /* Ensure ApplyBrace syntax sugar is used in the case of A + { }. */
-class FixPlusObject : public FmtPass
-{
+class FixPlusObject : public FmtPass {
     using FmtPass::visit;
 
    public:
@@ -933,8 +922,7 @@ class FixPlusObject : public FmtPass
 };
 
 /* Remove final colon in slices. */
-class NoRedundantSliceColon : public FmtPass
-{
+class NoRedundantSliceColon : public FmtPass {
     using FmtPass::visit;
 
    public:
@@ -954,8 +942,7 @@ class NoRedundantSliceColon : public FmtPass
 };
 
 /* Ensure syntax sugar is used where possible. */
-class PrettyFieldNames : public FmtPass
-{
+class PrettyFieldNames : public FmtPass {
     using FmtPass::visit;
 
    public:
@@ -1024,8 +1011,7 @@ class PrettyFieldNames : public FmtPass
     }
 };
 
-class FixIndentation
-{
+class FixIndentation {
     FmtOpts opts;
     unsigned column;
 

core/lexer_test.cpp

@@ -19,8 +19,7 @@ limitations under the License.
 #include <list>
 #include "gtest/gtest.h"
 
-namespace
-{
+namespace {
 void testLex(const char* name, const char* input, const std::list<Token>& tokens,
              const std::string& error)
 {

core/libjsonnet.cpp

@@ -467,8 +467,7 @@ char *jsonnet_fmt_snippet(JsonnetVm *vm, const char *filename, const char *snipp
     return nullptr;  // Never happens.
 }
 
-namespace
-{
+namespace {
 enum EvalKind { REGULAR, MULTI, STREAM };
 }  // namespace
 

core/parser.cpp

@@ -45,8 +45,7 @@ std::string jsonnet_unparse_number(double v)
     return ss.str();
 }
 
-namespace
-{
+namespace {
 static bool op_is_unary(const std::string &op, UnaryOp &uop)
 {
     auto it = unary_map.find(op);
@@ -82,8 +81,7 @@ LocationRange span(const Token &begin, AST *end)
 
 /** Holds state while parsing a given token list.
  */
-class Parser
-{
+class Parser {
     // The private member functions are utilities for dealing with the token stream.
 
     StaticError unexpected(const Token &tok, const std::string &while_)

core/parser_test.cpp

@@ -21,8 +21,7 @@ limitations under the License.
 #include "gtest/gtest.h"
 #include "lexer.h"
 
-namespace
-{
+namespace {
 // Checks whether the provided snippet parses successfully.
 // TODO(dzc): Update this test to check the parsed AST against an expected AST.
 void testParse(const char* snippet)

core/pass.cpp

@@ -361,8 +361,7 @@ void CompilerPass::file(AST *&body, Fodder &final_fodder)
 }
 
 /** A pass that clones the AST it is given. */
-class ClonePass : public CompilerPass
-{
+class ClonePass : public CompilerPass {
    public:
     ClonePass(Allocator &alloc) : CompilerPass(alloc) {}
     virtual void expr(AST *&ast);

core/pass.h

@@ -21,8 +21,7 @@ limitations under the License.
 
 /** A generic Pass that does nothing but can be extended to easily define real passes.
  */
-class CompilerPass
-{
+class CompilerPass {
    public:
    protected:
     Allocator &alloc;

core/state.h

@@ -17,8 +17,7 @@ limitations under the License.
 #ifndef JSONNET_STATE_H
 #define JSONNET_STATE_H
 
-namespace
-{
+namespace {
 /** Mark & sweep: advanced by 1 each GC cycle.
  */
 typedef unsigned char GarbageCollectionMark;
@@ -261,8 +260,7 @@ struct HeapString : public HeapEntity {
 };
 
 /** The heap does memory management, i.e. garbage collection. */
-class Heap
-{
+class Heap {
     /** How many objects must exist in the heap before we bother doing garbage collection?
      */
     unsigned gcTuneMinObjects;

core/unicode.h

@@ -145,8 +145,7 @@ static inline UString decode_utf8(const std::string &s)
 /** A stringstream-like class capable of holding unicode codepoints.
  * The C++ standard does not support std::basic_stringstream<char32_t.
  */
-class UStringStream
-{
+class UStringStream {
     UString buf;
 
    public:

core/vm.cpp

@@ -30,8 +30,7 @@ limitations under the License.
 #include "string_utils.h"
 #include "vm.h"
 
-namespace
-{
+namespace {
 /** Turn a path e.g. "/a/b/c" into a dir, e.g. "/a/b/".  If there is no path returns "".
  */
 std::string dir_name(const std::string &path)
@@ -204,8 +203,7 @@ struct Frame {
 };
 
 /** The stack holds all the stack frames and manages the stack frame limit. */
-class Stack
-{
+class Stack {
     /** How many call frames are on the stack. */
     unsigned calls;
 
@@ -446,8 +444,7 @@ typedef const AST *(Interpreter::*BuiltinFunc)(const LocationRange &loc,
  * All reachable entities have their mark field incremented.  Then all entities with the old
  * mark are removed from the heap.
  */
-class Interpreter
-{
+class Interpreter {
     /** The heap. */
     Heap heap;
 

cpp/libjsonnet++.cpp

@@ -16,8 +16,7 @@ limitations under the License.
 
 #include "libjsonnet++.h"
 
-namespace jsonnet
-{
+namespace jsonnet {
 Jsonnet::Jsonnet() {}
 
 Jsonnet::~Jsonnet()
@@ -111,8 +110,7 @@ bool Jsonnet::evaluateSnippet(const std::string& filename, const std::string& sn
     return true;
 }
 
-namespace
-{
+namespace {
 void parseMultiOutput(const char* jsonnet_output, std::map<std::string, std::string>* outputs)
 {
     for (const char* c = jsonnet_output; *c != '\0';) {

cpp/libjsonnet++_test.cpp

@@ -22,8 +22,7 @@ limitations under the License.
 
 #include "gtest/gtest.h"
 
-namespace jsonnet
-{
+namespace jsonnet {
 std::string readFile(const std::string& filename)
 {
     std::ifstream in(filename);

include/libjsonnet++.h

@@ -26,10 +26,8 @@ extern "C" {
 #include "libjsonnet.h"
 }
 
-namespace jsonnet
-{
-class Jsonnet
-{
+namespace jsonnet {
+class Jsonnet {
    public:
     Jsonnet();
     ~Jsonnet();