Rename crate directories for consistency

Qiskit · Jan 11, 2024 · ad75fca · ad75fca
1 parent 94e03c3
commit ad75fca
Show file tree

Hide file tree

Showing 51 changed files with 14 additions and 14 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,18 +9,18 @@ edition = "2021"
 license = "Apache-2.0"
 authors = ["OpenQASM3 parser team"]
 readme = "README.md"
-keywords = ["QASM", "OpenQASM3", "parser"]
+keywords = ["QASM", "openqasm3", "parser"]
 categories = ["parser-implementations"]
 repository = "https://github.com/Qiskit/openqasm3_parser"
 
 [workspace.dependencies]
 # local crates
-oq3_lexer = { path = "crates/lexer", version = "0.0.1" }
-oq3_parser = { path = "crates/parser", version = "0.0.1" }
+oq3_lexer = { path = "crates/oq3_lexer", version = "0.0.1" }
+oq3_parser = { path = "crates/oq3_parser", version = "0.0.1" }
 oq3_syntax = { path = "crates/oq3_syntax", version = "0.0.1" }
-oq3_semantics = { path = "crates/semantics", version = "0.0.1" }
-oq3_sourcegen = { path = "crates/sourcegen", version = "0.0.1" }
-oq3_source_file = { path = "crates/source_file", version = "0.0.1" }
+oq3_semantics = { path = "crates/oq3_semantics", version = "0.0.1" }
+oq3_sourcegen = { path = "crates/oq3_sourcegen", version = "0.0.1" }
+oq3_source_file = { path = "crates/oq3_source_file", version = "0.0.1" }
 
 # non-local crates
 limit = { version = "0.0.188", package = "ra_ap_limit" }

diff --git a/codegen_scripts/cleangenerated.sh b/codegen_scripts/cleangenerated.sh
@@ -8,8 +8,8 @@
 # are not touched by this script.
 
 cd ..
-rm crates/parser/src/syntax_kind/_syntax_kind_enum.rs
-rm crates/parser/src/syntax_kind/syntax_kind_enum.rs.~*
+rm crates/oq3_parser/src/syntax_kind/_syntax_kind_enum.rs
+rm crates/oq3_parser/src/syntax_kind/syntax_kind_enum.rs.~*
 
 rm crates/oq3_syntax/src/ast/generated/_new_nodes.rs
 rm crates/oq3_syntax/src/ast/generated/nodes.rs.~*

diff --git a/codegen_scripts/cpgenerated.sh b/codegen_scripts/cpgenerated.sh
@@ -6,5 +6,5 @@
 # Copy the generated code from the temporary files to which it is written
 # to it's final location where it will be compiled into the library.
 
-cd .. && cp -a --backup=t crates/parser/src/syntax_kind/_syntax_kind_enum.rs crates/parser/src/syntax_kind/syntax_kind_enum.rs
+cd .. && cp -a --backup=t crates/oq3_parser/src/syntax_kind/_syntax_kind_enum.rs crates/oq3_parser/src/syntax_kind/syntax_kind_enum.rs
 
diff --git a/codegen_scripts/mkgenerated.sh b/codegen_scripts/mkgenerated.sh
@@ -12,16 +12,16 @@
 # This should be enough for codegen.
 
 # But you still need to add the things to the parser grammar
-# 4 You might need to update crates/parser/src/grammar/expressions/atom.rs
-#   Or crates/parser/src/grammar/items.rs (eg. for `gate`)
+# 4 You might need to update crates/oq3_parser/src/grammar/expressions/atom.rs
+#   Or crates/oq3_parser/src/grammar/items.rs (eg. for `gate`)
 # Or other grammar files
 
 # Generated files are not given their final names in order not to clobber exisiting generated code
 # Here are the temporary filenames and the final filenames
 # You have to copy them manually.
 # crates/oq3_syntax/src/ast/generated/_new_tokens.rs --> tokens.rs
 # crates/oq3_syntax/src/ast/generated/_new_nodes.rs --> nodes.rs
-# crates/parser/src/syntax_kind/_generated.rs --> generated.rs
+# crates/oq3_parser/src/syntax_kind/_generated.rs --> generated.rs
 
 # Update: Running this script now seems robust. Originally all codegen was done
 # by a single test. I split it into two tests and run each of them twice.
@@ -41,6 +41,6 @@
 # Don't know why, but code gen will fail otherwise.
 
 cd ..
-rustfmt crates/parser/src/syntax_kind/_syntax_kind_enum.rs
+rustfmt crates/oq3_parser/src/syntax_kind/_syntax_kind_enum.rs
 rustfmt crates/oq3_syntax/src/ast/generated/_new_nodes.rs
 rustfmt crates/oq3_syntax/src/ast/generated/_new_tokens.rs
