From f02452d013e1815da5ee81ca6bda172f5701dec9 Mon Sep 17 00:00:00 2001 From: Vu Vo Date: Sun, 2 Aug 2026 23:20:49 +0700 Subject: [PATCH] rename module Signed-off-by: Vu Vo --- crates/lsp/src/file_db.rs | 2 +- crates/lsp/src/global_state.rs | 4 ++-- crates/lsp/src/handler/goto_definition.rs | 4 ++-- crates/lsp/src/handler/hover.rs | 2 +- crates/lsp/src/handler/references.rs | 4 ++-- crates/lsp/src/handler/rename.rs | 4 ++-- crates/lsp/src/main.rs | 2 +- crates/lsp/src/resolver.rs | 12 ++++++------ crates/lsp/src/source_db.rs | 6 +++--- crates/lsp/src/{semantic.rs => symbol_table.rs} | 2 +- crates/syntax/src/abstract_syntax_tree/block.rs | 2 +- .../syntax/src/abstract_syntax_tree/declaration.rs | 2 +- crates/syntax/src/abstract_syntax_tree/definition.rs | 2 +- crates/syntax/src/abstract_syntax_tree/expression.rs | 2 +- crates/syntax/src/abstract_syntax_tree/name.rs | 2 +- crates/syntax/src/abstract_syntax_tree/program.rs | 2 +- crates/syntax/src/abstract_syntax_tree/statement.rs | 2 +- crates/syntax/src/lib.rs | 6 +++--- crates/syntax/src/{syntax_node.rs => node.rs} | 0 ...s__error_recovery__missing_semicolon.circom.snap} | 0 ...s__error_recovery__unclosed_template.circom.snap} | 0 ...error_recovery__unexpected_top_level.circom.snap} | 0 ...sts____src__test_files__happy__block.circom.snap} | 0 ...rc__test_files__happy__block_comment.circom.snap} | 0 ...st_files__happy__full_circom_program.circom.snap} | 0 ...src__test_files__happy__line_comment.circom.snap} | 0 ...ts____src__test_files__happy__pragma.circom.snap} | 0 ...__src__test_files__happy__precedence.circom.snap} | 0 ...rc__test_files__happy__signal_header.circom.snap} | 0 ...__src__test_files__happy__statements.circom.snap} | 0 ...c__test_files__happy__syntax_surface.circom.snap} | 0 ...____src__test_files__happy__template.circom.snap} | 0 crates/syntax/src/{syntax.rs => tree.rs} | 8 ++++---- crates/syntax/src/{syntax => tree}/test_utils.rs | 4 ++-- crates/syntax/tests/ast_api.rs | 4 ++-- crates/syntax/tests/grammar_gaps.rs | 2 +- crates/syntax/tests/grammar_structure.rs | 4 ++-- 37 files changed, 42 insertions(+), 42 deletions(-) rename crates/lsp/src/{semantic.rs => symbol_table.rs} (99%) rename crates/syntax/src/{syntax_node.rs => node.rs} (100%) rename crates/syntax/src/snapshots/{syntax__syntax__tests____src__test_files__error_recovery__missing_semicolon.circom.snap => syntax__tree__tests____src__test_files__error_recovery__missing_semicolon.circom.snap} (100%) rename crates/syntax/src/snapshots/{syntax__syntax__tests____src__test_files__error_recovery__unclosed_template.circom.snap => syntax__tree__tests____src__test_files__error_recovery__unclosed_template.circom.snap} (100%) rename crates/syntax/src/snapshots/{syntax__syntax__tests____src__test_files__error_recovery__unexpected_top_level.circom.snap => syntax__tree__tests____src__test_files__error_recovery__unexpected_top_level.circom.snap} (100%) rename crates/syntax/src/snapshots/{syntax__syntax__tests____src__test_files__happy__block.circom.snap => syntax__tree__tests____src__test_files__happy__block.circom.snap} (100%) rename crates/syntax/src/snapshots/{syntax__syntax__tests____src__test_files__happy__block_comment.circom.snap => syntax__tree__tests____src__test_files__happy__block_comment.circom.snap} (100%) rename crates/syntax/src/snapshots/{syntax__syntax__tests____src__test_files__happy__full_circom_program.circom.snap => syntax__tree__tests____src__test_files__happy__full_circom_program.circom.snap} (100%) rename crates/syntax/src/snapshots/{syntax__syntax__tests____src__test_files__happy__line_comment.circom.snap => syntax__tree__tests____src__test_files__happy__line_comment.circom.snap} (100%) rename crates/syntax/src/snapshots/{syntax__syntax__tests____src__test_files__happy__pragma.circom.snap => syntax__tree__tests____src__test_files__happy__pragma.circom.snap} (100%) rename crates/syntax/src/snapshots/{syntax__syntax__tests____src__test_files__happy__precedence.circom.snap => syntax__tree__tests____src__test_files__happy__precedence.circom.snap} (100%) rename crates/syntax/src/snapshots/{syntax__syntax__tests____src__test_files__happy__signal_header.circom.snap => syntax__tree__tests____src__test_files__happy__signal_header.circom.snap} (100%) rename crates/syntax/src/snapshots/{syntax__syntax__tests____src__test_files__happy__statements.circom.snap => syntax__tree__tests____src__test_files__happy__statements.circom.snap} (100%) rename crates/syntax/src/snapshots/{syntax__syntax__tests____src__test_files__happy__syntax_surface.circom.snap => syntax__tree__tests____src__test_files__happy__syntax_surface.circom.snap} (100%) rename crates/syntax/src/snapshots/{syntax__syntax__tests____src__test_files__happy__template.circom.snap => syntax__tree__tests____src__test_files__happy__template.circom.snap} (100%) rename crates/syntax/src/{syntax.rs => tree.rs} (98%) rename crates/syntax/src/{syntax => tree}/test_utils.rs (90%) diff --git a/crates/lsp/src/file_db.rs b/crates/lsp/src/file_db.rs index 74a9874..45ae289 100644 --- a/crates/lsp/src/file_db.rs +++ b/crates/lsp/src/file_db.rs @@ -4,7 +4,7 @@ use std::sync::Arc; use lsp_types::{Position, Range, Url}; use rowan::TextSize; -use syntax::syntax_node::{SyntaxNode, SyntaxToken}; +use syntax::node::{SyntaxNode, SyntaxToken}; // File identity is owned by the `vfs` crate (a path-interned `u32` index), so aliased paths // collapse to one id via interning rather than via a path hash. Re-exported here for callers that diff --git a/crates/lsp/src/global_state.rs b/crates/lsp/src/global_state.rs index 4212e60..ac5bba9 100644 --- a/crates/lsp/src/global_state.rs +++ b/crates/lsp/src/global_state.rs @@ -12,7 +12,7 @@ use rowan::TextSize; use syntax::abstract_syntax_tree::{ AstCircomProgram, AstComponentCall, AstComponentDecl, AstMainComponent, }; -use syntax::syntax_node::SyntaxToken; +use syntax::node::SyntaxToken; use std::path::PathBuf; @@ -304,7 +304,7 @@ impl GlobalState { pub(crate) fn find_occurrences( &self, target: &(FileId, ResolvedSymbol), - ) -> Vec { + ) -> Vec { let (def_file, sym) = target; let Some(ast) = self.source_db.ast(*def_file) else { return Vec::new(); diff --git a/crates/lsp/src/handler/goto_definition.rs b/crates/lsp/src/handler/goto_definition.rs index 556ab29..5161df1 100644 --- a/crates/lsp/src/handler/goto_definition.rs +++ b/crates/lsp/src/handler/goto_definition.rs @@ -2,7 +2,7 @@ use lsp_types::{Location, Range, Url}; use rowan::ast::AstNode; use syntax::abstract_syntax_tree::AstInclude; -use syntax::syntax_node::SyntaxToken; +use syntax::node::SyntaxToken; use vfs::Vfs; use crate::file_db::FileDB; @@ -80,7 +80,7 @@ mod tests { use rowan::ast::AstNode; use syntax::{ abstract_syntax_tree::{AstCircomProgram, AstInputSignalDecl, AstTemplateDef}, - syntax::syntax_tree, + tree::syntax_tree, }; use crate::file_db::FileDB; diff --git a/crates/lsp/src/handler/hover.rs b/crates/lsp/src/handler/hover.rs index 8afa89e..104d884 100644 --- a/crates/lsp/src/handler/hover.rs +++ b/crates/lsp/src/handler/hover.rs @@ -84,7 +84,7 @@ mod tests { use crate::file_db::{FileDB, FileId}; use crate::global_state::GlobalState; use parser::token_kind::TokenKind; - use syntax::syntax::syntax_tree; + use syntax::tree::syntax_tree; use super::handle; use lsp_types::{ diff --git a/crates/lsp/src/handler/references.rs b/crates/lsp/src/handler/references.rs index 2251dfa..02713db 100644 --- a/crates/lsp/src/handler/references.rs +++ b/crates/lsp/src/handler/references.rs @@ -49,11 +49,11 @@ mod tests { use rowan::ast::AstNode; use syntax::abstract_syntax_tree::AstCircomProgram; - use syntax::syntax::syntax_tree; + use syntax::tree::syntax_tree; use crate::file_db::{FileDB, FileId}; use crate::resolver::{occurrences_in, resolve}; - use crate::semantic::SymbolTable; + use crate::symbol_table::SymbolTable; /// Times the `references` pipeline (parse, `SymbolTable::build`, `occurrences_in`) on a large /// synthetic circuit to split inherent cost (reparse) from avoidable cost (build/occurrences). diff --git a/crates/lsp/src/handler/rename.rs b/crates/lsp/src/handler/rename.rs index 5dab8af..2171bf9 100644 --- a/crates/lsp/src/handler/rename.rs +++ b/crates/lsp/src/handler/rename.rs @@ -18,7 +18,7 @@ use crate::file_db::FileId; use crate::global_state::{CursorContext, GlobalState}; use crate::resolver::{identifier_at, ResolvedSymbol}; use crate::source_db::SourceDatabase; -use syntax::syntax_node::SyntaxToken; +use syntax::node::SyntaxToken; /// Entry point for `textDocument/rename`. Returns `None` (no edits) when the cursor isn't on a /// renamable `Identifier`, `new_name` isn't a legal circom identifier, or the file is unknown. @@ -109,7 +109,7 @@ mod tests { }; use parser::token_kind::TokenKind; - use syntax::syntax::syntax_tree; + use syntax::tree::syntax_tree; use crate::file_db::{FileDB, FileId}; use crate::global_state::GlobalState; diff --git a/crates/lsp/src/main.rs b/crates/lsp/src/main.rs index e2f8d4f..88671e2 100644 --- a/crates/lsp/src/main.rs +++ b/crates/lsp/src/main.rs @@ -13,8 +13,8 @@ pub mod file_db; pub mod global_state; pub mod handler; pub mod resolver; -pub mod semantic; pub mod source_db; +pub mod symbol_table; fn main() -> Result<(), Box> { // All logging must go to stderr — stdout is the LSP message channel. diff --git a/crates/lsp/src/resolver.rs b/crates/lsp/src/resolver.rs index 21656bd..b1f3165 100644 --- a/crates/lsp/src/resolver.rs +++ b/crates/lsp/src/resolver.rs @@ -16,11 +16,11 @@ use rowan::ast::AstNode; use rowan::TextSize; use syntax::abstract_syntax_tree::{AstCall, AstCircomProgram, AstComponentCall}; -use syntax::syntax_node::{SyntaxNode, SyntaxToken}; +use syntax::node::{SyntaxNode, SyntaxToken}; -use crate::semantic::{Symbol, SymbolTable}; +use crate::symbol_table::{Symbol, SymbolTable}; -pub use crate::semantic::SymbolKind; +pub use crate::symbol_table::SymbolKind; // --- cursor/token navigation (shared by goto-definition, references, rename) ----------------- @@ -174,11 +174,11 @@ mod tests { AstCircomProgram, AstComponentCall, AstComponentDecl, AstInputSignalDecl, AstSignalDecl, AstVarDecl, }; - use syntax::syntax::syntax_tree; - use syntax::syntax_node::{CircomLanguage, SyntaxToken}; + use syntax::node::{CircomLanguage, SyntaxToken}; + use syntax::tree::syntax_tree; use crate::file_db::{FileDB, FileId}; - use crate::semantic::SymbolTable; + use crate::symbol_table::SymbolTable; use super::{resolve, SymbolKind}; diff --git a/crates/lsp/src/source_db.rs b/crates/lsp/src/source_db.rs index 36ebdd2..2471d56 100644 --- a/crates/lsp/src/source_db.rs +++ b/crates/lsp/src/source_db.rs @@ -14,12 +14,12 @@ use std::sync::Arc; use lsp_types::Url; use rowan::ast::AstNode; use syntax::abstract_syntax_tree::AstCircomProgram; -use syntax::syntax::syntax_tree; -use syntax::syntax_node::SyntaxNode; +use syntax::node::SyntaxNode; +use syntax::tree::syntax_tree; use vfs::{ChangedFile, Vfs, VfsPath}; use crate::file_db::{FileDB, FileId}; -use crate::semantic::SymbolTable; +use crate::symbol_table::SymbolTable; /// Source-level queries over open files, keyed by [`FileId`] — inputs (`file_text`) or /// content-derived values (`parse`/`ast`/`file_db`/`symbol_table`). All `&self` with memoization diff --git a/crates/lsp/src/semantic.rs b/crates/lsp/src/symbol_table.rs similarity index 99% rename from crates/lsp/src/semantic.rs rename to crates/lsp/src/symbol_table.rs index ab17db0..a30b4b1 100644 --- a/crates/lsp/src/semantic.rs +++ b/crates/lsp/src/symbol_table.rs @@ -9,7 +9,7 @@ use lsp_types::Range; use parser::token_kind::TokenKind; use rowan::ast::AstNode; use rowan::{TextRange, TextSize}; -use syntax::syntax_node::SyntaxNode; +use syntax::node::SyntaxNode; use syntax::abstract_syntax_tree::{ AstCircomProgram, AstComponentDecl, AstIdentifier, AstInputSignalDecl, AstOutputSignalDecl, diff --git a/crates/syntax/src/abstract_syntax_tree/block.rs b/crates/syntax/src/abstract_syntax_tree/block.rs index b0b9c9c..92e401b 100644 --- a/crates/syntax/src/abstract_syntax_tree/block.rs +++ b/crates/syntax/src/abstract_syntax_tree/block.rs @@ -4,7 +4,7 @@ use parser::token_kind::TokenKind; use parser::token_kind::TokenKind::*; use rowan::ast::{support, AstNode}; -use crate::syntax_node::{CircomLanguage, SyntaxNode}; +use crate::node::{CircomLanguage, SyntaxNode}; use super::name::Named; diff --git a/crates/syntax/src/abstract_syntax_tree/declaration.rs b/crates/syntax/src/abstract_syntax_tree/declaration.rs index 1c56a02..99fcd75 100644 --- a/crates/syntax/src/abstract_syntax_tree/declaration.rs +++ b/crates/syntax/src/abstract_syntax_tree/declaration.rs @@ -4,7 +4,7 @@ use parser::token_kind::TokenKind; use parser::token_kind::TokenKind::*; use rowan::ast::{support, AstNode}; -use crate::syntax_node::{CircomLanguage, SyntaxNode}; +use crate::node::{CircomLanguage, SyntaxNode}; use super::definition::AstTemplateName; use super::name::{AstComplexIdentifier, AstIdentifier, Named}; diff --git a/crates/syntax/src/abstract_syntax_tree/definition.rs b/crates/syntax/src/abstract_syntax_tree/definition.rs index ddfcaf1..d38a672 100644 --- a/crates/syntax/src/abstract_syntax_tree/definition.rs +++ b/crates/syntax/src/abstract_syntax_tree/definition.rs @@ -6,7 +6,7 @@ use parser::token_kind::TokenKind; use parser::token_kind::TokenKind::*; use rowan::ast::{support, AstNode}; -use crate::syntax_node::{CircomLanguage, SyntaxNode}; +use crate::node::{CircomLanguage, SyntaxNode}; use super::block::{AstBlock, AstStatementList}; use super::name::{AstIdentifier, AstParameterList, Named}; diff --git a/crates/syntax/src/abstract_syntax_tree/expression.rs b/crates/syntax/src/abstract_syntax_tree/expression.rs index bbfed7e..32157b8 100644 --- a/crates/syntax/src/abstract_syntax_tree/expression.rs +++ b/crates/syntax/src/abstract_syntax_tree/expression.rs @@ -12,7 +12,7 @@ use parser::token_kind::TokenKind::*; use rowan::ast::support; use rowan::ast::AstNode; -use crate::syntax_node::{CircomLanguage, SyntaxNode}; +use crate::node::{CircomLanguage, SyntaxNode}; use super::name::{AstComplexIdentifier, AstIdentifier}; diff --git a/crates/syntax/src/abstract_syntax_tree/name.rs b/crates/syntax/src/abstract_syntax_tree/name.rs index 05a593c..989d34d 100644 --- a/crates/syntax/src/abstract_syntax_tree/name.rs +++ b/crates/syntax/src/abstract_syntax_tree/name.rs @@ -5,7 +5,7 @@ use parser::token_kind::TokenKind; use parser::token_kind::TokenKind::*; use rowan::ast::{support, AstNode}; -use crate::syntax_node::{CircomLanguage, SyntaxNode}; +use crate::node::{CircomLanguage, SyntaxNode}; /// A node that declares a nameable symbol and exposes its leaf identifier token — the `a` in /// `signal input a;`, the `T` in `template T() {}`. Implementing it lets a declaration be looked up diff --git a/crates/syntax/src/abstract_syntax_tree/program.rs b/crates/syntax/src/abstract_syntax_tree/program.rs index aec60d4..4acdbd6 100644 --- a/crates/syntax/src/abstract_syntax_tree/program.rs +++ b/crates/syntax/src/abstract_syntax_tree/program.rs @@ -4,7 +4,7 @@ use parser::token_kind::TokenKind; use parser::token_kind::TokenKind::*; use rowan::ast::{support, AstNode}; -use crate::syntax_node::{CircomLanguage, SyntaxNode}; +use crate::node::{CircomLanguage, SyntaxNode}; use super::definition::{AstBusDef, AstFunctionDef, AstTemplateDef, AstTemplateName}; use super::expression::AstExpression; diff --git a/crates/syntax/src/abstract_syntax_tree/statement.rs b/crates/syntax/src/abstract_syntax_tree/statement.rs index ff64242..3ff4a91 100644 --- a/crates/syntax/src/abstract_syntax_tree/statement.rs +++ b/crates/syntax/src/abstract_syntax_tree/statement.rs @@ -9,7 +9,7 @@ use parser::token_kind::TokenKind; use parser::token_kind::TokenKind::*; use rowan::ast::{support, AstNode}; -use crate::syntax_node::{CircomLanguage, SyntaxNode}; +use crate::node::{CircomLanguage, SyntaxNode}; use super::block::AstBlock; use super::expression::AstExpression; diff --git a/crates/syntax/src/lib.rs b/crates/syntax/src/lib.rs index 622b4ac..f5a2494 100644 --- a/crates/syntax/src/lib.rs +++ b/crates/syntax/src/lib.rs @@ -1,3 +1,3 @@ -pub mod abstract_syntax_tree; -pub mod syntax; -pub mod syntax_node; +pub mod abstract_syntax_tree; +pub mod node; +pub mod tree; diff --git a/crates/syntax/src/syntax_node.rs b/crates/syntax/src/node.rs similarity index 100% rename from crates/syntax/src/syntax_node.rs rename to crates/syntax/src/node.rs diff --git a/crates/syntax/src/snapshots/syntax__syntax__tests____src__test_files__error_recovery__missing_semicolon.circom.snap b/crates/syntax/src/snapshots/syntax__tree__tests____src__test_files__error_recovery__missing_semicolon.circom.snap similarity index 100% rename from crates/syntax/src/snapshots/syntax__syntax__tests____src__test_files__error_recovery__missing_semicolon.circom.snap rename to crates/syntax/src/snapshots/syntax__tree__tests____src__test_files__error_recovery__missing_semicolon.circom.snap diff --git a/crates/syntax/src/snapshots/syntax__syntax__tests____src__test_files__error_recovery__unclosed_template.circom.snap b/crates/syntax/src/snapshots/syntax__tree__tests____src__test_files__error_recovery__unclosed_template.circom.snap similarity index 100% rename from crates/syntax/src/snapshots/syntax__syntax__tests____src__test_files__error_recovery__unclosed_template.circom.snap rename to crates/syntax/src/snapshots/syntax__tree__tests____src__test_files__error_recovery__unclosed_template.circom.snap diff --git a/crates/syntax/src/snapshots/syntax__syntax__tests____src__test_files__error_recovery__unexpected_top_level.circom.snap b/crates/syntax/src/snapshots/syntax__tree__tests____src__test_files__error_recovery__unexpected_top_level.circom.snap similarity index 100% rename from crates/syntax/src/snapshots/syntax__syntax__tests____src__test_files__error_recovery__unexpected_top_level.circom.snap rename to crates/syntax/src/snapshots/syntax__tree__tests____src__test_files__error_recovery__unexpected_top_level.circom.snap diff --git a/crates/syntax/src/snapshots/syntax__syntax__tests____src__test_files__happy__block.circom.snap b/crates/syntax/src/snapshots/syntax__tree__tests____src__test_files__happy__block.circom.snap similarity index 100% rename from crates/syntax/src/snapshots/syntax__syntax__tests____src__test_files__happy__block.circom.snap rename to crates/syntax/src/snapshots/syntax__tree__tests____src__test_files__happy__block.circom.snap diff --git a/crates/syntax/src/snapshots/syntax__syntax__tests____src__test_files__happy__block_comment.circom.snap b/crates/syntax/src/snapshots/syntax__tree__tests____src__test_files__happy__block_comment.circom.snap similarity index 100% rename from crates/syntax/src/snapshots/syntax__syntax__tests____src__test_files__happy__block_comment.circom.snap rename to crates/syntax/src/snapshots/syntax__tree__tests____src__test_files__happy__block_comment.circom.snap diff --git a/crates/syntax/src/snapshots/syntax__syntax__tests____src__test_files__happy__full_circom_program.circom.snap b/crates/syntax/src/snapshots/syntax__tree__tests____src__test_files__happy__full_circom_program.circom.snap similarity index 100% rename from crates/syntax/src/snapshots/syntax__syntax__tests____src__test_files__happy__full_circom_program.circom.snap rename to crates/syntax/src/snapshots/syntax__tree__tests____src__test_files__happy__full_circom_program.circom.snap diff --git a/crates/syntax/src/snapshots/syntax__syntax__tests____src__test_files__happy__line_comment.circom.snap b/crates/syntax/src/snapshots/syntax__tree__tests____src__test_files__happy__line_comment.circom.snap similarity index 100% rename from crates/syntax/src/snapshots/syntax__syntax__tests____src__test_files__happy__line_comment.circom.snap rename to crates/syntax/src/snapshots/syntax__tree__tests____src__test_files__happy__line_comment.circom.snap diff --git a/crates/syntax/src/snapshots/syntax__syntax__tests____src__test_files__happy__pragma.circom.snap b/crates/syntax/src/snapshots/syntax__tree__tests____src__test_files__happy__pragma.circom.snap similarity index 100% rename from crates/syntax/src/snapshots/syntax__syntax__tests____src__test_files__happy__pragma.circom.snap rename to crates/syntax/src/snapshots/syntax__tree__tests____src__test_files__happy__pragma.circom.snap diff --git a/crates/syntax/src/snapshots/syntax__syntax__tests____src__test_files__happy__precedence.circom.snap b/crates/syntax/src/snapshots/syntax__tree__tests____src__test_files__happy__precedence.circom.snap similarity index 100% rename from crates/syntax/src/snapshots/syntax__syntax__tests____src__test_files__happy__precedence.circom.snap rename to crates/syntax/src/snapshots/syntax__tree__tests____src__test_files__happy__precedence.circom.snap diff --git a/crates/syntax/src/snapshots/syntax__syntax__tests____src__test_files__happy__signal_header.circom.snap b/crates/syntax/src/snapshots/syntax__tree__tests____src__test_files__happy__signal_header.circom.snap similarity index 100% rename from crates/syntax/src/snapshots/syntax__syntax__tests____src__test_files__happy__signal_header.circom.snap rename to crates/syntax/src/snapshots/syntax__tree__tests____src__test_files__happy__signal_header.circom.snap diff --git a/crates/syntax/src/snapshots/syntax__syntax__tests____src__test_files__happy__statements.circom.snap b/crates/syntax/src/snapshots/syntax__tree__tests____src__test_files__happy__statements.circom.snap similarity index 100% rename from crates/syntax/src/snapshots/syntax__syntax__tests____src__test_files__happy__statements.circom.snap rename to crates/syntax/src/snapshots/syntax__tree__tests____src__test_files__happy__statements.circom.snap diff --git a/crates/syntax/src/snapshots/syntax__syntax__tests____src__test_files__happy__syntax_surface.circom.snap b/crates/syntax/src/snapshots/syntax__tree__tests____src__test_files__happy__syntax_surface.circom.snap similarity index 100% rename from crates/syntax/src/snapshots/syntax__syntax__tests____src__test_files__happy__syntax_surface.circom.snap rename to crates/syntax/src/snapshots/syntax__tree__tests____src__test_files__happy__syntax_surface.circom.snap diff --git a/crates/syntax/src/snapshots/syntax__syntax__tests____src__test_files__happy__template.circom.snap b/crates/syntax/src/snapshots/syntax__tree__tests____src__test_files__happy__template.circom.snap similarity index 100% rename from crates/syntax/src/snapshots/syntax__syntax__tests____src__test_files__happy__template.circom.snap rename to crates/syntax/src/snapshots/syntax__tree__tests____src__test_files__happy__template.circom.snap diff --git a/crates/syntax/src/syntax.rs b/crates/syntax/src/tree.rs similarity index 98% rename from crates/syntax/src/syntax.rs rename to crates/syntax/src/tree.rs index bff0dad..a3b17ae 100644 --- a/crates/syntax/src/syntax.rs +++ b/crates/syntax/src/tree.rs @@ -10,7 +10,7 @@ pub use rowan::{ WalkEvent, }; -use crate::syntax_node::SyntaxNode; +use crate::node::SyntaxNode; /// Parse `source` as a whole circom program and build its syntax tree. pub fn syntax_tree(source: &str) -> SyntaxNode { @@ -113,8 +113,8 @@ mod test_utils; mod tests { use parser::grammar::entry::Scope; - use crate::syntax::test_utils::view_ast; use crate::test_syntax; + use crate::tree::test_utils::view_ast; #[test] fn pragma_happy_test() { @@ -126,12 +126,12 @@ mod tests { // Regression: circom permits pragma/include/template/function/main in any order. A program // with an `include` *after* a definition must parse the include (not treat it as a stray // top-level token) and produce no error node for it. - use crate::syntax::WalkEvent; + use crate::tree::WalkEvent; use parser::token_kind::TokenKind; use rowan::NodeOrToken; let src = "pragma circom 2.0.0;\ntemplate T() {}\ninclude \"lib.circom\";\n"; - let tree = crate::syntax::syntax_tree(src); + let tree = crate::tree::syntax_tree(src); let mut has_include = false; let mut has_error = false; diff --git a/crates/syntax/src/syntax/test_utils.rs b/crates/syntax/src/tree/test_utils.rs similarity index 90% rename from crates/syntax/src/syntax/test_utils.rs rename to crates/syntax/src/tree/test_utils.rs index c47865f..ef2b362 100644 --- a/crates/syntax/src/syntax/test_utils.rs +++ b/crates/syntax/src/tree/test_utils.rs @@ -1,6 +1,6 @@ pub use rowan::{NodeOrToken, WalkEvent}; -use crate::syntax_node::SyntaxNode; +use crate::node::SyntaxNode; #[macro_export] macro_rules! test_syntax { @@ -9,7 +9,7 @@ macro_rules! test_syntax { let full_path = format!("{}{}", crate_path, $file_path); let source = std::fs::read_to_string(full_path).expect("Should not failed"); - let syntax = $crate::syntax::syntax_node_from_source(&source, $scope); + let syntax = $crate::tree::syntax_node_from_source(&source, $scope); insta::assert_snapshot!($file_path, view_ast(&syntax)); }; } diff --git a/crates/syntax/tests/ast_api.rs b/crates/syntax/tests/ast_api.rs index a7f9507..f806e3f 100644 --- a/crates/syntax/tests/ast_api.rs +++ b/crates/syntax/tests/ast_api.rs @@ -8,8 +8,8 @@ use rowan::ast::AstNode; use syntax::abstract_syntax_tree::{ AstCircomProgram, AstInlineArray, AstParallelExpr, AstTupleExpr, Named, }; -use syntax::syntax::syntax_tree; -use syntax::syntax_node::{CircomLanguage, SyntaxNode}; +use syntax::node::{CircomLanguage, SyntaxNode}; +use syntax::tree::syntax_tree; /// Parse `src` as a full program and return the typed root. fn program(src: &str) -> AstCircomProgram { diff --git a/crates/syntax/tests/grammar_gaps.rs b/crates/syntax/tests/grammar_gaps.rs index 1e283d2..1fb37ad 100644 --- a/crates/syntax/tests/grammar_gaps.rs +++ b/crates/syntax/tests/grammar_gaps.rs @@ -5,7 +5,7 @@ use parser::lexer::tokenize; use parser::token_kind::TokenKind; -use syntax::syntax::syntax_tree; +use syntax::tree::syntax_tree; // --- shared harness --------------------------------------------------------------------------- diff --git a/crates/syntax/tests/grammar_structure.rs b/crates/syntax/tests/grammar_structure.rs index 392557f..e05d6f8 100644 --- a/crates/syntax/tests/grammar_structure.rs +++ b/crates/syntax/tests/grammar_structure.rs @@ -8,8 +8,8 @@ //! gap is documented and surfaces the moment support lands. use parser::token_kind::TokenKind; -use syntax::syntax::syntax_tree; -use syntax::syntax_node::SyntaxNode; +use syntax::node::SyntaxNode; +use syntax::tree::syntax_tree; // --- harness ------------------------------------------------------------------------------------