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

Improve regex lattice #5

Draft
wants to merge 19 commits into
base: add-regex-compressor
Choose a base branch
from
Draft

Improve regex lattice #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
17cf435
Start addding unit tests
Yowgf Jan 25, 2023
2ad5926
First test passing
Yowgf Jan 28, 2023
1b016a0
Most basic tests are passing
Yowgf Jan 28, 2023
e37f932
First version where kleene nodes work
Yowgf Jan 28, 2023
6cdbcdb
Checkpoint
Yowgf Jan 30, 2023
bb35412
Test is now failing :pray:
Yowgf Feb 19, 2023
1a424f0
Fist non-trivial test is passing
Yowgf Feb 19, 2023
6b0c125
Fist test is passing (now with right logic)
Yowgf Feb 19, 2023
405bbe8
A lot more tests passing, now need lattice top
Yowgf Feb 19, 2023
66781a6
Finally made tests pass
Yowgf Feb 19, 2023
7342182
Checkpoint
Yowgf Mar 4, 2023
4391ea5
Checkpoint
Yowgf Mar 11, 2023
0a8cc49
Checkpoint
Yowgf Mar 11, 2023
a33c6ad
Tests are passing :)
Yowgf Mar 11, 2023
13c2607
Refactor and remove pattern file
Yowgf Mar 11, 2023
2c931f1
Remove antlr printer
Yowgf Mar 11, 2023
a4c5cd8
Refactor node interval
Yowgf Mar 11, 2023
edec7f1
Refactor compressor
Yowgf Mar 11, 2023
0cd08a4
More refactoring
Yowgf Mar 11, 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
90 changes: 0 additions & 90 deletions ParSy/src/main/kotlin/zhe/ParSy/Grammar/AntlrPrinter.kt
View file
Open in desktop

This file was deleted.

6 changes: 5 additions & 1 deletion ParSy/src/main/kotlin/zhe/ParSy/Grammar/HeapCNFGrammar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ public class HeapCNFGrammar : IGrammar {
}

override fun toString(): String {
return AntlrPrinter(this).string()
return "TODO"
}

override fun equals(other: Any?): Boolean {
return this.toString() == other.toString()
}

companion object {
Expand Down
7 changes: 4 additions & 3 deletions ParSy/src/main/kotlin/zhe/ParSy/Parser/ZheParser.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@ class ZheParser(
val sensitiveTokenIndexes = sensitiveTokenIndexesList?.toSet()
?: setOf<Int>()
val tokens = cleanLine.split(tokenDelimeter)
val newGrammar = solver.solve(tokens, sensitiveTokenIndexes)
grammar = merger.merge(grammar, newGrammar)
val grammarWasUpdated = true
val lineGrammar = solver.solve(tokens, sensitiveTokenIndexes)
val newGrammar = merger.merge(grammar, lineGrammar)
val grammarWasUpdated = newGrammar != grammar
if (grammarWasUpdated) {
grammar = newGrammar
File(grammarFilePath).writeText(grammar.toString())
}
return grammarWasUpdated
Expand Down
Loading