Move code into cli directory

2019-01-04 16:50:52 -08:00 · 2019-01-04 16:50:52 -08:00 · 5b0e12ea33
commit 5b0e12ea33
parent b8dd5d2640
29 changed files with 32 additions and 26 deletions
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,27 +1,6 @@
-[package]
-name = "rust-tree-sitter-cli"
-version = "0.1.0"
-authors = ["Max Brunsfeld <maxbrunsfeld@gmail.com>"]
-edition = "2018"
+[workspace]

-[dependencies]
-lazy_static = "1.2.0"
-smallbitvec = "2.3.0"
-clap = "2.32"
-dirs = "1.0.2"
-hashbrown = "0.1"
-ignore = "0.4.4"
-libloading = "0.5"
-rusqlite = "0.14.0"
-serde = "1.0"
-serde_derive = "1.0"
-tree-sitter = "0.3.1"
-regex-syntax = "0.6.4"
-
-[dependencies.serde_json]
-version = "1.0"
-features = ["preserve_order"]
-
-[dependencies.log]
-version = "0.4.6"
-features = ["std"]
+members = [
+    "cli",
+    "lib",
+]
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@ -0,0 +1,27 @@
+[package]
+name = "rust-tree-sitter-cli"
+version = "0.1.0"
+authors = ["Max Brunsfeld <maxbrunsfeld@gmail.com>"]
+edition = "2018"
+
+[dependencies]
+lazy_static = "1.2.0"
+smallbitvec = "2.3.0"
+clap = "2.32"
+dirs = "1.0.2"
+hashbrown = "0.1"
+ignore = "0.4.4"
+libloading = "0.5"
+rusqlite = "0.14.0"
+serde = "1.0"
+serde_derive = "1.0"
+tree-sitter = "0.3.1"
+regex-syntax = "0.6.4"
+
+[dependencies.serde_json]
+version = "1.0"
+features = ["preserve_order"]
+
+[dependencies.log]
+version = "0.4.6"
+features = ["std"]
--- a/cli/src/build_tables/build_lex_table.rs
+++ b/cli/src/build_tables/build_lex_table.rs
--- a/cli/src/build_tables/build_parse_table.rs
+++ b/cli/src/build_tables/build_parse_table.rs
--- a/cli/src/build_tables/coincident_tokens.rs
+++ b/cli/src/build_tables/coincident_tokens.rs
--- a/cli/src/build_tables/item.rs
+++ b/cli/src/build_tables/item.rs
--- a/cli/src/build_tables/item_set_builder.rs
+++ b/cli/src/build_tables/item_set_builder.rs
--- a/cli/src/build_tables/minimize_parse_table.rs
+++ b/cli/src/build_tables/minimize_parse_table.rs
--- a/cli/src/build_tables/mod.rs
+++ b/cli/src/build_tables/mod.rs
--- a/cli/src/build_tables/token_conflicts.rs
+++ b/cli/src/build_tables/token_conflicts.rs
--- a/cli/src/error.rs
+++ b/cli/src/error.rs
--- a/cli/src/generate.rs
+++ b/cli/src/generate.rs
--- a/cli/src/grammars.rs
+++ b/cli/src/grammars.rs
--- a/cli/src/js/dsl.js
+++ b/cli/src/js/dsl.js
--- a/cli/src/logger.rs
+++ b/cli/src/logger.rs
--- a/cli/src/main.rs
+++ b/cli/src/main.rs
--- a/cli/src/nfa.rs
+++ b/cli/src/nfa.rs
--- a/cli/src/parse_grammar.rs
+++ b/cli/src/parse_grammar.rs
--- a/cli/src/prepare_grammar/expand_repeats.rs
+++ b/cli/src/prepare_grammar/expand_repeats.rs
--- a/cli/src/prepare_grammar/expand_tokens.rs
+++ b/cli/src/prepare_grammar/expand_tokens.rs
--- a/cli/src/prepare_grammar/extract_simple_aliases.rs
+++ b/cli/src/prepare_grammar/extract_simple_aliases.rs
--- a/cli/src/prepare_grammar/extract_tokens.rs
+++ b/cli/src/prepare_grammar/extract_tokens.rs
--- a/cli/src/prepare_grammar/flatten_grammar.rs
+++ b/cli/src/prepare_grammar/flatten_grammar.rs
--- a/cli/src/prepare_grammar/intern_symbols.rs
+++ b/cli/src/prepare_grammar/intern_symbols.rs
--- a/cli/src/prepare_grammar/mod.rs
+++ b/cli/src/prepare_grammar/mod.rs
--- a/cli/src/prepare_grammar/process_inlines.rs
+++ b/cli/src/prepare_grammar/process_inlines.rs
--- a/cli/src/render/mod.rs
+++ b/cli/src/render/mod.rs
--- a/cli/src/rules.rs
+++ b/cli/src/rules.rs
--- a/cli/src/tables.rs
+++ b/cli/src/tables.rs