Bump tree-sitter version and deal with arising issues (#297)

* Bump tree-sitter commit

Problem: The commit used for tree-sitter is a bit old and it's desired
to bump it up.

Solution: Change the commit in the tree-sitter vendor directory to
something more recent (v.19.5 release).

* Remove ts_parser_halt_on_error

Problem: After bumping the version up, build fails on
ts_parser_halt_on_error.

Solution: Remove this foreign import.

* Bump submodules and deal with problems

Problem: It's been a pretty long time since the previous bump, so we'd
like to do it again, but this time, let's bump everything. This causes
some trouble that we need to deal with, though.

Solution:
* Run `git submodule update --remote --merge --init` to bump submodules.
* After this, running `cabal test all` has one failure. This is because
  the cursor size was increased from 24 to 32, so `sizeOfCursor` was
  updated accordingly. I took the liberty to fix a small typo in its
  documentation as well.
* After this, I wanted to test tree-sitter. I found a demo in
  `tree-sitter-haskell` but noticed it was SEGFAULTing when running. I
  don't understand the cause, but I assume the Haskell tree-sitter
  grammar changed so this demo was no longer valid. I "fixed" it by
  checking the child at index 2 (bindings) rather than 3, since there is
  no index 3. I took the liberty to modernize it so warnings are gone
  too.
* After that, I wanted to test a real-world tree-sitter contract. For
  that, I visited a pretty old commit of one of our Haskell projects
  that used tree-sitter (nowadays it doesn't use it anymore), pointed it
  to my local branch of `haskell-tree-sitter`, and tried to build it.
    * First, it failed because `nodeIsMissing` wasn't present.
      Curiously, I couldn't find it in the branch it was previously
      using either, but it may be trivially added to `Node` using the
      `tree-sitter` API if desired, but I didn't bother. I removed its
      usage from the Haskell project and continued with life.
    * It also complained that `tree_sitter/parser.h` was missing.
      Indeed, it was deleted from the tree-sitter repository, so I
      removed it from the Cabal file.
    * With those changes, the project compiled was able to successfully
      parse a test file for CameLIGO.
* n.b.: I didn't check each tree-sitter-* directory, just the haskell
  one as it had a demo, so it's possible there are other failures I'm
  unaware.

* Make grammars compile

Problem: Note all tree-sitter-* dirs are compiling.

Solution: Some of them had updated files or paths, so fix them
accordingly in the Cabal file. Change their .hs files accordingly.

* Fix some more paths

Problem: I forgot some paths in Cabal for OCaml and PHP.

Solution: Fix their paths to the updated ones.

* Run Build & test commands locally; fix issues

Problem: CI still fails.

Solution: Run the Build & test commands locally, fix remaining paths...

tree-sitter-c-sharp/tree-sitter-c-sharp.cabal

@@ -11,7 +11,7 @@ copyright:           2020 GitHub
 category:            Tree-sitter, CSharp, C#
 build-type:          Simple
 data-files:          vendor/tree-sitter-c-sharp/src/node-types.json
-                   , vendor/tree-sitter-c-sharp/corpus/*.txt
+                   , vendor/tree-sitter-c-sharp/test/corpus/*.txt
 extra-source-files:  ChangeLog.md
 
 common common

tree-sitter-go/tree-sitter-go.cabal

@@ -11,7 +11,7 @@ copyright:           2019 GitHub
 category:            Tree-sitter, Go
 build-type:          Simple
 data-files:          vendor/tree-sitter-go/src/node-types.json
-                   , vendor/tree-sitter-go/corpus/*.txt
+                   , vendor/tree-sitter-go/test/corpus/*.txt
 extra-source-files:  ChangeLog.md
 
 common common

tree-sitter-haskell/examples/Demo.hs

@@ -1,34 +1,28 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RecordWildCards #-}
-module Main where
+module Main (main) where
 
 import           TreeSitter.Parser
 import           TreeSitter.Tree
-import           TreeSitter.Language
 import           TreeSitter.Haskell
 import           TreeSitter.Node
 import           Foreign.C.String
-import           Foreign.C.Types
-import           Foreign.Ptr                    ( Ptr(..)
+import           Foreign.Ptr                    ( Ptr
                                                 , nullPtr
-                                                , plusPtr
-                                                )
-import           Foreign.Marshal.Alloc          ( malloc
-                                                , mallocBytes
                                                 )
+import           Foreign.Marshal.Alloc          ( malloc )
 import           Foreign.Marshal.Array          ( mallocArray )
 import           Foreign.Storable               ( peek
                                                 , peekElemOff
                                                 , poke
                                                 )
-import           Foreign.Marshal.Utils          ( new )
 import           Control.Monad
 
 
 main :: IO ()
 main = do
   parser <- ts_parser_new
-  ts_parser_set_language parser tree_sitter_haskell
+  _ <- ts_parser_set_language parser tree_sitter_haskell
 
   let source =
         "module Test (main) where\nimport Lib\nf1 = undefined\nf2 = undefined"
@@ -39,8 +33,8 @@ main = do
   n          <- malloc
   ts_tree_root_node_p tree n
 
-  print "module (root) ------------"
-  n@Node {..} <- peek n
+  putStrLn "module (root) ------------"
+  Node {..} <- peek n  -- header, imports, and declarations
   let childCount = fromIntegral nodeChildCount
 
   children <- mallocArray childCount
@@ -50,8 +44,8 @@ main = do
 
   printChildren children childCount
 
-  print "where ------------"
-  n@Node {..} <- peekElemOff children 3
+  putStrLn "declarations ------------"
+  Node {..} <- peekElemOff children 2  -- declarations: bind and bind
   let nextChildCount = fromIntegral nodeChildCount
 
   nextChildren <- mallocArray nextChildCount
@@ -61,7 +55,7 @@ main = do
 
   printChildren nextChildren nextChildCount
 
-  print "END"
+  putStrLn "END"
 
 printChildren :: Ptr Node -> Int -> IO ()
 printChildren children count = forM_
@@ -78,4 +72,4 @@ printNode n@(Node {..}) = do
       start        = "(" ++ show pointRow ++ "," ++ show pointColumn ++ ")"
   let TSPoint {..} = nodeEndPoint
       end          = "(" ++ show pointRow ++ "," ++ show pointColumn ++ ")"
-  print $ theType ++ start ++ "-" ++ end
+  putStrLn $ theType ++ start ++ "-" ++ end

tree-sitter-haskell/tree-sitter-haskell.cabal

@@ -64,7 +64,8 @@ library
   Include-dirs:        vendor/tree-sitter-haskell/src
   install-includes:    tree_sitter/parser.h
   c-sources:           vendor/tree-sitter-haskell/src/parser.c
-                     , vendor/tree-sitter-haskell/src/scanner.cc
+                     , vendor/tree-sitter-haskell/src/scanner.c
+  cxx-sources:
   extra-libraries:     stdc++
 
 source-repository head

tree-sitter-java/tree-sitter-java.cabal

@@ -11,7 +11,7 @@ copyright:           2019 GitHub
 category:            Tree-sitter, Java
 build-type:          Simple
 data-files:          vendor/tree-sitter-java/src/node-types.json
-                   , vendor/tree-sitter-java/corpus/*.txt
+                   , vendor/tree-sitter-java/test/corpus/*.txt
 extra-source-files:  ChangeLog.md
 
 common common

tree-sitter-json/tree-sitter-json.cabal

@@ -11,7 +11,7 @@ copyright:           2019 GitHub
 category:            Tree-sitter, JSON
 build-type:          Simple
 data-files:          vendor/tree-sitter-json/src/node-types.json
-                   , vendor/tree-sitter-json/corpus/*.txt
+                   , vendor/tree-sitter-json/test/corpus/*.txt
 extra-source-files:  ChangeLog.md
 
 common common

tree-sitter-nix/tree-sitter-nix.cabal

@@ -55,7 +55,7 @@ library tree-sitter-nix-internal
                      , tree-sitter
   Include-dirs:        vendor/tree-sitter-nix/src
   c-sources:           vendor/tree-sitter-nix/src/parser.c
-                       vendor/tree-sitter-nix/src/scanner.cc
+                       vendor/tree-sitter-nix/src/scanner.c
   extra-libraries:     stdc++
 
 source-repository head

tree-sitter-ocaml/TreeSitter/OCaml.hs

@@ -8,10 +8,10 @@ import Foreign.Ptr
 import TreeSitter.Language
 import Paths_tree_sitter_ocaml
 
-foreign import ccall unsafe "vendor/tree-sitter-ocaml/src/parser.c tree_sitter_ocaml" tree_sitter_ocaml :: Ptr Language
+foreign import ccall unsafe "vendor/tree-sitter-ocaml/grammars/ocaml/src/parser.c tree_sitter_ocaml" tree_sitter_ocaml :: Ptr Language
 
 getNodeTypesPath :: IO FilePath
-getNodeTypesPath = getDataFileName "vendor/tree-sitter-ocaml/src/node-types.json"
+getNodeTypesPath = getDataFileName "vendor/tree-sitter-ocaml/grammars/ocaml/src/node-types.json"
 
 getTestCorpusDir :: IO FilePath
-getTestCorpusDir = getDataFileName "vendor/tree-sitter-ocaml/corpus"
+getTestCorpusDir = getDataFileName "vendor/tree-sitter-ocaml/grammars/ocaml/test/corpus"

tree-sitter-ocaml/tree-sitter-ocaml.cabal

@@ -9,8 +9,8 @@ maintainer:          [email protected]
 copyright:           2020 GitHub, Anton Kochkov
 category:            Tree-sitter, OCaml
 build-type:          Simple
-data-files:          vendor/tree-sitter-ocaml/src/node-types.json
-                   , vendor/tree-sitter-ocaml/corpus/*.txt
+data-files:          vendor/tree-sitter-ocaml/grammars/ocaml/src/node-types.json
+                   , vendor/tree-sitter-ocaml/grammars/ocaml/test/corpus/*.txt
 extra-source-files:  ChangeLog.md
 
 common common
@@ -46,10 +46,10 @@ library
   other-modules:       Paths_tree_sitter_ocaml
   build-depends:       base >= 4.12 && < 5
                      , tree-sitter ^>= 0.9.0.0
-  Include-dirs:        vendor/tree-sitter-ocaml/src
+  Include-dirs:        vendor/tree-sitter-ocaml/grammars/ocaml/src
   install-includes:    tree_sitter/parser.h
-  c-sources:           vendor/tree-sitter-ocaml/src/parser.c
-                     , vendor/tree-sitter-ocaml/src/scanner.cc
+  c-sources:           vendor/tree-sitter-ocaml/grammars/ocaml/src/parser.c
+                     , vendor/tree-sitter-ocaml/grammars/ocaml/src/scanner.c
   extra-libraries:     stdc++
 
 source-repository head

tree-sitter-php/TreeSitter/PHP.hs

@@ -7,7 +7,7 @@ import Foreign.Ptr
 import TreeSitter.Language
 import Paths_tree_sitter_php
 
-foreign import ccall unsafe "vendor/tree-sitter-php/src/parser.c tree_sitter_php" tree_sitter_php :: Ptr Language
+foreign import ccall unsafe "vendor/tree-sitter-php/php/src/parser.c tree_sitter_php" tree_sitter_php :: Ptr Language
 
 getNodeTypesPath :: IO FilePath
-getNodeTypesPath = getDataFileName "vendor/tree-sitter-php/src/node-types.json"
+getNodeTypesPath = getDataFileName "vendor/tree-sitter-php/php/src/node-types.json"

tree-sitter-php/tree-sitter-php.cabal

@@ -10,7 +10,7 @@ maintainer:          [email protected]
 copyright:           2019 GitHub
 category:            Tree-sitter, PHP
 build-type:          Simple
-data-files:          vendor/tree-sitter-php/src/node-types.json
+data-files:          vendor/tree-sitter-php/php/src/node-types.json
 extra-source-files:  ChangeLog.md
 
 common common
@@ -46,10 +46,10 @@ library
   other-modules:       Paths_tree_sitter_php
   build-depends:       base >= 4.12 && < 5
                      , tree-sitter
-  include-dirs:        vendor/tree-sitter-php/src
+  include-dirs:        vendor/tree-sitter-php/php/src
   install-includes:    tree_sitter/parser.h
-  c-sources:           vendor/tree-sitter-php/src/parser.c
-                     , vendor/tree-sitter-php/src/scanner.cc
+  c-sources:           vendor/tree-sitter-php/php/src/parser.c
+                     , vendor/tree-sitter-php/php/src/scanner.c
   extra-libraries:     stdc++
 
 source-repository head

tree-sitter-python/tree-sitter-python.cabal

@@ -50,7 +50,7 @@ library
   Include-dirs:        vendor/tree-sitter-python/src
   install-includes:    tree_sitter/parser.h
   c-sources:           vendor/tree-sitter-python/src/parser.c
-                     , vendor/tree-sitter-python/src/scanner.cc
+                     , vendor/tree-sitter-python/src/scanner.c
   extra-libraries:     stdc++
 
 source-repository head

tree-sitter-ruby/tree-sitter-ruby.cabal

@@ -50,7 +50,7 @@ library
   Include-dirs:        vendor/tree-sitter-ruby/src
   install-includes:    tree_sitter/parser.h
   c-sources:           vendor/tree-sitter-ruby/src/parser.c
-                     , vendor/tree-sitter-ruby/src/scanner.cc
+                     , vendor/tree-sitter-ruby/src/scanner.c
   extra-libraries:     stdc++
 
 

tree-sitter-rust/tree-sitter-rust.cabal

@@ -10,7 +10,7 @@ copyright:           2020 GitHub
 category:            Tree-sitter, Rust
 build-type:          Simple
 data-files:          vendor/tree-sitter-rust/src/node-types.json
-                   , vendor/tree-sitter-rust/corpus/*.txt
+                   , vendor/tree-sitter-rust/test/corpus/*.txt
 extra-source-files:  ChangeLog.md
 
 common common

tree-sitter-tsx/tree-sitter-tsx.cabal

@@ -11,7 +11,7 @@ copyright:           2019 GitHub
 category:            Tree-sitter, TypeScript
 build-type:          Simple
 data-files:          vendor/tree-sitter-typescript/tsx/src/node-types.json
-                   , vendor/tree-sitter-typescript/tsx/corpus/**/*.txt
+                   , vendor/tree-sitter-typescript/test/corpus/*.txt
 extra-source-files:  ChangeLog.md
 
 common common

tree-sitter-typescript/tree-sitter-typescript.cabal

@@ -11,7 +11,7 @@ copyright:           2019 GitHub
 category:            Tree-sitter, TypeScript
 build-type:          Simple
 data-files:          vendor/tree-sitter-typescript/typescript/src/node-types.json
-                   , vendor/tree-sitter-typescript/typescript/corpus/**/*.txt
+                   , vendor/tree-sitter-typescript/test/corpus/*.txt
 extra-source-files:  ChangeLog.md
 
 common common

tree-sitter/src/TreeSitter/Cursor.hs

@@ -34,9 +34,9 @@ withCursor rootPtr action = allocaBytes sizeOfCursor $ \ cursor -> Exc.bracket
   ts_tree_cursor_delete
   action
 
--- | THe size of a 'Cursor' in bytes. The tests verify that this value is the same as @sizeof(TSTreeCursor)@.
+-- | The size of a 'Cursor' in bytes. The tests verify that this value is the same as @sizeof(TSTreeCursor)@.
 sizeOfCursor :: Int
-sizeOfCursor = 24
+sizeOfCursor = 32
 
 foreign import ccall unsafe "src/bridge.c ts_tree_cursor_new_p" ts_tree_cursor_new_p :: Ptr TSNode -> Ptr Cursor -> IO ()
 foreign import ccall unsafe "ts_tree_cursor_delete" ts_tree_cursor_delete :: Ptr Cursor -> IO ()

tree-sitter/src/TreeSitter/Parser.hs

@@ -3,7 +3,6 @@ module TreeSitter.Parser
 , withParser
 , withParseTree
 , ts_parser_new
-, ts_parser_halt_on_error
 , ts_parser_parse_string
 , ts_parser_delete
 , ts_parser_set_language
@@ -44,7 +43,6 @@ withParseTree parser bytestring action =
           | otherwise    = ts_tree_delete t
 
 foreign import ccall safe "ts_parser_new" ts_parser_new :: IO (Ptr Parser)
-foreign import ccall safe "ts_parser_halt_on_error" ts_parser_halt_on_error :: Ptr Parser -> CBool -> IO ()
 foreign import ccall safe "ts_parser_parse_string" ts_parser_parse_string :: Ptr Parser -> Ptr Tree -> CString -> Int -> IO (Ptr Tree)
 foreign import ccall safe "ts_parser_delete" ts_parser_delete :: Ptr Parser -> IO ()
 foreign import ccall safe "ts_parser_set_language" ts_parser_set_language :: Ptr Parser -> Ptr Language -> IO Bool

tree-sitter/tree-sitter.cabal

@@ -69,7 +69,6 @@ library
   include-dirs:        vendor/tree-sitter/lib/include
                      , vendor/tree-sitter/lib/src
   install-includes:    tree_sitter/api.h
-                     , tree_sitter/parser.h
   c-sources:           src/bridge.c
                      , vendor/tree-sitter/lib/src/lib.c
   cc-options:          -std=c99