Inline YGFloatOptional completely

Summary: @public `YGFLoatOptional` only contains trivial functionality. Make it header-only. Reviewed By: SidharthGuglani Differential Revision: D13439609 fbshipit-source-id: 3f3c6c3a15e05ac55da2af30eb629f786ecb90a9
facebook · Dec 13, 2018 · 96d93f2 · 96d93f2
1 parent 236bcc1
commit 96d93f2
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 59 deletions.
diff --git a/yoga/YGFloatOptional.cpp b/yoga/YGFloatOptional.cpp
diff --git a/yoga/YGFloatOptional.h b/yoga/YGFloatOptional.h
@@ -8,6 +8,7 @@
 
 #include <cmath>
 #include <limits>
+#include "Yoga-internal.h"
 
 struct YGFloatOptional {
  private:
@@ -18,22 +19,40 @@ struct YGFloatOptional {
   constexpr YGFloatOptional() = default;
 
   // returns the wrapped value, or a value x with YGIsUndefined(x) == true
-  float unwrap() const {
+  constexpr float unwrap() const {
     return value_;
   }
 
   bool isUndefined() const {
     return std::isnan(value_);
   }
 
-  YGFloatOptional operator+(YGFloatOptional op) const;
-  bool operator>(YGFloatOptional op) const;
-  bool operator<(YGFloatOptional op) const;
-  bool operator>=(YGFloatOptional op) const;
-  bool operator<=(YGFloatOptional op) const;
-  bool operator==(YGFloatOptional op) const;
-  bool operator!=(YGFloatOptional op) const;
+  YGFloatOptional operator+(YGFloatOptional op) const {
+    return YGFloatOptional{value_ + op.value_};
+  }
+  bool operator>(YGFloatOptional op) const {
+    return value_ > op.value_;
+  }
+  bool operator<(YGFloatOptional op) const {
+    return value_ < op.value_;
+  }
+  bool operator>=(YGFloatOptional op) const {
+    return *this > op || *this == op;
+  }
+  bool operator<=(YGFloatOptional op) const {
+    return *this < op || *this == op;
+  }
+  bool operator==(YGFloatOptional op) const {
+    return value_ == op.value_ || (isUndefined() && op.isUndefined());
+  }
+  bool operator!=(YGFloatOptional op) const {
+    return !(*this == op);
+  }
 
-  bool operator==(float val) const;
-  bool operator!=(float val) const;
+  bool operator==(float val) const {
+    return value_ == val || (isUndefined() && yoga::isUndefined(val));
+  }
+  bool operator!=(float val) const {
+    return !(*this == val);
+  }
 };