Commit graph

1419 commits

Author SHA1 Message Date
Max Brunsfeld
79ffc20be1 Remove RTTI flag in gyp file 2017-03-17 13:31:35 -07:00
Max Brunsfeld
db4b9ebc7c Implement Rule as a union rather than an abstract base class 2017-03-17 13:29:31 -07:00
Max Brunsfeld
272e3cc9c6 Merge pull request #68 from tree-sitter/lexer-lookahead
Allow lexer to look ahead in order to find the actual longest match
2017-03-13 17:40:52 -07:00
Max Brunsfeld
42b05b4b5e Add simple unit test for invalidating trees preceding an edit due to lookahead 2017-03-13 17:34:31 -07:00
Max Brunsfeld
d222dbb9fd Allow lexer to accept tokens that ended at previous positions
* Track lookahead in each tree
* Add 'mark_end' API that external scanners can use
2017-03-13 17:06:52 -07:00
Max Brunsfeld
12d2a9d93f Merge pull request #66 from tree-sitter/handle-unused-tokens
Handle unused tokens
2017-03-09 21:20:13 -08:00
Max Brunsfeld
f04d7c5860 Handle unused tokens 2017-03-09 21:16:37 -08:00
Max Brunsfeld
c79fae6d21 Clean up extract_tokens function 2017-03-09 21:16:20 -08:00
Max Brunsfeld
dc2035c262 Clean up gitignore 2017-03-09 20:49:11 -08:00
Max Brunsfeld
6dc0ff359d Rename spec -> test
'Test' is a lot more straightforward of a name.
2017-03-09 20:40:01 -08:00
Max Brunsfeld
7d8daf573e Remove gitattrs file
There's no longer any generated code checked in.
2017-03-09 20:31:18 -08:00
Max Brunsfeld
796fc26c74 Add a readme to another fixture grammar 2017-03-09 14:37:55 -08:00
Max Brunsfeld
53f72f0eca Fix list formatting in a fixture grammar readme 2017-03-09 12:28:25 -08:00
Max Brunsfeld
352e678c12 Merge pull request #63 from tree-sitter/avoid-lexing-issues-when-merging-states
Avoid introducing new lexical conflicts when merging parse states
2017-03-09 12:19:46 -08:00
Max Brunsfeld
56ec45729c Add regression test for avoiding lexical conflicts due to state merging 2017-03-09 12:13:44 -08:00
Max Brunsfeld
ac4167fdc9 Restructure integration tests to use separate JSON and corpus files
This makes these tests way easier to write and read.
2017-03-09 11:49:36 -08:00
Max Brunsfeld
f049d5d94c Make ParseItem a struct, not a class 2017-03-08 21:06:30 -08:00
Max Brunsfeld
64e9230071 Use LexTableBuilder to detect conflicts between tokens more correctly 2017-03-08 12:47:38 -08:00
Max Brunsfeld
abf8a4f2c2 🎨 2017-03-01 22:15:26 -08:00
Max Brunsfeld
686dc0997c Avoid introducing certain lexical conflicts during parse state merging
The current pretty conservative approach is to avoid merging parse states which
would cause a pair tokens to co-exist for the first time in any parse state,
where the two tokens can start with the same character and at least one of the
tokens can contain a character which is part of the grammar's separators.
2017-02-27 22:54:38 -08:00
Max Brunsfeld
3c8e6f9987 Restructure parse state merging logic
* Remove remnants of templatized remove_duplicate_states function
* Rename recovery_tokens function to get_compatible_tokens and augment it
  also compute pairs of tokens which could potentially be incompatible
