fix: do not perform lossy casts on row/col info

Cargo.toml

@@ -21,10 +21,7 @@ include = ["bindings/rust/*", "grammar.js", "queries/*", "src/*"]
 path = "bindings/rust/lib.rs"
 
 [dependencies]
-tree-sitter-language = "0.1.2"
-
-[dev-dependencies]
-tree-sitter = ">=0.22"
+tree-sitter = ">=0.21.0"
 
 [build-dependencies]
 cc = "1.0.92"

bindings/rust/lib.rs

@@ -11,7 +11,7 @@
 //!     - item2
 //! "#;
 //! let mut parser = tree_sitter::Parser::new();
-//! parser.set_language(&tree_sitter_yaml::LANGUAGE.into()).expect("Error loading YAML grammar");
+//! parser.set_language(&tree_sitter_yaml::language()).expect("Error loading YAML grammar");
 //! let tree = parser.parse(code, None).unwrap();
 //! assert!(!tree.root_node().has_error());
 //! ```
@@ -21,16 +21,18 @@
 //! [Parser]: https://docs.rs/tree-sitter/*/tree_sitter/struct.Parser.html
 //! [tree-sitter]: https://tree-sitter.github.io/
 
-use tree_sitter_language::LanguageFn;
+use tree_sitter::Language;
 
 extern "C" {
-    fn tree_sitter_yaml() -> *const ();
+    fn tree_sitter_yaml() -> Language;
 }
 
-/// The tree-sitter [`LanguageFn`][LanguageFn] for this grammar.
+/// Get the tree-sitter [Language][] for this grammar.
 ///
-/// [LanguageFn]: https://docs.rs/tree-sitter-language/*/tree_sitter_language/struct.LanguageFn.html
-pub const LANGUAGE: LanguageFn = unsafe { LanguageFn::from_raw(tree_sitter_yaml) };
+/// [Language]: https://docs.rs/tree-sitter/*/tree_sitter/struct.Language.html
+pub fn language() -> Language {
+    unsafe { tree_sitter_yaml() }
+}
 
 /// The content of the [`node-types.json`][] file for this grammar.
 ///
@@ -46,7 +48,7 @@ mod tests {
     fn test_can_load_grammar() {
         let mut parser = tree_sitter::Parser::new();
         parser
-            .set_language(&super::LANGUAGE.into())
+            .set_language(&super::language())
             .expect("Error loading YAML grammar");
     }
 }

src/scanner.c

@@ -2,7 +2,7 @@
 #include "tree_sitter/parser.h"
 
 #define _str(x) #x
-#define _file(x) _str(./schema.x.c)
+#define _file(x) _str(schema.x.c)
 
 #ifndef YAML_SCHEMA
 #define YAML_SCHEMA core
