From 521010cc4f68be196d7dbe93882c7c6bf85606ad Mon Sep 17 00:00:00 2001 From: Chris Fallin Date: Tue, 14 Sep 2021 23:24:49 -0700 Subject: [PATCH] Split into isle and islec crates --- cranelift/isle/Cargo.lock | 12 ++++++++++-- cranelift/isle/Cargo.toml | 13 ++----------- cranelift/isle/isle/Cargo.toml | 9 +++++++++ cranelift/isle/{ => isle}/src/ast.rs | 0 cranelift/isle/{ => isle}/src/codegen.rs | 0 cranelift/isle/{ => isle}/src/compile.rs | 0 cranelift/isle/{ => isle}/src/error.rs | 0 cranelift/isle/{ => isle}/src/ir.rs | 0 cranelift/isle/{ => isle}/src/lexer.rs | 0 cranelift/isle/isle/src/lib.rs | 9 +++++++++ cranelift/isle/{ => isle}/src/parser.rs | 0 cranelift/isle/{ => isle}/src/sema.rs | 0 cranelift/isle/islec/Cargo.toml | 12 ++++++++++++ .../isle/{src/bin/isle.rs => islec/src/main.rs} | 0 14 files changed, 42 insertions(+), 13 deletions(-) create mode 100644 cranelift/isle/isle/Cargo.toml rename cranelift/isle/{ => isle}/src/ast.rs (100%) rename cranelift/isle/{ => isle}/src/codegen.rs (100%) rename cranelift/isle/{ => isle}/src/compile.rs (100%) rename cranelift/isle/{ => isle}/src/error.rs (100%) rename cranelift/isle/{ => isle}/src/ir.rs (100%) rename cranelift/isle/{ => isle}/src/lexer.rs (100%) create mode 100644 cranelift/isle/isle/src/lib.rs rename cranelift/isle/{ => isle}/src/parser.rs (100%) rename cranelift/isle/{ => isle}/src/sema.rs (100%) create mode 100644 cranelift/isle/islec/Cargo.toml rename cranelift/isle/{src/bin/isle.rs => islec/src/main.rs} (100%) diff --git a/cranelift/isle/Cargo.lock b/cranelift/isle/Cargo.lock index 26a438a64e..63a6b3a949 100644 --- a/cranelift/isle/Cargo.lock +++ b/cranelift/isle/Cargo.lock @@ -70,17 +70,25 @@ dependencies = [ [[package]] name = "isle" version = "0.1.0" +dependencies = [ + "log", +] + +[[package]] +name = "islec" +version = "0.1.0" dependencies = [ "clap", "env_logger", + "isle", "log", ] [[package]] name = "libc" -version = "0.2.97" +version = "0.2.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6" +checksum = "3cb00336871be5ed2c8ed44b60ae9959dc5b9f08539422ed43f09e34ecaeba21" [[package]] name = "log" diff --git a/cranelift/isle/Cargo.toml b/cranelift/isle/Cargo.toml index 2d7da0ae6f..2f3fcbb680 100644 --- a/cranelift/isle/Cargo.toml +++ b/cranelift/isle/Cargo.toml @@ -1,11 +1,2 @@ -[package] -name = "isle" -version = "0.1.0" -authors = ["Chris Fallin "] -edition = "2018" -license = "Apache-2.0 WITH LLVM-exception" - -[dependencies] -log = "0.4" -env_logger = { version = "0.8", default-features = false } -clap = "2.33" +[workspace] +members = [ "isle", "islec" ] diff --git a/cranelift/isle/isle/Cargo.toml b/cranelift/isle/isle/Cargo.toml new file mode 100644 index 0000000000..3fe78c9eb7 --- /dev/null +++ b/cranelift/isle/isle/Cargo.toml @@ -0,0 +1,9 @@ +[package] +name = "isle" +version = "0.1.0" +authors = ["Chris Fallin "] +edition = "2018" +license = "Apache-2.0 WITH LLVM-exception" + +[dependencies] +log = "0.4" diff --git a/cranelift/isle/src/ast.rs b/cranelift/isle/isle/src/ast.rs similarity index 100% rename from cranelift/isle/src/ast.rs rename to cranelift/isle/isle/src/ast.rs diff --git a/cranelift/isle/src/codegen.rs b/cranelift/isle/isle/src/codegen.rs similarity index 100% rename from cranelift/isle/src/codegen.rs rename to cranelift/isle/isle/src/codegen.rs diff --git a/cranelift/isle/src/compile.rs b/cranelift/isle/isle/src/compile.rs similarity index 100% rename from cranelift/isle/src/compile.rs rename to cranelift/isle/isle/src/compile.rs diff --git a/cranelift/isle/src/error.rs b/cranelift/isle/isle/src/error.rs similarity index 100% rename from cranelift/isle/src/error.rs rename to cranelift/isle/isle/src/error.rs diff --git a/cranelift/isle/src/ir.rs b/cranelift/isle/isle/src/ir.rs similarity index 100% rename from cranelift/isle/src/ir.rs rename to cranelift/isle/isle/src/ir.rs diff --git a/cranelift/isle/src/lexer.rs b/cranelift/isle/isle/src/lexer.rs similarity index 100% rename from cranelift/isle/src/lexer.rs rename to cranelift/isle/isle/src/lexer.rs diff --git a/cranelift/isle/isle/src/lib.rs b/cranelift/isle/isle/src/lib.rs new file mode 100644 index 0000000000..5d9dcb088a --- /dev/null +++ b/cranelift/isle/isle/src/lib.rs @@ -0,0 +1,9 @@ +pub mod ast; +pub mod codegen; +pub mod compile; +pub mod error; +pub mod ir; +pub mod lexer; +pub mod parser; +pub mod sema; + diff --git a/cranelift/isle/src/parser.rs b/cranelift/isle/isle/src/parser.rs similarity index 100% rename from cranelift/isle/src/parser.rs rename to cranelift/isle/isle/src/parser.rs diff --git a/cranelift/isle/src/sema.rs b/cranelift/isle/isle/src/sema.rs similarity index 100% rename from cranelift/isle/src/sema.rs rename to cranelift/isle/isle/src/sema.rs diff --git a/cranelift/isle/islec/Cargo.toml b/cranelift/isle/islec/Cargo.toml new file mode 100644 index 0000000000..4454234640 --- /dev/null +++ b/cranelift/isle/islec/Cargo.toml @@ -0,0 +1,12 @@ +[package] +name = "islec" +version = "0.1.0" +authors = ["Chris Fallin "] +edition = "2018" +license = "Apache-2.0 WITH LLVM-exception" + +[dependencies] +log = "0.4" +isle = { version = "*", path = "../isle/" } +env_logger = { version = "0.8", default-features = false } +clap = "2.33" diff --git a/cranelift/isle/src/bin/isle.rs b/cranelift/isle/islec/src/main.rs similarity index 100% rename from cranelift/isle/src/bin/isle.rs rename to cranelift/isle/islec/src/main.rs