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

Add support left recursion #123

Merged
merged 14 commits into from
Sep 22, 2023
Merged

Add support left recursion #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
681b7be
Add left recursion check
Jun 13, 2023
040bfe9
Add support left recursion
Jun 15, 2023
9624399
Add support priority of operations
Jun 16, 2023
23894e2
Fix comments
Jun 25, 2023
8a83e81
Add removal of parts needed only to support the left recursion
Jun 25, 2023
32b14c8
Add docs
Jun 26, 2023
3f1e079
Fix comments
Jun 28, 2023
cd17ff2
Fix comments
Jul 5, 2023
f39183d
Fix formatting
Jul 5, 2023
f458d76
Add left recursion tests with state, labeled failures, throw and recover
Jul 6, 2023
31bf448
Use errors.As
Jul 10, 2023
fabdceb
Fix Memoize mode
Jul 21, 2023
1faea72
Fix formatting
breml Aug 30, 2023
e5cbadb
Add test case for issue #79
breml Aug 30, 2023
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
57 changes: 56 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,11 +167,66 @@ $(TEST_DIR)/issue_70/optimized-grammar/issue_70.go: $(TEST_DIR)/issue_70/issue_7
$(BINDIR)/pigeon -nolint -optimize-grammar $< > $@

$(TEST_DIR)/issue_70b/issue_70b.go: $(TEST_DIR)/issue_70b/issue_70b.peg $(BINDIR)/pigeon
$(BINDIR)/pigeon -nolint --optimize-grammar $< > $@
$(BINDIR)/pigeon -nolint -optimize-grammar -support-left-recursion $< > $@
breml marked this conversation as resolved.
Show resolved Hide resolved

$(TEST_DIR)/issue_79/issue_79.go: $(TEST_DIR)/issue_79/issue_79.peg $(BINDIR)/pigeon
@! $(BINDIR)/pigeon $< > $@ 2>/dev/null && exit 0 || echo "failure, expect build to fail due to left recursion!" && exit 1
$(BINDIR)/pigeon -support-left-recursion $< > $@

$(TEST_DIR)/issue_80/issue_80.go: $(TEST_DIR)/issue_80/issue_80.peg $(BINDIR)/pigeon
$(BINDIR)/pigeon -nolint $< > $@

$(TEST_DIR)/left_recursion/left_recursion.go: \
$(TEST_DIR)/left_recursion/standart/leftrecursion/left_recursion.go \
$(TEST_DIR)/left_recursion/optimized/leftrecursion/left_recursion.go \
$(BINDIR)/pigeon

$(TEST_DIR)/left_recursion/standart/leftrecursion/left_recursion.go: \
$(TEST_DIR)/left_recursion/left_recursion.peg $(BINDIR)/pigeon
$(BINDIR)/pigeon -nolint -support-left-recursion $< > $@

$(TEST_DIR)/left_recursion/optimized/leftrecursion/left_recursion.go: \
$(TEST_DIR)/left_recursion/left_recursion.peg $(BINDIR)/pigeon
$(BINDIR)/pigeon -nolint -optimize-parser -support-left-recursion $< > $@

$(TEST_DIR)/left_recursion/without_left_recursion.go: \
$(TEST_DIR)/left_recursion/standart/withoutleftrecursion/without_left_recursion.go \
$(TEST_DIR)/left_recursion/optimized/withoutleftrecursion/without_left_recursion.go \
$(BINDIR)/pigeon

$(TEST_DIR)/left_recursion/standart/withoutleftrecursion/without_left_recursion.go: \
$(TEST_DIR)/left_recursion/without_left_recursion.peg \
$(BINDIR)/pigeon
$(BINDIR)/pigeon -nolint $< > $@

$(TEST_DIR)/left_recursion/optimized/withoutleftrecursion/without_left_recursion.go: \
$(TEST_DIR)/left_recursion/without_left_recursion.peg \
$(BINDIR)/pigeon
$(BINDIR)/pigeon -nolint -optimize-parser $< > $@

$(TEST_DIR)/left_recursion_state/left_recursion_state.go: \
$(TEST_DIR)/left_recursion_state/standart/left_recursion_state.go \
$(TEST_DIR)/left_recursion_state/optimized/left_recursion_state.go \
$(BINDIR)/pigeon

$(TEST_DIR)/left_recursion_state/standart/left_recursion_state.go: \
$(TEST_DIR)/left_recursion_state/left_recursion_state.peg $(BINDIR)/pigeon
$(BINDIR)/pigeon -nolint -support-left-recursion $< > $@

$(TEST_DIR)/left_recursion_state/optimized/left_recursion_state.go: \
$(TEST_DIR)/left_recursion_state/left_recursion_state.peg $(BINDIR)/pigeon
$(BINDIR)/pigeon -nolint -optimize-parser -support-left-recursion $< > $@

$(TEST_DIR)/left_recursion_labeled_failures/left_recursion_labeled_failures.go: \
$(TEST_DIR)/left_recursion_labeled_failures/left_recursion_labeled_failures.peg \
$(BINDIR)/pigeon
$(BINDIR)/pigeon -nolint -support-left-recursion $< > $@

$(TEST_DIR)/left_recursion_thrownrecover/left_recursion_thrownrecover.go: \
$(TEST_DIR)/left_recursion_thrownrecover/left_recursion_thrownrecover.peg \
$(BINDIR)/pigeon
$(BINDIR)/pigeon -nolint -support-left-recursion $< > $@

lint:
golint ./...
go vet ./...
Expand Down
25 changes: 25 additions & 0 deletions THIRD-PARTY-NOTICES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
----------------------------------------------------------------------
License notice for github.com/stretchr/testify
----------------------------------------------------------------------

MIT License

Copyright (c) 2012-2020 Mat Ryer, Tyler Bunnell and contributors.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Loading