diff --git a/crates/lexer/Cargo.toml → crates/oq3_lexer/Cargo.toml b/crates/lexer/Cargo.toml → crates/oq3_lexer/Cargo.toml
diff --git a/crates/lexer/src/cursor.rs → crates/oq3_lexer/src/cursor.rs b/crates/lexer/src/cursor.rs → crates/oq3_lexer/src/cursor.rs
diff --git a/crates/lexer/src/lib.rs → crates/oq3_lexer/src/lib.rs b/crates/lexer/src/lib.rs → crates/oq3_lexer/src/lib.rs
diff --git a/crates/lexer/src/tests.rs → crates/oq3_lexer/src/tests.rs b/crates/lexer/src/tests.rs → crates/oq3_lexer/src/tests.rs
diff --git a/crates/lexer/src/unescape.rs → crates/oq3_lexer/src/unescape.rs b/crates/lexer/src/unescape.rs → crates/oq3_lexer/src/unescape.rs
diff --git a/crates/lexer/src/unescape/tests.rs → crates/oq3_lexer/src/unescape/tests.rs b/crates/lexer/src/unescape/tests.rs → crates/oq3_lexer/src/unescape/tests.rs
diff --git a/crates/parser/Cargo.toml → crates/oq3_parser/Cargo.toml b/crates/parser/Cargo.toml → crates/oq3_parser/Cargo.toml
diff --git a/crates/parser/src/event.rs → crates/oq3_parser/src/event.rs b/crates/parser/src/event.rs → crates/oq3_parser/src/event.rs
diff --git a/crates/parser/src/grammar.rs → crates/oq3_parser/src/grammar.rs b/crates/parser/src/grammar.rs → crates/oq3_parser/src/grammar.rs
diff --git a/crates/parser/src/grammar/expressions.rs → crates/oq3_parser/src/grammar/expressions.rs b/crates/parser/src/grammar/expressions.rs → crates/oq3_parser/src/grammar/expressions.rs
diff --git a/...es/parser/src/grammar/expressions/atom.rs → ...q3_parser/src/grammar/expressions/atom.rs b/...es/parser/src/grammar/expressions/atom.rs → ...q3_parser/src/grammar/expressions/atom.rs
diff --git a/crates/parser/src/grammar/items.rs → crates/oq3_parser/src/grammar/items.rs b/crates/parser/src/grammar/items.rs → crates/oq3_parser/src/grammar/items.rs
diff --git a/crates/parser/src/grammar/params.rs → crates/oq3_parser/src/grammar/params.rs b/crates/parser/src/grammar/params.rs → crates/oq3_parser/src/grammar/params.rs
diff --git a/crates/parser/src/input.rs → crates/oq3_parser/src/input.rs b/crates/parser/src/input.rs → crates/oq3_parser/src/input.rs
diff --git a/crates/parser/src/lexed_str.rs → crates/oq3_parser/src/lexed_str.rs b/crates/parser/src/lexed_str.rs → crates/oq3_parser/src/lexed_str.rs
diff --git a/crates/parser/src/lib.rs → crates/oq3_parser/src/lib.rs b/crates/parser/src/lib.rs → crates/oq3_parser/src/lib.rs
diff --git a/crates/parser/src/output.rs → crates/oq3_parser/src/output.rs b/crates/parser/src/output.rs → crates/oq3_parser/src/output.rs
diff --git a/crates/parser/src/parser.rs → crates/oq3_parser/src/parser.rs b/crates/parser/src/parser.rs → crates/oq3_parser/src/parser.rs
diff --git a/crates/parser/src/shortcuts.rs → crates/oq3_parser/src/shortcuts.rs b/crates/parser/src/shortcuts.rs → crates/oq3_parser/src/shortcuts.rs
diff --git a/crates/parser/src/syntax_kind.rs → crates/oq3_parser/src/syntax_kind.rs b/crates/parser/src/syntax_kind.rs → crates/oq3_parser/src/syntax_kind.rs
diff --git a/...arser/src/syntax_kind/syntax_kind_enum.rs → ...arser/src/syntax_kind/syntax_kind_enum.rs b/...arser/src/syntax_kind/syntax_kind_enum.rs → ...arser/src/syntax_kind/syntax_kind_enum.rs
diff --git a/crates/parser/src/token_set.rs → crates/oq3_parser/src/token_set.rs b/crates/parser/src/token_set.rs → crates/oq3_parser/src/token_set.rs
diff --git a/crates/semantics/.gitignore → crates/oq3_semantics/.gitignore b/crates/semantics/.gitignore → crates/oq3_semantics/.gitignore
diff --git a/crates/semantics/Cargo.toml → crates/oq3_semantics/Cargo.toml b/crates/semantics/Cargo.toml → crates/oq3_semantics/Cargo.toml
diff --git a/crates/semantics/examples/semdemo.rs → crates/oq3_semantics/examples/semdemo.rs b/crates/semantics/examples/semdemo.rs → crates/oq3_semantics/examples/semdemo.rs
diff --git a/crates/semantics/src/asg.rs → crates/oq3_semantics/src/asg.rs b/crates/semantics/src/asg.rs → crates/oq3_semantics/src/asg.rs
diff --git a/crates/semantics/src/context.rs → crates/oq3_semantics/src/context.rs b/crates/semantics/src/context.rs → crates/oq3_semantics/src/context.rs
diff --git a/crates/semantics/src/display.rs → crates/oq3_semantics/src/display.rs b/crates/semantics/src/display.rs → crates/oq3_semantics/src/display.rs
diff --git a/crates/semantics/src/initialize_ast.rs → crates/oq3_semantics/src/initialize_ast.rs b/crates/semantics/src/initialize_ast.rs → crates/oq3_semantics/src/initialize_ast.rs
diff --git a/crates/semantics/src/lib.rs → crates/oq3_semantics/src/lib.rs b/crates/semantics/src/lib.rs → crates/oq3_semantics/src/lib.rs
diff --git a/crates/semantics/src/semantic_error.rs → crates/oq3_semantics/src/semantic_error.rs b/crates/semantics/src/semantic_error.rs → crates/oq3_semantics/src/semantic_error.rs
diff --git a/crates/semantics/src/symbols.rs → crates/oq3_semantics/src/symbols.rs b/crates/semantics/src/symbols.rs → crates/oq3_semantics/src/symbols.rs
diff --git a/crates/semantics/src/syntax_to_semantics.rs → .../oq3_semantics/src/syntax_to_semantics.rs b/crates/semantics/src/syntax_to_semantics.rs → .../oq3_semantics/src/syntax_to_semantics.rs
diff --git a/crates/semantics/src/types.rs → crates/oq3_semantics/src/types.rs b/crates/semantics/src/types.rs → crates/oq3_semantics/src/types.rs
diff --git a/crates/semantics/src/utils.rs → crates/oq3_semantics/src/utils.rs b/crates/semantics/src/utils.rs → crates/oq3_semantics/src/utils.rs
diff --git a/crates/semantics/src/validate.rs → crates/oq3_semantics/src/validate.rs b/crates/semantics/src/validate.rs → crates/oq3_semantics/src/validate.rs
diff --git a/crates/semantics/tests/ast_tests.rs → crates/oq3_semantics/tests/ast_tests.rs b/crates/semantics/tests/ast_tests.rs → crates/oq3_semantics/tests/ast_tests.rs
diff --git a/crates/semantics/tests/from_string_tests.rs → .../oq3_semantics/tests/from_string_tests.rs b/crates/semantics/tests/from_string_tests.rs → .../oq3_semantics/tests/from_string_tests.rs
diff --git a/crates/semantics/tests/symbol_tests.rs → crates/oq3_semantics/tests/symbol_tests.rs b/crates/semantics/tests/symbol_tests.rs → crates/oq3_semantics/tests/symbol_tests.rs
diff --git a/crates/semantics/tests/types_test.rs → crates/oq3_semantics/tests/types_test.rs b/crates/semantics/tests/types_test.rs → crates/oq3_semantics/tests/types_test.rs
diff --git a/crates/source_file/Cargo.toml → crates/oq3_source_file/Cargo.toml b/crates/source_file/Cargo.toml → crates/oq3_source_file/Cargo.toml
diff --git a/crates/source_file/src/api.rs → crates/oq3_source_file/src/api.rs b/crates/source_file/src/api.rs → crates/oq3_source_file/src/api.rs
diff --git a/crates/source_file/src/lib.rs → crates/oq3_source_file/src/lib.rs b/crates/source_file/src/lib.rs → crates/oq3_source_file/src/lib.rs
diff --git a/crates/source_file/src/source_file.rs → crates/oq3_source_file/src/source_file.rs b/crates/source_file/src/source_file.rs → crates/oq3_source_file/src/source_file.rs
diff --git a/crates/sourcegen/Cargo.toml → crates/oq3_sourcegen/Cargo.toml b/crates/sourcegen/Cargo.toml → crates/oq3_sourcegen/Cargo.toml
diff --git a/crates/sourcegen/src/lib.rs → crates/oq3_sourcegen/src/lib.rs b/crates/sourcegen/src/lib.rs → crates/oq3_sourcegen/src/lib.rs
diff --git a/crates/oq3_syntax/src/tests/sourcegen_ast.rs b/crates/oq3_syntax/src/tests/sourcegen_ast.rs
@@ -36,7 +36,7 @@ fn our_project_root() -> PathBuf {
 fn write_syntax_kinds_enum() {
     let syntax_kinds = generate_syntax_kinds(KINDS_SRC);
     let syntax_kinds_file =
-        our_project_root().join("crates/parser/src/syntax_kind/_syntax_kind_enum.rs");
+        our_project_root().join("crates/oq3_parser/src/syntax_kind/_syntax_kind_enum.rs");
     oq3_sourcegen::ensure_file_contents(syntax_kinds_file.as_path(), &syntax_kinds);
 }