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.

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

Update mod.rs #895

Closed
wants to merge 134 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
134 commits
Select commit Hold shift + click to select a range
ad81703
Adding typed node and typed parser
TheVeryDarkness Jun 28, 2023
33e9892
Update generator.rs
TheVeryDarkness Jun 28, 2023
cf11997
Create graph.rs
TheVeryDarkness Jun 28, 2023
d093260
Add simple doc comment for TypedNode
TheVeryDarkness Jun 28, 2023
ccbcd48
Remove old codes and add structs implementation
TheVeryDarkness Jun 28, 2023
17c7f71
Add impl; add a missed declaration; fix macro errors
TheVeryDarkness Jun 28, 2023
613312a
Update generator.rs
TheVeryDarkness Jun 28, 2023
3cb3b02
Try using typed_state to implement typed parser
TheVeryDarkness Jul 4, 2023
ae0af2e
Remove typed_state
TheVeryDarkness Jul 4, 2023
0889935
Before rewrite some codes
TheVeryDarkness Jul 4, 2023
0e207d2
Before remove outdated codes
TheVeryDarkness Jul 4, 2023
ee896de
Update graph.rs
TheVeryDarkness Jul 4, 2023
931011f
Change return value type; change function name; fixing errors
TheVeryDarkness Jul 5, 2023
9351355
Improve interfaces
TheVeryDarkness Jul 6, 2023
2dc66e7
Removing BuiltInRule
TheVeryDarkness Jul 6, 2023
178648d
Try fixing
TheVeryDarkness Jul 6, 2023
755d915
Before reconsidering built-in rules
TheVeryDarkness Jul 6, 2023
ed96cd5
Remove rules notices on error
TheVeryDarkness Jul 6, 2023
8d7ba69
Fixing errors
TheVeryDarkness Jul 6, 2023
787d4fa
Support automatic spaces and comments; move some codes outside proc m…
TheVeryDarkness Jul 6, 2023
495815e
Derive Debug for each node
TheVeryDarkness Jul 6, 2023
bee0c83
Update generator.rs
TheVeryDarkness Jul 7, 2023
a612b19
More debugging information
TheVeryDarkness Jul 7, 2023
0791e22
Move more structure outside proc macro
TheVeryDarkness Jul 7, 2023
2ab7de9
Compress
TheVeryDarkness Jul 7, 2023
b601419
Process comments and white spaces in another impl
TheVeryDarkness Jul 8, 2023
72029cc
Add one more trait for never failed node
TheVeryDarkness Jul 8, 2023
a4c0af0
Added missed item in Seq and fixed recursive type error
TheVeryDarkness Jul 8, 2023
99c7502
Show more debugging information
TheVeryDarkness Jul 8, 2023
4b50e64
Update graph.rs
TheVeryDarkness Jul 8, 2023
34f7569
Update graph.rs
TheVeryDarkness Jul 8, 2023
7d715e2
Update graph.rs
TheVeryDarkness Jul 8, 2023
1e382ec
Compress type graph; use more predefined structures
TheVeryDarkness Jul 8, 2023
29cf793
Update predefined_node.rs
TheVeryDarkness Jul 8, 2023
fa6a33a
Update predefined_node.rs
TheVeryDarkness Jul 8, 2023
52c7aab
Update predefined_node.rs
TheVeryDarkness Jul 8, 2023
7bc24a3
More debugging information
TheVeryDarkness Jul 9, 2023
83d8216
Use predefined items; remove useless codes
TheVeryDarkness Jul 9, 2023
1d6fe24
Rename Restore as Restorable and mark it as never-failed
TheVeryDarkness Jul 9, 2023
1d8bfb7
Update graph.rs
TheVeryDarkness Jul 9, 2023
5152a5d
More debugging information
TheVeryDarkness Jul 9, 2023
8acb6e1
Fix an error in predefined_node::Restorable
TheVeryDarkness Jul 9, 2023
85eb846
Using meta programming
TheVeryDarkness Jul 9, 2023
dc0a4fc
Update lib.rs
TheVeryDarkness Jul 9, 2023
8e110d0
Create .gitattributes
TheVeryDarkness Jul 9, 2023
213445e
Update predefined_node.rs
TheVeryDarkness Jul 9, 2023
2858637
Update generated doc comments
TheVeryDarkness Jul 9, 2023
b9a450e
Update .gitattributes
TheVeryDarkness Jul 9, 2023
940c5c1
Update predefined_node.rs
TheVeryDarkness Jul 9, 2023
4f78bb4
Update graph.rs
TheVeryDarkness Jul 9, 2023
8f36fd0
Output expression for generated type alias.
TheVeryDarkness Jul 9, 2023
29f12a3
Update graph.rs
TheVeryDarkness Jul 9, 2023
3bc1e77
Update typed_node.rs
TheVeryDarkness Jul 9, 2023
2e94a1b
Update graph.rs
TheVeryDarkness Jul 9, 2023
9699927
Implement and use core::fmt::Display for OptimizedExpr
TheVeryDarkness Jul 10, 2023
8fe45d9
Update graph.rs
TheVeryDarkness Jul 10, 2023
582cda9
Merge pull request #1 from pest-parser/master
TheVeryDarkness Jul 10, 2023
9d31360
Add get_content to access contained string.
TheVeryDarkness Jul 10, 2023
12cf281
Add a test.
TheVeryDarkness Jul 10, 2023
0ee7192
Update graph.rs
TheVeryDarkness Jul 10, 2023
22c971f
Rename new to parse_with
TheVeryDarkness Jul 10, 2023
9520c37
Restore a breaking change
TheVeryDarkness Jul 11, 2023
673b977
Correctly Implement atomicity
TheVeryDarkness Jul 11, 2023
3970f29
Update lib.rs
TheVeryDarkness Jul 11, 2023
3a08c98
Update graph.rs
TheVeryDarkness Jul 11, 2023
6da0e1f
Update predefined_node.rs
TheVeryDarkness Jul 11, 2023
5f2da1a
Fix an error that nothing can be ignored.
TheVeryDarkness Jul 11, 2023
beae216
Update predefined_node.rs
TheVeryDarkness Jul 11, 2023
0b6eb2a
Update predefined_node.rs
TheVeryDarkness Jul 11, 2023
f93bb4b
Update .gitattributes
TheVeryDarkness Jul 11, 2023
5b0afb6
Move my codes into a separate folder.
TheVeryDarkness Jul 11, 2023
1fee3b7
Done moving codes
TheVeryDarkness Jul 12, 2023
a4e1bde
Update .gitattributes
TheVeryDarkness Jul 12, 2023
dc831db
Move .gitattributes to root
TheVeryDarkness Jul 12, 2023
9bfa412
*.rs as text
TheVeryDarkness Jul 12, 2023
b65970b
Split codes in predefined_node.rs
TheVeryDarkness Jul 12, 2023
d5ce990
Update wrapper.rs
TheVeryDarkness Jul 12, 2023
3411c4d
Try to optimize error reporting
TheVeryDarkness Jul 14, 2023
ed72847
Modify function signature
TheVeryDarkness Jul 15, 2023
3e645fb
Update graph.rs
TheVeryDarkness Jul 15, 2023
3f6d7a6
Removing my codes
TheVeryDarkness Jul 15, 2023
56f4d8b
Update mod.rs
TheVeryDarkness Jul 16, 2023
400ce62
Update .gitattributes
TheVeryDarkness Jul 16, 2023
3528519
Revert "Removing my codes"
TheVeryDarkness Jul 16, 2023
841af30
Converting everything to generics
TheVeryDarkness Jul 17, 2023
7b6b208
Remove unused codes; reduce hard coding
TheVeryDarkness Jul 17, 2023
f0daba5
Try removing predefined_node::Rule
TheVeryDarkness Jul 17, 2023
678c62b
Fixing errors in generated codes
TheVeryDarkness Jul 17, 2023
c4323be
Warnings fixed.
TheVeryDarkness Jul 17, 2023
ee60ccf
Update predefined_node.rs
TheVeryDarkness Jul 17, 2023
43f1bdc
Update mod.rs
TheVeryDarkness Jul 17, 2023
34ae25a
Fixing error reporting
TheVeryDarkness Jul 17, 2023
56f1fb3
Update graph.rs
TheVeryDarkness Jul 17, 2023
fbf1449
Update predefined_node.rs
TheVeryDarkness Jul 17, 2023
f5510cb
Try to generate accessers
TheVeryDarkness Jul 17, 2023
480cb7b
Update functions related to typed parser .
TheVeryDarkness Jul 18, 2023
5800807
Move codes about typed parser into typed.rs
TheVeryDarkness Jul 18, 2023
cdb76c7
Update typed.rs
TheVeryDarkness Jul 18, 2023
81bfd29
Update typed.rs
TheVeryDarkness Jul 18, 2023
9316157
Update mod.rs
TheVeryDarkness Jul 18, 2023
e770e59
Handle errors
TheVeryDarkness Jul 18, 2023
226565a
Fixing errors
TheVeryDarkness Jul 18, 2023
7fde97a
Fill built-in types and avoiding name confliction
TheVeryDarkness Jul 18, 2023
0278975
Add a test.
TheVeryDarkness Jul 18, 2023
ef657a4
Update predefined_node.rs
TheVeryDarkness Jul 18, 2023
b3520fd
Update error.rs
TheVeryDarkness Jul 18, 2023
fb64b4c
Update predefined_node.rs
TheVeryDarkness Jul 18, 2023
cfcd43e
Update grammar_typed.rs
TheVeryDarkness Jul 18, 2023
af3837f
Update predefined_node.rs
TheVeryDarkness Jul 18, 2023
39c1293
Update grammar_typed.rs
TheVeryDarkness Jul 18, 2023
c791c42
Update graph.rs
TheVeryDarkness Jul 19, 2023
6c591b5
Update graph.rs
TheVeryDarkness Jul 19, 2023
e62582b
Update predefined_node.rs
TheVeryDarkness Jul 19, 2023
9026562
Update predefined_node.rs
TheVeryDarkness Jul 19, 2023
456d694
Format codes
TheVeryDarkness Jul 19, 2023
6dbc823
Update predefined_node.rs
TheVeryDarkness Jul 19, 2023
33d0386
Update graph.rs
TheVeryDarkness Jul 19, 2023
df2cf95
Update graph.rs
TheVeryDarkness Jul 19, 2023
00456ce
Update graph.rs
TheVeryDarkness Jul 19, 2023
b4db71b
Removing my codes.
TheVeryDarkness Jul 19, 2023
3509b5a
Merge remote-tracking branch 'upstream/master'
TheVeryDarkness Jul 19, 2023
69ebd01
Update mod.rs
TheVeryDarkness Jul 19, 2023
523bcf7
Update mod.rs
TheVeryDarkness Jul 19, 2023
bfa72cf
Improve the impl of Display for OptimizedExpr
TheVeryDarkness Jul 19, 2023
da51856
Add tests to impl of Display for OptimizedExpr.
TheVeryDarkness Jul 20, 2023
34e72f6
Merge remote-tracking branch 'fork' into patch-2
TheVeryDarkness Jul 20, 2023
665a813
Update Display::fmt for OptimizedExpr
TheVeryDarkness Jul 20, 2023
820d58e
Update tests of Display for OptimizedExpr
TheVeryDarkness Jul 20, 2023
651380b
Move tests about Display into a separate module
TheVeryDarkness Jul 20, 2023
614c134
Implement Display for Expr
TheVeryDarkness Jul 20, 2023
1993083
Add several tests to Display for Expr and OptimizedExpr
TheVeryDarkness Jul 20, 2023
66bc30b
Format tests in ast.rs and optimizer/mod.rs.
TheVeryDarkness Jul 20, 2023
58685d5
Remove unnecessary to_owned() and format
TheVeryDarkness Jul 20, 2023
6f3c3e9
Merge remote-tracking branch 'fork/patch-2' into patch-2
TheVeryDarkness Jul 20, 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
15 changes: 11 additions & 4 deletions meta/src/optimizer/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,16 @@ pub struct OptimizedExprTopDownIterator {
impl core::fmt::Display for OptimizedExpr {
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
match self {
OptimizedExpr::Str(s) => write!(f, "\"{}\"", s),
OptimizedExpr::Insens(s) => write!(f, "^\"{}\"", s),
OptimizedExpr::Range(start, end) => write!(f, "('{}'..'{}')", start, end),
OptimizedExpr::Str(s) => write!(f, "{:?}", s),
OptimizedExpr::Insens(s) => write!(f, "^{:?}", s),
OptimizedExpr::Range(start, end) => {
write!(
f,
"({:?}..{:?})",
start.chars().next().expect("Empty range start."),
end.chars().next().expect("Empty range end.")
)
}
OptimizedExpr::Ident(id) => write!(f, "{}", id),
OptimizedExpr::PeekSlice(start, end) => match end {
Some(end) => write!(f, "PEEK[{}..{}]", start, end),
Expand Down Expand Up @@ -315,7 +322,7 @@ impl core::fmt::Display for OptimizedExpr {
OptimizedExpr::Skip(strings) => {
let strings = strings
.iter()
.map(|s| format!("\"{}\"", s))
.map(|s| format!("{:?}", s))
.collect::<Vec<_>>()
.join(" | ");
write!(f, "(!({}) ~ ANY)*", strings)
Expand Down