review improvements

YogaKit/YGLayout.h

@@ -9,7 +9,6 @@
 
 #import <UIKit/UIKit.h>
 #import <yoga/YGEnums.h>
-#import <yoga/YGValue.h>
 
 @interface YGLayout : NSObject
 

YogaKit/YGLayout.m

@@ -10,11 +10,6 @@
 #import "YGLayout+Private.h"
 #import "UIView+Yoga.h"
 #import <yoga/Yoga.h>
-#import <UIKit/UIKit.h>
-
-extern YGValue YGValueMake(CGFloat value, YGUnit unit) {
-  return (YGValue) { .value = value, .unit = unit };
-}
 
 #define YG_STYLE_PROPERTY_IMPL(type, lowercased_name, capitalized_name) \
 - (type)lowercased_name                                                 \

enums.py

@@ -126,23 +126,13 @@ with open(root + '/yoga/YGEnums.h', 'w') as f:
     f.write('YG_EXTERN_C_BEGIN\n\n')
     for name, values in ENUMS.items():
         f.write('#define YG%sCount %s\n' % (name, len(values)))        
-        f.write('#ifndef NS_ENUM\n')
+        f.write('typedef YG_ENUM_BEGIN(YG%s) {\n' % name)
-        f.write('typedef enum YG%s {\n' % name)
         for value in values:
             if isinstance(value, tuple):
                 f.write('  YG%s%s = %d,\n' % (name, value[0], value[1]))
             else:
                 f.write('  YG%s%s,\n' % (name, value))
-        f.write('} YG%s;\n' % name)
+        f.write('} YG_ENUM_END(YG%s);\n' % name)
-        f.write('#else\n')
-        f.write('typedef NS_ENUM(NSInteger, YG%s) {\n' % name)
-        for value in values:
-            if isinstance(value, tuple):
-                f.write('  YG%s%s = %d,\n' % (name, value[0], value[1]))
-            else:
-                f.write('  YG%s%s,\n' % (name, value))
-        f.write('};\n')
-        f.write('#endif\n')
         f.write('\n')
     f.write('YG_EXTERN_C_END\n')
 

yoga/YGEnums.h

@@ -14,55 +14,29 @@
 YG_EXTERN_C_BEGIN
 
 #define YGFlexDirectionCount 4
-#ifndef NS_ENUM
+typedef YG_ENUM_BEGIN(YGFlexDirection) {
-typedef enum YGFlexDirection {
   YGFlexDirectionColumn,
   YGFlexDirectionColumnReverse,
   YGFlexDirectionRow,
   YGFlexDirectionRowReverse,
-} YGFlexDirection;
+} YG_ENUM_END(YGFlexDirection);
-#else
-typedef NS_ENUM(NSInteger, YGFlexDirection) {
-  YGFlexDirectionColumn,
-  YGFlexDirectionColumnReverse,
-  YGFlexDirectionRow,
-  YGFlexDirectionRowReverse,
-};
-#endif
 
 #define YGMeasureModeCount 3
-#ifndef NS_ENUM
+typedef YG_ENUM_BEGIN(YGMeasureMode) {
-typedef enum YGMeasureMode {
   YGMeasureModeUndefined,
   YGMeasureModeExactly,
   YGMeasureModeAtMost,
-} YGMeasureMode;
+} YG_ENUM_END(YGMeasureMode);
-#else
-typedef NS_ENUM(NSInteger, YGMeasureMode) {
-  YGMeasureModeUndefined,
-  YGMeasureModeExactly,
-  YGMeasureModeAtMost,
-};
-#endif
 
 #define YGPrintOptionsCount 3
-#ifndef NS_ENUM
+typedef YG_ENUM_BEGIN(YGPrintOptions) {
-typedef enum YGPrintOptions {
   YGPrintOptionsLayout = 1,
   YGPrintOptionsStyle = 2,
   YGPrintOptionsChildren = 4,
-} YGPrintOptions;
+} YG_ENUM_END(YGPrintOptions);
-#else
-typedef NS_ENUM(NSInteger, YGPrintOptions) {
-  YGPrintOptionsLayout = 1,
-  YGPrintOptionsStyle = 2,
-  YGPrintOptionsChildren = 4,
-};
-#endif
 
 #define YGEdgeCount 9
