From edc519c7f15d4efd06a9df277a29f7b4c1756070 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Tue, 22 Dec 2015 19:06:07 -0500 Subject: [PATCH 1/3] Bump tree-sitter-parsers to `bumps`. --- vendor/tree-sitter-parsers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/tree-sitter-parsers b/vendor/tree-sitter-parsers index 7127518a5..5ff906683 160000 --- a/vendor/tree-sitter-parsers +++ b/vendor/tree-sitter-parsers @@ -1 +1 @@ -Subproject commit 7127518a529e5feb242721df01ac4c65e443001c +Subproject commit 5ff9066831bb052c1a9ee87a6a50afbbf0b396a9 From e1a84e2ab112221cfbb4a2f492142b208807f93c Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Tue, 22 Dec 2015 19:06:51 -0500 Subject: [PATCH 2/3] Increase the size of TSNode to match the current definition. See also https://github.com/maxbrunsfeld/tree-sitter/blob/master/include/tree_sit ter/runtime.h#L38-L41 --- src/TreeSitter.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/TreeSitter.hs b/src/TreeSitter.hs index 51896f0d0..2057f68ef 100644 --- a/src/TreeSitter.hs +++ b/src/TreeSitter.hs @@ -27,8 +27,8 @@ data TSNode = TsNode { _data :: Ptr (), offset :: TSLength } deriving (Show, Eq) instance Storable TSNode where - alignment _ = 24 - sizeOf _ = 24 + alignment _ = 32 + sizeOf _ = 32 peek _ = error "Haskell code should never read TSNode values directly." poke _ _ = error "Haskell code should never write TSNode values directly." From 59f3efc9ff34a3e04d18170ed30396d9664fde02 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Tue, 22 Dec 2015 19:08:55 -0500 Subject: [PATCH 3/3] Bump tree-sitter-parsers back to master since the PR was merged. --- vendor/tree-sitter-parsers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/tree-sitter-parsers b/vendor/tree-sitter-parsers index 5ff906683..ddaaf9d0a 160000 --- a/vendor/tree-sitter-parsers +++ b/vendor/tree-sitter-parsers @@ -1 +1 @@ -Subproject commit 5ff9066831bb052c1a9ee87a6a50afbbf0b396a9 +Subproject commit ddaaf9d0ab39345da4f1c6bda12958d67a6b4147