Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix makefile #179

Open
wants to merge 1 commit into
base: split_parser
Choose a base branch
from
Open

Fix makefile #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ found in the `tree-sitter-markdown` folder, and one for inline structure, which
can be found in the `tree-sitter-markdown-inline` folder. Components that are
parts of either grammar can be found in the `common` folder.

For either of the grammar the most important files are the `grammar.js` which
For either of the grammar the most important files are the `grammar.json` which
defines most nodes and the `src/scanner.c` which defines nodes that cannot
be parsed with normal tree-sitter rules. All other files in the `src` subfolder
are auto-generated by running `tree-sitter generate`. (You need to install the
[tree-sitter cli tool][tree-sitter-cli] and [Node.js][nodejs] first.)

Some syntactical components can be enabled or disabled by environment variables
at compile time. The logic for this can be found in the `common/grammar.js`
at compile time. The logic for this can be found in the `common/common.js`
file.

Tests are located in the `test/corpus` subfolder:
Expand All @@ -54,7 +54,7 @@ Before submitting any code please check the following:

* You ran `tree-sitter generate` in the `tree-sitter-markdown` or
`tree-sitter-markdown-inline` directories respectively after modifying any
`grammar.js` file.
`grammar.json` file.
* When running `tree-sitter test` only the cases defined in `failing.txt` or
`extension_<>.txt` for not activated extensions fail for **both** grammars.
* If you implemented new behavior please add tests. (In most cases these belong
Expand Down
2 changes: 1 addition & 1 deletion common/common.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ $(LANGUAGE_NAME).pc: bindings/c/$(LANGUAGE_NAME).pc.in
-e 's|@CMAKE_INSTALL_PREFIX@|$(PREFIX)|' \
-e 's|@TS_REQUIRES@|$(REQUIRES)|' $< > $@

$(PARSER): $(SRC_DIR)/grammar.js
$(PARSER): $(SRC_DIR)/grammar.json
$(TS) generate $^

install: all
Expand Down