joshvera
e674094f64
Sum the offset_point like offset in ts_tree_assign_parents
2015-12-02 16:41:40 -05:00
joshvera
3f9c8b76de
Add padding_point.row to ts_node_start_point's row.
2015-12-02 16:41:16 -05:00
joshvera
9da4aeaeff
columns start at 0 for sanity's sake
2015-11-30 17:22:47 -05:00
joshvera
dc3818987c
start points from zero
2015-11-30 16:54:10 -05:00
joshvera
cc77889d11
combine logs
2015-11-30 14:19:50 -05:00
joshvera
88d3432787
Merge remote-tracking branch 'joshvera/line-numbers' into line-numbers
2015-11-30 13:06:54 -05:00
joshvera
7633cbb836
indentation
2015-11-30 12:59:23 -05:00
joshvera
4af3b7d0fd
Add offset_point to LookaheadState
2015-11-30 12:50:16 -05:00
joshvera
f5fc247c8b
Merge remote-tracking branch 'origin/master' into line-numbers
2015-11-30 12:36:11 -05:00
joshvera
4cbc4b8bcf
Revert "try starting from 1"
...
This reverts commit 11efff2442
2015-11-30 12:16:58 -05:00
joshvera
2dc63f2c30
Revert "start the root node from 1"
...
This reverts commit 7fab9e2c42
2015-11-30 12:16:49 -05:00
joshvera
7fab9e2c42
start the root node from 1
2015-11-25 14:28:52 -05:00
joshvera
11efff2442
try starting from 1
2015-11-25 14:25:11 -05:00
joshvera
3d9a44d880
Calculate the column and offset separately in TSNode
2015-11-25 13:36:19 -05:00
joshvera
4663b9ce89
Add padding and size points to ts_tree_make_leaf in ts_lexer__accept
2015-11-25 11:44:13 -05:00
joshvera
ad58b752e6
Rename ts_tree_total_size_point to ts_tree_offset_point
2015-11-25 11:28:28 -05:00
joshvera
2669933d06
Implement ts_find_parent_offset_point
2015-11-25 11:08:44 -05:00
Max Brunsfeld
ce27c2ee97
🔥 variable accidentally left in for debugging
2015-11-20 13:12:32 -08:00
Max Brunsfeld
c28db44cd9
🎨
2015-11-20 13:10:11 -08:00
Max Brunsfeld
32b1088823
Rename HeadState -> LookaheadState, remove parser.lookahead field
2015-11-20 12:55:01 -08:00
Max Brunsfeld
467930a785
Move some ts_language functions to the right file
2015-11-20 12:00:49 -08:00
Max Brunsfeld
5c95d02bd0
Move ts_tree_compare to the right file
2015-11-20 11:53:03 -08:00
Max Brunsfeld
7aba2a0716
Rename DEBUG macro to LOG
...
DEBUG is already used as the symbol to enable/disable assert() calls
2015-11-20 11:50:50 -08:00
Max Brunsfeld
8d1b9501ab
Fix integer comparison warnings
2015-11-20 11:47:39 -08:00
Max Brunsfeld
ee66f1e774
Make vector.h compile when included by C++, w/o clang extensions
2015-11-20 00:11:17 -08:00
Max Brunsfeld
c88e9044d5
Make stack popping more robust
2015-11-20 00:04:21 -08:00
Max Brunsfeld
64874449e4
Allow different parse stack heads to lex differently
2015-11-19 20:55:18 -08:00
joshvera
8446b657f0
Rename position to offset and point to offset_point
2015-11-18 17:53:38 -08:00
joshvera
cf72f2f0ae
ts_node_size_point
2015-11-18 16:47:27 -08:00
joshvera
eb2a18cf16
s/TSLength/TSPoint
2015-11-18 16:46:09 -08:00
joshvera
6485e27d70
add ts_node_end_point
2015-11-18 16:45:10 -08:00
joshvera
b0f6bac3ab
replace start and end with padding and size
2015-11-18 16:34:50 -08:00
joshvera
a85b7fe3c4
start column at 0 again
2015-11-16 16:59:12 -08:00
Max Brunsfeld
484721b0c2
Assign tree parent pointers after parse is complete
2015-11-15 12:21:16 -08:00
Max Brunsfeld
ab34cfecd9
Replace TreeVector with a more generic Vector struct
2015-11-15 09:55:36 -08:00
Max Brunsfeld
0824d3e1f3
Only use first parse stack path during error recovery
2015-11-14 12:37:21 -08:00
joshvera
fc49a3949a
try resetting to 1
2015-11-13 14:13:16 -05:00
joshvera
8058500c5b
Add source info to TSTree
2015-11-12 15:32:53 -05:00
joshvera
bf666351e9
Set token_end_source_info
2015-11-12 13:28:33 -05:00
joshvera
e60ab58187
maybe increment line and column here?
2015-11-12 13:25:35 -05:00
joshvera
e3936e71fd
Merge remote-tracking branch 'origin/master' into line-numbers
2015-11-12 13:14:17 -05:00
joshvera
e720922662
Add source info to TSLexer
2015-11-12 12:24:05 -05:00
Max Brunsfeld
46e99d3e42
Retrieve the shift action correctly when reducing and recovering
2015-11-11 17:53:45 -08:00
Max Brunsfeld
483577f00d
Fix error when merging nodes at the base of the parse stack
2015-11-11 17:31:40 -08:00
Max Brunsfeld
40a90b551a
Allow error recovery to look all the way to the bottom of the stack
...
Previously, there was a bug where the first node on the stack
would never be popped
2015-11-11 16:59:41 -08:00
Max Brunsfeld
1a5d5b3156
Make ambiguities resolve deterministically
...
In the future, they should resolve according to some kind of dynamic
precedence annotations provided in the grammars. For now, this at least makes
them fully deterministic, so that tests won't fail due to ambiguities resolving
differently after undone edits.
2015-11-11 16:54:03 -08:00
Max Brunsfeld
e11515fb74
Escape backslashes and quotes in symbol name strings
2015-11-09 09:33:24 -08:00
Max Brunsfeld
d5ce268074
Fix handling of changing precedence within lexical rules.
...
A precedence annotation wrapping a sequence of characters now only affects how
tightly those characters bind to *each other*, not how tightly they bind to the
preceding character.
This bug surfaced because a generated lexer was failing to recognize a '\n' character
as a token, instead treating it as ubiquitous whitespace. It made this error
because, even though anonymous ubiquitous tokens have the lowest precedence, the
character immediately *after* the '\n' was part of a normal token, which had
*normal* precedence (0). Advancing into that following token was incorrectly
prioritized above accepting the line-break token.
2015-11-08 13:36:15 -08:00
Max Brunsfeld
30b6530fd1
Account for parse stack merges when shifting
...
Previously, when the parse stack was split into 3 or more heads, it was
possible for head 3 to be accidentally skipped if head 2 merged with head 1.
2015-11-05 21:21:18 -08:00
Max Brunsfeld
4ab4fd7346
Merge pull request #4 from maxbrunsfeld/mb-precedence-handling-within-tokens
...
Make precedence more useful within tokens
2015-11-01 21:50:53 -08:00
