feat(lib): add the language name

tree-sitter · May 6, 2024 · ee7a88e · ee7a88e
1 parent 6e6dcf1
commit ee7a88e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 0 deletions.
diff --git a/cli/src/generate/render.rs b/cli/src/generate/render.rs
@@ -20,6 +20,7 @@ const SMALL_STATE_THRESHOLD: usize = 64;
 const ABI_VERSION_MIN: usize = 13;
 const ABI_VERSION_MAX: usize = tree_sitter::LANGUAGE_VERSION;
 const ABI_VERSION_WITH_PRIMARY_STATES: usize = 14;
+const ABI_VERSION_WITH_NAMES: usize = 15;
 
 macro_rules! add {
  ($this: tt, $($arg: tt)*) => {{
@@ -1438,6 +1439,9 @@ impl Generator {
  if self.abi_version >= ABI_VERSION_WITH_PRIMARY_STATES {
  add_line!(self, ".primary_state_ids = ts_primary_state_ids,");
  }
+ if self.abi_version >= ABI_VERSION_WITH_NAMES {
+ add_line!(self, ".name = \"{}\",", self.language_name);
+ }
 
  dedent!(self);
  add_line!(self, "}};");

diff --git a/lib/include/tree_sitter/api.h b/lib/include/tree_sitter/api.h
@@ -1097,6 +1097,11 @@ uint32_t ts_language_version(const TSLanguage *self);
 */
 TSStateId ts_language_next_state(const TSLanguage *self, TSStateId state, TSSymbol symbol);
 
+/**
+ * Get the name of this language. This returns `NULL` in older parsers.
+ */
+const char *ts_language_name(const TSLanguage *self);
+
 /********************************/
 /* Section - Lookahead Iterator */
 /********************************/

diff --git a/lib/src/language.c b/lib/src/language.c
@@ -28,6 +28,10 @@ uint32_t ts_language_version(const TSLanguage *self) {
  return self->version;
 }
 
+const char *ts_language_name(const TSLanguage *self) {
+ return self->version >= LANGUAGE_VERSION_WITH_NAMES ? self->name : NULL;
+}
+
 uint32_t ts_language_field_count(const TSLanguage *self) {
  return self->field_count;
 }

diff --git a/lib/src/language.h b/lib/src/language.h
@@ -10,6 +10,7 @@ extern "C" {
 
 #define ts_builtin_sym_error_repeat (ts_builtin_sym_error - 1)
 
+#define LANGUAGE_VERSION_WITH_NAMES 15
 #define LANGUAGE_VERSION_WITH_PRIMARY_STATES 14
 #define LANGUAGE_VERSION_USABLE_VIA_WASM 13
 

diff --git a/lib/src/parser.h b/lib/src/parser.h
@@ -128,6 +128,7 @@ struct TSLanguage {
  void (*deserialize)(void *, const char *, unsigned);
  } external_scanner;
  const TSStateId *primary_state_ids;
+ const char *name;
 };
 
 static inline bool set_contains(TSCharacterRange *ranges, uint32_t len, int32_t lookahead) {