diff --git a/kclvm/Cargo.lock b/kclvm/Cargo.lock index c12cffdf6..757dbf103 100644 --- a/kclvm/Cargo.lock +++ b/kclvm/Cargo.lock @@ -1853,97 +1853,52 @@ dependencies = [ ] [[package]] -name = "kcl-language-server" +name = "kcl" version = "0.11.2" dependencies = [ - "anyhow", - "chrono", - "clap", - "compiler_base_session", - "crossbeam-channel", - "dashmap", - "env_logger", - "im-rc", - "insta", - "kclvm-ast", - "kclvm-config", - "kclvm-driver", - "kclvm-error", - "kclvm-parser", - "kclvm-primitives", - "kclvm-query", - "kclvm-sema", - "kclvm-span", - "kclvm-tools", - "kclvm-utils", - "kclvm-version", - "log", - "lsp-server", - "lsp-types", - "maplit", - "notify 7.0.0", - "parking_lot 0.12.3", - "proc_macro_crate", - "ra_ap_vfs", - "ra_ap_vfs-notify", - "ropey", - "rustc-hash 1.1.0", - "rustc_lexer", - "salsa", - "serde", - "serde_json", - "threadpool", - "tokio", - "tokio-test", -] - -[[package]] -name = "kclvm" -version = "0.11.2" -dependencies = [ - "kclvm-api", - "kclvm-ast", - "kclvm-cmd", - "kclvm-compiler", - "kclvm-config", - "kclvm-driver", - "kclvm-error", - "kclvm-evaluator", - "kclvm-loader", - "kclvm-parser", - "kclvm-primitives", - "kclvm-query", - "kclvm-runner", - "kclvm-runtime", - "kclvm-sema", - "kclvm-tools", - "kclvm-version", -] - -[[package]] -name = "kclvm-api" + "kcl-api", + "kcl-ast", + "kcl-cmd", + "kcl-compiler", + "kcl-config", + "kcl-driver", + "kcl-error", + "kcl-evaluator", + "kcl-loader", + "kcl-parser", + "kcl-primitives", + "kcl-query", + "kcl-runner", + "kcl-runtime", + "kcl-sema", + "kcl-tools", + "kcl-version", +] + +[[package]] +name = "kcl-api" version = "0.11.2" dependencies = [ "anyhow", "criterion", "futures", "jsonrpc-stdio-server", + "kcl-ast", + "kcl-ast-pretty", + "kcl-config", + "kcl-driver", + "kcl-error", "kcl-language-server", - "kclvm-ast", - "kclvm-ast-pretty", - "kclvm-config", - "kclvm-driver", - "kclvm-error", - "kclvm-loader", - "kclvm-parser", - "kclvm-primitives", - "kclvm-query", - "kclvm-runner", - "kclvm-runtime", - "kclvm-sema", - "kclvm-tools", - "kclvm-utils", - "kclvm-version", + "kcl-loader", + "kcl-parser", + "kcl-primitives", + "kcl-query", + "kcl-runner", + "kcl-runtime", + "kcl-sema", + "kcl-tools", + "kcl-utils", + "kcl-version", "maplit", "once_cell", "prost", @@ -1961,15 +1916,15 @@ dependencies = [ ] [[package]] -name = "kclvm-ast" +name = "kcl-ast" version = "0.11.2" dependencies = [ "anyhow", "compiler_base_span", - "kclvm-error", - "kclvm-parser", - "kclvm-span", - "kclvm-utils", + "kcl-error", + "kcl-parser", + "kcl-span", + "kcl-utils", "serde", "serde_json", "thread_local", @@ -1977,50 +1932,50 @@ dependencies = [ ] [[package]] -name = "kclvm-ast-pretty" +name = "kcl-ast-pretty" version = "0.11.2" dependencies = [ "compiler_base_macros", "compiler_base_session", "fancy-regex", - "kclvm-ast", - "kclvm-error", - "kclvm-parser", - "kclvm-primitives", + "kcl-ast", + "kcl-error", + "kcl-parser", + "kcl-primitives", "pretty_assertions", ] [[package]] -name = "kclvm-cmd" +name = "kcl-cmd" version = "0.11.2" dependencies = [ "anyhow", "clap", "compiler_base_session", - "kclvm-api", - "kclvm-config", - "kclvm-driver", - "kclvm-error", - "kclvm-parser", - "kclvm-runner", - "kclvm-runtime", - "kclvm-tools", - "kclvm-version", + "kcl-api", + "kcl-config", + "kcl-driver", + "kcl-error", + "kcl-parser", + "kcl-runner", + "kcl-runtime", + "kcl-tools", + "kcl-version", ] [[package]] -name = "kclvm-compiler" +name = "kcl-compiler" version = "0.11.2" dependencies = [ "bit-set", "bitflags 1.3.2", "fancy-regex", "inkwell", - "kclvm-ast", - "kclvm-error", - "kclvm-primitives", - "kclvm-runtime", - "kclvm-sema", + "kcl-ast", + "kcl-error", + "kcl-primitives", + "kcl-runtime", + "kcl-sema", "once_cell", "phf", "time 0.2.27", @@ -2028,16 +1983,16 @@ dependencies = [ ] [[package]] -name = "kclvm-config" +name = "kcl-config" version = "0.11.2" dependencies = [ "anyhow", "chrono", "dirs", "glob", - "kclvm-ast", - "kclvm-utils", - "kclvm-version", + "kcl-ast", + "kcl-utils", + "kcl-version", "md-5 0.8.0", "pathdiff", "regex", @@ -2050,17 +2005,17 @@ dependencies = [ ] [[package]] -name = "kclvm-driver" +name = "kcl-driver" version = "0.11.2" dependencies = [ "anyhow", "flate2", - "kclvm-ast", - "kclvm-config", - "kclvm-parser", - "kclvm-primitives", - "kclvm-runtime", - "kclvm-utils", + "kcl-ast", + "kcl-config", + "kcl-parser", + "kcl-primitives", + "kcl-runtime", + "kcl-utils", "oci-client", "once_cell", "parking_lot 0.12.3", @@ -2072,7 +2027,7 @@ dependencies = [ ] [[package]] -name = "kclvm-error" +name = "kcl-error" version = "0.11.2" dependencies = [ "annotate-snippets", @@ -2081,10 +2036,10 @@ dependencies = [ "compiler_base_macros", "compiler_base_session", "compiler_base_span", - "kclvm-primitives", - "kclvm-runtime", - "kclvm-span", - "kclvm-utils", + "kcl-primitives", + "kcl-runtime", + "kcl-span", + "kcl-utils", "serde", "serde_json", "termize", @@ -2093,61 +2048,109 @@ dependencies = [ ] [[package]] -name = "kclvm-evaluator" +name = "kcl-evaluator" version = "0.11.2" dependencies = [ "anyhow", "generational-arena", "insta", - "kclvm-ast", - "kclvm-error", - "kclvm-loader", - "kclvm-parser", - "kclvm-primitives", - "kclvm-runtime", - "kclvm-sema", + "kcl-ast", + "kcl-error", + "kcl-loader", + "kcl-parser", + "kcl-primitives", + "kcl-runtime", + "kcl-sema", "scopeguard", ] [[package]] -name = "kclvm-lexer" +name = "kcl-language-server" +version = "0.11.2" +dependencies = [ + "anyhow", + "chrono", + "clap", + "compiler_base_session", + "crossbeam-channel", + "dashmap", + "env_logger", + "im-rc", + "insta", + "kcl-ast", + "kcl-config", + "kcl-driver", + "kcl-error", + "kcl-parser", + "kcl-primitives", + "kcl-query", + "kcl-sema", + "kcl-span", + "kcl-tools", + "kcl-utils", + "kcl-version", + "log", + "lsp-server", + "lsp-types", + "maplit", + "notify 7.0.0", + "parking_lot 0.12.3", + "proc_macro_crate", + "ra_ap_vfs", + "ra_ap_vfs-notify", + "ropey", + "rustc-hash 1.1.0", + "rustc_lexer", + "salsa", + "serde", + "serde_json", + "threadpool", + "tokio", + "tokio-test", +] + +[[package]] +name = "kcl-lexer" version = "0.11.2" dependencies = [ "expect-test", - "kclvm-error", + "kcl-error", + "kcl-primitives", + "kcl-utils", "rustc_lexer", "unic-emoji-char", ] [[package]] -name = "kclvm-loader" +name = "kcl-loader" version = "0.11.2" dependencies = [ "anyhow", "insta", - "kclvm-ast", - "kclvm-ast-pretty", - "kclvm-error", - "kclvm-parser", - "kclvm-primitives", - "kclvm-query", - "kclvm-sema", - "kclvm-utils", + "kcl-ast", + "kcl-ast-pretty", + "kcl-error", + "kcl-parser", + "kcl-primitives", + "kcl-query", + "kcl-sema", + "kcl-utils", "maplit", ] [[package]] -name = "kclvm-macros" +name = "kcl-macros" version = "0.11.2" dependencies = [ + "kcl-primitives", + "kcl-utils", "proc-macro2", "quote", - "syn 1.0.109", - "synstructure 0.12.6", + "syn 2.0.72", ] [[package]] -name = "kclvm-parser" +name = "kcl-parser" version = "0.11.2" dependencies = [ "anyhow", @@ -2161,14 +2164,14 @@ dependencies = [ "expect-test", "glob", "insta", - "kclvm-ast", - "kclvm-config", - "kclvm-error", - "kclvm-lexer", - "kclvm-primitives", - "kclvm-sema", - "kclvm-span", - "kclvm-utils", + "kcl-ast", + "kcl-config", + "kcl-error", + "kcl-lexer", + "kcl-primitives", + "kcl-sema", + "kcl-span", + "kcl-utils", "num-bigint", "parking_lot 0.12.3", "petgraph", @@ -2182,7 +2185,7 @@ dependencies = [ ] [[package]] -name = "kclvm-primitives" +name = "kcl-primitives" version = "0.11.2" dependencies = [ "indexmap 2.9.0", @@ -2190,7 +2193,7 @@ dependencies = [ ] [[package]] -name = "kclvm-query" +name = "kcl-query" version = "0.11.2" dependencies = [ "anyhow", @@ -2198,13 +2201,13 @@ dependencies = [ "compiler_base_session", "fancy-regex", "insta", - "kclvm-ast", - "kclvm-ast-pretty", - "kclvm-error", - "kclvm-parser", - "kclvm-primitives", - "kclvm-sema", - "kclvm-utils", + "kcl-ast", + "kcl-ast-pretty", + "kcl-error", + "kcl-parser", + "kcl-primitives", + "kcl-sema", + "kcl-utils", "maplit", "pretty_assertions", "serde", @@ -2212,7 +2215,7 @@ dependencies = [ ] [[package]] -name = "kclvm-runner" +name = "kcl-runner" version = "0.11.2" dependencies = [ "anyhow", @@ -2222,19 +2225,19 @@ dependencies = [ "compiler_base_session", "criterion", "glob", - "kclvm-ast", - "kclvm-compiler", - "kclvm-config", - "kclvm-driver", - "kclvm-error", - "kclvm-evaluator", - "kclvm-parser", - "kclvm-primitives", - "kclvm-query", - "kclvm-runtime", - "kclvm-sema", - "kclvm-utils", - "kclvm-version", + "kcl-ast", + "kcl-compiler", + "kcl-config", + "kcl-driver", + "kcl-error", + "kcl-evaluator", + "kcl-parser", + "kcl-primitives", + "kcl-query", + "kcl-runtime", + "kcl-sema", + "kcl-utils", + "kcl-version", "libc", "libloading", "once_cell", @@ -2247,7 +2250,7 @@ dependencies = [ ] [[package]] -name = "kclvm-runtime" +name = "kcl-runtime" version = "0.11.2" dependencies = [ "anyhow", @@ -2265,8 +2268,8 @@ dependencies = [ "handlebars", "hostname", "itertools", - "kclvm-primitives", - "kclvm_runtime_internal_macros", + "kcl-primitives", + "kcl_runtime_internal_macros", "lazy_static", "libc", "md5", @@ -2286,7 +2289,7 @@ dependencies = [ ] [[package]] -name = "kclvm-sema" +name = "kcl-sema" version = "0.11.2" dependencies = [ "anyhow", @@ -2299,14 +2302,14 @@ dependencies = [ "criterion", "fancy-regex", "generational-arena", - "kclvm-ast", - "kclvm-ast-pretty", - "kclvm-error", - "kclvm-parser", - "kclvm-primitives", - "kclvm-runtime", - "kclvm-span", - "kclvm-utils", + "kcl-ast", + "kcl-ast-pretty", + "kcl-error", + "kcl-parser", + "kcl-primitives", + "kcl-runtime", + "kcl-span", + "kcl-utils", "lazy_static", "once_cell", "parking_lot 0.12.3", @@ -2320,17 +2323,17 @@ dependencies = [ ] [[package]] -name = "kclvm-span" +name = "kcl-span" version = "0.11.2" dependencies = [ "compiler_base_span", - "kclvm-macros", + "kcl-macros", "parking_lot 0.11.2", "scoped-tls", ] [[package]] -name = "kclvm-tools" +name = "kcl-tools" version = "0.11.2" dependencies = [ "anyhow", @@ -2340,18 +2343,18 @@ dependencies = [ "fancy-regex", "insta", "json-spanned-value", - "kclvm-ast", - "kclvm-ast-pretty", - "kclvm-config", - "kclvm-driver", - "kclvm-error", - "kclvm-parser", - "kclvm-primitives", - "kclvm-query", - "kclvm-runner", - "kclvm-runtime", - "kclvm-sema", - "kclvm-utils", + "kcl-ast", + "kcl-ast-pretty", + "kcl-config", + "kcl-driver", + "kcl-error", + "kcl-parser", + "kcl-primitives", + "kcl-query", + "kcl-runner", + "kcl-runtime", + "kcl-sema", + "kcl-utils", "located_yaml", "once_cell", "pretty_assertions", @@ -2363,7 +2366,7 @@ dependencies = [ ] [[package]] -name = "kclvm-utils" +name = "kcl-utils" version = "0.11.2" dependencies = [ "anyhow", @@ -2372,14 +2375,14 @@ dependencies = [ ] [[package]] -name = "kclvm-version" +name = "kcl-version" version = "0.11.2" dependencies = [ "vergen-gitcl", ] [[package]] -name = "kclvm_runtime_internal_macros" +name = "kcl_runtime_internal_macros" version = "0.5.0" dependencies = [ "proc-macro2", @@ -3936,7 +3939,7 @@ dependencies = [ "indexmap 2.9.0", "indoc", "itoa", - "kclvm-primitives", + "kcl-primitives", "ryu", "serde", "serde_derive", @@ -4186,18 +4189,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", -] - [[package]] name = "synstructure" version = "0.13.1" @@ -5353,7 +5344,7 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.72", - "synstructure 0.13.1", + "synstructure", ] [[package]] @@ -5374,7 +5365,7 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.72", - "synstructure 0.13.1", + "synstructure", ] [[package]] diff --git a/kclvm/Cargo.toml b/kclvm/Cargo.toml index 679b3163d..1b9c4c082 100644 --- a/kclvm/Cargo.toml +++ b/kclvm/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "kclvm" +name = "kcl" version = "0.11.2" edition = "2021" @@ -11,23 +11,23 @@ path = "src/lib.rs" name = "kclvm_cli_cdylib" [dependencies] -kclvm-api = { path = "./api" } -kclvm-cmd = { path = "./cmd" } -kclvm-ast = { path = "./ast" } -kclvm-runner = { path = "./runner" } -kclvm-parser = { path = "./parser" } -kclvm-compiler = { path = "./compiler" } -kclvm-config = { path = "./config" } -kclvm-loader = { path = "./loader" } -kclvm-runtime = { path = "./runtime" } -kclvm-sema = { path = "./sema" } -kclvm-tools = { path = "./tools" } -kclvm-version = { path = "./version" } -kclvm-error = { path = "./error" } -kclvm-evaluator = { path = "./evaluator" } -kclvm-query = { path = "./query" } -kclvm-driver = { path = "./driver" } -kclvm-primitives = { path = "./primitives" } +kcl-api = { path = "./api" } +kcl-cmd = { path = "./cmd" } +kcl-ast = { path = "./ast" } +kcl-runner = { path = "./runner" } +kcl-parser = { path = "./parser" } +kcl-compiler = { path = "./compiler" } +kcl-config = { path = "./config" } +kcl-loader = { path = "./loader" } +kcl-runtime = { path = "./runtime" } +kcl-sema = { path = "./sema" } +kcl-tools = { path = "./tools" } +kcl-version = { path = "./version" } +kcl-error = { path = "./error" } +kcl-evaluator = { path = "./evaluator" } +kcl-query = { path = "./query" } +kcl-driver = { path = "./driver" } +kcl-primitives = { path = "./primitives" } [profile.release] rpath = true @@ -64,8 +64,8 @@ members = [ [features] llvm = [ - "kclvm-compiler/llvm", - "kclvm-runner/llvm", - "kclvm-tools/llvm", - "kclvm-api/llvm", + "kcl-compiler/llvm", + "kcl-runner/llvm", + "kcl-tools/llvm", + "kcl-api/llvm", ] diff --git a/kclvm/api/Cargo.toml b/kclvm/api/Cargo.toml index 133a64e6c..65fb7aed6 100644 --- a/kclvm/api/Cargo.toml +++ b/kclvm/api/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "kclvm-api" +name = "kcl-api" version = "0.11.2" edition = "2021" @@ -18,22 +18,22 @@ once_cell = "1.5.2" prost-wkt = { path = "../third-party/prost-wkt", version = "0.4.1" } prost-wkt-types = { path = "../third-party/prost-wkt/wkt-types", version = "0.4.1" } -kclvm-runner = { path = "../runner" } -kclvm-config = { path = "../config" } -kclvm-driver = { path = "../driver" } -kclvm-error = { path = "../error" } -kclvm-parser = { path = "../parser" } -kclvm-loader = { path = "../loader" } -kclvm-sema = { path = "../sema" } -kclvm-ast = { path = "../ast" } -kclvm-ast-pretty = { path = "../ast_pretty" } -kclvm-runtime = { path = "../runtime" } -kclvm-tools = { path = "../tools" } -kclvm-query = { path = "../query" } -kclvm-version = { path = "../version" } +kcl-runner = { path = "../runner" } +kcl-config = { path = "../config" } +kcl-driver = { path = "../driver" } +kcl-error = { path = "../error" } +kcl-parser = { path = "../parser" } +kcl-loader = { path = "../loader" } +kcl-sema = { path = "../sema" } +kcl-ast = { path = "../ast" } +kcl-ast-pretty = { path = "../ast_pretty" } +kcl-runtime = { path = "../runtime" } +kcl-tools = { path = "../tools" } +kcl-query = { path = "../query" } +kcl-version = { path = "../version" } kcl-language-server = { path = "../tools/src/LSP" } -kclvm-primitives = { path = "../primitives" } -kclvm-utils = { path = "../utils" } +kcl-primitives = { path = "../primitives" } +kcl-utils = { path = "../utils" } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] jsonrpc-stdio-server = "18.0.0" @@ -48,4 +48,4 @@ prost-build = "0.11.8" prost-wkt-build = { path = "../third-party/prost-wkt/wkt-build", version = "0.4.1" } [features] -llvm = ["kclvm-runner/llvm"] +llvm = ["kcl-runner/llvm"] diff --git a/kclvm/ast/Cargo.toml b/kclvm/ast/Cargo.toml index e76842ecd..60911f8f8 100644 --- a/kclvm/ast/Cargo.toml +++ b/kclvm/ast/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "kclvm-ast" +name = "kcl-ast" version = "0.11.2" edition = "2021" @@ -11,11 +11,11 @@ compiler_base_span = "0.1.2" serde = { version = "1", features = ["derive"] } serde_json = "1.0" -kclvm-span = { path = "../span" } -kclvm-error = { path = "../error" } +kcl-span = { path = "../span" } +kcl-error = { path = "../error" } thread_local = "1.1.7" -kclvm-utils = {path = "../utils"} +kcl-utils = {path = "../utils"} anyhow = "1.0" [dev-dependencies] -kclvm-parser = { path = "../parser" } +kcl-parser = { path = "../parser" } diff --git a/kclvm/ast/src/ast.rs b/kclvm/ast/src/ast.rs index 9dbae2924..b867baf5c 100644 --- a/kclvm/ast/src/ast.rs +++ b/kclvm/ast/src/ast.rs @@ -33,7 +33,8 @@ //! in the compiler and regenerate the walker code. //! :copyright: Copyright The KCL Authors. All rights reserved. -use kclvm_utils::path::PathPrefix; +use kcl_error::{diagnostic::Range, Position}; +use kcl_utils::path::PathPrefix; use serde::{ser::SerializeStruct, Deserialize, Serialize, Serializer}; use std::{ collections::HashMap, @@ -47,7 +48,6 @@ use uuid; use super::token; use crate::{node_ref, pos::ContainsPos}; -use kclvm_error::{diagnostic::Range, Position}; use std::cell::RefCell; thread_local! { @@ -210,7 +210,7 @@ impl Node { } pub fn node(node: T, (lo, hi): (Loc, Loc)) -> Self { - let filename = kclvm_utils::path::convert_windows_drive_letter(&format!( + let filename = kcl_utils::path::convert_windows_drive_letter(&format!( "{}", lo.file.name.prefer_remapped() )) @@ -2010,7 +2010,7 @@ impl TryFrom for UnaryOp { type Error = (); fn try_from(token: token::Token) -> Result { - use kclvm_span::symbol::kw; + use kcl_span::symbol::kw; match token.kind { token::TokenKind::UnaryOp(token::UnaryOpToken::UTilde) => Ok(UnaryOp::Invert), @@ -2041,7 +2041,7 @@ impl TryFrom for BinOrCmpOp { type Error = (); fn try_from(token: token::Token) -> Result { - use kclvm_span::symbol::kw; + use kcl_span::symbol::kw; match token.kind { token::TokenKind::BinOp(ot) => match ot { diff --git a/kclvm/ast/src/pos.rs b/kclvm/ast/src/pos.rs index f8d56fa2c..75bf141e8 100644 --- a/kclvm/ast/src/pos.rs +++ b/kclvm/ast/src/pos.rs @@ -1,4 +1,4 @@ -use kclvm_error::{diagnostic::Range, Position}; +use kcl_error::{diagnostic::Range, Position}; use crate::ast; diff --git a/kclvm/ast/src/token.rs b/kclvm/ast/src/token.rs index d375b4c07..766b47e30 100644 --- a/kclvm/ast/src/token.rs +++ b/kclvm/ast/src/token.rs @@ -11,7 +11,7 @@ pub use TokenKind::*; pub use UnaryOpToken::*; use compiler_base_span::{Span, DUMMY_SP}; -pub use kclvm_span::symbol::{Ident, Symbol}; +pub use kcl_span::symbol::{Ident, Symbol}; pub const VALID_SPACES_LENGTH: usize = 0; #[derive(Clone, Copy, PartialEq, Debug)] diff --git a/kclvm/ast_pretty/Cargo.toml b/kclvm/ast_pretty/Cargo.toml index 9a6b3728d..d224b8555 100644 --- a/kclvm/ast_pretty/Cargo.toml +++ b/kclvm/ast_pretty/Cargo.toml @@ -1,14 +1,14 @@ [package] -name = "kclvm-ast-pretty" +name = "kcl-ast-pretty" version = "0.11.2" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -kclvm-error = { path = "../error" } -kclvm-ast = { path = "../ast" } -kclvm-primitives = { path = "../primitives" } +kcl-error = { path = "../error" } +kcl-ast = { path = "../ast" } +kcl-primitives = { path = "../primitives" } fancy-regex = "0.7.1" pretty_assertions = "1.3.0" @@ -16,4 +16,4 @@ compiler_base_session = "0.1.3" compiler_base_macros = "0.1.1" [dev-dependencies] -kclvm-parser = { path = "../parser" } +kcl-parser = { path = "../parser" } diff --git a/kclvm/ast_pretty/src/lib.rs b/kclvm/ast_pretty/src/lib.rs index 690ff30c8..951f80071 100644 --- a/kclvm/ast_pretty/src/lib.rs +++ b/kclvm/ast_pretty/src/lib.rs @@ -1,9 +1,9 @@ -use kclvm_ast::{ +use kcl_ast::{ ast::{self, Module}, token::TokenKind, walker::MutSelfTypedResultWalker, }; -use kclvm_primitives::IndexMap; +use kcl_primitives::IndexMap; use std::collections::VecDeque; mod node; diff --git a/kclvm/ast_pretty/src/node.rs b/kclvm/ast_pretty/src/node.rs index 8328f81c7..7bfeb0308 100644 --- a/kclvm/ast_pretty/src/node.rs +++ b/kclvm/ast_pretty/src/node.rs @@ -1,11 +1,12 @@ use std::collections::HashSet; use compiler_base_macros::bug; -use kclvm_ast::{ +use kcl_ast::{ ast::{self, CallExpr}, token::{DelimToken, TokenKind}, walker::MutSelfTypedResultWalker, }; +use kcl_primitives::IndexMap; use super::{Indentation, Printer}; diff --git a/kclvm/cmd/Cargo.toml b/kclvm/cmd/Cargo.toml index e3186a38b..889ccad13 100644 --- a/kclvm/cmd/Cargo.toml +++ b/kclvm/cmd/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "kclvm-cmd" +name = "kcl-cmd" version = "0.11.2" edition = "2021" @@ -8,12 +8,12 @@ anyhow = "1.0" clap = "4.3.0" compiler_base_session = "0.1.3" -kclvm-api = {path = "../api"} -kclvm-parser = {path = "../parser"} -kclvm-runner = {path = "../runner"} -kclvm-config = {path = "../config"} -kclvm-driver = {path = "../driver"} -kclvm-runtime = {path = "../runtime"} -kclvm-tools = {path = "../tools"} -kclvm-error = {path = "../error"} -kclvm-version = {path = "../version"} +kcl-api = {path = "../api"} +kcl-parser = {path = "../parser"} +kcl-runner = {path = "../runner"} +kcl-config = {path = "../config"} +kcl-driver = {path = "../driver"} +kcl-runtime = {path = "../runtime"} +kcl-tools = {path = "../tools"} +kcl-error = {path = "../error"} +kcl-version = {path = "../version"} diff --git a/kclvm/compiler/Cargo.toml b/kclvm/compiler/Cargo.toml index 7efb23558..00054f2ec 100644 --- a/kclvm/compiler/Cargo.toml +++ b/kclvm/compiler/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "kclvm-compiler" +name = "kcl-compiler" version = "0.11.2" edition = "2021" @@ -14,11 +14,11 @@ bitflags = "1.2.1" once_cell = "1.5.2" fancy-regex = "0.7.1" unicode_names2 = "0.4" -kclvm-ast = { path = "../ast" } -kclvm-sema = { path = "../sema" } -kclvm-runtime = { path = "../runtime" } -kclvm-error = { path = "../error" } -kclvm-primitives = { path = "../primitives" } +kcl-ast = { path = "../ast" } +kcl-sema = { path = "../sema" } +kcl-runtime = { path = "../runtime" } +kcl-error = { path = "../error" } +kcl-primitives = { path = "../primitives" } [features] llvm = ["inkwell/target-webassembly", "inkwell/llvm12-0"] diff --git a/kclvm/config/Cargo.toml b/kclvm/config/Cargo.toml index b5872e7cf..179912b66 100644 --- a/kclvm/config/Cargo.toml +++ b/kclvm/config/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "kclvm-config" +name = "kcl-config" version = "0.11.2" edition = "2021" @@ -16,9 +16,9 @@ glob = "0.3.0" pathdiff = "0.2.1" anyhow = "1.0" -kclvm-version = {path = "../version"} -kclvm-utils = {path = "../utils"} -kclvm-ast = {path = "../ast"} +kcl-version = {path = "../version"} +kcl-utils = {path = "../utils"} +kcl-ast = {path = "../ast"} dirs = "5.0.0" md-5 = "0.8.0" regex = "1.10.4" diff --git a/kclvm/config/src/cache.rs b/kclvm/config/src/cache.rs index adf1b5bc5..9301e355c 100644 --- a/kclvm/config/src/cache.rs +++ b/kclvm/config/src/cache.rs @@ -2,8 +2,10 @@ extern crate chrono; use super::modfile::KCL_FILE_SUFFIX; use anyhow::Result; -use kclvm_utils::fslock::open_lock_file; -use kclvm_utils::pkgpath::{parse_external_pkg_name, rm_external_pkg_name}; +use kcl_utils::fslock::open_lock_file; +use kcl_utils::pkgpath::{parse_external_pkg_name, rm_external_pkg_name}; +use kcl_utils::path::PathPrefix; +use kcl_version as version; use md5::{Digest, Md5}; use serde::{de::DeserializeOwned, Serialize}; use std::collections::HashMap; @@ -12,8 +14,6 @@ use std::fs::{create_dir_all, File}; use std::io::{Read, Write}; use std::path::Path; -use kclvm_version as version; - const LOCK_SUFFIX: &str = ".lock"; const DEFAULT_CACHE_DIR: &str = ".kclvm/cache"; const CACHE_INFO_FILENAME: &str = "info"; diff --git a/kclvm/config/src/modfile.rs b/kclvm/config/src/modfile.rs index 3c5410d2b..d36d9ed12 100644 --- a/kclvm/config/src/modfile.rs +++ b/kclvm/config/src/modfile.rs @@ -1,7 +1,7 @@ //! Copyright The KCL Authors. All rights reserved. use anyhow::Result; -use kclvm_utils::path::PathPrefix; +use kcl_utils::path::PathPrefix; use serde::{Deserialize, Serialize}; use std::{ collections::HashMap, diff --git a/kclvm/config/src/vfs.rs b/kclvm/config/src/vfs.rs index a0fbe3751..5d377e542 100644 --- a/kclvm/config/src/vfs.rs +++ b/kclvm/config/src/vfs.rs @@ -1,6 +1,6 @@ use std::path::Path; -use kclvm_utils::path::PathPrefix; +use kcl_utils::path::PathPrefix; extern crate pathdiff; diff --git a/kclvm/config/src/workfile.rs b/kclvm/config/src/workfile.rs index fb09d7a16..bd13bc064 100644 --- a/kclvm/config/src/workfile.rs +++ b/kclvm/config/src/workfile.rs @@ -1,6 +1,6 @@ //! The config for IDE/LSP workspace config file `kcl.work' -use kclvm_utils::path::PathPrefix; +use kcl_utils::path::PathPrefix; use serde::{Deserialize, Serialize}; use std::{ collections::HashMap, diff --git a/kclvm/driver/Cargo.toml b/kclvm/driver/Cargo.toml index a9b5fe67e..298bef5a8 100644 --- a/kclvm/driver/Cargo.toml +++ b/kclvm/driver/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "kclvm-driver" +name = "kcl-driver" version = "0.11.2" edition = "2021" @@ -8,12 +8,12 @@ edition = "2021" [dependencies] serde_json = "1.0.86" -kclvm-config = { path = "../config" } -kclvm-runtime = { path = "../runtime" } -kclvm-utils = { path = "../utils" } -kclvm-parser = { path = "../parser" } -kclvm-ast = { path = "../ast" } -kclvm-primitives = { path = "../primitives" } +kcl-config = { path = "../config" } +kcl-runtime = { path = "../runtime" } +kcl-utils = { path = "../utils" } +kcl-parser = { path = "../parser" } +kcl-ast = { path = "../ast" } +kcl-primitives = { path = "../primitives" } walkdir = "2" serde = { version = "1.0", features = ["derive"] } anyhow = { version = "1.0.70", features = ["backtrace"] } diff --git a/kclvm/error/Cargo.toml b/kclvm/error/Cargo.toml index af8003088..b4f0dd68e 100644 --- a/kclvm/error/Cargo.toml +++ b/kclvm/error/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "kclvm-error" +name = "kcl-error" version = "0.11.2" edition = "2021" @@ -11,10 +11,10 @@ compiler_base_session = "0.1.3" compiler_base_error = "0.1.6" compiler_base_macros = "0.1.1" -kclvm-primitives = { path = "../primitives" } -kclvm-span = { path = "../span" } -kclvm-runtime = { path = "../runtime" } -kclvm-utils = { path = "../utils" } +kcl-primitives = { path = "../primitives" } +kcl-span = { path = "../span" } +kcl-runtime = { path = "../runtime" } +kcl-utils = { path = "../utils" } anyhow = "1.0" tracing = "0.1" diff --git a/kclvm/error/src/diagnostic.rs b/kclvm/error/src/diagnostic.rs index 019c5c2e2..f9e6bc8f4 100644 --- a/kclvm/error/src/diagnostic.rs +++ b/kclvm/error/src/diagnostic.rs @@ -1,5 +1,5 @@ -use kclvm_primitives::IndexSet; -use kclvm_span::Loc; +use kcl_primitives::IndexSet; +use kcl_span::Loc; use std::fmt; use std::hash::Hash; @@ -84,7 +84,7 @@ impl Position { impl From for Position { fn from(loc: Loc) -> Self { - let filename = kclvm_utils::path::convert_windows_drive_letter(&format!( + let filename = kcl_utils::path::convert_windows_drive_letter(&format!( "{}", loc.file.name.prefer_remapped() )); diff --git a/kclvm/error/src/lib.rs b/kclvm/error/src/lib.rs index e70fa3f92..7df172880 100644 --- a/kclvm/error/src/lib.rs +++ b/kclvm/error/src/lib.rs @@ -21,8 +21,8 @@ use compiler_base_error::{ use compiler_base_session::{Session, SessionDiagnostic}; use compiler_base_span::{span::new_byte_pos, Span}; use diagnostic::Range; -use kclvm_primitives::{DefaultHashBuilder, IndexSet}; -use kclvm_runtime::PanicInfo; +use kcl_primitives::{DefaultHashBuilder, IndexSet}; +use kcl_runtime::PanicInfo; use std::{any::Any, sync::Arc}; use thiserror::Error; diff --git a/kclvm/evaluator/Cargo.toml b/kclvm/evaluator/Cargo.toml index 61f7bee72..826dbd5fd 100644 --- a/kclvm/evaluator/Cargo.toml +++ b/kclvm/evaluator/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "kclvm-evaluator" +name = "kcl-evaluator" version = "0.11.2" edition = "2021" @@ -8,14 +8,14 @@ edition = "2021" [dependencies] anyhow = "1.0" generational-arena = "0.2.9" -kclvm-ast = { path = "../ast" } -kclvm-sema = { path = "../sema" } -kclvm-runtime = { path = "../runtime" } -kclvm-error = { path = "../error" } -kclvm-primitives = { path = "../primitives" } +kcl-ast = { path = "../ast" } +kcl-sema = { path = "../sema" } +kcl-runtime = { path = "../runtime" } +kcl-error = { path = "../error" } +kcl-primitives = { path = "../primitives" } scopeguard = "1.2.0" [dev-dependencies] -kclvm-parser = { path = "../parser" } -kclvm-loader = { path = "../loader" } +kcl-parser = { path = "../parser" } +kcl-loader = { path = "../loader" } insta = "1.8.0" diff --git a/kclvm/lexer/Cargo.toml b/kclvm/lexer/Cargo.toml index bd2d73bd9..57d43811e 100644 --- a/kclvm/lexer/Cargo.toml +++ b/kclvm/lexer/Cargo.toml @@ -1,14 +1,16 @@ [package] -name = "kclvm-lexer" +name = "kcl-lexer" version = "0.11.2" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] +kcl-error = { path = "../error" } +kcl-utils = { path = "../utils" } +kcl-primitives = { path = "../primitives" } rustc_lexer = "0.1.0" unic-emoji-char = "0.9.0" -kclvm-error = {path = "../error"} [dev-dependencies] expect-test = "1.0" \ No newline at end of file diff --git a/kclvm/lexer/src/lib.rs b/kclvm/lexer/src/lib.rs index a7f1fa17d..c30243a17 100644 --- a/kclvm/lexer/src/lib.rs +++ b/kclvm/lexer/src/lib.rs @@ -28,7 +28,7 @@ mod number; #[cfg(test)] mod tests; -extern crate kclvm_error; +extern crate kcl_error; use cursor::EOF_CHAR; diff --git a/kclvm/loader/Cargo.toml b/kclvm/loader/Cargo.toml index ce790ee41..c64870b13 100644 --- a/kclvm/loader/Cargo.toml +++ b/kclvm/loader/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "kclvm-loader" +name = "kcl-loader" version = "0.11.2" edition = "2021" @@ -8,14 +8,14 @@ edition = "2021" [dependencies] anyhow = "1.0" -kclvm-ast = { path = "../ast" } -kclvm-ast-pretty = { path = "../ast_pretty" } -kclvm-parser = { path = "../parser" } -kclvm-sema = { path = "../sema" } -kclvm-error = { path = "../error" } -kclvm-query = { path = "../query" } -kclvm-utils = { path = "../utils" } -kclvm-primitives = { path = "../primitives" } +kcl-ast = { path = "../ast" } +kcl-ast-pretty = { path = "../ast_pretty" } +kcl-parser = { path = "../parser" } +kcl-sema = { path = "../sema" } +kcl-error = { path = "../error" } +kcl-query = { path = "../query" } +kcl-utils = { path = "../utils" } +kcl-primitives = { path = "../primitives" } maplit = "1.0.2" [dev-dependencies] diff --git a/kclvm/macros/Cargo.toml b/kclvm/macros/Cargo.toml index 0c0732d9c..0990eddfa 100644 --- a/kclvm/macros/Cargo.toml +++ b/kclvm/macros/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "kclvm-macros" +name = "kcl-macros" version = "0.11.2" edition = "2021" @@ -9,7 +9,8 @@ edition = "2021" proc-macro = true [dependencies] -synstructure = "0.12.1" -syn = { version = "1", features = ["full"] } -proc-macro2 = "1" -quote = "1" +quote = "1.0" +syn = { version = "2.0", features = ["full", "extra-traits"] } +proc-macro2 = "1.0" +kcl-utils = { path = "../utils" } +kcl-primitives = { path = "../primitives" } diff --git a/kclvm/macros/src/symbols.rs b/kclvm/macros/src/symbols.rs index 144f33b80..ac2c7fdab 100644 --- a/kclvm/macros/src/symbols.rs +++ b/kclvm/macros/src/symbols.rs @@ -7,11 +7,12 @@ //! //! Reference: -use proc_macro2::{Span, TokenStream}; +use proc_macro::TokenStream; use quote::quote; use std::collections::HashMap; use syn::parse::{Parse, ParseStream, Result}; use syn::{braced, punctuated::Punctuated, Ident, LitStr, Token}; +use proc_macro2::Span; #[cfg(test)] mod tests; @@ -86,17 +87,17 @@ impl Errors { } pub fn symbols(input: TokenStream) -> TokenStream { - let (mut output, errors) = symbols_with_errors(input); + let (mut output, errors) = symbols_with_errors(input.clone().into()); // If we generated any errors, then report them as compiler_error!() macro calls. // This lets the errors point back to the most relevant span. It also allows us // to report as many errors as we can during a single run. output.extend(errors.into_iter().map(|e| e.to_compile_error())); - output + output.into() } -fn symbols_with_errors(input: TokenStream) -> (TokenStream, Vec) { +fn symbols_with_errors(input: proc_macro2::TokenStream) -> (proc_macro2::TokenStream, Vec) { let mut errors = Errors::default(); let input: Input = match syn::parse2(input) { diff --git a/kclvm/parser/Cargo.toml b/kclvm/parser/Cargo.toml index d0a7e89c3..1eacad5f4 100644 --- a/kclvm/parser/Cargo.toml +++ b/kclvm/parser/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "kclvm-parser" +name = "kcl-parser" version = "0.11.2" edition = "2021" @@ -25,14 +25,14 @@ anyhow = "1.0" parking_lot = "0.12.3" glob = "0.3.1" -kclvm-lexer = { path = "../lexer" } -kclvm-ast = { path = "../ast" } -kclvm-span = { path = "../span" } -kclvm-error = { path = "../error" } -kclvm-config = { path = "../config" } -kclvm-sema = { path = "../sema" } -kclvm-utils = { path = "../utils" } -kclvm-primitives = { path = "../primitives" } +kcl-lexer = { path = "../lexer" } +kcl-ast = { path = "../ast" } +kcl-span = { path = "../span" } +kcl-error = { path = "../error" } +kcl-config = { path = "../config" } +kcl-sema = { path = "../sema" } +kcl-utils = { path = "../utils" } +kcl-primitives = { path = "../primitives" } walkdir = "2" [dev-dependencies] diff --git a/kclvm/primitives/Cargo.toml b/kclvm/primitives/Cargo.toml index 98b114bf0..9a1408033 100644 --- a/kclvm/primitives/Cargo.toml +++ b/kclvm/primitives/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "kclvm-primitives" +name = "kcl-primitives" version = "0.11.2" edition = "2021" diff --git a/kclvm/query/Cargo.toml b/kclvm/query/Cargo.toml index 88d3f5a58..6d150c5e7 100644 --- a/kclvm/query/Cargo.toml +++ b/kclvm/query/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "kclvm-query" +name = "kcl-query" version = "0.11.2" edition = "2021" @@ -10,13 +10,13 @@ anyhow = "1.0" compiler_base_session = "0.1.3" compiler_base_macros = "0.1.1" -kclvm-ast = { path = "../ast" } -kclvm-ast-pretty = { path = "../ast_pretty" } -kclvm-parser = { path = "../parser" } -kclvm-sema = { path = "../sema" } -kclvm-error = { path = "../error" } -kclvm-utils = { path = "../utils" } -kclvm-primitives = { path = "../primitives" } +kcl-ast = { path = "../ast" } +kcl-ast-pretty = { path = "../ast_pretty" } +kcl-parser = { path = "../parser" } +kcl-sema = { path = "../sema" } +kcl-error = { path = "../error" } +kcl-utils = { path = "../utils" } +kcl-primitives = { path = "../primitives" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" fancy-regex = "0.7.1" diff --git a/kclvm/runner/Cargo.toml b/kclvm/runner/Cargo.toml index 349f21661..f3499240f 100644 --- a/kclvm/runner/Cargo.toml +++ b/kclvm/runner/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "kclvm-runner" +name = "kcl-runner" version = "0.11.2" edition = "2021" @@ -25,22 +25,22 @@ uuid = "1.7.0" compiler_base_session = "0.1.3" compiler_base_macros = "0.1.1" -kclvm-ast = { path = "../ast" } -kclvm-parser = { path = "../parser" } -kclvm-compiler = { path = "../compiler" } -kclvm-config = { path = "../config" } -kclvm-runtime = { path = "../runtime" } -kclvm-sema = { path = "../sema" } -kclvm-version = { path = "../version" } -kclvm-error = { path = "../error" } -kclvm-query = { path = "../query" } -kclvm-utils = { path = "../utils" } -kclvm-driver = { path = "../driver" } -kclvm-evaluator = { path = "../evaluator" } -kclvm-primitives = { path = "../primitives" } +kcl-ast = { path = "../ast" } +kcl-parser = { path = "../parser" } +kcl-compiler = { path = "../compiler" } +kcl-config = { path = "../config" } +kcl-runtime = { path = "../runtime" } +kcl-sema = { path = "../sema" } +kcl-version = { path = "../version" } +kcl-error = { path = "../error" } +kcl-query = { path = "../query" } +kcl-utils = { path = "../utils" } +kcl-driver = { path = "../driver" } +kcl-evaluator = { path = "../evaluator" } +kcl-primitives = { path = "../primitives" } [dev-dependencies] -kclvm-parser = { path = "../parser" } +kcl-parser = { path = "../parser" } criterion = "0.5" [[bench]] @@ -48,4 +48,4 @@ name = "bench_runner" harness = false [features] -llvm = ["kclvm-compiler/llvm"] +llvm = ["kcl-compiler/llvm"] diff --git a/kclvm/runtime/Cargo.toml b/kclvm/runtime/Cargo.toml index 90e5ad1b7..d9bcf7050 100644 --- a/kclvm/runtime/Cargo.toml +++ b/kclvm/runtime/Cargo.toml @@ -1,11 +1,11 @@ [package] -name = "kclvm-runtime" +name = "kcl-runtime" version = "0.11.2" edition = "2021" [dependencies] -kclvm-primitives = { path = "../primitives" } -kclvm_runtime_internal_macros = { path = "./internal_macros" } +kcl-primitives = { path = "../primitives" } +kcl_runtime_internal_macros = { path = "./internal_macros" } serde_json = {package = "serde_json", version = "= 1.0.115"} serde = { version = "1", features = ["derive"] } serde_yaml = {path = "../third-party/serde_yaml"} diff --git a/kclvm/runtime/internal_macros/Cargo.toml b/kclvm/runtime/internal_macros/Cargo.toml index 3db5e19ac..68048aa8d 100644 --- a/kclvm/runtime/internal_macros/Cargo.toml +++ b/kclvm/runtime/internal_macros/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "kclvm_runtime_internal_macros" +name = "kcl_runtime_internal_macros" version = "0.5.0" edition = "2021" diff --git a/kclvm/runtime/src/api/kclvm.rs b/kclvm/runtime/src/api/kclvm.rs index 0dea5a7bf..1f4be6adb 100644 --- a/kclvm/runtime/src/api/kclvm.rs +++ b/kclvm/runtime/src/api/kclvm.rs @@ -2,7 +2,7 @@ use crate::{new_mut_ptr, val_plan::PlanOptions}; use generational_arena::Index; -use kclvm_primitives::{IndexMap, IndexSet}; +use kcl_primitives::{IndexMap, IndexSet}; use serde::{Deserialize, Serialize}; use std::collections::{HashMap, HashSet}; use std::panic::{RefUnwindSafe, UnwindSafe}; diff --git a/kclvm/runtime/src/eval/mod.rs b/kclvm/runtime/src/eval/mod.rs index 71a2c97aa..e80026862 100644 --- a/kclvm/runtime/src/eval/mod.rs +++ b/kclvm/runtime/src/eval/mod.rs @@ -6,7 +6,7 @@ use std::{ use crate::{ kclvm_context_t, kclvm_eval_scope_t, kclvm_value_ref_t, mut_ptr_as_ref, Context, ValueRef, }; -use kclvm_primitives::IndexMap; +use kcl_primitives::IndexMap; /// Variable setter function type. fn(ctx: &mut Context, scope: &mut ScopeEval, args: ValueRef, kwargs: ValueRef) -> ValueRef. pub type SetterFuncType = unsafe extern "C-unwind" fn( diff --git a/kclvm/runtime/src/lib.rs b/kclvm/runtime/src/lib.rs index 456144cbf..1da442872 100644 --- a/kclvm/runtime/src/lib.rs +++ b/kclvm/runtime/src/lib.rs @@ -1,6 +1,6 @@ //! Copyright The KCL Authors. All rights reserved. -use kclvm_runtime_internal_macros::runtime_fn; +use kcl_runtime_internal_macros::runtime_fn; // api-spec: kclvm_context_t // api-spec(c): typedef struct kclvm_context_t kclvm_context_t; diff --git a/kclvm/runtime/src/types/constructor.rs b/kclvm/runtime/src/types/constructor.rs index 4b703a43f..a664dcd8f 100644 --- a/kclvm/runtime/src/types/constructor.rs +++ b/kclvm/runtime/src/types/constructor.rs @@ -1,6 +1,6 @@ //! Copyright The KCL Authors. All rights reserved. -use kclvm_primitives::IndexMap; +use kcl_primitives::IndexMap; use crate::*; diff --git a/kclvm/runtime/src/value/api.rs b/kclvm/runtime/src/value/api.rs index b857a52d6..1882b551b 100644 --- a/kclvm/runtime/src/value/api.rs +++ b/kclvm/runtime/src/value/api.rs @@ -3,7 +3,7 @@ use std::{mem::transmute_copy, os::raw::c_char}; -use kclvm_primitives::IndexMap; +use kcl_primitives::IndexMap; use crate::*; diff --git a/kclvm/runtime/src/value/val_json.rs b/kclvm/runtime/src/value/val_json.rs index 7118b5c4d..222ba7cca 100644 --- a/kclvm/runtime/src/value/val_json.rs +++ b/kclvm/runtime/src/value/val_json.rs @@ -1,7 +1,7 @@ //! Copyright The KCL Authors. All rights reserved. use bstr::ByteSlice; -use kclvm_primitives::{DefaultHashBuilder, IndexMap}; +use kcl_primitives::{DefaultHashBuilder, IndexMap}; use serde::{ de::{DeserializeSeed, MapAccess, SeqAccess, Visitor}, Deserialize, Serialize, diff --git a/kclvm/runtime/src/value/val_schema.rs b/kclvm/runtime/src/value/val_schema.rs index 84022f845..3fc5f8356 100644 --- a/kclvm/runtime/src/value/val_schema.rs +++ b/kclvm/runtime/src/value/val_schema.rs @@ -1,6 +1,6 @@ //! Copyright The KCL Authors. All rights reserved. -use kclvm_primitives::{DefaultHashBuilder, IndexSet}; +use kcl_primitives::{DefaultHashBuilder, IndexSet}; use crate::*; diff --git a/kclvm/sema/Cargo.toml b/kclvm/sema/Cargo.toml index 6f887c33e..6020cdc0f 100644 --- a/kclvm/sema/Cargo.toml +++ b/kclvm/sema/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "kclvm-sema" +name = "kcl-sema" version = "0.11.2" edition = "2021" @@ -20,13 +20,13 @@ anyhow = "1.0" regex = "1.7.0" lazy_static = "1.4.0" -kclvm-primitives = { path = "../primitives" } -kclvm-ast = { path = "../ast" } -kclvm-ast-pretty = { path = "../ast_pretty" } -kclvm-runtime = { path = "../runtime" } -kclvm-error = { path = "../error" } -kclvm-span = { path = "../span" } -kclvm-utils = { path = "../utils" } +kcl-primitives = { path = "../primitives" } +kcl-ast = { path = "../ast" } +kcl-ast-pretty = { path = "../ast_pretty" } +kcl-runtime = { path = "../runtime" } +kcl-error = { path = "../error" } +kcl-span = { path = "../span" } +kcl-utils = { path = "../utils" } compiler_base_span = "0.1.2" compiler_base_session = "0.1.3" compiler_base_macros = "0.1.1" @@ -35,7 +35,7 @@ suggestions = "0.1.1" parking_lot = { version = "0.12.0", default-features = false } [dev-dependencies] -kclvm-parser = { path = "../parser" } +kcl-parser = { path = "../parser" } criterion = "0.5" [[bench]] diff --git a/kclvm/sema/src/advanced_resolver/node.rs b/kclvm/sema/src/advanced_resolver/node.rs index 028ecd371..03291e2c0 100644 --- a/kclvm/sema/src/advanced_resolver/node.rs +++ b/kclvm/sema/src/advanced_resolver/node.rs @@ -1,11 +1,11 @@ use anyhow::anyhow; use std::sync::Arc; -use kclvm_ast::ast::{self, Stmt}; -use kclvm_ast::pos::GetPos; -use kclvm_ast::walker::MutSelfTypedResultWalker; -use kclvm_error::{diagnostic::Range, Position}; -use kclvm_primitives::{DefaultHashBuilder, IndexMap}; +use kcl_ast::ast::{self, Stmt}; +use kcl_ast::pos::GetPos; +use kcl_ast::walker::MutSelfTypedResultWalker; +use kcl_error::{diagnostic::Range, Position}; +use kcl_primitives::{DefaultHashBuilder, IndexMap}; use crate::core::symbol::Symbol; use crate::{ @@ -942,7 +942,7 @@ impl<'ctx> MutSelfTypedResultWalker<'ctx> for AdvancedResolver<'_> { Ok(None) } - fn walk_arguments(&mut self, arguments: &'ctx ast::Arguments) -> Self::Result { + fn walk_arguments(&mut self, arguments: &'ctx ast::Arguments) -> as MutSelfTypedResultWalker<'ctx>>::Result { for (i, arg) in arguments.args.iter().enumerate() { let ty = arguments.get_arg_type_node(i); self.walk_type_expr(ty)?; diff --git a/kclvm/sema/src/builtin/decorator.rs b/kclvm/sema/src/builtin/decorator.rs index 74ae5550c..916ade6de 100644 --- a/kclvm/sema/src/builtin/decorator.rs +++ b/kclvm/sema/src/builtin/decorator.rs @@ -1,7 +1,7 @@ use std::sync::Arc; -use kclvm_error::diagnostic::dummy_range; -use kclvm_primitives::IndexMap; +use kcl_error::diagnostic::dummy_range; +use kcl_primitives::IndexMap; use once_cell::sync::Lazy; use crate::ty::{Parameter, Type}; diff --git a/kclvm/sema/src/builtin/string.rs b/kclvm/sema/src/builtin/string.rs index 79ccdcec4..dc24343e0 100644 --- a/kclvm/sema/src/builtin/string.rs +++ b/kclvm/sema/src/builtin/string.rs @@ -1,7 +1,7 @@ use std::sync::Arc; -use kclvm_error::diagnostic::dummy_range; -use kclvm_primitives::IndexMap; +use kcl_error::diagnostic::dummy_range; +use kcl_primitives::IndexMap; use once_cell::sync::Lazy; use crate::ty::{Parameter, Type}; diff --git a/kclvm/sema/src/builtin/system_module.rs b/kclvm/sema/src/builtin/system_module.rs index e46d96e77..8b823d9c4 100644 --- a/kclvm/sema/src/builtin/system_module.rs +++ b/kclvm/sema/src/builtin/system_module.rs @@ -3,8 +3,8 @@ use std::sync::Arc; use crate::ty::{Parameter, Type, TypeRef}; -use kclvm_error::diagnostic::dummy_range; -use kclvm_primitives::IndexMap; +use kcl_error::diagnostic::dummy_range; +use kcl_primitives::IndexMap; use once_cell::sync::Lazy; // ------------------------------ diff --git a/kclvm/sema/src/core/global_state.rs b/kclvm/sema/src/core/global_state.rs index 6b1c44834..c2cd1c11d 100644 --- a/kclvm/sema/src/core/global_state.rs +++ b/kclvm/sema/src/core/global_state.rs @@ -1,7 +1,7 @@ use std::collections::HashSet; -use kclvm_error::Position; -use kclvm_primitives::{IndexMap, IndexSet}; +use kcl_error::Position; +use kcl_primitives::{IndexMap, IndexSet}; use super::{ package::{ModuleInfo, PackageDB}, diff --git a/kclvm/sema/src/pre_process/tests.rs b/kclvm/sema/src/pre_process/tests.rs index 1cc0eb88f..526b1a9c8 100644 --- a/kclvm/sema/src/pre_process/tests.rs +++ b/kclvm/sema/src/pre_process/tests.rs @@ -1,9 +1,9 @@ use std::sync::Arc; use super::*; -use kclvm_ast::path::get_attr_paths_from_config_expr; -use kclvm_parser::{load_program, parse_file_force_errors, ParseSession}; -use kclvm_primitives::IndexMap; +use kcl_ast::path::get_attr_paths_from_config_expr; +use kcl_parser::{load_program, parse_file_force_errors, ParseSession}; +use kcl_primitives::IndexMap; #[test] fn test_fix_qualified_identifier() { diff --git a/kclvm/sema/src/resolver/calculation.rs b/kclvm/sema/src/resolver/calculation.rs index fff27b38b..93a38a501 100644 --- a/kclvm/sema/src/resolver/calculation.rs +++ b/kclvm/sema/src/resolver/calculation.rs @@ -6,7 +6,7 @@ use crate::ty::{ }; use kclvm_ast::ast; use kclvm_error::diagnostic::Range; -use kclvm_primitives::{DefaultHashBuilder, IndexMap}; +use kcl_primitives::{DefaultHashBuilder, IndexMap}; const DIV_OR_MOD_ZERO_MSG: &str = "integer division or modulo by zero"; diff --git a/kclvm/sema/src/resolver/doc.rs b/kclvm/sema/src/resolver/doc.rs index 089e4897d..b1afd4af7 100644 --- a/kclvm/sema/src/resolver/doc.rs +++ b/kclvm/sema/src/resolver/doc.rs @@ -1,4 +1,4 @@ -use kclvm_ast::ast::{self, SchemaStmt}; +use kcl_ast::ast::{self, SchemaStmt}; use std::collections::{HashMap, HashSet}; use std::iter::Iterator; use std::str; diff --git a/kclvm/sema/src/resolver/import.rs b/kclvm/sema/src/resolver/import.rs index 0251a286d..399cf944c 100644 --- a/kclvm/sema/src/resolver/import.rs +++ b/kclvm/sema/src/resolver/import.rs @@ -6,16 +6,11 @@ use crate::{ builtin::system_module::STANDARD_SYSTEM_MODULES, ty::{Type, TypeKind}, }; -use kclvm_ast::ast; -use kclvm_error::*; -use kclvm_primitives::IndexMap; -use std::rc::Rc; -use std::sync::Arc; -use std::{cell::RefCell, path::Path}; - -use super::scope::{Scope, ScopeKind, ScopeObject, ScopeObjectKind}; -use kclvm_ast::pos::GetPos; -use kclvm_utils::pkgpath::parse_external_pkg_name; +use kcl_ast::ast; +use kcl_error::*; +use kcl_primitives::IndexMap; +use kcl_ast::pos::GetPos; +use kcl_utils::pkgpath::parse_external_pkg_name; impl<'ctx> Resolver<'ctx> { /// Check import error diff --git a/kclvm/sema/src/resolver/tests.rs b/kclvm/sema/src/resolver/tests.rs index 2c566e8aa..bef6dc9c6 100644 --- a/kclvm/sema/src/resolver/tests.rs +++ b/kclvm/sema/src/resolver/tests.rs @@ -7,15 +7,15 @@ use crate::resolver::resolve_program_with_opts; use crate::resolver::scope::*; use crate::ty::{Type, TypeKind}; use anyhow::Result; -use kclvm_ast::ast; -use kclvm_ast::pos::ContainsPos; -use kclvm_ast::MAIN_PKG; -use kclvm_error::*; -use kclvm_parser::load_program; -use kclvm_parser::parse_file_force_errors; -use kclvm_parser::LoadProgramOptions; -use kclvm_parser::ParseSession; -use kclvm_utils::path::PathPrefix; +use kcl_ast::ast; +use kcl_ast::pos::ContainsPos; +use kcl_ast::MAIN_PKG; +use kcl_error::*; +use kcl_parser::load_program; +use kcl_parser::parse_file_force_errors; +use kcl_parser::LoadProgramOptions; +use kcl_parser::ParseSession; +use kcl_utils::path::PathPrefix; use parking_lot::lock_api::RwLock; use std::collections::HashMap; use std::collections::HashSet; @@ -38,7 +38,7 @@ pub fn parse_program(filename: &str) -> Result { module.filename = filename.to_string(); prog.pkgs - .insert(kclvm_ast::MAIN_PKG.to_string(), vec![filename.to_string()]); + .insert(kcl_ast::MAIN_PKG.to_string(), vec![filename.to_string()]); prog.modules .insert(filename.to_string(), Arc::new(Lock::new(module))); @@ -278,7 +278,7 @@ fn test_record_used_module() { let scope = resolve_program(&mut program); let main_scope = scope .scope_map - .get(kclvm_runtime::MAIN_PKG_PATH) + .get(kcl_runtime::MAIN_PKG_PATH) .unwrap() .borrow_mut() .clone(); @@ -487,7 +487,7 @@ fn test_resolve_schema_doc() { let scope = resolve_program(&mut program); let main_scope = scope .scope_map - .get(kclvm_runtime::MAIN_PKG_PATH) + .get(kcl_runtime::MAIN_PKG_PATH) .unwrap() .borrow_mut() .clone(); @@ -546,7 +546,7 @@ fn test_pkg_scope() { assert_eq!(scope.scope_map.len(), 2); let main_scope = scope .scope_map - .get(kclvm_runtime::MAIN_PKG_PATH) + .get(kcl_runtime::MAIN_PKG_PATH) .unwrap() .borrow_mut() .clone(); @@ -595,7 +595,7 @@ fn test_system_package() { let scope = resolve_program(&mut program); let main_scope = scope .scope_map - .get(kclvm_runtime::MAIN_PKG_PATH) + .get(kcl_runtime::MAIN_PKG_PATH) .unwrap() .borrow_mut() .clone(); diff --git a/kclvm/sema/src/resolver/ty_erasure.rs b/kclvm/sema/src/resolver/ty_erasure.rs index eead1b252..5c6276c65 100644 --- a/kclvm/sema/src/resolver/ty_erasure.rs +++ b/kclvm/sema/src/resolver/ty_erasure.rs @@ -1,5 +1,5 @@ -use kclvm_ast::walker::MutSelfMutWalker; -use kclvm_ast::{ast, walk_if_mut, walk_list_mut}; +use kcl_ast::walker::MutSelfMutWalker; +use kcl_ast::{ast, walk_if_mut, walk_list_mut}; #[derive(Default)] struct TypeErasureTransformer; diff --git a/kclvm/sema/src/ty/into.rs b/kclvm/sema/src/ty/into.rs index 21ded369e..03a76cd54 100644 --- a/kclvm/sema/src/ty/into.rs +++ b/kclvm/sema/src/ty/into.rs @@ -1,5 +1,5 @@ use super::*; -use kclvm_ast::pos::GetPos; +use kcl_ast::pos::GetPos; impl Type { /// Downcast ty into the list type. @@ -162,7 +162,7 @@ impl From for Type { suffix: suffix_option, }) => match suffix_option { Some(suffix) => Type::number_multiplier( - kclvm_runtime::cal_num(v, &suffix.value()), + kcl_runtime::cal_num(v, &suffix.value()), v, &suffix.value(), ), diff --git a/kclvm/sema/src/ty/mod.rs b/kclvm/sema/src/ty/mod.rs index 6ac46184d..92bfa6bd2 100644 --- a/kclvm/sema/src/ty/mod.rs +++ b/kclvm/sema/src/ty/mod.rs @@ -11,11 +11,11 @@ use std::sync::Arc; pub use constants::*; pub use context::{TypeContext, TypeInferMethods}; -use kclvm_ast::ast; -use kclvm_ast::MAIN_PKG; -use kclvm_error::diagnostic::Range; -use kclvm_error::Position; -use kclvm_primitives::IndexMap; +use kcl_ast::ast; +use kcl_ast::MAIN_PKG; +use kcl_error::diagnostic::Range; +use kcl_error::Position; +use kcl_primitives::IndexMap; pub use unify::*; pub use walker::walk_type; diff --git a/kclvm/sema/src/ty/unify.rs b/kclvm/sema/src/ty/unify.rs index b116f67aa..9ca9e5d39 100644 --- a/kclvm/sema/src/ty/unify.rs +++ b/kclvm/sema/src/ty/unify.rs @@ -1,6 +1,6 @@ use std::{collections::HashSet, sync::Arc}; -use kclvm_primitives::IndexMap; +use kcl_primitives::IndexMap; use super::{SchemaType, Type, TypeKind, TypeRef}; diff --git a/kclvm/span/Cargo.toml b/kclvm/span/Cargo.toml index 0b278f0b2..35e690418 100644 --- a/kclvm/span/Cargo.toml +++ b/kclvm/span/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "kclvm-span" +name = "kcl-span" version = "0.11.2" edition = "2021" @@ -8,6 +8,6 @@ edition = "2021" [dependencies] compiler_base_span = "0.1.2" -kclvm-macros = { path = "../macros" } +kcl-macros = { path = "../macros" } scoped-tls = "1.0" parking_lot = "0.11" diff --git a/kclvm/span/src/lib.rs b/kclvm/span/src/lib.rs index 7f50765e6..35d504a68 100644 --- a/kclvm/span/src/lib.rs +++ b/kclvm/span/src/lib.rs @@ -19,4 +19,4 @@ use session_globals::with_session_globals; pub use symbol::{Ident, Symbol}; #[macro_use] -extern crate kclvm_macros; +extern crate kcl_macros; diff --git a/kclvm/span/src/symbol.rs b/kclvm/span/src/symbol.rs index d57abd990..697740095 100644 --- a/kclvm/span/src/symbol.rs +++ b/kclvm/span/src/symbol.rs @@ -6,6 +6,7 @@ use std::{ use crate::session_globals::Interner; use crate::with_session_globals; +use kcl_macros::symbols; // The proc macro code for this is in `kclvm_macros/src/symbols.rs`. symbols! { diff --git a/kclvm/third-party/serde_yaml/Cargo.toml b/kclvm/third-party/serde_yaml/Cargo.toml index 301215156..b91917227 100644 --- a/kclvm/third-party/serde_yaml/Cargo.toml +++ b/kclvm/third-party/serde_yaml/Cargo.toml @@ -52,7 +52,7 @@ version = "1.0.195" [dependencies.unsafe-libyaml] version = "0.2.11" -[dependencies.kclvm-primitives] +[dependencies.kcl-primitives] path = "../../primitives" [dev-dependencies.anyhow] diff --git a/kclvm/third-party/serde_yaml/src/mapping.rs b/kclvm/third-party/serde_yaml/src/mapping.rs index 7a53f6aea..dd5a27eb7 100644 --- a/kclvm/third-party/serde_yaml/src/mapping.rs +++ b/kclvm/third-party/serde_yaml/src/mapping.rs @@ -1,7 +1,7 @@ //! A YAML mapping and its iterator types. use crate::{private, Value}; -use kclvm_primitives::{DefaultHashBuilder, IndexMap}; +use kcl_primitives::{DefaultHashBuilder, IndexMap}; use serde::{Deserialize, Deserializer, Serialize}; use std::cmp::Ordering; use std::collections::hash_map::DefaultHasher; diff --git a/kclvm/tools/Cargo.toml b/kclvm/tools/Cargo.toml index 34b3fa51c..2bfa87f69 100644 --- a/kclvm/tools/Cargo.toml +++ b/kclvm/tools/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "kclvm-tools" +name = "kcl-tools" version = "0.11.2" edition = "2021" @@ -12,18 +12,18 @@ anyhow = "1.0" compiler_base_session = "0.1.3" rustc_lexer = "0.1.0" -kclvm-ast = { path = "../ast" } -kclvm-error = { path = "../error" } -kclvm-parser = { path = "../parser" } -kclvm-sema = { path = "../sema" } -kclvm-config = { path = "../config" } -kclvm-ast-pretty = { path = "../ast_pretty" } -kclvm-query = { path = "../query" } -kclvm-runner = { path = "../runner" } -kclvm-runtime = { path = "../runtime" } -kclvm-driver = { path = "../driver" } -kclvm-utils = { path = "../utils" } -kclvm-primitives = { path = "../primitives" } +kcl-ast = { path = "../ast" } +kcl-error = { path = "../error" } +kcl-parser = { path = "../parser" } +kcl-sema = { path = "../sema" } +kcl-config = { path = "../config" } +kcl-ast-pretty = { path = "../ast_pretty" } +kcl-query = { path = "../query" } +kcl-runner = { path = "../runner" } +kcl-runtime = { path = "../runtime" } +kcl-driver = { path = "../driver" } +kcl-utils = { path = "../utils" } +kcl-primitives = { path = "../primitives" } serde_json = "1.0" serde_yaml = { path = "../third-party/serde_yaml" } @@ -43,4 +43,4 @@ name = "benchmark" harness = false [features] -llvm = ["kclvm-runner/llvm"] +llvm = ["kcl-runner/llvm"] diff --git a/kclvm/tools/src/LSP/Cargo.toml b/kclvm/tools/src/LSP/Cargo.toml index 82a625764..3a5e7db0a 100644 --- a/kclvm/tools/src/LSP/Cargo.toml +++ b/kclvm/tools/src/LSP/Cargo.toml @@ -19,18 +19,18 @@ clap = { version = "4.3.0", features = ["string"] } maplit = "1.0.2" compiler_base_session = "0.1.3" -kclvm-tools = { path = "../../../tools" } -kclvm-error = { path = "../../../error" } -kclvm-config = { path = "../../../config" } -kclvm-driver = { path = "../../../driver" } -kclvm-parser = { path = "../../../parser" } -kclvm-sema = { path = "../../../sema" } -kclvm-ast = { path = "../../../ast" } -kclvm-utils = { path = "../../../utils" } -kclvm-version = { path = "../../../version" } -kclvm-query = { path = "../../../query" } -kclvm-span = { path = "../../../span" } -kclvm-primitives = { path = "../../../primitives" } +kcl-tools = { path = "../../../tools" } +kcl-error = { path = "../../../error" } +kcl-config = { path = "../../../config" } +kcl-driver = { path = "../../../driver" } +kcl-parser = { path = "../../../parser" } +kcl-sema = { path = "../../../sema" } +kcl-ast = { path = "../../../ast" } +kcl-utils = { path = "../../../utils" } +kcl-version = { path = "../../../version" } +kcl-query = { path = "../../../query" } +kcl-span = { path = "../../../span" } +kcl-primitives = { path = "../../../primitives" } lsp-server = { version = "0.7.7", default-features = false } anyhow = { version = "1.0", default-features = false, features = ["std"] } diff --git a/kclvm/utils/Cargo.toml b/kclvm/utils/Cargo.toml index de90c6049..4c6979c06 100644 --- a/kclvm/utils/Cargo.toml +++ b/kclvm/utils/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "kclvm-utils" +name = "kcl-utils" version = "0.11.2" edition = "2021" diff --git a/kclvm/version/Cargo.toml b/kclvm/version/Cargo.toml index ec35707f1..a6fce1b50 100644 --- a/kclvm/version/Cargo.toml +++ b/kclvm/version/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "kclvm-version" +name = "kcl-version" version = "0.11.2" edition = "2021"