From 90a3818ca0e295112d6be738113b9ffa84a0426a Mon Sep 17 00:00:00 2001 From: John Date: Fri, 19 Apr 2024 07:39:23 -0500 Subject: [PATCH] conlang: Move all cl-libs into the compiler directory --- Cargo.toml | 16 ++++++++-------- {cl-ast => compiler/cl-ast}/Cargo.toml | 0 {cl-ast => compiler/cl-ast}/src/ast.rs | 0 {cl-ast => compiler/cl-ast}/src/ast_impl.rs | 0 {cl-ast => compiler/cl-ast}/src/ast_visitor.rs | 0 .../cl-ast}/src/ast_visitor/fold.rs | 0 .../cl-ast}/src/ast_visitor/visit.rs | 0 {cl-ast => compiler/cl-ast}/src/desugar.rs | 0 .../cl-ast}/src/desugar/squash_groups.rs | 0 .../cl-ast}/src/desugar/while_else.rs | 0 {cl-ast => compiler/cl-ast}/src/format.rs | 0 {cl-ast => compiler/cl-ast}/src/lib.rs | 0 .../cl-interpret}/Cargo.toml | 0 .../cl-interpret}/examples/fib.rs | 0 .../cl-interpret}/src/builtin.rs | 0 .../cl-interpret}/src/interpret.rs | 0 .../cl-interpret}/src/lib.rs | 0 .../cl-interpret}/src/tests.rs | 0 {cl-lexer => compiler/cl-lexer}/Cargo.toml | 0 {cl-lexer => compiler/cl-lexer}/src/lib.rs | 0 {cl-lexer => compiler/cl-lexer}/src/tests.rs | 0 {cl-parser => compiler/cl-parser}/Cargo.toml | 0 {cl-parser => compiler/cl-parser}/src/error.rs | 0 {cl-parser => compiler/cl-parser}/src/lib.rs | 0 {cl-parser => compiler/cl-parser}/src/parser.rs | 0 {cl-repl => compiler/cl-repl}/Cargo.toml | 2 +- .../cl-repl}/examples/identify_tokens.rs | 0 {cl-repl => compiler/cl-repl}/examples/typeck.rs | 2 +- {cl-repl => compiler/cl-repl}/examples/yaml.rs | 0 {cl-repl => compiler/cl-repl}/src/ansi.rs | 0 {cl-repl => compiler/cl-repl}/src/args.rs | 0 {cl-repl => compiler/cl-repl}/src/bin/conlang.rs | 0 {cl-repl => compiler/cl-repl}/src/cli.rs | 0 {cl-repl => compiler/cl-repl}/src/ctx.rs | 0 {cl-repl => compiler/cl-repl}/src/lib.rs | 0 {cl-repl => compiler/cl-repl}/src/menu.rs | 0 {cl-repl => compiler/cl-repl}/src/tools.rs | 0 .../cl-structures}/Cargo.toml | 0 .../cl-structures}/src/intern_pool.rs | 0 .../cl-structures}/src/lib.rs | 0 .../cl-structures}/src/span.rs | 0 .../cl-structures}/src/stack.rs | 0 .../cl-structures}/src/tree.rs | 0 .../cl-structures}/src/tree/tree_ref.rs | 0 {cl-token => compiler/cl-token}/Cargo.toml | 0 {cl-token => compiler/cl-token}/src/lib.rs | 0 {cl-token => compiler/cl-token}/src/token.rs | 0 .../cl-token}/src/token_data.rs | 0 .../cl-token}/src/token_type.rs | 0 {cl-typeck => compiler/cl-typeck}/Cargo.toml | 0 .../cl-typeck}/src/definition/display.rs | 0 {cl-typeck => compiler/cl-typeck}/src/lib.rs | 0 52 files changed, 10 insertions(+), 10 deletions(-) rename {cl-ast => compiler/cl-ast}/Cargo.toml (100%) rename {cl-ast => compiler/cl-ast}/src/ast.rs (100%) rename {cl-ast => compiler/cl-ast}/src/ast_impl.rs (100%) rename {cl-ast => compiler/cl-ast}/src/ast_visitor.rs (100%) rename {cl-ast => compiler/cl-ast}/src/ast_visitor/fold.rs (100%) rename {cl-ast => compiler/cl-ast}/src/ast_visitor/visit.rs (100%) rename {cl-ast => compiler/cl-ast}/src/desugar.rs (100%) rename {cl-ast => compiler/cl-ast}/src/desugar/squash_groups.rs (100%) rename {cl-ast => compiler/cl-ast}/src/desugar/while_else.rs (100%) rename {cl-ast => compiler/cl-ast}/src/format.rs (100%) rename {cl-ast => compiler/cl-ast}/src/lib.rs (100%) rename {cl-interpret => compiler/cl-interpret}/Cargo.toml (100%) rename {cl-interpret => compiler/cl-interpret}/examples/fib.rs (100%) rename {cl-interpret => compiler/cl-interpret}/src/builtin.rs (100%) rename {cl-interpret => compiler/cl-interpret}/src/interpret.rs (100%) rename {cl-interpret => compiler/cl-interpret}/src/lib.rs (100%) rename {cl-interpret => compiler/cl-interpret}/src/tests.rs (100%) rename {cl-lexer => compiler/cl-lexer}/Cargo.toml (100%) rename {cl-lexer => compiler/cl-lexer}/src/lib.rs (100%) rename {cl-lexer => compiler/cl-lexer}/src/tests.rs (100%) rename {cl-parser => compiler/cl-parser}/Cargo.toml (100%) rename {cl-parser => compiler/cl-parser}/src/error.rs (100%) rename {cl-parser => compiler/cl-parser}/src/lib.rs (100%) rename {cl-parser => compiler/cl-parser}/src/parser.rs (100%) rename {cl-repl => compiler/cl-repl}/Cargo.toml (93%) rename {cl-repl => compiler/cl-repl}/examples/identify_tokens.rs (100%) rename {cl-repl => compiler/cl-repl}/examples/typeck.rs (98%) rename {cl-repl => compiler/cl-repl}/examples/yaml.rs (100%) rename {cl-repl => compiler/cl-repl}/src/ansi.rs (100%) rename {cl-repl => compiler/cl-repl}/src/args.rs (100%) rename {cl-repl => compiler/cl-repl}/src/bin/conlang.rs (100%) rename {cl-repl => compiler/cl-repl}/src/cli.rs (100%) rename {cl-repl => compiler/cl-repl}/src/ctx.rs (100%) rename {cl-repl => compiler/cl-repl}/src/lib.rs (100%) rename {cl-repl => compiler/cl-repl}/src/menu.rs (100%) rename {cl-repl => compiler/cl-repl}/src/tools.rs (100%) rename {cl-structures => compiler/cl-structures}/Cargo.toml (100%) rename {cl-structures => compiler/cl-structures}/src/intern_pool.rs (100%) rename {cl-structures => compiler/cl-structures}/src/lib.rs (100%) rename {cl-structures => compiler/cl-structures}/src/span.rs (100%) rename {cl-structures => compiler/cl-structures}/src/stack.rs (100%) rename {cl-structures => compiler/cl-structures}/src/tree.rs (100%) rename {cl-structures => compiler/cl-structures}/src/tree/tree_ref.rs (100%) rename {cl-token => compiler/cl-token}/Cargo.toml (100%) rename {cl-token => compiler/cl-token}/src/lib.rs (100%) rename {cl-token => compiler/cl-token}/src/token.rs (100%) rename {cl-token => compiler/cl-token}/src/token_data.rs (100%) rename {cl-token => compiler/cl-token}/src/token_type.rs (100%) rename {cl-typeck => compiler/cl-typeck}/Cargo.toml (100%) rename {cl-typeck => compiler/cl-typeck}/src/definition/display.rs (100%) rename {cl-typeck => compiler/cl-typeck}/src/lib.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 8555030..96fe598 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,13 +1,13 @@ [workspace] members = [ - "cl-repl", - "cl-typeck", - "cl-interpret", - "cl-structures", - "cl-token", - "cl-ast", - "cl-parser", - "cl-lexer", + "compiler/cl-repl", + "compiler/cl-typeck", + "compiler/cl-interpret", + "compiler/cl-structures", + "compiler/cl-token", + "compiler/cl-ast", + "compiler/cl-parser", + "compiler/cl-lexer", "repline", ] resolver = "2" diff --git a/cl-ast/Cargo.toml b/compiler/cl-ast/Cargo.toml similarity index 100% rename from cl-ast/Cargo.toml rename to compiler/cl-ast/Cargo.toml diff --git a/cl-ast/src/ast.rs b/compiler/cl-ast/src/ast.rs similarity index 100% rename from cl-ast/src/ast.rs rename to compiler/cl-ast/src/ast.rs diff --git a/cl-ast/src/ast_impl.rs b/compiler/cl-ast/src/ast_impl.rs similarity index 100% rename from cl-ast/src/ast_impl.rs rename to compiler/cl-ast/src/ast_impl.rs diff --git a/cl-ast/src/ast_visitor.rs b/compiler/cl-ast/src/ast_visitor.rs similarity index 100% rename from cl-ast/src/ast_visitor.rs rename to compiler/cl-ast/src/ast_visitor.rs diff --git a/cl-ast/src/ast_visitor/fold.rs b/compiler/cl-ast/src/ast_visitor/fold.rs similarity index 100% rename from cl-ast/src/ast_visitor/fold.rs rename to compiler/cl-ast/src/ast_visitor/fold.rs diff --git a/cl-ast/src/ast_visitor/visit.rs b/compiler/cl-ast/src/ast_visitor/visit.rs similarity index 100% rename from cl-ast/src/ast_visitor/visit.rs rename to compiler/cl-ast/src/ast_visitor/visit.rs diff --git a/cl-ast/src/desugar.rs b/compiler/cl-ast/src/desugar.rs similarity index 100% rename from cl-ast/src/desugar.rs rename to compiler/cl-ast/src/desugar.rs diff --git a/cl-ast/src/desugar/squash_groups.rs b/compiler/cl-ast/src/desugar/squash_groups.rs similarity index 100% rename from cl-ast/src/desugar/squash_groups.rs rename to compiler/cl-ast/src/desugar/squash_groups.rs diff --git a/cl-ast/src/desugar/while_else.rs b/compiler/cl-ast/src/desugar/while_else.rs similarity index 100% rename from cl-ast/src/desugar/while_else.rs rename to compiler/cl-ast/src/desugar/while_else.rs diff --git a/cl-ast/src/format.rs b/compiler/cl-ast/src/format.rs similarity index 100% rename from cl-ast/src/format.rs rename to compiler/cl-ast/src/format.rs diff --git a/cl-ast/src/lib.rs b/compiler/cl-ast/src/lib.rs similarity index 100% rename from cl-ast/src/lib.rs rename to compiler/cl-ast/src/lib.rs diff --git a/cl-interpret/Cargo.toml b/compiler/cl-interpret/Cargo.toml similarity index 100% rename from cl-interpret/Cargo.toml rename to compiler/cl-interpret/Cargo.toml diff --git a/cl-interpret/examples/fib.rs b/compiler/cl-interpret/examples/fib.rs similarity index 100% rename from cl-interpret/examples/fib.rs rename to compiler/cl-interpret/examples/fib.rs diff --git a/cl-interpret/src/builtin.rs b/compiler/cl-interpret/src/builtin.rs similarity index 100% rename from cl-interpret/src/builtin.rs rename to compiler/cl-interpret/src/builtin.rs diff --git a/cl-interpret/src/interpret.rs b/compiler/cl-interpret/src/interpret.rs similarity index 100% rename from cl-interpret/src/interpret.rs rename to compiler/cl-interpret/src/interpret.rs diff --git a/cl-interpret/src/lib.rs b/compiler/cl-interpret/src/lib.rs similarity index 100% rename from cl-interpret/src/lib.rs rename to compiler/cl-interpret/src/lib.rs diff --git a/cl-interpret/src/tests.rs b/compiler/cl-interpret/src/tests.rs similarity index 100% rename from cl-interpret/src/tests.rs rename to compiler/cl-interpret/src/tests.rs diff --git a/cl-lexer/Cargo.toml b/compiler/cl-lexer/Cargo.toml similarity index 100% rename from cl-lexer/Cargo.toml rename to compiler/cl-lexer/Cargo.toml diff --git a/cl-lexer/src/lib.rs b/compiler/cl-lexer/src/lib.rs similarity index 100% rename from cl-lexer/src/lib.rs rename to compiler/cl-lexer/src/lib.rs diff --git a/cl-lexer/src/tests.rs b/compiler/cl-lexer/src/tests.rs similarity index 100% rename from cl-lexer/src/tests.rs rename to compiler/cl-lexer/src/tests.rs diff --git a/cl-parser/Cargo.toml b/compiler/cl-parser/Cargo.toml similarity index 100% rename from cl-parser/Cargo.toml rename to compiler/cl-parser/Cargo.toml diff --git a/cl-parser/src/error.rs b/compiler/cl-parser/src/error.rs similarity index 100% rename from cl-parser/src/error.rs rename to compiler/cl-parser/src/error.rs diff --git a/cl-parser/src/lib.rs b/compiler/cl-parser/src/lib.rs similarity index 100% rename from cl-parser/src/lib.rs rename to compiler/cl-parser/src/lib.rs diff --git a/cl-parser/src/parser.rs b/compiler/cl-parser/src/parser.rs similarity index 100% rename from cl-parser/src/parser.rs rename to compiler/cl-parser/src/parser.rs diff --git a/cl-repl/Cargo.toml b/compiler/cl-repl/Cargo.toml similarity index 93% rename from cl-repl/Cargo.toml rename to compiler/cl-repl/Cargo.toml index 5ed4b2f..e089c69 100644 --- a/cl-repl/Cargo.toml +++ b/compiler/cl-repl/Cargo.toml @@ -15,7 +15,7 @@ cl-lexer = { path = "../cl-lexer" } cl-token = { path = "../cl-token" } cl-parser = { path = "../cl-parser" } cl-interpret = { path = "../cl-interpret" } -repline = { path = "../repline" } +repline = { path = "../../repline" } argh = "0.1.12" [dev-dependencies] diff --git a/cl-repl/examples/identify_tokens.rs b/compiler/cl-repl/examples/identify_tokens.rs similarity index 100% rename from cl-repl/examples/identify_tokens.rs rename to compiler/cl-repl/examples/identify_tokens.rs diff --git a/cl-repl/examples/typeck.rs b/compiler/cl-repl/examples/typeck.rs similarity index 98% rename from cl-repl/examples/typeck.rs rename to compiler/cl-repl/examples/typeck.rs index 54e5529..d2c1fdb 100644 --- a/cl-repl/examples/typeck.rs +++ b/compiler/cl-repl/examples/typeck.rs @@ -13,7 +13,7 @@ use std::error::Error; // Path to display in standard library errors const STDLIB_DISPLAY_PATH: &str = "stdlib/lib.cl"; // Statically included standard library -const STDLIB: &str = include_str!("../../stdlib/lib.cl"); +const STDLIB: &str = include_str!("../../../stdlib/lib.cl"); // Colors const C_MAIN: &str = ""; diff --git a/cl-repl/examples/yaml.rs b/compiler/cl-repl/examples/yaml.rs similarity index 100% rename from cl-repl/examples/yaml.rs rename to compiler/cl-repl/examples/yaml.rs diff --git a/cl-repl/src/ansi.rs b/compiler/cl-repl/src/ansi.rs similarity index 100% rename from cl-repl/src/ansi.rs rename to compiler/cl-repl/src/ansi.rs diff --git a/cl-repl/src/args.rs b/compiler/cl-repl/src/args.rs similarity index 100% rename from cl-repl/src/args.rs rename to compiler/cl-repl/src/args.rs diff --git a/cl-repl/src/bin/conlang.rs b/compiler/cl-repl/src/bin/conlang.rs similarity index 100% rename from cl-repl/src/bin/conlang.rs rename to compiler/cl-repl/src/bin/conlang.rs diff --git a/cl-repl/src/cli.rs b/compiler/cl-repl/src/cli.rs similarity index 100% rename from cl-repl/src/cli.rs rename to compiler/cl-repl/src/cli.rs diff --git a/cl-repl/src/ctx.rs b/compiler/cl-repl/src/ctx.rs similarity index 100% rename from cl-repl/src/ctx.rs rename to compiler/cl-repl/src/ctx.rs diff --git a/cl-repl/src/lib.rs b/compiler/cl-repl/src/lib.rs similarity index 100% rename from cl-repl/src/lib.rs rename to compiler/cl-repl/src/lib.rs diff --git a/cl-repl/src/menu.rs b/compiler/cl-repl/src/menu.rs similarity index 100% rename from cl-repl/src/menu.rs rename to compiler/cl-repl/src/menu.rs diff --git a/cl-repl/src/tools.rs b/compiler/cl-repl/src/tools.rs similarity index 100% rename from cl-repl/src/tools.rs rename to compiler/cl-repl/src/tools.rs diff --git a/cl-structures/Cargo.toml b/compiler/cl-structures/Cargo.toml similarity index 100% rename from cl-structures/Cargo.toml rename to compiler/cl-structures/Cargo.toml diff --git a/cl-structures/src/intern_pool.rs b/compiler/cl-structures/src/intern_pool.rs similarity index 100% rename from cl-structures/src/intern_pool.rs rename to compiler/cl-structures/src/intern_pool.rs diff --git a/cl-structures/src/lib.rs b/compiler/cl-structures/src/lib.rs similarity index 100% rename from cl-structures/src/lib.rs rename to compiler/cl-structures/src/lib.rs diff --git a/cl-structures/src/span.rs b/compiler/cl-structures/src/span.rs similarity index 100% rename from cl-structures/src/span.rs rename to compiler/cl-structures/src/span.rs diff --git a/cl-structures/src/stack.rs b/compiler/cl-structures/src/stack.rs similarity index 100% rename from cl-structures/src/stack.rs rename to compiler/cl-structures/src/stack.rs diff --git a/cl-structures/src/tree.rs b/compiler/cl-structures/src/tree.rs similarity index 100% rename from cl-structures/src/tree.rs rename to compiler/cl-structures/src/tree.rs diff --git a/cl-structures/src/tree/tree_ref.rs b/compiler/cl-structures/src/tree/tree_ref.rs similarity index 100% rename from cl-structures/src/tree/tree_ref.rs rename to compiler/cl-structures/src/tree/tree_ref.rs diff --git a/cl-token/Cargo.toml b/compiler/cl-token/Cargo.toml similarity index 100% rename from cl-token/Cargo.toml rename to compiler/cl-token/Cargo.toml diff --git a/cl-token/src/lib.rs b/compiler/cl-token/src/lib.rs similarity index 100% rename from cl-token/src/lib.rs rename to compiler/cl-token/src/lib.rs diff --git a/cl-token/src/token.rs b/compiler/cl-token/src/token.rs similarity index 100% rename from cl-token/src/token.rs rename to compiler/cl-token/src/token.rs diff --git a/cl-token/src/token_data.rs b/compiler/cl-token/src/token_data.rs similarity index 100% rename from cl-token/src/token_data.rs rename to compiler/cl-token/src/token_data.rs diff --git a/cl-token/src/token_type.rs b/compiler/cl-token/src/token_type.rs similarity index 100% rename from cl-token/src/token_type.rs rename to compiler/cl-token/src/token_type.rs diff --git a/cl-typeck/Cargo.toml b/compiler/cl-typeck/Cargo.toml similarity index 100% rename from cl-typeck/Cargo.toml rename to compiler/cl-typeck/Cargo.toml diff --git a/cl-typeck/src/definition/display.rs b/compiler/cl-typeck/src/definition/display.rs similarity index 100% rename from cl-typeck/src/definition/display.rs rename to compiler/cl-typeck/src/definition/display.rs diff --git a/cl-typeck/src/lib.rs b/compiler/cl-typeck/src/lib.rs similarity index 100% rename from cl-typeck/src/lib.rs rename to compiler/cl-typeck/src/lib.rs