From 2fd78566a3e403796e855c1cdf31e1b6dae1091e Mon Sep 17 00:00:00 2001 From: Nilstrieb <48135649+Nilstrieb@users.noreply.github.com> Date: Sat, 4 Mar 2023 11:30:53 +0100 Subject: [PATCH] single craqte --- Cargo.lock | 15 ++++----------- Cargo.toml | 10 ++++++---- parser/Cargo.toml | 14 -------------- parser/src/main.rs | 3 --- {parser/src => src}/ast.rs | 0 {parser/src => src}/lexer.rs | 0 {parser/src => src}/lib.rs | 0 src/main.rs | 3 +-- {parser/src => src}/parser.rs | 0 {parser/src => src}/pretty.rs | 0 .../snapshots/ub__lexer__tests__idents.snap | 3 +-- .../snapshots/ub__lexer__tests__keywords.snap | 3 +-- .../snapshots/ub__lexer__tests__literals.snap | 3 +-- .../snapshots/ub__lexer__tests__punctuation.snap | 3 +-- .../snapshots/ub__lexer__tests__whitespace.snap | 3 +-- .../snapshots/ub__parser__tests__addition.snap | 4 ++-- .../snapshots/ub__parser__tests__expression.snap | 4 ++-- .../snapshots/ub__parser__tests__function.snap | 4 ++-- .../snapshots/ub__parser__tests__if_else.snap | 4 ++-- .../snapshots/ub__parser__tests__if_no_else.snap | 4 ++-- .../snapshots/ub__parser__tests__struct_.snap | 4 ++-- .../snapshots/ub__parser__tests__types.snap | 4 ++-- .../snapshots/ub__parser__tests__unary.snap | 4 ++-- .../snapshots/ub__parser__tests__var_decl.snap | 4 ++-- .../snapshots/ub__parser__tests__while_loop.snap | 4 ++-- 25 files changed, 36 insertions(+), 64 deletions(-) delete mode 100644 parser/Cargo.toml delete mode 100644 parser/src/main.rs rename {parser/src => src}/ast.rs (100%) rename {parser/src => src}/lexer.rs (100%) rename {parser/src => src}/lib.rs (100%) rename {parser/src => src}/parser.rs (100%) rename {parser/src => src}/pretty.rs (100%) rename parser/src/snapshots/parser__lexer__tests__idents.snap => src/snapshots/ub__lexer__tests__idents.snap (74%) rename parser/src/snapshots/parser__lexer__tests__keywords.snap => src/snapshots/ub__lexer__tests__keywords.snap (69%) rename parser/src/snapshots/parser__lexer__tests__literals.snap => src/snapshots/ub__lexer__tests__literals.snap (80%) rename parser/src/snapshots/parser__lexer__tests__punctuation.snap => src/snapshots/ub__lexer__tests__punctuation.snap (87%) rename parser/src/snapshots/parser__lexer__tests__whitespace.snap => src/snapshots/ub__lexer__tests__whitespace.snap (50%) rename parser/src/snapshots/parser__parser__tests__addition.snap => src/snapshots/ub__parser__tests__addition.snap (97%) rename parser/src/snapshots/parser__parser__tests__expression.snap => src/snapshots/ub__parser__tests__expression.snap (98%) rename parser/src/snapshots/parser__parser__tests__function.snap => src/snapshots/ub__parser__tests__function.snap (97%) rename parser/src/snapshots/parser__parser__tests__if_else.snap => src/snapshots/ub__parser__tests__if_else.snap (95%) rename parser/src/snapshots/parser__parser__tests__if_no_else.snap => src/snapshots/ub__parser__tests__if_no_else.snap (95%) rename parser/src/snapshots/parser__parser__tests__struct_.snap => src/snapshots/ub__parser__tests__struct_.snap (94%) rename parser/src/snapshots/parser__parser__tests__types.snap => src/snapshots/ub__parser__tests__types.snap (98%) rename parser/src/snapshots/parser__parser__tests__unary.snap => src/snapshots/ub__parser__tests__unary.snap (99%) rename parser/src/snapshots/parser__parser__tests__var_decl.snap => src/snapshots/ub__parser__tests__var_decl.snap (98%) rename parser/src/snapshots/parser__parser__tests__while_loop.snap => src/snapshots/ub__parser__tests__while_loop.snap (94%) diff --git a/Cargo.lock b/Cargo.lock index 13b8f91..3bc3585 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -164,16 +164,6 @@ version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" -[[package]] -name = "parser" -version = "0.1.0" -dependencies = [ - "ariadne", - "chumsky", - "insta", - "logos", -] - [[package]] name = "proc-macro-hack" version = "0.5.20+deprecated" @@ -234,7 +224,10 @@ dependencies = [ name = "ub" version = "0.1.0" dependencies = [ - "parser", + "ariadne", + "chumsky", + "insta", + "logos", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 3b8d2e8..e4f73b0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,3 @@ -[workspace] -members = [".", "./parser"] - [package] name = "ub" version = "0.1.0" @@ -9,4 +6,9 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -parser = { path = "./parser" } \ No newline at end of file +ariadne = "0.1.5" +chumsky = "0.8.0" +logos = "0.12.0" + +[dev-dependencies] +insta = "1.13.0" diff --git a/parser/Cargo.toml b/parser/Cargo.toml deleted file mode 100644 index d56c217..0000000 --- a/parser/Cargo.toml +++ /dev/null @@ -1,14 +0,0 @@ -[package] -name = "parser" -version = "0.1.0" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] -ariadne = "0.1.5" -chumsky = "0.8.0" -logos = "0.12.0" - -[dev-dependencies] -insta = "1.13.0" diff --git a/parser/src/main.rs b/parser/src/main.rs deleted file mode 100644 index 335123c..0000000 --- a/parser/src/main.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - parser::test(); -} diff --git a/parser/src/ast.rs b/src/ast.rs similarity index 100% rename from parser/src/ast.rs rename to src/ast.rs diff --git a/parser/src/lexer.rs b/src/lexer.rs similarity index 100% rename from parser/src/lexer.rs rename to src/lexer.rs diff --git a/parser/src/lib.rs b/src/lib.rs similarity index 100% rename from parser/src/lib.rs rename to src/lib.rs diff --git a/src/main.rs b/src/main.rs index 8d5d429..a8b2533 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,3 @@ fn main() { - parser::test(); + ub::test(); } - diff --git a/parser/src/parser.rs b/src/parser.rs similarity index 100% rename from parser/src/parser.rs rename to src/parser.rs diff --git a/parser/src/pretty.rs b/src/pretty.rs similarity index 100% rename from parser/src/pretty.rs rename to src/pretty.rs diff --git a/parser/src/snapshots/parser__lexer__tests__idents.snap b/src/snapshots/ub__lexer__tests__idents.snap similarity index 74% rename from parser/src/snapshots/parser__lexer__tests__idents.snap rename to src/snapshots/ub__lexer__tests__idents.snap index 5b20531..2d02c95 100644 --- a/parser/src/snapshots/parser__lexer__tests__idents.snap +++ b/src/snapshots/ub__lexer__tests__idents.snap @@ -1,6 +1,5 @@ --- -source: parser/src/lexer.rs -assertion_line: 125 +source: src/lexer.rs expression: tokens --- [ diff --git a/parser/src/snapshots/parser__lexer__tests__keywords.snap b/src/snapshots/ub__lexer__tests__keywords.snap similarity index 69% rename from parser/src/snapshots/parser__lexer__tests__keywords.snap rename to src/snapshots/ub__lexer__tests__keywords.snap index 7e8da21..bc55971 100644 --- a/parser/src/snapshots/parser__lexer__tests__keywords.snap +++ b/src/snapshots/ub__lexer__tests__keywords.snap @@ -1,6 +1,5 @@ --- -source: parser/src/lexer.rs -assertion_line: 137 +source: src/lexer.rs expression: tokens --- [ diff --git a/parser/src/snapshots/parser__lexer__tests__literals.snap b/src/snapshots/ub__lexer__tests__literals.snap similarity index 80% rename from parser/src/snapshots/parser__lexer__tests__literals.snap rename to src/snapshots/ub__lexer__tests__literals.snap index 2b3008e..7b6df21 100644 --- a/parser/src/snapshots/parser__lexer__tests__literals.snap +++ b/src/snapshots/ub__lexer__tests__literals.snap @@ -1,6 +1,5 @@ --- -source: parser/src/lexer.rs -assertion_line: 131 +source: src/lexer.rs expression: tokens --- [ diff --git a/parser/src/snapshots/parser__lexer__tests__punctuation.snap b/src/snapshots/ub__lexer__tests__punctuation.snap similarity index 87% rename from parser/src/snapshots/parser__lexer__tests__punctuation.snap rename to src/snapshots/ub__lexer__tests__punctuation.snap index cc48eca..6888766 100644 --- a/parser/src/snapshots/parser__lexer__tests__punctuation.snap +++ b/src/snapshots/ub__lexer__tests__punctuation.snap @@ -1,6 +1,5 @@ --- -source: parser/src/lexer.rs -assertion_line: 158 +source: src/lexer.rs expression: tokens --- [ diff --git a/parser/src/snapshots/parser__lexer__tests__whitespace.snap b/src/snapshots/ub__lexer__tests__whitespace.snap similarity index 50% rename from parser/src/snapshots/parser__lexer__tests__whitespace.snap rename to src/snapshots/ub__lexer__tests__whitespace.snap index 1b87fa3..6e5757a 100644 --- a/parser/src/snapshots/parser__lexer__tests__whitespace.snap +++ b/src/snapshots/ub__lexer__tests__whitespace.snap @@ -1,6 +1,5 @@ --- -source: parser/src/lexer.rs -assertion_line: 119 +source: src/lexer.rs expression: tokens --- [ diff --git a/parser/src/snapshots/parser__parser__tests__addition.snap b/src/snapshots/ub__parser__tests__addition.snap similarity index 97% rename from parser/src/snapshots/parser__parser__tests__addition.snap rename to src/snapshots/ub__parser__tests__addition.snap index 09c2c92..29318c1 100644 --- a/parser/src/snapshots/parser__parser__tests__addition.snap +++ b/src/snapshots/ub__parser__tests__addition.snap @@ -1,11 +1,11 @@ --- -source: parser/src/parser.rs +source: src/parser.rs expression: r --- ( Some( File { - name: "parser__parser__tests", + name: "ub__parser__tests", items: [ FnDecl( FnDecl { diff --git a/parser/src/snapshots/parser__parser__tests__expression.snap b/src/snapshots/ub__parser__tests__expression.snap similarity index 98% rename from parser/src/snapshots/parser__parser__tests__expression.snap rename to src/snapshots/ub__parser__tests__expression.snap index 611f08e..116b940 100644 --- a/parser/src/snapshots/parser__parser__tests__expression.snap +++ b/src/snapshots/ub__parser__tests__expression.snap @@ -1,11 +1,11 @@ --- -source: parser/src/parser.rs +source: src/parser.rs expression: r --- ( Some( File { - name: "parser__parser__tests", + name: "ub__parser__tests", items: [ FnDecl( FnDecl { diff --git a/parser/src/snapshots/parser__parser__tests__function.snap b/src/snapshots/ub__parser__tests__function.snap similarity index 97% rename from parser/src/snapshots/parser__parser__tests__function.snap rename to src/snapshots/ub__parser__tests__function.snap index 03bea9e..36e4912 100644 --- a/parser/src/snapshots/parser__parser__tests__function.snap +++ b/src/snapshots/ub__parser__tests__function.snap @@ -1,11 +1,11 @@ --- -source: parser/src/parser.rs +source: src/parser.rs expression: r --- ( Some( File { - name: "parser__parser__tests", + name: "ub__parser__tests", items: [ FnDecl( FnDecl { diff --git a/parser/src/snapshots/parser__parser__tests__if_else.snap b/src/snapshots/ub__parser__tests__if_else.snap similarity index 95% rename from parser/src/snapshots/parser__parser__tests__if_else.snap rename to src/snapshots/ub__parser__tests__if_else.snap index 64b60b8..782ca53 100644 --- a/parser/src/snapshots/parser__parser__tests__if_else.snap +++ b/src/snapshots/ub__parser__tests__if_else.snap @@ -1,11 +1,11 @@ --- -source: parser/src/parser.rs +source: src/parser.rs expression: r --- ( Some( File { - name: "parser__parser__tests", + name: "ub__parser__tests", items: [ FnDecl( FnDecl { diff --git a/parser/src/snapshots/parser__parser__tests__if_no_else.snap b/src/snapshots/ub__parser__tests__if_no_else.snap similarity index 95% rename from parser/src/snapshots/parser__parser__tests__if_no_else.snap rename to src/snapshots/ub__parser__tests__if_no_else.snap index 09b9c8b..7430b50 100644 --- a/parser/src/snapshots/parser__parser__tests__if_no_else.snap +++ b/src/snapshots/ub__parser__tests__if_no_else.snap @@ -1,11 +1,11 @@ --- -source: parser/src/parser.rs +source: src/parser.rs expression: r --- ( Some( File { - name: "parser__parser__tests", + name: "ub__parser__tests", items: [ FnDecl( FnDecl { diff --git a/parser/src/snapshots/parser__parser__tests__struct_.snap b/src/snapshots/ub__parser__tests__struct_.snap similarity index 94% rename from parser/src/snapshots/parser__parser__tests__struct_.snap rename to src/snapshots/ub__parser__tests__struct_.snap index 6355842..2708686 100644 --- a/parser/src/snapshots/parser__parser__tests__struct_.snap +++ b/src/snapshots/ub__parser__tests__struct_.snap @@ -1,11 +1,11 @@ --- -source: parser/src/parser.rs +source: src/parser.rs expression: r --- ( Some( File { - name: "parser__parser__tests", + name: "ub__parser__tests", items: [ StructDecl( StructDecl { diff --git a/parser/src/snapshots/parser__parser__tests__types.snap b/src/snapshots/ub__parser__tests__types.snap similarity index 98% rename from parser/src/snapshots/parser__parser__tests__types.snap rename to src/snapshots/ub__parser__tests__types.snap index a76d80f..49772cc 100644 --- a/parser/src/snapshots/parser__parser__tests__types.snap +++ b/src/snapshots/ub__parser__tests__types.snap @@ -1,11 +1,11 @@ --- -source: parser/src/parser.rs +source: src/parser.rs expression: r --- ( Some( File { - name: "parser__parser__tests", + name: "ub__parser__tests", items: [ FnDecl( FnDecl { diff --git a/parser/src/snapshots/parser__parser__tests__unary.snap b/src/snapshots/ub__parser__tests__unary.snap similarity index 99% rename from parser/src/snapshots/parser__parser__tests__unary.snap rename to src/snapshots/ub__parser__tests__unary.snap index d46658f..37a8ed3 100644 --- a/parser/src/snapshots/parser__parser__tests__unary.snap +++ b/src/snapshots/ub__parser__tests__unary.snap @@ -1,11 +1,11 @@ --- -source: parser/src/parser.rs +source: src/parser.rs expression: r --- ( Some( File { - name: "parser__parser__tests", + name: "ub__parser__tests", items: [ FnDecl( FnDecl { diff --git a/parser/src/snapshots/parser__parser__tests__var_decl.snap b/src/snapshots/ub__parser__tests__var_decl.snap similarity index 98% rename from parser/src/snapshots/parser__parser__tests__var_decl.snap rename to src/snapshots/ub__parser__tests__var_decl.snap index 99201d7..2dde208 100644 --- a/parser/src/snapshots/parser__parser__tests__var_decl.snap +++ b/src/snapshots/ub__parser__tests__var_decl.snap @@ -1,11 +1,11 @@ --- -source: parser/src/parser.rs +source: src/parser.rs expression: r --- ( Some( File { - name: "parser__parser__tests", + name: "ub__parser__tests", items: [ FnDecl( FnDecl { diff --git a/parser/src/snapshots/parser__parser__tests__while_loop.snap b/src/snapshots/ub__parser__tests__while_loop.snap similarity index 94% rename from parser/src/snapshots/parser__parser__tests__while_loop.snap rename to src/snapshots/ub__parser__tests__while_loop.snap index 6e1cb79..1ff2c55 100644 --- a/parser/src/snapshots/parser__parser__tests__while_loop.snap +++ b/src/snapshots/ub__parser__tests__while_loop.snap @@ -1,11 +1,11 @@ --- -source: parser/src/parser.rs +source: src/parser.rs expression: r --- ( Some( File { - name: "parser__parser__tests", + name: "ub__parser__tests", items: [ FnDecl( FnDecl {