diff --git a/src/gf.c b/src/gf.c index 1cb8ec4cf324a..5d344f1815c03 100644 --- a/src/gf.c +++ b/src/gf.c @@ -1339,7 +1339,7 @@ jl_methlist_t *jl_method_list_insert(jl_methlist_t **pml, jl_tuple_t *type, } item = next; pitem = pnext; - item_parent = next_parent; + item_parent = next_parent; } } JL_GC_POP(); diff --git a/src/support/MurmurHash3.c b/src/support/MurmurHash3.c index 6dcde79304394..cbdd6b35d4def 100644 --- a/src/support/MurmurHash3.c +++ b/src/support/MurmurHash3.c @@ -16,20 +16,20 @@ #if defined(_MSC_VER) -#define FORCE_INLINE __forceinline +#define FORCE_INLINE __forceinline #include -#define ROTL32(x,y) _rotl(x,y) -#define ROTL64(x,y) _rotl64(x,y) +#define ROTL32(x,y) _rotl(x,y) +#define ROTL64(x,y) _rotl64(x,y) #define BIG_CONSTANT(x) (x) // Other compilers -#else // defined(_MSC_VER) +#else // defined(_MSC_VER) -#define FORCE_INLINE inline __attribute__((always_inline)) +#define FORCE_INLINE inline __attribute__((always_inline)) static inline uint32_t rotl32 ( uint32_t x, int8_t r ) { @@ -41,8 +41,8 @@ static inline uint64_t rotl64 ( uint64_t x, int8_t r ) return (x << r) | (x >> (64 - r)); } -#define ROTL32(x,y) rotl32(x,y) -#define ROTL64(x,y) rotl64(x,y) +#define ROTL32(x,y) rotl32(x,y) +#define ROTL64(x,y) rotl64(x,y) #define BIG_CONSTANT(x) (x##LLU) diff --git a/src/support/dtypes.h b/src/support/dtypes.h index 9ccb64151dc46..86a8d7b325ca4 100644 --- a/src/support/dtypes.h +++ b/src/support/dtypes.h @@ -84,15 +84,15 @@ #endif #ifdef _OS_WINDOWS_ -#define __LITTLE_ENDIAN 1234 -#define __BIG_ENDIAN 4321 -#define __PDP_ENDIAN 3412 +#define __LITTLE_ENDIAN 1234 +#define __BIG_ENDIAN 4321 +#define __PDP_ENDIAN 3412 #define __BYTE_ORDER __LITTLE_ENDIAN #define __FLOAT_WORD_ORDER __LITTLE_ENDIAN -#define LITTLE_ENDIAN __LITTLE_ENDIAN -#define BIG_ENDIAN __BIG_ENDIAN -#define PDP_ENDIAN __PDP_ENDIAN -#define BYTE_ORDER __BYTE_ORDER +#define LITTLE_ENDIAN __LITTLE_ENDIAN +#define BIG_ENDIAN __BIG_ENDIAN +#define PDP_ENDIAN __PDP_ENDIAN +#define BYTE_ORDER __BYTE_ORDER #endif #if (__STDC_VERSION__ >= 199901L) || defined(__GNUG__) diff --git a/src/support/wcwidth.c b/src/support/wcwidth.c index 2137eccc1a8c8..c74a28967f10e 100644 --- a/src/support/wcwidth.c +++ b/src/support/wcwidth.c @@ -192,7 +192,7 @@ DLLEXPORT int wcwidth(uint32_t ucs) /* binary search in table of non-spacing characters */ if (bisearch(ucs, combining, - sizeof(combining) / sizeof(struct interval) - 1)) + sizeof(combining) / sizeof(struct interval) - 1)) return 0; /* if we arrive here, ucs is not a combining or C0/C1 control character */ @@ -298,7 +298,7 @@ int wcwidth_cjk(uint32_t ucs) /* binary search in table of non-spacing characters */ if (bisearch(ucs, ambiguous, - sizeof(ambiguous) / sizeof(struct interval) - 1)) + sizeof(ambiguous) / sizeof(struct interval) - 1)) return 2; return wcwidth(ucs); diff --git a/test/functional.jl b/test/functional.jl index 4f94914d1ba15..ef0fa6d7e8ee8 100644 --- a/test/functional.jl +++ b/test/functional.jl @@ -70,9 +70,9 @@ end let i = 0 for j = countfrom(0, 2) - @test j == i*2 - i += 1 - i <= 10 || break + @test j == i*2 + i += 1 + i <= 10 || break end end @@ -83,16 +83,16 @@ let t = take(0:2:8, 10), i = 0 @test length(collect(t)) == 5 for j = t - @test j == i*2 - i += 1 + @test j == i*2 + i += 1 end @test i == 5 end let i = 0 for j = take(0:2:100, 10) - @test j == i*2 - i += 1 + @test j == i*2 + i += 1 end @test i == 10 end @@ -102,8 +102,8 @@ end let i = 0 for j = drop(0:2:10, 2) - @test j == (i+2)*2 - i += 1 + @test j == (i+2)*2 + i += 1 end @test i == 4 end @@ -113,9 +113,9 @@ end let i = 0 for j = cycle(0:3) - @test j == i % 4 - i += 1 - i <= 10 || break + @test j == i % 4 + i += 1 + i <= 10 || break end end @@ -124,15 +124,15 @@ end let i = 0 for j = repeated(1, 10) - @test j == 1 - i += 1 + @test j == 1 + i += 1 end @test i == 10 end let i = 0 for j = repeated(1) - @test j == 1 - i += 1 - i <= 10 || break + @test j == 1 + i += 1 + i <= 10 || break end end