-#ifndef NS_ENUM
+typedef YG_ENUM_BEGIN(YGEdge) {
-typedef enum YGEdge {
   YGEdgeLeft,
   YGEdgeTop,
   YGEdgeRight,
@@ -72,173 +46,78 @@ typedef enum YGEdge {
   YGEdgeHorizontal,
   YGEdgeVertical,
   YGEdgeAll,
-} YGEdge;
+} YG_ENUM_END(YGEdge);
-#else
-typedef NS_ENUM(NSInteger, YGEdge) {
-  YGEdgeLeft,
-  YGEdgeTop,
-  YGEdgeRight,
-  YGEdgeBottom,
-  YGEdgeStart,
-  YGEdgeEnd,
-  YGEdgeHorizontal,
-  YGEdgeVertical,
-  YGEdgeAll,
-};
-#endif
 
 #define YGPositionTypeCount 2
-#ifndef NS_ENUM
+typedef YG_ENUM_BEGIN(YGPositionType) {
-typedef enum YGPositionType {
   YGPositionTypeRelative,
   YGPositionTypeAbsolute,
-} YGPositionType;
+} YG_ENUM_END(YGPositionType);
-#else
-typedef NS_ENUM(NSInteger, YGPositionType) {
-  YGPositionTypeRelative,
-  YGPositionTypeAbsolute,
-};
-#endif
 
 #define YGDimensionCount 2
-#ifndef NS_ENUM
+typedef YG_ENUM_BEGIN(YGDimension) {
-typedef enum YGDimension {
   YGDimensionWidth,
   YGDimensionHeight,
-} YGDimension;
+} YG_ENUM_END(YGDimension);
-#else
-typedef NS_ENUM(NSInteger, YGDimension) {
-  YGDimensionWidth,
-  YGDimensionHeight,
-};
-#endif
 
 #define YGJustifyCount 5
-#ifndef NS_ENUM
+typedef YG_ENUM_BEGIN(YGJustify) {
-typedef enum YGJustify {
   YGJustifyFlexStart,
   YGJustifyCenter,
   YGJustifyFlexEnd,
   YGJustifySpaceBetween,
   YGJustifySpaceAround,
-} YGJustify;
+} YG_ENUM_END(YGJustify);
-#else
-typedef NS_ENUM(NSInteger, YGJustify) {
-  YGJustifyFlexStart,
-  YGJustifyCenter,
-  YGJustifyFlexEnd,
-  YGJustifySpaceBetween,
-  YGJustifySpaceAround,
-};
-#endif
 
 #define YGDirectionCount 3
-#ifndef NS_ENUM
+typedef YG_ENUM_BEGIN(YGDirection) {
-typedef enum YGDirection {
   YGDirectionInherit,
   YGDirectionLTR,
   YGDirectionRTL,
-} YGDirection;
+} YG_ENUM_END(YGDirection);
-#else
-typedef NS_ENUM(NSInteger, YGDirection) {
-  YGDirectionInherit,
-  YGDirectionLTR,
-  YGDirectionRTL,
-};
-#endif
 
 #define YGLogLevelCount 5
-#ifndef NS_ENUM
+typedef YG_ENUM_BEGIN(YGLogLevel) {
-typedef enum YGLogLevel {
   YGLogLevelError,
   YGLogLevelWarn,
   YGLogLevelInfo,
   YGLogLevelDebug,
   YGLogLevelVerbose,
-} YGLogLevel;
+} YG_ENUM_END(YGLogLevel);
-#else
-typedef NS_ENUM(NSInteger, YGLogLevel) {
-  YGLogLevelError,
-  YGLogLevelWarn,
-  YGLogLevelInfo,
-  YGLogLevelDebug,
-  YGLogLevelVerbose,
-};
-#endif
 
 #define YGWrapCount 2
-#ifndef NS_ENUM
+typedef YG_ENUM_BEGIN(YGWrap) {
-typedef enum YGWrap {
   YGWrapNoWrap,
   YGWrapWrap,
-} YGWrap;
+} YG_ENUM_END(YGWrap);
-#else
-typedef NS_ENUM(NSInteger, YGWrap) {
-  YGWrapNoWrap,
-  YGWrapWrap,
-};
-#endif
 
 #define YGOverflowCount 3
-#ifndef NS_ENUM
+typedef YG_ENUM_BEGIN(YGOverflow) {
-typedef enum YGOverflow {
   YGOverflowVisible,
   YGOverflowHidden,
   YGOverflowScroll,
-} YGOverflow;
+} YG_ENUM_END(YGOverflow);
-#else
-typedef NS_ENUM(NSInteger, YGOverflow) {
-  YGOverflowVisible,
-  YGOverflowHidden,
-  YGOverflowScroll,
-};
-#endif
 
 #define YGExperimentalFeatureCount 2
-#ifndef NS_ENUM
+typedef YG_ENUM_BEGIN(YGExperimentalFeature) {
-typedef enum YGExperimentalFeature {
   YGExperimentalFeatureRounding,
   YGExperimentalFeatureWebFlexBasis,
-} YGExperimentalFeature;
+} YG_ENUM_END(YGExperimentalFeature);
-#else
-typedef NS_ENUM(NSInteger, YGExperimentalFeature) {
-  YGExperimentalFeatureRounding,
-  YGExperimentalFeatureWebFlexBasis,
-};
-#endif
 
 #define YGAlignCount 5
-#ifndef NS_ENUM
+typedef YG_ENUM_BEGIN(YGAlign) {
-typedef enum YGAlign {
   YGAlignAuto,
   YGAlignFlexStart,
   YGAlignCenter,
   YGAlignFlexEnd,
   YGAlignStretch,
-} YGAlign;
+} YG_ENUM_END(YGAlign);
-#else
-typedef NS_ENUM(NSInteger, YGAlign) {
-  YGAlignAuto,
-  YGAlignFlexStart,
-  YGAlignCenter,
-  YGAlignFlexEnd,
-  YGAlignStretch,
-};
-#endif
 
 #define YGUnitCount 3
-#ifndef NS_ENUM
+typedef YG_ENUM_BEGIN(YGUnit) {
-typedef enum YGUnit {
   YGUnitUndefined,
   YGUnitPixel,
   YGUnitPercent,
-} YGUnit;
+} YG_ENUM_END(YGUnit);
-#else
-typedef NS_ENUM(NSInteger, YGUnit) {
-  YGUnitUndefined,
-  YGUnitPixel,
-  YGUnitPercent,
-};
-#endif
 
 YG_EXTERN_C_END

yoga/YGMacros.h

@@ -40,3 +40,19 @@
     YG_ABORT();                            \
   }
 #endif
