1 files changed, 126 insertions, 146 deletions

diff --git a/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Go/GoParser.h b/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Go/GoParser.h
index 9ceb670..bd12855 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Go/GoParser.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/ExpressionParser/Go/GoParser.h
@@ -1,4 +1,5 @@
-//===-- GoParser.h -----------------------------------------------*- C++ -*-===//
+//===-- GoParser.h -----------------------------------------------*- C++
+//-*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -10,155 +11,134 @@
 #ifndef liblldb_GoParser_h
 #define liblldb_GoParser_h
 
-#include "lldb/lldb-private.h"
 #include "Plugins/ExpressionParser/Go/GoAST.h"
 #include "Plugins/ExpressionParser/Go/GoLexer.h"
+#include "lldb/lldb-private.h"
 
-namespace lldb_private
-{
-class GoParser
-{
-  public:
-    explicit GoParser(const char *src);
-
-    GoASTStmt *Statement();
-
-    GoASTStmt *GoStmt();
-    GoASTStmt *ReturnStmt();
-    GoASTStmt *BranchStmt();
-    GoASTStmt *EmptyStmt();
-    GoASTStmt *ExpressionStmt(GoASTExpr *e);
-    GoASTStmt *IncDecStmt(GoASTExpr *e);
-    GoASTStmt *Assignment(GoASTExpr *e);
-    GoASTBlockStmt *Block();
-
-    GoASTExpr *MoreExpressionList();  // ["," Expression]
-    GoASTIdent *MoreIdentifierList(); // ["," Identifier]
-
-    GoASTExpr *Expression();
-    GoASTExpr *UnaryExpr();
-    GoASTExpr *OrExpr();
-    GoASTExpr *AndExpr();
-    GoASTExpr *RelExpr();
-    GoASTExpr *AddExpr();
-    GoASTExpr *MulExpr();
-    GoASTExpr *PrimaryExpr();
-    GoASTExpr *Operand();
-    GoASTExpr *Conversion();
-
-    GoASTExpr *Selector(GoASTExpr *e);
-    GoASTExpr *IndexOrSlice(GoASTExpr *e);
-    GoASTExpr *TypeAssertion(GoASTExpr *e);
-    GoASTExpr *Arguments(GoASTExpr *e);
-
-    GoASTExpr *Type();
-    GoASTExpr *Type2();
-    GoASTExpr *ArrayOrSliceType(bool allowEllipsis);
-    GoASTExpr *StructType();
-    GoASTExpr *FunctionType();
-    GoASTExpr *InterfaceType();
-    GoASTExpr *MapType();
-    GoASTExpr *ChanType();
-    GoASTExpr *ChanType2();
-
-    GoASTExpr *Name();
-    GoASTExpr *QualifiedIdent(GoASTIdent *p);
-    GoASTIdent *Identifier();
-
-    GoASTField *FieldDecl();
-    GoASTExpr *AnonymousFieldType();
-    GoASTExpr *FieldNamesAndType(GoASTField *f);
-
-    GoASTFieldList *Params();
-    GoASTField *ParamDecl();
-    GoASTExpr *ParamType();
-    GoASTFuncType *Signature();
-    GoASTExpr *CompositeLit();
-    GoASTExpr *FunctionLit();
-    GoASTExpr *Element();
-    GoASTCompositeLit *LiteralValue();
-
-    bool
-    Failed() const
-    {
-        return m_failed;
-    }
-    bool
-    AtEOF() const
-    {
-        return m_lexer.BytesRemaining() == 0 && m_pos == m_tokens.size();
-    }
-
-    void GetError(Error &error);
-
-  private:
-    class Rule;
-    friend class Rule;
-
-    std::nullptr_t
-    syntaxerror()
-    {
-        m_failed = true;
-        return nullptr;
+namespace lldb_private {
+class GoParser {
+public:
+  explicit GoParser(const char *src);
+
+  GoASTStmt *Statement();
+
+  GoASTStmt *GoStmt();
+  GoASTStmt *ReturnStmt();
+  GoASTStmt *BranchStmt();
+  GoASTStmt *EmptyStmt();
+  GoASTStmt *ExpressionStmt(GoASTExpr *e);
+  GoASTStmt *IncDecStmt(GoASTExpr *e);
+  GoASTStmt *Assignment(GoASTExpr *e);
+  GoASTBlockStmt *Block();
+
+  GoASTExpr *MoreExpressionList();  // ["," Expression]
+  GoASTIdent *MoreIdentifierList(); // ["," Identifier]
+
+  GoASTExpr *Expression();
+  GoASTExpr *UnaryExpr();
+  GoASTExpr *OrExpr();
+  GoASTExpr *AndExpr();
+  GoASTExpr *RelExpr();
+  GoASTExpr *AddExpr();
+  GoASTExpr *MulExpr();
+  GoASTExpr *PrimaryExpr();
+  GoASTExpr *Operand();
+  GoASTExpr *Conversion();
+
+  GoASTExpr *Selector(GoASTExpr *e);
+  GoASTExpr *IndexOrSlice(GoASTExpr *e);
+  GoASTExpr *TypeAssertion(GoASTExpr *e);
+  GoASTExpr *Arguments(GoASTExpr *e);
+
+  GoASTExpr *Type();
+  GoASTExpr *Type2();
+  GoASTExpr *ArrayOrSliceType(bool allowEllipsis);
+  GoASTExpr *StructType();
+  GoASTExpr *FunctionType();
+  GoASTExpr *InterfaceType();
+  GoASTExpr *MapType();
+  GoASTExpr *ChanType();
+  GoASTExpr *ChanType2();
+
+  GoASTExpr *Name();
+  GoASTExpr *QualifiedIdent(GoASTIdent *p);
+  GoASTIdent *Identifier();
+
+  GoASTField *FieldDecl();
+  GoASTExpr *AnonymousFieldType();
+  GoASTExpr *FieldNamesAndType(GoASTField *f);
+
+  GoASTFieldList *Params();
+  GoASTField *ParamDecl();
+  GoASTExpr *ParamType();
+  GoASTFuncType *Signature();
+  GoASTExpr *CompositeLit();
+  GoASTExpr *FunctionLit();
+  GoASTExpr *Element();
+  GoASTCompositeLit *LiteralValue();
+
+  bool Failed() const { return m_failed; }
+  bool AtEOF() const {
+    return m_lexer.BytesRemaining() == 0 && m_pos == m_tokens.size();
+  }
+
+  void GetError(Error &error);
+
+private:
+  class Rule;
+  friend class Rule;
+
+  std::nullptr_t syntaxerror() {
+    m_failed = true;
+    return nullptr;
+  }
+  GoLexer::Token &next() {
+    if (m_pos >= m_tokens.size()) {
+      if (m_pos != 0 && (m_tokens.back().m_type == GoLexer::TOK_EOF ||
+                         m_tokens.back().m_type == GoLexer::TOK_INVALID))
+        return m_tokens.back();
+      m_pos = m_tokens.size();
+      m_tokens.push_back(m_lexer.Lex());
     }
-    GoLexer::Token &
-    next()
-    {
-        if (m_pos >= m_tokens.size())
-        {
-            if (m_pos != 0 &&
-                (m_tokens.back().m_type == GoLexer::TOK_EOF || m_tokens.back().m_type == GoLexer::TOK_INVALID))
-                return m_tokens.back();
-            m_pos = m_tokens.size();
-            m_tokens.push_back(m_lexer.Lex());
-        }
-        return m_tokens[m_pos++];
-    }
-    GoLexer::TokenType
-    peek()
-    {
-        GoLexer::Token &tok = next();
-        --m_pos;
-        return tok.m_type;
-    }
-    GoLexer::Token *
-    match(GoLexer::TokenType t)
-    {
-        GoLexer::Token &tok = next();
-        if (tok.m_type == t)
-            return &tok;
-        --m_pos;
-        m_last_tok = t;
-        return nullptr;
-    }
-    GoLexer::Token *
-    mustMatch(GoLexer::TokenType t)
-    {
-        GoLexer::Token *tok = match(t);
-        if (tok)
-            return tok;
-        return syntaxerror();
-    }
-    bool Semicolon();
-
-    GoASTStmt *
-    FinishStmt(GoASTStmt *s)
-    {
-        if (!Semicolon())
-            m_failed = true;
-        return s;
-    }
-
-    llvm::StringRef CopyString(llvm::StringRef s);
-
-    GoLexer m_lexer;
-    std::vector<GoLexer::Token> m_tokens;
-    size_t m_pos;
-    llvm::StringRef m_error;
-    llvm::StringRef m_last;
-    GoLexer::TokenType m_last_tok;
-    llvm::StringMap<uint8_t> m_strings;
-    bool m_failed;
+    return m_tokens[m_pos++];
+  }
+  GoLexer::TokenType peek() {
+    GoLexer::Token &tok = next();
+    --m_pos;
+    return tok.m_type;
+  }
+  GoLexer::Token *match(GoLexer::TokenType t) {
+    GoLexer::Token &tok = next();
+    if (tok.m_type == t)
+      return &tok;
+    --m_pos;
+    m_last_tok = t;
+    return nullptr;
+  }
+  GoLexer::Token *mustMatch(GoLexer::TokenType t) {
+    GoLexer::Token *tok = match(t);
+    if (tok)
+      return tok;
+    return syntaxerror();
+  }
+  bool Semicolon();
+
+  GoASTStmt *FinishStmt(GoASTStmt *s) {
+    if (!Semicolon())
+      m_failed = true;
+    return s;
+  }
+
+  llvm::StringRef CopyString(llvm::StringRef s);
+
+  GoLexer m_lexer;
+  std::vector<GoLexer::Token> m_tokens;
+  size_t m_pos;
+  llvm::StringRef m_error;
+  llvm::StringRef m_last;
+  GoLexer::TokenType m_last_tok;
+  llvm::StringMap<uint8_t> m_strings;
+  bool m_failed;
 };
 }