Remove NumericBitfield (#41394)

Summary: X-link: facebook/yoga#1463 Now that are enums are unsigned, and we don't have BitfieldRef, we can convert the last remaining user of NumericBitfield to a plain old bitfield, for better readability (e.g. the default values), debugability, and less complexity. We also break a cycle which lets us properly group public vs private members. Reviewed By: joevilches Differential Revision: D51159415
facebook · Nov 27, 2023 · 29d1ebe · 29d1ebe
1 parent 6dfcd92
commit 29d1ebe
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 189 deletions.
diff --git a/packages/react-native/ReactCommon/yoga/yoga/YGEnums.h b/packages/react-native/ReactCommon/yoga/yoga/YGEnums.h
@@ -12,7 +12,7 @@
 
 YG_EXTERN_C_BEGIN
 
-YG_ENUM_SEQ_DECL(
+YG_ENUM_DECL(
     YGAlign,
     YGAlignAuto,
     YGAlignFlexStart,
@@ -24,23 +24,23 @@ YG_ENUM_SEQ_DECL(
     YGAlignSpaceAround,
     YGAlignSpaceEvenly)
 
-YG_ENUM_SEQ_DECL(
+YG_ENUM_DECL(
     YGDimension,
     YGDimensionWidth,
     YGDimensionHeight)
 
-YG_ENUM_SEQ_DECL(
+YG_ENUM_DECL(
     YGDirection,
     YGDirectionInherit,
     YGDirectionLTR,
     YGDirectionRTL)
 
-YG_ENUM_SEQ_DECL(
+YG_ENUM_DECL(
     YGDisplay,
     YGDisplayFlex,
     YGDisplayNone)
 
-YG_ENUM_SEQ_DECL(
+YG_ENUM_DECL(
     YGEdge,
     YGEdgeLeft,
     YGEdgeTop,
@@ -62,25 +62,25 @@ YG_ENUM_DECL(
     YGErrataClassic = 2147483646)
 YG_DEFINE_ENUM_FLAG_OPERATORS(YGErrata)
 
-YG_ENUM_SEQ_DECL(
+YG_ENUM_DECL(
     YGExperimentalFeature,
     YGExperimentalFeatureWebFlexBasis,
     YGExperimentalFeatureAbsolutePercentageAgainstPaddingEdge)
 
-YG_ENUM_SEQ_DECL(
+YG_ENUM_DECL(
     YGFlexDirection,
     YGFlexDirectionColumn,
     YGFlexDirectionColumnReverse,
     YGFlexDirectionRow,
     YGFlexDirectionRowReverse)
 
-YG_ENUM_SEQ_DECL(
+YG_ENUM_DECL(
     YGGutter,
     YGGutterColumn,
     YGGutterRow,
     YGGutterAll)
 
-YG_ENUM_SEQ_DECL(
+YG_ENUM_DECL(
     YGJustify,
     YGJustifyFlexStart,
     YGJustifyCenter,
@@ -89,7 +89,7 @@ YG_ENUM_SEQ_DECL(
     YGJustifySpaceAround,
     YGJustifySpaceEvenly)
 
-YG_ENUM_SEQ_DECL(
+YG_ENUM_DECL(
     YGLogLevel,
     YGLogLevelError,
     YGLogLevelWarn,
@@ -98,24 +98,24 @@ YG_ENUM_SEQ_DECL(
     YGLogLevelVerbose,
     YGLogLevelFatal)
 
-YG_ENUM_SEQ_DECL(
+YG_ENUM_DECL(
     YGMeasureMode,
     YGMeasureModeUndefined,
     YGMeasureModeExactly,
     YGMeasureModeAtMost)
 
-YG_ENUM_SEQ_DECL(
+YG_ENUM_DECL(
     YGNodeType,
     YGNodeTypeDefault,
     YGNodeTypeText)
 
-YG_ENUM_SEQ_DECL(
+YG_ENUM_DECL(
     YGOverflow,
     YGOverflowVisible,
     YGOverflowHidden,
     YGOverflowScroll)
 
-YG_ENUM_SEQ_DECL(
+YG_ENUM_DECL(
     YGPositionType,
     YGPositionTypeStatic,
     YGPositionTypeRelative,
@@ -128,14 +128,14 @@ YG_ENUM_DECL(
     YGPrintOptionsChildren = 4)
 YG_DEFINE_ENUM_FLAG_OPERATORS(YGPrintOptions)
 
-YG_ENUM_SEQ_DECL(
+YG_ENUM_DECL(
     YGUnit,
     YGUnitUndefined,
     YGUnitPoint,
     YGUnitPercent,
     YGUnitAuto)
 
-YG_ENUM_SEQ_DECL(
+YG_ENUM_DECL(
     YGWrap,
     YGWrapNoWrap,
     YGWrapWrap,

diff --git a/packages/react-native/ReactCommon/yoga/yoga/YGMacros.h b/packages/react-native/ReactCommon/yoga/yoga/YGMacros.h
@@ -88,40 +88,6 @@
 #define YG_DEFINE_ENUM_FLAG_OPERATORS(name)
 #endif
 
-#ifdef __cplusplus
-
-namespace facebook::yoga {
-
-template <typename T>
-constexpr int
-ordinalCount(); // can't use `= delete` due to a defect in clang < 3.9
-
-namespace detail {
-template <int... xs>
-constexpr int n() {
-  return sizeof...(xs);
-}
-} // namespace detail
-
-} // namespace facebook::yoga
-#endif
-
 #define YG_ENUM_DECL(NAME, ...)                               \
   typedef YG_ENUM_BEGIN(NAME){__VA_ARGS__} YG_ENUM_END(NAME); \
   YG_EXPORT const char* NAME##ToString(NAME);
-
-#ifdef __cplusplus
-#define YG_ENUM_SEQ_DECL(NAME, ...)    \
-  YG_ENUM_DECL(NAME, __VA_ARGS__)      \
-  YG_EXTERN_C_END                      \
-                                       \
-  namespace facebook::yoga {           \
-  template <>                          \
-  constexpr int ordinalCount<NAME>() { \
-    return detail::n<__VA_ARGS__>();   \
-  }                                    \
-  }                                    \
-  YG_EXTERN_C_BEGIN
-#else
-#define YG_ENUM_SEQ_DECL YG_ENUM_DECL
-#endif
diff --git a/packages/react-native/ReactCommon/yoga/yoga/bits/NumericBitfield.h b/packages/react-native/ReactCommon/yoga/yoga/bits/NumericBitfield.h
diff --git a/packages/react-native/ReactCommon/yoga/yoga/node/LayoutResults.h b/packages/react-native/ReactCommon/yoga/yoga/node/LayoutResults.h
@@ -9,7 +9,6 @@
 
 #include <array>
 
-#include <yoga/bits/NumericBitfield.h>
 #include <yoga/debug/AssertFatal.h>
 #include <yoga/enums/Dimension.h>
 #include <yoga/enums/Direction.h>