C++ style enums 4/N: Errata

Summary: This converts usages of YGErrata to Errata Differential Revision: D49270354 fbshipit-source-id: 2e332e222ce38ab01ccd481ac6a60f1c0195ff7e
facebook · Sep 14, 2023 · b0a16e3 · b0a16e3
1 parent 092b3e7
commit b0a16e3
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 16 deletions.
diff --git a/enums.py b/enums.py
@@ -164,6 +164,7 @@ def to_hyphenated_lower(symbol):
             ordinal = value[0] if isinstance(value, tuple) else value
             f.write(f"  {ordinal} = YG{name}{ordinal},\n")
         f.write("};\n\n")
+        f.write(f"YG_DEFINE_ENUM_FLAG_OPERATORS({name})\n\n" if name in BITSET_ENUMS else "")
 
         f.write("template <>\n")
         f.write(f"constexpr inline int32_t ordinalCount<{name}>() {{\n")

diff --git a/yoga/Yoga.cpp b/yoga/Yoga.cpp
@@ -878,11 +878,11 @@ void* YGConfigGetContext(const YGConfigConstRef config) {
 }
 
 void YGConfigSetErrata(YGConfigRef config, YGErrata errata) {
-  resolveRef(config)->setErrata(errata);
+  resolveRef(config)->setErrata(scopedEnum(errata));
 }
 
 YGErrata YGConfigGetErrata(YGConfigConstRef config) {
-  return resolveRef(config)->getErrata();
+  return unscopedEnum(resolveRef(config)->getErrata());
 }
 
 void YGConfigSetCloneNodeFunc(

diff --git a/yoga/algorithm/CalculateLayout.cpp b/yoga/algorithm/CalculateLayout.cpp
@@ -1756,7 +1756,7 @@ static void calculateLayoutImpl(
         availableInnerMainDim = maxInnerMainDim;
       } else {
         bool useLegacyStretchBehaviour =
-            node->hasErrata(YGErrataStretchFlexBasis);
+            node->hasErrata(Errata::StretchFlexBasis);
 
         if (!useLegacyStretchBehaviour &&
             ((!yoga::isUndefined(flexLine.layout.totalFlexGrowFactors) &&

diff --git a/yoga/config/Config.cpp b/yoga/config/Config.cpp
@@ -54,24 +54,24 @@ ExperimentalFeatureSet Config::getEnabledExperiments() const {
   return experimentalFeatures_;
 }
 
-void Config::setErrata(YGErrata errata) {
+void Config::setErrata(Errata errata) {
   errata_ = errata;
 }
 
-void Config::addErrata(YGErrata errata) {
+void Config::addErrata(Errata errata) {
   errata_ |= errata;
 }
 
-void Config::removeErrata(YGErrata errata) {
+void Config::removeErrata(Errata errata) {
   errata_ &= (~errata);
 }
 
-YGErrata Config::getErrata() const {
+Errata Config::getErrata() const {
   return errata_;
 }
 
-bool Config::hasErrata(YGErrata errata) const {
-  return (errata_ & errata) != YGErrataNone;
+bool Config::hasErrata(Errata errata) const {
+  return (errata_ & errata) != Errata::None;
 }
 
 void Config::setPointScaleFactor(float pointScaleFactor) {

diff --git a/yoga/config/Config.h b/yoga/config/Config.h
@@ -10,6 +10,7 @@
 #include <bitset>
 
 #include <yoga/Yoga.h>
+#include <yoga/enums/Errata.h>
 #include <yoga/enums/ExperimentalFeature.h>
 
 // Tag struct used to form the opaque YGConfigRef for the public C API
@@ -51,11 +52,11 @@ class YG_EXPORT Config : public ::YGConfig {
   bool isExperimentalFeatureEnabled(ExperimentalFeature feature) const;
   ExperimentalFeatureSet getEnabledExperiments() const;
 
-  void setErrata(YGErrata errata);
-  void addErrata(YGErrata errata);
-  void removeErrata(YGErrata errata);
-  YGErrata getErrata() const;
-  bool hasErrata(YGErrata errata) const;
+  void setErrata(Errata errata);
+  void addErrata(Errata errata);
+  void removeErrata(Errata errata);
+  Errata getErrata() const;
+  bool hasErrata(Errata errata) const;
 
   void setPointScaleFactor(float pointScaleFactor);
   float getPointScaleFactor() const;
@@ -82,7 +83,7 @@ class YG_EXPORT Config : public ::YGConfig {
 
   ConfigFlags flags_{};
   ExperimentalFeatureSet experimentalFeatures_{};
-  YGErrata errata_ = YGErrataNone;
+  Errata errata_ = Errata::None;
   float pointScaleFactor_ = 1.0f;
   void* context_ = nullptr;
 };

diff --git a/yoga/enums/Errata.h b/yoga/enums/Errata.h
@@ -22,6 +22,8 @@ enum class Errata : uint32_t {
   Classic = YGErrataClassic,
 };
 
+YG_DEFINE_ENUM_FLAG_OPERATORS(Errata)
+
 template <>
 constexpr inline int32_t ordinalCount<Errata>() {
   return 4;

diff --git a/yoga/enums/PrintOptions.h b/yoga/enums/PrintOptions.h
@@ -21,6 +21,8 @@ enum class PrintOptions : uint32_t {
   Children = YGPrintOptionsChildren,
 };
 
+YG_DEFINE_ENUM_FLAG_OPERATORS(PrintOptions)
+
 template <>
 constexpr inline int32_t ordinalCount<PrintOptions>() {
   return 3;

diff --git a/yoga/node/Node.h b/yoga/node/Node.h
@@ -14,6 +14,7 @@
 #include <yoga/Yoga.h>
 
 #include <yoga/config/Config.h>
+#include <yoga/enums/Errata.h>
 #include <yoga/enums/NodeType.h>
 #include <yoga/node/LayoutResults.h>
 #include <yoga/style/CompactValue.h>
@@ -109,7 +110,7 @@ class YG_EXPORT Node : public ::YGNode {
 
   float baseline(float width, float height) const;
 
-  bool hasErrata(YGErrata errata) const {
+  bool hasErrata(Errata errata) const {
     return config_->hasErrata(errata);
   }