@@ -152,20 +152,27 @@ typedef struct {
 } Scanner;
 
 static unsigned serialize(Scanner *scanner, char *buffer) {
-    size_t i = 0;
-    buffer[i++] = (char)scanner->row;
-    buffer[i++] = (char)scanner->col;
-    buffer[i++] = (char)scanner->blk_imp_row;
-    buffer[i++] = (char)scanner->blk_imp_col;
-    buffer[i++] = (char)scanner->blk_imp_tab;
+    size_t size = 0;
+    *(int16_t *)&buffer[size] = scanner->row;
+    size += sizeof(int16_t);
+    *(int16_t *)&buffer[size] = scanner->col;
+    size += sizeof(int16_t);
+    *(int16_t *)&buffer[size] = scanner->blk_imp_row;
+    size += sizeof(int16_t);
+    *(int16_t *)&buffer[size] = scanner->blk_imp_col;
+    size += sizeof(int16_t);
+    *(int16_t *)&buffer[size] = scanner->blk_imp_tab;
+    size += sizeof(int16_t);
     int16_t *typ_itr = scanner->ind_typ_stk.contents + 1;
     int16_t *typ_end = scanner->ind_typ_stk.contents + scanner->ind_typ_stk.size;
     int16_t *len_itr = scanner->ind_len_stk.contents + 1;
-    for (; typ_itr != typ_end && i < TREE_SITTER_SERIALIZATION_BUFFER_SIZE; ++typ_itr, ++len_itr) {
-        buffer[i++] = (char)*typ_itr;
-        buffer[i++] = (char)*len_itr;
+    for (; typ_itr != typ_end && size < TREE_SITTER_SERIALIZATION_BUFFER_SIZE; ++typ_itr, ++len_itr) {
+        *(int16_t *)&buffer[size] = *typ_itr;
+        size += sizeof(int16_t);
+        *(int16_t *)&buffer[size] = *len_itr;
+        size += sizeof(int16_t);
     }
-    return i;
+    return size;
 }
 
 static void deserialize(Scanner *scanner, const char *buffer, unsigned length) {
@@ -179,16 +186,24 @@ static void deserialize(Scanner *scanner, const char *buffer, unsigned length) {
     array_delete(&scanner->ind_len_stk);
     array_push(&scanner->ind_len_stk, -1);
     if (length > 0) {
-        size_t i = 0;
-        scanner->row = (int16_t)buffer[i++];
-        scanner->col = (int16_t)buffer[i++];
-        scanner->blk_imp_row = (int16_t)buffer[i++];
-        scanner->blk_imp_col = (int16_t)buffer[i++];
-        scanner->blk_imp_tab = (int16_t)buffer[i++];
-        while (i < length) {
-            array_push(&scanner->ind_typ_stk, (int16_t)buffer[i++]);
-            array_push(&scanner->ind_len_stk, (int16_t)buffer[i++]);
+        size_t size = 0;
+        scanner->row = *(int16_t *)&buffer[size];
+        size += sizeof(int16_t);
+        scanner->col = *(int16_t *)&buffer[size];
+        size += sizeof(int16_t);
+        scanner->blk_imp_row = *(int16_t *)&buffer[size];
+        size += sizeof(int16_t);
+        scanner->blk_imp_col = *(int16_t *)&buffer[size];
+        size += sizeof(int16_t);
+        scanner->blk_imp_tab = *(int16_t *)&buffer[size];
+        size += sizeof(int16_t);
+        while (size < length) {
+            array_push(&scanner->ind_typ_stk, *(int16_t *)&buffer[size]);
+            size += sizeof(int16_t);
+            array_push(&scanner->ind_len_stk, *(int16_t *)&buffer[size]);
+            size += sizeof(int16_t);
         }
+        assert(size == length);
     }
 }
 

test/corpus/08_blocks.txt

@@ -73,21 +73,6 @@ Block Indentation Indicator
           (block_node
             (block_scalar)))))))
 
-================================================================================
-Invalid Block Scalar Indentation Indicators
-:error
-================================================================================
-- |
-
- text
-- >
-  text
- text
-- |2
- text
-
---------------------------------------------------------------------------------
-
 ================================================================================
 Chomping Final Line Break
 ================================================================================
@@ -768,3 +753,30 @@ mapping: !!map
                 (flow_node
                   (plain_scalar
                     (string_scalar)))))))))))
+
+================================================================================
+Long string scalar (> SCHAR_MAX in length)
+================================================================================
+
+long:
+  abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdef1234567890!@#$%^&*()_+{}|:"<>?`-=[]\;',./almostat128chars!:
+    {}
+
+---
+
+(stream
+  (document
+    (block_node
+      (block_mapping
+        (block_mapping_pair
+          (flow_node
+            (plain_scalar
+              (string_scalar)))
+          (block_node
+            (block_mapping
+              (block_mapping_pair
+                (flow_node
+                  (plain_scalar
+                    (string_scalar)))
+                (flow_node
+                  (flow_mapping))))))))))