Compare commits

...

1 commit

Author SHA1 Message Date
Amaan Qureshi 7b03feefd3 fix: do not perform lossy casts on row/col info
Some checks failed
CI / Test parsers (macos-14) (push) Has been cancelled
CI / Test parsers (ubuntu-latest) (push) Has been cancelled
CI / Test parsers (windows-latest) (push) Has been cancelled
Fuzz / Fuzz scanner (push) Has been cancelled
2024-05-08 11:44:24 -04:00
2 changed files with 413 additions and 386 deletions

View file

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

View file

@ -19,25 +19,25 @@ Block Scalar Header
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
(stream (stream
(document (document
(block_node (block_node
(block_sequence (block_sequence
(block_sequence_item (block_sequence_item
(block_node (block_node
(block_scalar (block_scalar
(comment)))) (comment))))
(block_sequence_item (block_sequence_item
(block_node (block_node
(block_scalar (block_scalar
(comment)))) (comment))))
(block_sequence_item (block_sequence_item
(block_node (block_node
(block_scalar (block_scalar
(comment)))) (comment))))
(block_sequence_item (block_sequence_item
(block_node (block_node
(block_scalar (block_scalar
(comment)))))))) (comment))))))))
================================================================================ ================================================================================
Block Indentation Indicator Block Indentation Indicator
@ -57,36 +57,21 @@ Block Indentation Indicator
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
(stream (stream
(document (document
(block_node (block_node
(block_sequence (block_sequence
(block_sequence_item (block_sequence_item
(block_node (block_node
(block_scalar))) (block_scalar)))
(block_sequence_item (block_sequence_item
(block_node (block_node
(block_scalar))) (block_scalar)))
(block_sequence_item (block_sequence_item
(block_node (block_node
(block_scalar))) (block_scalar)))
(block_sequence_item (block_sequence_item
(block_node (block_node
(block_scalar))))))) (block_scalar)))))))
================================================================================
Invalid Block Scalar Indentation Indicators
:error
================================================================================
- |
text
- >
text
text
- |2
text
--------------------------------------------------------------------------------
================================================================================ ================================================================================
Chomping Final Line Break Chomping Final Line Break
@ -104,27 +89,27 @@ keep: |+
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
(stream (stream
(document (document
(block_node (block_node
(block_mapping (block_mapping
(block_mapping_pair (block_mapping_pair
(flow_node (flow_node
(plain_scalar (plain_scalar
(string_scalar))) (string_scalar)))
(block_node (block_node
(block_scalar))) (block_scalar)))
(block_mapping_pair (block_mapping_pair
(flow_node (flow_node
(plain_scalar (plain_scalar
(string_scalar))) (string_scalar)))
(block_node (block_node
(block_scalar))) (block_scalar)))
(block_mapping_pair (block_mapping_pair
(flow_node (flow_node
(plain_scalar (plain_scalar
(string_scalar))) (string_scalar)))
(block_node (block_node
(block_scalar))))))) (block_scalar)))))))
================================================================================ ================================================================================
Chomping Trailing Lines Chomping Trailing Lines
@ -159,35 +144,35 @@ keep: |+
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
(stream (stream
(comment) (comment)
(comment) (comment)
(document (document
(block_node (block_node
(block_mapping (block_mapping
(block_mapping_pair (block_mapping_pair
(flow_node (flow_node
(plain_scalar (plain_scalar
(string_scalar))) (string_scalar)))
(block_node (block_node
(block_scalar))) (block_scalar)))
(comment) (comment)
(comment) (comment)
(block_mapping_pair (block_mapping_pair
(flow_node (flow_node
(plain_scalar (plain_scalar
(string_scalar))) (string_scalar)))
(block_node (block_node
(block_scalar))) (block_scalar)))
(comment) (comment)
(comment) (comment)
(block_mapping_pair (block_mapping_pair
(flow_node (flow_node
(plain_scalar (plain_scalar
(string_scalar))) (string_scalar)))
(block_node (block_node
(block_scalar))) (block_scalar)))
(comment) (comment)
(comment))))) (comment)))))
================================================================================ ================================================================================
Empty Scalar Chomping Empty Scalar Chomping
@ -205,27 +190,27 @@ keep: |+
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
(stream (stream
(document (document
(block_node (block_node
(block_mapping (block_mapping
(block_mapping_pair (block_mapping_pair
(flow_node (flow_node
(plain_scalar (plain_scalar
(string_scalar))) (string_scalar)))
(block_node (block_node
(block_scalar))) (block_scalar)))
(block_mapping_pair (block_mapping_pair
(flow_node (flow_node
(plain_scalar (plain_scalar
(string_scalar))) (string_scalar)))
(block_node (block_node
(block_scalar))) (block_scalar)))
(block_mapping_pair (block_mapping_pair
(flow_node (flow_node
(plain_scalar (plain_scalar
(string_scalar))) (string_scalar)))
(block_node (block_node
(block_scalar))))))) (block_scalar)))))))
================================================================================ ================================================================================
Literal Scalar Literal Scalar
@ -242,9 +227,9 @@ Literal Scalar
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
(stream (stream
(document (document
(block_node (block_node
(block_scalar)))) (block_scalar))))
================================================================================ ================================================================================
Literal Content Literal Content
@ -266,10 +251,10 @@ Literal Content
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
(stream (stream
(document (document
(block_node (block_node
(block_scalar))) (block_scalar)))
(comment)) (comment))
================================================================================ ================================================================================
Folded Scalar Folded Scalar
@ -286,9 +271,9 @@ Folded Scalar
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
(stream (stream
(document (document
(block_node (block_node
(block_scalar)))) (block_scalar))))
================================================================================ ================================================================================
Folded Lines Folded Lines
@ -319,10 +304,10 @@ Folded Lines
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
(stream (stream
(document (document
(block_node (block_node
(block_scalar))) (block_scalar)))
(comment)) (comment))
================================================================================ ================================================================================
More Indented Lines More Indented Lines
@ -351,10 +336,10 @@ More Indented Lines
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
(stream (stream
(document (document
(block_node (block_node
(block_scalar))) (block_scalar)))
(comment)) (comment))
================================================================================ ================================================================================
Empty Separation Lines Empty Separation Lines
@ -385,10 +370,10 @@ Empty Separation Lines
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
(stream (stream
(document (document
(block_node (block_node
(block_scalar))) (block_scalar)))
(comment)) (comment))
================================================================================ ================================================================================
Final Empty Lines Final Empty Lines
@ -414,10 +399,10 @@ Final Empty Lines
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
(stream (stream
(document (document
(block_node (block_node
(block_scalar))) (block_scalar)))
(comment)) (comment))
================================================================================ ================================================================================
Block Sequence Block Sequence
@ -431,29 +416,29 @@ block sequence:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
(stream (stream
(document (document
(block_node (block_node
(block_mapping (block_mapping
(block_mapping_pair (block_mapping_pair
(flow_node (flow_node
(plain_scalar
(string_scalar)))
(block_node
(block_sequence
(block_sequence_item
(flow_node
(plain_scalar
(string_scalar))))
(block_sequence_item
(block_node
(block_mapping
(block_mapping_pair
(flow_node
(plain_scalar (plain_scalar
(string_scalar))) (string_scalar)))
(flow_node (block_node
(plain_scalar (block_sequence
(string_scalar)))))))))))))) (block_sequence_item
(flow_node
(plain_scalar
(string_scalar))))
(block_sequence_item
(block_node
(block_mapping
(block_mapping_pair
(flow_node
(plain_scalar
(string_scalar)))
(flow_node
(plain_scalar
(string_scalar))))))))))))))
================================================================================ ================================================================================
Block Sequence Entry Types Block Sequence Entry Types
@ -468,38 +453,38 @@ Block Sequence Entry Types
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
(stream (stream
(document (document
(block_node (block_node
(block_sequence (block_sequence
(block_sequence_item) (block_sequence_item)
(comment) (comment)
(block_sequence_item (block_sequence_item
(block_node (block_node
(block_scalar))) (block_scalar)))
(block_sequence_item (block_sequence_item
(block_node (block_node
(block_sequence (block_sequence
(block_sequence_item (block_sequence_item
(flow_node (flow_node
(plain_scalar (plain_scalar
(string_scalar)))) (string_scalar))))
(comment) (comment)
(block_sequence_item (block_sequence_item
(flow_node (flow_node
(plain_scalar (plain_scalar
(string_scalar)))) (string_scalar))))
(comment)))) (comment))))
(block_sequence_item (block_sequence_item
(block_node (block_node
(block_mapping (block_mapping
(block_mapping_pair (block_mapping_pair
(flow_node (flow_node
(plain_scalar (plain_scalar
(string_scalar))) (string_scalar)))
(flow_node (flow_node
(plain_scalar (plain_scalar
(string_scalar)))) (string_scalar))))
(comment)))))))) (comment))))))))
================================================================================ ================================================================================
Block Mappings Block Mappings
@ -511,22 +496,22 @@ block mapping:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
(stream (stream
(document (document
(block_node (block_node
(block_mapping
(block_mapping_pair
(flow_node
(plain_scalar
(string_scalar)))
(block_node
(block_mapping (block_mapping
(block_mapping_pair (block_mapping_pair
(flow_node (flow_node
(plain_scalar (plain_scalar
(string_scalar))) (string_scalar)))
(flow_node (block_node
(plain_scalar (block_mapping
(string_scalar))))))))))) (block_mapping_pair
(flow_node
(plain_scalar
(string_scalar)))
(flow_node
(plain_scalar
(string_scalar)))))))))))
================================================================================ ================================================================================
Explicit Block Mapping Entries Explicit Block Mapping Entries
@ -543,29 +528,29 @@ Explicit Block Mapping Entries
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
(stream (stream
(document (document
(block_node (block_node
(block_mapping (block_mapping
(block_mapping_pair (block_mapping_pair
(flow_node (flow_node
(plain_scalar (plain_scalar
(string_scalar)))) (string_scalar))))
(comment) (comment)
(block_mapping_pair (block_mapping_pair
(block_node (block_node
(block_scalar)) (block_scalar))
(block_node (block_node
(block_sequence (block_sequence
(block_sequence_item (block_sequence_item
(flow_node (flow_node
(plain_scalar (plain_scalar
(string_scalar)))) (string_scalar))))
(comment) (comment)
(block_sequence_item (block_sequence_item
(flow_node (flow_node
(plain_scalar (plain_scalar
(string_scalar)))) (string_scalar))))
(comment)))))))) (comment))))))))
================================================================================ ================================================================================
Implicit Block Mapping Entries Implicit Block Mapping Entries
@ -578,27 +563,27 @@ plain key: in-line value
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
(stream (stream
(document (document
(block_node (block_node
(block_mapping (block_mapping
(block_mapping_pair (block_mapping_pair
(flow_node (flow_node
(plain_scalar (plain_scalar
(string_scalar))) (string_scalar)))
(flow_node (flow_node
(plain_scalar (plain_scalar
(string_scalar)))) (string_scalar))))
(block_mapping_pair) (block_mapping_pair)
(comment) (comment)
(block_mapping_pair (block_mapping_pair
(flow_node (flow_node
(double_quote_scalar)) (double_quote_scalar))
(block_node (block_node
(block_sequence (block_sequence
(block_sequence_item (block_sequence_item
(flow_node (flow_node
(plain_scalar (plain_scalar
(string_scalar))))))))))) (string_scalar)))))))))))
================================================================================ ================================================================================
Compact Block Mappings Compact Block Mappings
@ -613,41 +598,41 @@ Compact Block Mappings
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
(stream (stream
(document (document
(block_node (block_node
(block_sequence (block_sequence
(block_sequence_item (block_sequence_item
(block_node (block_node
(block_mapping (block_mapping
(block_mapping_pair (block_mapping_pair
(flow_node (flow_node
(plain_scalar (plain_scalar
(string_scalar))) (string_scalar)))
(flow_node (flow_node
(plain_scalar (plain_scalar
(string_scalar))))))) (string_scalar)))))))
(block_sequence_item (block_sequence_item
(block_node (block_node
(block_mapping (block_mapping
(block_mapping_pair (block_mapping_pair
(block_node (block_node
(block_mapping (block_mapping
(block_mapping_pair (block_mapping_pair
(flow_node (flow_node
(plain_scalar (plain_scalar
(string_scalar))) (string_scalar)))
(flow_node (flow_node
(plain_scalar (plain_scalar
(string_scalar)))))) (string_scalar))))))
(block_node (block_node
(block_mapping (block_mapping
(block_mapping_pair (block_mapping_pair
(flow_node (flow_node
(plain_scalar (plain_scalar
(string_scalar))) (string_scalar)))
(flow_node (flow_node
(plain_scalar (plain_scalar
(string_scalar)))))))))))))) (string_scalar))))))))))))))
================================================================================ ================================================================================
Block Node Types Block Node Types
@ -666,27 +651,27 @@ Block Node Types
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
(stream (stream
(document (document
(block_node (block_node
(block_sequence (block_sequence
(block_sequence_item (block_sequence_item
(flow_node (flow_node
(double_quote_scalar))) (double_quote_scalar)))
(block_sequence_item (block_sequence_item
(block_node (block_node
(block_scalar))) (block_scalar)))
(block_sequence_item (block_sequence_item
(block_node (block_node
(tag) (tag)
(comment) (comment)
(block_mapping (block_mapping
(block_mapping_pair (block_mapping_pair
(flow_node (flow_node
(plain_scalar (plain_scalar
(string_scalar))) (string_scalar)))
(flow_node (flow_node
(plain_scalar (plain_scalar
(string_scalar))))))))))) (string_scalar)))))))))))
================================================================================ ================================================================================
Block Scalar Nodes Block Scalar Nodes
@ -702,22 +687,22 @@ folded:
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
(stream (stream
(document (document
(block_node (block_node
(block_mapping (block_mapping
(block_mapping_pair (block_mapping_pair
(flow_node (flow_node
(plain_scalar (plain_scalar
(string_scalar))) (string_scalar)))
(block_node (block_node
(block_scalar))) (block_scalar)))
(block_mapping_pair (block_mapping_pair
(flow_node (flow_node
(plain_scalar (plain_scalar
(string_scalar))) (string_scalar)))
(block_node (block_node
(tag) (tag)
(block_scalar))))))) (block_scalar)))))))
================================================================================ ================================================================================
Block Collection Nodes Block Collection Nodes
@ -732,39 +717,66 @@ mapping: !!map
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
(stream (stream
(document (document
(block_node (block_node
(block_mapping
(block_mapping_pair
(flow_node
(plain_scalar
(string_scalar)))
(block_node
(tag)
(block_sequence
(block_sequence_item
(flow_node
(plain_scalar
(string_scalar))))
(block_sequence_item
(block_node
(tag)
(block_sequence
(block_sequence_item
(flow_node
(plain_scalar
(string_scalar))))))))))
(block_mapping_pair
(flow_node
(plain_scalar
(string_scalar)))
(block_node
(tag)
(block_mapping (block_mapping
(block_mapping_pair (block_mapping_pair
(flow_node (flow_node
(plain_scalar (plain_scalar
(string_scalar))) (string_scalar)))
(flow_node (block_node
(plain_scalar (tag)
(string_scalar))))))))))) (block_sequence
(block_sequence_item
(flow_node
(plain_scalar
(string_scalar))))
(block_sequence_item
(block_node
(tag)
(block_sequence
(block_sequence_item
(flow_node
(plain_scalar
(string_scalar))))))))))
(block_mapping_pair
(flow_node
(plain_scalar
(string_scalar)))
(block_node
(tag)
(block_mapping
(block_mapping_pair
(flow_node
(plain_scalar
(string_scalar)))
(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))))))))))