DaddyFrosty/yoga
1
0
Fork 0
Code Issues 96 Pull Requests 31 Actions Packages Projects Releases 33 Wiki Activity

Update clang-format rules

Browse Source 
Summary: Spent a couple hours customizing the clang-format rules to better match the desired code style.

Reviewed By: IanChilds

Differential Revision: D3714510

fbshipit-source-id: f6d0436346416aab023aacbedd70ea189e583e8d
This commit is contained in:
Emil Sjolander
2016-08-15 09:15:02 -07:00
committed by Facebook Github Bot 6
parent 6a44dbc43b
commit 7a1e353404
10 changed files with 602 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CSSLayout/CSSLayout-internal.h
View File

@@ -90,10 +90,10 @@ typedef struct CSSNode {
struct CSSNode *nextChild;
CSSSize (*measure)(void *context,
float width,
CSSMeasureMode widthMode,
float height,
CSSMeasureMode heightMode);
float width,
CSSMeasureMode widthMode,
float height,
CSSMeasureMode heightMode);
void (*print)(void *context);
void *context;
} CSSNode;

851
CSSLayout/CSSLayout.c
View File

File diff suppressed because it is too large Load Diff

29
CSSLayout/CSSLayout.h
View File

@@ -11,9 +11,9 @@
#include <assert.h>
#include <math.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#ifndef __cplusplus
#include <stdbool.h>
@@ -21,8 +21,8 @@
// Not defined in MSVC++
#ifndef NAN
static const unsigned long __nan[2] = { 0xffffffff, 0x7fffffff };
#define NAN (*(const float *)__nan)
static const unsigned long __nan[2] = {0xffffffff, 0x7fffffff};
#define NAN (*(const float *) __nan)
#endif
#define CSSUndefined NAN
@@ -113,8 +113,11 @@ typedef struct CSSSize {
} CSSSize;
typedef struct CSSNode *CSSNodeRef;
typedef CSSSize (*CSSMeasureFunc)(
void *context, float width, CSSMeasureMode widthMode, float height, CSSMeasureMode heightMode);
typedef CSSSize (*CSSMeasureFunc)(void *context,
float width,
CSSMeasureMode widthMode,
float height,
CSSMeasureMode heightMode);
typedef void (*CSSPrintFunc)(void *context);
// CSSNode
@@ -127,8 +130,10 @@ void CSSNodeRemoveChild(CSSNodeRef node, CSSNodeRef child);
CSSNodeRef CSSNodeGetChild(CSSNodeRef node, uint32_t index);
uint32_t CSSNodeChildCount(CSSNodeRef node);
void CSSNodeCalculateLayout(
CSSNodeRef node, float availableWidth, float availableHeight, CSSDirection parentDirection);
void CSSNodeCalculateLayout(CSSNodeRef node,
float availableWidth,
float availableHeight,
CSSDirection parentDirection);
// Mark a node as dirty. Only valid for nodes with a custom measure function
// set.
@@ -143,12 +148,12 @@ void CSSNodePrint(CSSNodeRef node, CSSPrintOptions options);
bool CSSValueIsUndefined(float value);
#define CSS_NODE_PROPERTY(type, name, paramName) \
void CSSNodeSet##name(CSSNodeRef node, type paramName); \
#define CSS_NODE_PROPERTY(type, name, paramName) \
void CSSNodeSet##name(CSSNodeRef node, type paramName); \
type CSSNodeGet##name(CSSNodeRef node);
#define CSS_NODE_STYLE_PROPERTY(type, name, paramName) \
void CSSNodeStyleSet##name(CSSNodeRef node, type paramName); \
#define CSS_NODE_STYLE_PROPERTY(type, name, paramName) \
void CSSNodeStyleSet##name(CSSNodeRef node, type paramName); \
type CSSNodeStyleGet##name(CSSNodeRef node);
#define CSS_NODE_LAYOUT_PROPERTY(type, name) type CSSNodeLayoutGet##name(CSSNodeRef node);

8
CSSLayout/CSSMacros.h
View File

