floss/tree-sitter-org
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix precedence for paragraph over section

Browse source
This commit is contained in:
Emilia Simmons 2021-07-21 11:50:21 -04:00
parent feefaeec27
commit 11fec7c047
6 changed files with 49329 additions and 49196 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
corpus/basic.tst
View file

@ -191,6 +191,25 @@ c*
(body (paragraph))
))
==============
Headlines.10 - Precedences
==============
* a
b
* c
d
----------
(document
(section
(headline (stars) (item))
(body (paragraph)))
(section
(headline (stars) (item))
(body (paragraph)))
)
===================
PropertyDrawer.1 -
===================

4
grammar.js
View file

@ -130,7 +130,7 @@ org_grammar = {
// Headlines =========================================== {{{1
headline: $ => seq(
$._stars, alias(/\*+/, $.stars),
$.stars,
optional(seq(
/[ \t]+/, // so it's not part of title
$.item,
@ -138,6 +138,8 @@ org_grammar = {
optional(field('tags', $._taglist)),
),
stars: $ => seq(prec.dynamic(10, $._stars), /\*+/),
// the choice with ':' allows for the conflict of $.title to operate
item: $ => seq(
field('first', choice($._text, /[ \t]:/)),

24
src/grammar.json
View file

@ -428,16 +428,7 @@
"members": [
{
"type": "SYMBOL",
"name": "_stars"
},
{
"type": "ALIAS",
"content": {
"type": "PATTERN",
"value": "\\*+"
},
"named": true,
"value": "stars"
"name": "stars"
},
{
"type": "CHOICE",
@ -478,6 +469,19 @@
}
]
},
"stars": {
"type": "SEQ",
"members": [
{
"type": "SYMBOL",
"name": "_stars"
},
{
"type": "PATTERN",
"value": "\\*+"
}
]
},
"item": {
"type": "SEQ",
"members": [

9
src/node-types.json
View file

@ -697,6 +697,11 @@
]
}
},
{
"type": "stars",
"named": true,
"fields": {}
},
{
"type": "subscript",
"named": true,
@ -917,10 +922,6 @@
"type": "repeater",
"named": true
},
{
"type": "stars",
"named": true
},
{
"type": "tag",
"named": true

98446
src/parser.c
View file

File diff suppressed because it is too large Load diff

23
src/scanner.cc
View file

@ -4,6 +4,7 @@
#include <cstring>
#include <cassert>
#include <stdio.h>
// #include <iostream> // std::cout
namespace {
@ -106,6 +107,7 @@ struct Scanner { // {{{1
indent_length_stack.pop_back();
bullet_stack.pop_back();
lexer->result_symbol = LISTEND;
// std::cout << " == Dedent~" << std::endl;
return true;
}
@ -154,6 +156,14 @@ struct Scanner { // {{{1
bool scan(TSLexer *lexer, const bool *valid_symbols) { // {{{1
// std::cout << " == ls:" << valid_symbols[LISTSTART];
// std::cout << ", le:" << valid_symbols[LISTEND];
// std::cout << ", lie:" << valid_symbols[LISTITEMEND];
// std::cout << ", bl:" << valid_symbols[BULLET];
// std::cout << ", st:" << valid_symbols[HLSTARS];
// std::cout << ", se:" << valid_symbols[SECTIONEND];
// std::cout << ", eof:" << valid_symbols[ENDOFFILE];
// std::cout << ", mu:" << valid_symbols[MARKUP] << std::endl;
// - Section ends {{{2
@ -208,6 +218,7 @@ bool scan(TSLexer *lexer, const bool *valid_symbols) { // {{{1
return dedent(lexer);
} else if (indent_length == indent_length_stack.back()) {
if (getbullet(lexer) == bullet_stack.back()) {
// std::cout << " == Item end~" << std::endl;
lexer->result_symbol = LISTITEMEND;
return true;
}
@ -217,6 +228,7 @@ bool scan(TSLexer *lexer, const bool *valid_symbols) { // {{{1
return false;
}
// std::cout << " == indent: " << indent_length << " next: '" << char(lexer->lookahead) << "'" << std::endl;
// - Col=0 star {{{2
if (indent_length == 0 && lexer->lookahead == '*') {
lexer->mark_end(lexer);
@ -230,13 +242,16 @@ bool scan(TSLexer *lexer, const bool *valid_symbols) { // {{{1
if (valid_symbols[SECTIONEND] && iswspace(lexer->lookahead) && stars > 0 && stars <= section_stack.back()) {
section_stack.pop_back();
lexer->result_symbol = SECTIONEND;
// std::cout << " == Section End~" << std::endl;
return true;
} else if (valid_symbols[HLSTARS] && iswspace(lexer->lookahead)) {
section_stack.push_back(stars);
lexer->result_symbol = HLSTARS;
// std::cout << " == Stars~" << std::endl;
return true;
} else if (valid_symbols[MARKUP] && stars == 1 && (!iswspace(lexer->lookahead) && lexer->lookahead != '\0')) {
lexer->result_symbol = MARKUP;
// std::cout << " == Bold~" << std::endl;
return true;
}
return false;
@ -250,22 +265,28 @@ bool scan(TSLexer *lexer, const bool *valid_symbols) { // {{{1
bool markup = lexer->lookahead == '+' || lexer->lookahead == '*';
Bullet bullet = getbullet(lexer);
// std::cout << " == bullet: " << bullet << " back indent: " << indent_length_stack.back() << std::endl;
// std::cout << " == il gt back: " << (indent_length > indent_length_stack.back()) << std::endl;
if (valid_symbols[BULLET] && bullet == bullet_stack.back() && indent_length == indent_length_stack.back()) {
lexer->mark_end(lexer);
lexer->result_symbol = BULLET;
// std::cout << " == Bullet~" << std::endl;
return true;
} else if (valid_symbols[LISTSTART] && bullet != NOTABULLET && indent_length > indent_length_stack.back()) {
indent_length_stack.push_back(indent_length);
bullet_stack.push_back(bullet);
lexer->result_symbol = LISTSTART;
// std::cout << " == Liststart~" << std::endl;
return true;
} else if (valid_symbols[MARKUP] && bullet == NOTABULLET && markup) {
lexer->result_symbol = MARKUP;
// std::cout << " == Markup~" << std::endl;
return (!iswspace(lexer->lookahead) && lexer->lookahead != '\0');
}
}
// - Markup {{{2
// std::cout << " == MUvalid: " << valid_symbols[MARKUP] << std::endl;
if (valid_symbols[MARKUP] && (indent_length > 0 || lexer->get_column(lexer) == 0)
&& (lexer->lookahead == '*'
|| lexer->lookahead == '/'
@ -277,9 +298,11 @@ bool scan(TSLexer *lexer, const bool *valid_symbols) { // {{{1
lexer->mark_end(lexer);
skip(lexer);
lexer->result_symbol = MARKUP;
// std::cout << " == Markup~" << std::endl;
return (!iswspace(lexer->lookahead) && lexer->lookahead != '\0');
}
// - Default {{{2
// std::cout << " == False~" << std::endl;
return false;
}
};