From 652fa2f8a5363156c8b1bc992c6288b11475f336 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Wed, 4 Jun 2014 13:46:18 -0700 Subject: [PATCH] Fix stack spec on gcc --- include/tree_sitter/parser/lexer.h | 17 ++++++++--------- spec/runtime/stack_spec.cc | 13 ++----------- spec/runtime/tree_spec.cc | 8 +------- 3 files changed, 11 insertions(+), 27 deletions(-) diff --git a/include/tree_sitter/parser/lexer.h b/include/tree_sitter/parser/lexer.h index 062ea655..814d4429 100644 --- a/include/tree_sitter/parser/lexer.h +++ b/include/tree_sitter/parser/lexer.h @@ -17,15 +17,14 @@ typedef struct { } ts_lexer; static inline ts_lexer ts_lexer_make() { - ts_lexer result = { - .chunk = NULL, - .chunk_start = 0, - .chunk_size = 0, - .position_in_chunk = 0, - .token_start_position = 0, - .token_end_position = 0, - .reached_end = 0, - }; + ts_lexer result; + result.chunk = NULL; + result.chunk_start = 0; + result.chunk_size = 0; + result.position_in_chunk = 0; + result.token_start_position = 0; + result.token_end_position = 0; + result.reached_end = 0; return result; } diff --git a/spec/runtime/stack_spec.cc b/spec/runtime/stack_spec.cc index a9fe8724..2b5b7aa6 100644 --- a/spec/runtime/stack_spec.cc +++ b/spec/runtime/stack_spec.cc @@ -3,17 +3,8 @@ START_TEST -enum { - sym1 = 101, - sym2 = 102, - hidden_sym = 103, -}; - -int hidden_symbols[] = { - [sym1] = 0, - [sym2] = 0, - [hidden_sym] = 1, -}; +enum { sym1, sym2, hidden_sym }; +int hidden_symbols[] = { 0, 0, 1 }; describe("stacks", [&]() { ts_stack stack; diff --git a/spec/runtime/tree_spec.cc b/spec/runtime/tree_spec.cc index a9fb10f7..201be0b1 100644 --- a/spec/runtime/tree_spec.cc +++ b/spec/runtime/tree_spec.cc @@ -8,13 +8,7 @@ enum { pig = 4, }; -static const char *names[] = { - [ts_builtin_sym_error] = "error", - [ts_builtin_sym_end] = "end", - [cat] = "cat", - [dog] = "dog", - [pig] = "pig", -}; +static const char *names[] = { "error", "end", "cat", "dog", "pig" }; describe("trees", []() { ts_tree *tree1, *tree2, *parent1;