@@ -27,8 +27,8 @@
#define CSS_ABORT()
#endif
#define CSS_ASSERT(X, message) \
if (!(X)) { \
fprintf(stderr, "%s\n", message); \
CSS_ABORT(); \
#define CSS_ASSERT(X, message) \
if (!(X)) { \
fprintf(stderr, "%s\n", message); \
CSS_ABORT(); \
}

12
CSSLayout/CSSNodeList.c
View File

@@ -28,11 +28,13 @@ CSSNodeListRef CSSNodeListNew(uint32_t initialCapacity) {
}
void CSSNodeListFree(CSSNodeListRef list) {
free(list->items);
free(list);
free(list->items);
free(list);
}
uint32_t CSSNodeListCount(CSSNodeListRef list) { return list->count; }
uint32_t CSSNodeListCount(CSSNodeListRef list) {
return list->count;
}
void CSSNodeListAdd(CSSNodeListRef list, CSSNodeRef node) {
CSSNodeListInsert(list, node, list->count);
@@ -76,4 +78,6 @@ CSSNodeRef CSSNodeListDelete(CSSNodeListRef list, CSSNodeRef node) {
return NULL;
}
CSSNodeRef CSSNodeListGet(CSSNodeListRef list, uint32_t index) { return list->items[index]; }
CSSNodeRef CSSNodeListGet(CSSNodeListRef list, uint32_t index) {
return list->items[index];
}

4
CSSLayout/CSSNodeList.h
View File

@@ -10,9 +10,9 @@
#pragma once
#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <CSSLayout/CSSLayout.h>
#include <CSSLayout/CSSMacros.h>

14
benchmarks/CSSBenchmark.c
View File

@@ -9,17 +9,21 @@
#include "CSSBenchmark.h"
#include <time.h>
#include <CSSLayout/CSSLayout.h>
#include <time.h>
// Measure functions can be quite slow, for example when measuring text.
// Simulate this by sleeping for 1 millisecond.
static CSSSize _measure(void *context, float width, CSSMeasureMode widthMode, float height, CSSMeasureMode heightMode) {
static CSSSize _measure(void *context,
float width,
CSSMeasureMode widthMode,
float height,
CSSMeasureMode heightMode) {
struct timespec sleeptime = {0, 1000000};
nanosleep(&sleeptime, NULL);
return (CSSSize) {
.width = widthMode == CSSMeasureModeUndefined ? 10 : width,
.height = heightMode == CSSMeasureModeUndefined ? 10 : width,
return (CSSSize){
.width = widthMode == CSSMeasureModeUndefined ? 10 : width,
.height = heightMode == CSSMeasureModeUndefined ? 10 : width,
};
}

37
benchmarks/CSSBenchmark.h
View File

@@ -10,33 +10,32 @@
#pragma once
#include <math.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
#define NUM_REPETITIONS 100
#define CSS_BENCHMARKS(BLOCK) \
int main(int argc, char const *argv[]) { \
clock_t __start; \
clock_t __endTimes[NUM_REPETITIONS]; \
{ BLOCK } \
return 0; \
#define CSS_BENCHMARKS(BLOCK) \
int main(int argc, char const *argv[]) { \
clock_t __start; \
clock_t __endTimes[NUM_REPETITIONS]; \
{ BLOCK } \
return 0; \
}
#define CSS_BENCHMARK(NAME, BLOCK) \
__start = clock(); \
for (uint32_t __i = 0; __i < NUM_REPETITIONS; __i++) { \
{ BLOCK } \
__endTimes[__i] = clock(); \
} \
#define CSS_BENCHMARK(NAME, BLOCK) \
__start = clock(); \
for (uint32_t __i = 0; __i < NUM_REPETITIONS; __i++) { \
{ BLOCK } \
__endTimes[__i] = clock(); \
} \
__printBenchmarkResult(NAME, __start, __endTimes);
int __compareDoubles(const void* a, const void* b) {
double arg1 = *(const double*)a;
double arg2 = *(const double*)b;
int __compareDoubles(const void *a, const void *b) {
double arg1 = *(const double *) a;
double arg2 = *(const double *) b;
if (arg1 < arg2) {
return -1;
@@ -54,7 +53,7 @@ void __printBenchmarkResult(char *name, clock_t start, clock_t *endTimes) {
double mean = 0;
clock_t lastEnd = start;
for (uint32_t i = 0; i < NUM_REPETITIONS; i++) {
timesInMs[i] = (endTimes[i] - lastEnd) / (double)CLOCKS_PER_SEC * 1000;
timesInMs[i] = (endTimes[i] - lastEnd) / (double) CLOCKS_PER_SEC * 1000;
lastEnd = endTimes[i];
mean += timesInMs[i];
}

26
format.sh
View File

@@ -2,11 +2,29 @@
clang-format \
-style="{ \
BasedOnStyle: WebKit, \
IndentWidth: 2, \
ColumnLimit: 100, \
BreakBeforeBraces: Attach, \
AlignEscapedNewlinesLeft: true, \
AlignOperands: true, \
AllowAllParametersOfDeclarationOnNextLine: false, \
AllowShortBlocksOnASingleLine: false, \
AllowShortCaseLabelsOnASingleLine: true, \
AllowShortFunctionsOnASingleLine: false, \
AllowShortIfStatementsOnASingleLine: false, \
AllowShortLoopsOnASingleLine: false, \
BinPackArguments: false, \
BinPackParameters: false, \
BreakBeforeBraces: Attach, \
ColumnLimit: 100, \
ContinuationIndentWidth: 4, \
IndentCaseLabels: true, \
IndentWidth: 2, \
KeepEmptyLinesAtTheStartOfBlocks: false, \
Language: Cpp, \
PenaltyBreakBeforeFirstCallParameter: 100, \
PenaltyBreakString: 100, \
PenaltyExcessCharacter: 100, \
PointerAlignment: Right, \
SortIncludes: true, \
SpaceAfterCStyleCast: true, \
UseTab: Never, \
}" "$@" \
-i ./**/*.{h,c,cpp}

73
tests/CSSLayoutTest.cpp
View File

@@ -3939,7 +3939,7 @@ TEST(CSSLayoutTest, test_layout_node_with_just_text) {
{
CSSNode *node_0 = root_node;
node_0->measure = measure;
node_0->context = (char *)SMALL_TEXT;
node_0->context = (char *) SMALL_TEXT;
}
CSSNode *root_layout = new_test_css_node();
@@ -3960,7 +3960,7 @@ TEST(CSSLayoutTest, test_layout_node_with_fixed_width_and_custom_measure) {
CSSNode *node_0 = root_node;
node_0->style.dimensions[CSSDimensionWidth] = 100;
node_0->measure = measure;
node_0->context = (char *)MEASURE_WITH_RATIO_2;
node_0->context = (char *) MEASURE_WITH_RATIO_2;
}
CSSNode *root_layout = new_test_css_node();
@@ -3981,7 +3981,7 @@ TEST(CSSLayoutTest, test_layout_node_with_fixed_height_and_custom_measure) {
CSSNode *node_0 = root_node;
node_0->style.dimensions[CSSDimensionHeight] = 100;
node_0->measure = measure;
node_0->context = (char *)MEASURE_WITH_RATIO_2;
node_0->context = (char *) MEASURE_WITH_RATIO_2;
}
CSSNode *root_layout = new_test_css_node();
@@ -4003,7 +4003,7 @@ TEST(CSSLayoutTest, test_should_skip_measure_if_fixed_height_and_width) {
node_0->style.dimensions[CSSDimensionWidth] = 100;
node_0->style.dimensions[CSSDimensionHeight] = 100;
node_0->measure = measure;
node_0->context = (char *)MEASURE_WITH_RATIO_2;
node_0->context = (char *) MEASURE_WITH_RATIO_2;
}
CSSNode *root_layout = new_test_css_node();
@@ -4023,7 +4023,7 @@ TEST(CSSLayoutTest, test_should_layout_node_with_measure) {
{
CSSNode *node_0 = root_node;
node_0->measure = measure;
node_0->context = (char *)MEASURE_WITH_RATIO_2;
node_0->context = (char *) MEASURE_WITH_RATIO_2;
}
CSSNode *root_layout = new_test_css_node();
@@ -4049,7 +4049,7 @@ TEST(CSSLayoutTest, test_should_layout_nested_stacks_with_measure) {
CSSNode *node_1;
node_1 = CSSNodeGetChild(node_0, 0);
node_1->measure = measure;
node_1->context = (char *)MEASURE_WITH_RATIO_2;
node_1->context = (char *) MEASURE_WITH_RATIO_2;
node_1 = CSSNodeGetChild(node_0, 1);
node_1->style.flexDirection = CSSFlexDirectionRow;
node_1->style.overflow = CSSOverflowHidden;
@@ -4059,10 +4059,10 @@ TEST(CSSLayoutTest, test_should_layout_nested_stacks_with_measure) {
CSSNode *node_2;
node_2 = CSSNodeGetChild(node_1, 0);
node_2->measure = measure;
node_2->context = (char *)MEASURE_WITH_RATIO_2;
node_2->context = (char *) MEASURE_WITH_RATIO_2;
node_2 = CSSNodeGetChild(node_1, 1);
node_2->measure = measure;
node_2->context = (char *)MEASURE_WITH_RATIO_2;
node_2->context = (char *) MEASURE_WITH_RATIO_2;
}
}
}
@@ -4113,7 +4113,7 @@ TEST(CSSLayoutTest, test_should_layout_text_node_with_width) {
CSSNode *node_0 = root_node;
node_0->style.dimensions[CSSDimensionWidth] = 10;
node_0->measure = measure;
node_0->context = (char *)SMALL_TEXT;
node_0->context = (char *) SMALL_TEXT;
}
CSSNode *root_layout = new_test_css_node();
@@ -4133,7 +4133,7 @@ TEST(CSSLayoutTest, test_should_layout_text_node_with_padding_and_margin) {
{
CSSNode *node_0 = root_node;
node_0->measure = measure;
node_0->context = (char *)LONG_TEXT;
node_0->context = (char *) LONG_TEXT;
}
CSSNode *root_layout = new_test_css_node();
@@ -4213,7 +4213,7 @@ TEST(CSSLayoutTest, test_should_layout_node_with_text_and_flex) {
node_2 = CSSNodeGetChild(node_1, 0);
node_2->style.flex = 1;
node_2->measure = measure;
node_2->context = (char *)LONG_TEXT;
node_2->context = (char *) LONG_TEXT;
}
}
}
@@ -4265,7 +4265,7 @@ TEST(CSSLayoutTest, test_should_layout_node_text_and_flex_rtl) {
node_2 = CSSNodeGetChild(node_1, 0);
node_2->style.flex = 1;
node_2->measure = measure;
node_2->context = (char *)LONG_TEXT;
node_2->context = (char *) LONG_TEXT;
}
}
}
@@ -4316,7 +4316,7 @@ TEST(CSSLayoutTest, test_should_layout_node_text_and_stretch) {
CSSNode *node_2;
node_2 = CSSNodeGetChild(node_1, 0);
node_2->measure = measure;
node_2->context = (char *)LONG_TEXT;
node_2->context = (char *) LONG_TEXT;
}
}
}
@@ -4368,7 +4368,7 @@ TEST(CSSLayoutTest, test_should_layout_node_text_and_stretch_and_width) {
node_2 = CSSNodeGetChild(node_1, 0);
node_2->style.dimensions[CSSDimensionWidth] = 130;
node_2->measure = measure;
node_2->context = (char *)LONG_TEXT;
node_2->context = (char *) LONG_TEXT;
}
}
}
@@ -4415,7 +4415,7 @@ TEST(CSSLayoutTest, test_should_layout_node_text_bounded_by_parent) {
node_1 = CSSNodeGetChild(node_0, 0);
node_1->style.alignSelf = CSSAlignFlexStart;
node_1->measure = measure;
node_1->context = (char *)LONG_TEXT;
node_1->context = (char *) LONG_TEXT;
}
}
@@ -4468,7 +4468,7 @@ TEST(CSSLayoutTest, test_should_layout_node_text_bounded_by_grand_parent) {
CSSNode *node_2;
node_2 = CSSNodeGetChild(node_1, 0);
node_2->measure = measure;
node_2->context = (char *)LONG_TEXT;
node_2->context = (char *) LONG_TEXT;
}
}
}
@@ -4680,7 +4680,7 @@ TEST(CSSLayoutTest, test_should_layout_text_direction_row) {
node_2->style.margin[CSSPositionStart] = 20;
node_2->style.margin[CSSPositionEnd] = 20;
node_2->measure = measure;
node_2->context = (char *)SMALL_TEXT;
node_2->context = (char *) SMALL_TEXT;
}
}
}
@@ -4737,7 +4737,7 @@ TEST(CSSLayoutTest, test_should_layout_text_direction_row_rtl) {
node_2->style.margin[CSSPositionStart] = 20;
node_2->style.margin[CSSPositionEnd] = 20;
node_2->measure = measure;
node_2->context = (char *)SMALL_TEXT;
node_2->context = (char *) SMALL_TEXT;
}
}
}
@@ -4792,7 +4792,7 @@ TEST(CSSLayoutTest, test_should_layout_text_with_margin) {
node_2->style.margin[CSSPositionStart] = 20;
node_2->style.margin[CSSPositionEnd] = 20;
node_2->measure = measure;
node_2->context = (char *)LONG_TEXT;
node_2->context = (char *) LONG_TEXT;
}
}
}
@@ -5315,8 +5315,8 @@ TEST(CSSLayoutTest, test_should_layout_absolute_node_top_with_right_width_and_no
ASSERT_TRUE(test(root_node, root_layout));
}
TEST(
CSSLayoutTest, test_should_layout_absolute_node_left_with_right_width_and_no_parent_dimension) {
TEST(CSSLayoutTest,
test_should_layout_absolute_node_left_with_right_width_and_no_parent_dimension) {
CSSNode *root_node = new_test_css_node();
{
CSSNode *node_0 = root_node;
@@ -5352,7 +5352,7 @@ TEST(
}
TEST(CSSLayoutTest,
test_should_layout_node_with_border_bottom__insidejustifyContent_space_between_container) {
test_should_layout_node_with_border_bottom__insidejustifyContent_space_between_container) {
CSSNode *root_node = new_test_css_node();
{
CSSNode *node_0 = root_node;
@@ -5387,7 +5387,7 @@ TEST(CSSLayoutTest,
}
TEST(CSSLayoutTest,
test_should_layout_node_with_negative_margin_top_inside_justifyContent_center_container) {
test_should_layout_node_with_negative_margin_top_inside_justifyContent_center_container) {
CSSNode *root_node = new_test_css_node();
{
CSSNode *node_0 = root_node;
@@ -5421,8 +5421,8 @@ TEST(CSSLayoutTest,
ASSERT_TRUE(test(root_node, root_layout));
}
TEST(
CSSLayoutTest, test_should_layout_node_with_margin_top_inside_justifyContent_center_container) {
TEST(CSSLayoutTest,
test_should_layout_node_with_margin_top_inside_justifyContent_center_container) {
CSSNode *root_node = new_test_css_node();
{
CSSNode *node_0 = root_node;
@@ -7746,7 +7746,7 @@ TEST(CSSLayoutTest, test_should_propagate_size_contraints_from_flex_parent) {
node_2->style.flex = 1;
node_2->style.dimensions[CSSDimensionHeight] = 10;
node_2->measure = measure;
node_2->context = (char *)MEASURE_WITH_MATCH_PARENT;
node_2->context = (char *) MEASURE_WITH_MATCH_PARENT;
}
}
}
@@ -8170,8 +8170,8 @@ TEST(CSSLayoutTest, test_should_shrink_column_node_when_there_is_no_space_left_o
ASSERT_TRUE(test(root_node, root_layout));
}
TEST(
CSSLayoutTest, test_should_not_shrink_column_node_with_siblings_when_there_is_space_left_over) {
TEST(CSSLayoutTest,
test_should_not_shrink_column_node_with_siblings_when_there_is_space_left_over) {
CSSNode *root_node = new_test_css_node();
{
CSSNode *node_0 = root_node;
@@ -8307,7 +8307,8 @@ TEST(CSSLayoutTest, test_should_shrink_column_node_with_siblings_when_there_is_n
ASSERT_TRUE(test(root_node, root_layout));
}
TEST(CSSLayoutTest,
TEST(
CSSLayoutTest,
test_should_shrink_column_nodes_proporional_to_their_main_size_when_there_is_no_space_left_over) {
CSSNode *root_node = new_test_css_node();
{
@@ -8469,7 +8470,7 @@ TEST(CSSLayoutTest, test_should_shrink_visible_row_node_when_there_is_no_space_l
}
TEST(CSSLayoutTest,
test_should_not_shrink_visible_row_node_with_siblings_when_there_is_space_left_over) {
test_should_not_shrink_visible_row_node_with_siblings_when_there_is_space_left_over) {
CSSNode *root_node = new_test_css_node();
{
CSSNode *node_0 = root_node;
@@ -8539,7 +8540,7 @@ TEST(CSSLayoutTest,
}
TEST(CSSLayoutTest,
test_should_shrink_visible_row_node_with_siblings_when_there_is_no_space_left_over) {
test_should_shrink_visible_row_node_with_siblings_when_there_is_no_space_left_over) {
CSSNode *root_node = new_test_css_node();
{
CSSNode *node_0 = root_node;
@@ -8772,7 +8773,7 @@ TEST(CSSLayoutTest, test_should_shrink_hidden_row_node_when_there_is_no_space_le
}
TEST(CSSLayoutTest,
test_should_not_shrink_hidden_row_node_with_siblings_when_there_is_space_left_over) {
test_should_not_shrink_hidden_row_node_with_siblings_when_there_is_space_left_over) {
CSSNode *root_node = new_test_css_node();
{
CSSNode *node_0 = root_node;
@@ -8843,7 +8844,7 @@ TEST(CSSLayoutTest,
}
TEST(CSSLayoutTest,
test_should_shrink_hidden_row_node_with_siblings_when_there_is_no_space_left_over) {
test_should_shrink_hidden_row_node_with_siblings_when_there_is_no_space_left_over) {
CSSNode *root_node = new_test_css_node();
{
CSSNode *node_0 = root_node;
@@ -8914,7 +8915,7 @@ TEST(CSSLayoutTest,
}
TEST(CSSLayoutTest,
test_should_shrink_hidden_row_nodes_propertional_to_main_size_when_there_is_no_space_left_over) {
test_should_shrink_hidden_row_nodes_propertional_to_main_size_when_there_is_no_space_left_over) {
CSSNode *root_node = new_test_css_node();
{
CSSNode *node_0 = root_node;
@@ -8994,7 +8995,7 @@ TEST(CSSLayoutTest, test_should_not_shrink_text_node_with_siblings_when_there_is
CSSNode *node_2;
node_2 = CSSNodeGetChild(node_1, 0);
node_2->measure = measure;
node_2->context = (char *)LONG_TEXT;
node_2->context = (char *) LONG_TEXT;
}
node_1 = CSSNodeGetChild(node_0, 2);
node_1->style.dimensions[CSSDimensionWidth] = 15;
@@ -9066,7 +9067,7 @@ TEST(CSSLayoutTest, test_should_shrink_text_node_with_siblings_when_there_is_no_
node_2 = CSSNodeGetChild(node_1, 0);
node_2->style.flex = -1;
node_2->measure = measure;
node_2->context = (char *)LONG_TEXT;
node_2->context = (char *) LONG_TEXT;
}
node_1 = CSSNodeGetChild(node_0, 2);
node_1->style.dimensions[CSSDimensionWidth] = 15;