清理警告

Author: CppCXY

CodeService/src/Format/Analyzer/SpaceAnalyzer.cpp

@@ -314,23 +314,23 @@ void SpaceAnalyzer::SpaceRight(LuaSyntaxNode &n, const LuaSyntaxTree &t, std::si
     _rightSpaces[token.GetIndex()] = space;
 }
 
-std::optional<std::size_t> SpaceAnalyzer::GetRightSpace(LuaSyntaxNode &n) const {
+SpaceAnalyzer::OptionalInt SpaceAnalyzer::GetRightSpace(LuaSyntaxNode &n) const {
     if (_ignoreSpace.count(n.GetIndex())) {
-        return {};
+        return OptionalInt();
     }
 
     auto it = _rightSpaces.find(n.GetIndex());
     if (it == _rightSpaces.end()) {
-        return {};
+        return OptionalInt();
     }
-    return it->second;
+    return OptionalInt(it->second);
 }
 
 std::size_t
 SpaceAnalyzer::ProcessSpace(const LuaSyntaxTree &t, LuaSyntaxNode &left, LuaSyntaxNode &right) {
     auto rightSpaceOfLeftToken = GetRightSpace(left);
-    if (rightSpaceOfLeftToken.has_value()) {
-        return rightSpaceOfLeftToken.value();
+    if (rightSpaceOfLeftToken.HasValue) {
+        return rightSpaceOfLeftToken.Value;
     }
     if (!right.IsNull(t)) {
         return t.GetStartOffset(right.GetIndex()) - t.GetEndOffset(left.GetIndex()) - 1;

CodeService/src/RangeFormat/RangeFormatBuilder.cpp

@@ -2,7 +2,7 @@
 #include "LuaParser/Lexer/LuaTokenTypeDetail.h"
 
 RangeFormatBuilder::RangeFormatBuilder(LuaStyle &style, FormatRange &range)
-        : FormatBuilder(style), _range(range), _validRange(false) {
+        : FormatBuilder(style), _validRange(false), _range(range) {
 
 }
 

include/CodeService/Format/Analyzer/SpaceAnalyzer.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <optional>
 #include <unordered_set>
 #include <unordered_map>
 #include "CodeService/Format/Analyzer/FormatAnalyzer.h"
@@ -9,6 +8,16 @@ class SpaceAnalyzer : public FormatAnalyzer {
 public:
     DECLARE_FORMAT_ANALYZER(SpaceAnalyzer)
 
+    // workaround for mac 10.13
+    struct OptionalInt {
+        OptionalInt() : HasValue(false), Value(0) {}
+
+        explicit OptionalInt(std::size_t value) : HasValue(true), Value(value) {}
+
+        bool HasValue;
+        std::size_t Value;
+    };
+
     SpaceAnalyzer();
 
     void Analyze(FormatState &f, const LuaSyntaxTree &t) override;
@@ -26,9 +35,7 @@ class SpaceAnalyzer : public FormatAnalyzer {
     void SpaceIgnore(LuaSyntaxNode &n, const LuaSyntaxTree &t);
 
 private:
-//    std::optional<std::size_t> GetLeftSpace(LuaSyntaxNode &n) const;
-
-    std::optional<std::size_t> GetRightSpace(LuaSyntaxNode &n) const;
+    OptionalInt GetRightSpace(LuaSyntaxNode &n) const;
 
     std::size_t ProcessSpace(const LuaSyntaxTree &t, LuaSyntaxNode &left, LuaSyntaxNode &right);