2017-02-26 12:23:48 -08:00
Max Brunsfeld
8d3b72e1d9 Merge pull request #62 from tree-sitter/fix-crash-when-iterating-crazy-stack
Prevent crash due to huge number of possible paths through parse stack
2017-02-20 14:43:17 -08:00
Max Brunsfeld
df520635c6 Prevent crash due to huge number of possible paths through parse stack 2017-02-20 14:34:10 -08:00
Max Brunsfeld
ce5b3e8284 Merge pull request #61 from tree-sitter/error-recovery-improvements
More error recovery improvements
2017-02-20 12:26:52 -08:00
Max Brunsfeld
cefc57fe86 Move error cost comparisons into their own source file 2017-02-19 21:54:06 -08:00
Max Brunsfeld
5b4e6df3ff Don't mark error nodes created in the error state as extras 2017-02-19 21:54:06 -08:00
Max Brunsfeld
c14a776a3d Avoid including trailing extra tokens within error nodes unnecessarily 2017-02-19 21:21:54 -08:00
Max Brunsfeld
135d8ef4e0 Merge pull request #58 from tree-sitter/reduce-error-recovery-branching
Reduce the branching factor of the parse stack during error recovery
2017-02-18 11:34:09 -08:00
Timothy Clem
87b8b932e5 Merge pull request #59 from tree-sitter/input-string-with-length
Input string with length
2017-02-13 09:58:46 -08:00
Timothy Clem
93e94bf4b2 Add a happy path test for ts_document_set_input_string_with_length 2017-02-13 08:48:51 -08:00
Rob Rix
638aa87e42 Pass through to ts_string_input_make_with_length. 2017-02-10 09:27:21 -05:00
Rob Rix
eab518e5da Semicolon shame. 2017-02-10 09:20:58 -05:00
Rob Rix
c230658bae Add public API to set the input string with explicit length. 2017-02-10 09:10:31 -05:00
Rob Rix
e6927238e1 Construct TSStringInput with explicit length. 2017-02-10 09:10:06 -05:00
Max Brunsfeld
93d7a75b09 Suppress one unnecessary type of error recovery variation
If we already have a stack version in which, for example,
a `function_call` is skipped, don't create another stack
version in which that `function_call` is reduced to an
`expression`, and then the `expression` is skipped. That
doesn't improve the error recovery at all, but adds to the
branching factor of the parse stack and makes things harder
to debug.
2017-02-07 22:07:56 -08:00
Max Brunsfeld
819b63e78d Merge pull request #57 from tree-sitter/fix-error-recovery-bugs
Fix error recovery bug when error parent node contains extra tokens
2017-02-07 21:11:16 -08:00
Max Brunsfeld
9b930748cf Test against a specific version of the javascript grammar for now 2017-02-07 17:49:31 -08:00
Max Brunsfeld
5b23a8fca9 Update error corpus to reflect slightly different recoveries 2017-02-07 17:49:15 -08:00
Max Brunsfeld
b01c5404eb Ensure error_end_position variable is initialized 2017-02-07 17:48:53 -08:00
Max Brunsfeld
343887c1dd Fix miscounting of extra tokens when repairing errors 2017-02-06 17:43:07 -08:00
Max Brunsfeld
85e6d7ffad Merge pull request #55 from tree-sitter/nonwhitespace-character-class-regex
Allow \S for negated whitespace regex shorthand
2017-01-31 15:18:23 -08:00
Timothy Clem
ab00f1b0da Add support for \W and \D negated character classes too 2017-01-31 15:03:48 -08:00
Timothy Clem
902b7f9745 Allow \S for negated whitespace regex shorthand 2017-01-31 14:45:28 -08:00
Max Brunsfeld
3edb5dbdd9 Merge pull request #54 from tree-sitter/external-scanners
External scanners
2017-01-31 11:46:49 -08:00
Max Brunsfeld
0a6e5f9ee6 Fix some build warnings on gcc 2017-01-31 11:46:28 -08:00
Max Brunsfeld
d73534e97d Update language function name in README 2017-01-31 11:41:46 -08:00
Max Brunsfeld
005308f4c9 🔥 todo.md 2017-01-31 11:39:30 -08:00
Max Brunsfeld
4131e1c16e Return an error when external token name matches non-terminal rule 2017-01-31 11:36:51 -08:00
Max Brunsfeld
60f6998485 Rename generated language functions to e.g. tree_sitter_python
They used to be called e.g. `ts_language_python`. Now that there
are APIs that deal with the `TSLanguage` objects themselves, such
as `ts_language_symbol_count`, the old names were a little confusing.
2017-01-31 10:29:31 -08:00
Max Brunsfeld
d853b6504d Add version number to TSLanguage structs 2017-01-31 10:21:47 -08:00