+
+#ifndef YG_ENUM_BEGIN
+#ifndef NS_ENUM
+#define YG_ENUM_BEGIN(name) enum name
+#else
+#define YG_ENUM_BEGIN(name) NS_ENUM(NSInteger, name)
+#endif
+#endif
+
+#ifndef YG_ENUM_END
+#ifndef NS_ENUM
+#define YG_ENUM_END(name) name
+#else
+#define YG_ENUM_END(name)
+#endif
+#endif

yoga/YGValue.h

@@ -1,19 +0,0 @@
-/**
- * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-#pragma once
-
-YG_EXTERN_C_BEGIN
-
-typedef struct YGValue {
-  float value;
-  YGUnit unit;
-} YGValue;
-
-YG_EXTERN_C_END

yoga/Yoga.h

@@ -30,7 +30,6 @@ static const unsigned long __nan[2] = {0xffffffff, 0x7fffffff};
 
 #include "YGEnums.h"
 #include "YGMacros.h"
-#include "YGValue.h"
 
 YG_EXTERN_C_BEGIN
 
@@ -39,6 +38,11 @@ typedef struct YGSize {
   float height;
 } YGSize;
 
+typedef struct YGValue {
+  float value;
+  YGUnit unit;
+} YGValue;
+
 typedef struct YGNode *YGNodeRef;
 typedef YGSize (*YGMeasureFunc)(YGNodeRef node,
                                 float width,