From b75677343e5387b76f7b99d54577deaf882ea590 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Wed, 18 Jul 2018 10:57:07 -0700 Subject: [PATCH] :arrow_up: tree-sitter-cli (new ABI version) --- package.json | 3 +-- src/parser.c | 2 +- src/tree_sitter/parser.h | 13 ++++++++----- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index d7277ee..dd51e81 100644 --- a/package.json +++ b/package.json @@ -10,11 +10,10 @@ "author": "Max Brunsfeld", "license": "MIT", "dependencies": { - "bindings": "1.2.x", "nan": "^2.10.0" }, "devDependencies": { - "tree-sitter-cli": "^0.12.6" + "tree-sitter-cli": "^0.13.1" }, "scripts": { "build": "tree-sitter generate && node-gyp build", diff --git a/src/parser.c b/src/parser.c index 317ba30..31654e5 100644 --- a/src/parser.c +++ b/src/parser.c @@ -5,7 +5,7 @@ #pragma GCC diagnostic ignored "-Wmissing-field-initializers" #endif -#define LANGUAGE_VERSION 8 +#define LANGUAGE_VERSION 9 #define STATE_COUNT 1428 #define SYMBOL_COUNT 208 #define ALIAS_COUNT 18 diff --git a/src/tree_sitter/parser.h b/src/tree_sitter/parser.h index 1b6c2b1..a757eac 100644 --- a/src/tree_sitter/parser.h +++ b/src/tree_sitter/parser.h @@ -25,13 +25,16 @@ typedef struct { bool named : 1; } TSSymbolMetadata; -typedef struct { - void (*advance)(void *, bool); - void (*mark_end)(void *); - uint32_t (*get_column)(void *); +typedef struct TSLexer TSLexer; + +struct TSLexer { int32_t lookahead; TSSymbol result_symbol; -} TSLexer; + void (*advance)(TSLexer *, bool); + void (*mark_end)(TSLexer *); + uint32_t (*get_column)(TSLexer *); + bool (*is_at_included_range_start)(TSLexer *); +}; typedef enum { TSParseActionTypeShift,