Skip to content

refactor declaration grammar #65

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

Jump to bottom
Merged
vuvoth merged 66 commits into from
Feb 6, 2025
Merged

refactor declaration grammar #65

vuvoth merged 66 commits into from
Feb 6, 2025

Conversation

@NTTVy03
Copy link
Collaborator

@NTTVy03 NTTVy03 commented Jan 6, 2025

  1. add missing signal assign token
  2. fix the grammar of the statement
  3. add statements test
  4. fix declaration, support matrix
  5. refactor declaration
  6. use list identity parser in the tuple

NTTVy03 added 30 commits November 9, 2024 15:01
@NTTVy03
skip trivial first tokens in parsing
5f66905
@NTTVy03
remove comment in input test
6913c55
@NTTVy03
Merge branch 'master' of https://github.com/vuvoth/ccls
b2a750f
@NTTVy03
manage out-of-bound case, update input test
caac481
@NTTVy03
update input test
8efa4f7
@NTTVy03
update input test
c78761e
@NTTVy03
make test programs private
bfd1f15
@NTTVy03
remove comments in syntax tests
e054b57
@NTTVy03
format
15c9e5f
@NTTVy03
make Pragma optional, remove ROOT
c76246b
@NTTVy03
rename close() params, use advance() in eat(), fix typo scope
cd125ab
@NTTVy03
parse params using list_identity
15470b1
@NTTVy03
return Option in token_value() and position_of()
6dbb51a
@NTTVy03
do not allow <--, <== in var declaration
6d5f0c6
@NTTVy03
make public signal optional in main component
fbdc5b9
@NTTVy03
fix format before merge
07c4171
@NTTVy03
remove empty test
0bf3a04
@NTTVy03
replace expect by eat in block
f1b0c39
@NTTVy03
add scope parsing test
a10be25
@NTTVy03
fix space in scope parsing test
47df964
@NTTVy03
update snapshot test for syntax
5c6cb56
@NTTVy03
refactor syntax test
372efd3
@NTTVy03
update input tests with snapshot
46929c2
@NTTVy03
change param type in find signal into str
d811037
@NTTVy03
add snapshot guild
cafff02
@NTTVy03
add some combine arithmetic operators
03da99a
@NTTVy03
error report in expect and expect_any
7792a96
@NTTVy03
update snapshot for combine operators
6ac9ac9
@NTTVy03
update snapshot test
ec73df8
@NTTVy03
fix wrap trivial tokens before open a tree
5bdda2f
vuvoth
vuvoth reviewed Feb 4, 2025
View reviewed changes
crates/lsp/src/handler/goto_definition.rs Outdated
if let Some(token) = lookup_token_at_postion(&file, &program_ast, file.position(tmp)) {
println!(
"{:#?}",
lookup_node_wrap_token(TokenKind::TemplateDef, &token)
Copy link
Owner

@vuvoth vuvoth Feb 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can apply Insta here to snapshot output and use it for test later.

crates/lsp/src/handler/goto_definition.rs Outdated
let url = Url::from_file_path(Path::new("/hello/abc.tx"));
let binding = url.unwrap();
let p = binding.path();
println!("{:?}", Path::new(p).parent());
Copy link
Owner

@vuvoth vuvoth Feb 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add assert! here

crates/syntax/src/snapshots/syntax__syntax__tests____src__test_files__happy__block.circom.snap Outdated
| | | | SignalKw 174..180
| | | | | SignalKw 174..180 "signal"
| | | | WhiteSpace 180..181
| Error 1..2
Copy link
Owner

@vuvoth vuvoth Feb 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we have the error here?

Copy link
Collaborator Author

@NTTVy03 NTTVy03 Feb 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because you separate the test code into other file, the format is changed ('\r' character is added before '\n'). You can read more about '\r' here

I have fixed that.

crates/syntax/src/snapshots/syntax__syntax__tests____src__test_files__happy__block.circom.snap Outdated
Comment on lines 39 to 48
| | | Identifier 56..58
| | | | Identifier 56..58 "in"
| | | LBracket 58..59
| | | | LBracket 58..59 "["
| | | Expression 59..60
| | | | Identifier 59..60
| | | | | Identifier 59..60
| | | | | | Identifier 59..60 "N"
| | | RBracket 60..61
| | | | RBracket 60..61 "]"
Copy link
Owner

@vuvoth vuvoth Feb 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Group this to one node.

vuvoth
vuvoth reviewed Feb 6, 2025
View reviewed changes
...tax/src/snapshots/syntax__syntax__tests____src__test_files__happy__block_comment.circom.snap Outdated
| BlockComment 2..25
| | BlockComment 2..25
| | | BlockComment 2..25 "/*\r\ncomment\r\nblocks\r\n*/"
| Error 25..26
Copy link
Owner

@vuvoth vuvoth Feb 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Block comments have errors!

@vuvoth
Copy link
Owner

vuvoth commented Feb 6, 2025

We want to fix something. Let's merge this PR and create other PRs to solve this better.

@vuvoth vuvoth merged commit ff69d94 into master Feb 6, 2025
1 check passed
NTTVy03 added a commit that referenced this pull request Feb 6, 2025
@NTTVy03
merger master after PR #65
0c6696f
@NTTVy03 NTTVy03 deleted the signal-inline-init branch May 18, 2025 12:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vuvoth vuvoth vuvoth approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@NTTVy03 @vuvoth