libnixf: refactor namespace nixf { -> using namespace / explict

a-kenji · Apr 21, 2024 · dc0164e · dc0164e
1 parent 67c955d
commit dc0164e
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 44 deletions.
diff --git a/libnixf/src/Basic/Diagnostic.cpp b/libnixf/src/Basic/Diagnostic.cpp
@@ -2,6 +2,8 @@
 
 #include <sstream>
 
+using namespace nixf;
+
 namespace {
 
 std::string simpleFormat(const char *Fmt,
@@ -22,8 +24,6 @@ std::string simpleFormat(const char *Fmt,
 
 } // namespace
 
-namespace nixf {
-
 const char *nixf::Note::sname(NoteKind Kind) {
   switch (Kind) {
 #define DIAG_NOTE(SNAME, CNAME, MESSAGE)                                       \
@@ -84,5 +84,3 @@ const char *nixf::Note::message(NoteKind Kind) {
 std::string PartialDiagnostic::format() const {
   return simpleFormat(message(), Args);
 }
-
-} // namespace nixf
diff --git a/libnixf/src/Parse/Lexer.cpp b/libnixf/src/Parse/Lexer.cpp
@@ -5,8 +5,7 @@
 #include <cassert>
 #include <cctype>
 
-namespace nixf {
-
+using namespace nixf;
 using namespace tok;
 
 namespace {
@@ -635,4 +634,3 @@ Token Lexer::lex() {
     consume();
   return finishToken();
 }
-} // namespace nixf
diff --git a/libnixf/src/Parse/ParseAttrs.cpp b/libnixf/src/Parse/ParseAttrs.cpp
@@ -1,7 +1,6 @@
 #include "Parser.h"
 
-namespace nixf {
-
+using namespace nixf;
 using namespace detail;
 
 std::shared_ptr<AttrName> Parser::parseAttrName() {
@@ -204,5 +203,3 @@ std::shared_ptr<ExprAttrs> Parser::parseExprAttrs() {
   return Act.onExprAttrs(LexerCursorRange{Begin, LastToken->rCur()},
                          std::move(Binds), std::move(Rec));
 }
-
-} // namespace nixf
diff --git a/libnixf/src/Parse/ParseExpr.cpp b/libnixf/src/Parse/ParseExpr.cpp
@@ -1,8 +1,7 @@
 #include "Parser.h"
 
-namespace nixf {
-
-using namespace detail;
+using namespace nixf;
+using namespace nixf::detail;
 
 std::shared_ptr<Expr> Parser::parseExprSelect() {
   std::shared_ptr<Expr> Expr = parseExprSimple();
@@ -312,5 +311,3 @@ std::shared_ptr<ExprWith> Parser::parseExprWith() {
                                     std::move(KwWith), std::move(TokSemi),
                                     std::move(With), std::move(E));
 }
-
-} // namespace nixf
diff --git a/libnixf/src/Parse/ParseLambda.cpp b/libnixf/src/Parse/ParseLambda.cpp
@@ -1,7 +1,6 @@
 #include "Parser.h"
 
-namespace nixf {
-
+using namespace nixf;
 using namespace detail;
 
 std::shared_ptr<Formal> Parser::parseFormal() {
@@ -146,5 +145,3 @@ std::shared_ptr<ExprLambda> Parser::parseExprLambda() {
   return std::make_shared<ExprLambda>(LexerCursorRange{LCur, LastToken->rCur()},
                                       std::move(Arg), std::move(Body));
 }
-
-} // namespace nixf
diff --git a/libnixf/src/Parse/ParseOp.cpp b/libnixf/src/Parse/ParseOp.cpp
@@ -9,6 +9,7 @@
 
 using namespace nixf::tok;
 using namespace nixf::detail;
+using namespace nixf;
 
 /// Operators.
 namespace {
@@ -73,8 +74,6 @@ unsigned getUnaryBP(TokenKind Kind) {
 
 } // namespace
 
-namespace nixf {
-
 std::shared_ptr<Expr> Parser::parseExprOpBP(unsigned LeftRBP) {
   std::shared_ptr<Expr> Prefix;
   LexerCursor LCur = lCur();
@@ -148,5 +147,3 @@ std::shared_ptr<Expr> Parser::parseExprOpBP(unsigned LeftRBP) {
     }
   }
 }
-
-} // namespace nixf
diff --git a/libnixf/src/Parse/ParseSimple.cpp b/libnixf/src/Parse/ParseSimple.cpp
@@ -2,9 +2,8 @@
 
 #include <charconv>
 
-namespace nixf {
-
-using namespace detail;
+using namespace nixf;
+using namespace nixf::detail;
 
 std::shared_ptr<ExprParen> Parser::parseExprParen() {
   Token L = peek();
@@ -107,5 +106,3 @@ std::shared_ptr<Expr> Parser::parseExprSimple() {
     return nullptr;
   }
 }
-
-} // namespace nixf
diff --git a/libnixf/src/Parse/ParseStrings.cpp b/libnixf/src/Parse/ParseStrings.cpp
@@ -1,8 +1,7 @@
 #include "Parser.h"
 
-namespace nixf {
-
-using namespace detail;
+using namespace nixf;
+using namespace nixf::detail;
 
 std::shared_ptr<Interpolation> Parser::parseInterpolation() {
   Token TokDollarCurly = peek();
@@ -110,5 +109,3 @@ std::shared_ptr<ExprString> Parser::parseString(bool IsIndented) {
 
   } // with(PS_String / PS_IndString)
 }
-
-} // namespace nixf
diff --git a/libnixf/src/Parse/ParseSupport.cpp b/libnixf/src/Parse/ParseSupport.cpp
@@ -3,21 +3,19 @@
 
 #include "Parser.h"
 
-namespace nixf {
+#include "nixf/Parse/Parser.h"
 
-namespace detail {
+using namespace nixf;
 
-Diagnostic &diagNullExpr(std::vector<Diagnostic> &Diags, LexerCursor Loc,
-                         std::string As) {
+Diagnostic &detail::diagNullExpr(std::vector<Diagnostic> &Diags,
+                                 LexerCursor Loc, std::string As) {
   Diagnostic &D =
       Diags.emplace_back(Diagnostic::DK_Expected, LexerCursorRange(Loc));
   D << std::move(As) + " expression";
   D.fix("insert dummy expression").edit(TextEdit::mkInsertion(Loc, " expr"));
   return D;
 }
 
-} // namespace detail
-
 void Parser::pushState(ParserState NewState) {
   resetLookAheadBuf();
   State.push(NewState);
@@ -35,8 +33,8 @@ Parser::StateRAII Parser::withState(ParserState NewState) {
 
 Parser::SyncRAII Parser::withSync(TokenKind Kind) { return {*this, Kind}; }
 
-std::shared_ptr<Node> parse(std::string_view Src,
-                            std::vector<Diagnostic> &Diags) {
+std::shared_ptr<Node> nixf::parse(std::string_view Src,
+                                  std::vector<Diagnostic> &Diags) {
   Parser P(Src, Diags);
   return P.parse();
 }
@@ -109,5 +107,3 @@ Parser::ExpectResult Parser::expect(TokenKind Kind) {
       .edit(TextEdit::mkInsertion(Insert, std::string(tok::spelling(Kind))));
   return {&D};
 }
-
-} // namespace nixf