diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock index 664d30d..385fc5a 100644 --- a/fuzz/Cargo.lock +++ b/fuzz/Cargo.lock @@ -2,12 +2,54 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "aho-corasick" +version = "0.7.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +dependencies = [ + "memchr", +] + [[package]] name = "arbitrary" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "577b08a4acd7b99869f863c50011b01eb73424ccc798ecd996f2e24817adfca7" +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "base64" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" + +[[package]] +name = "bincode" +version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +dependencies = [ + "serde", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + [[package]] name = "bumpalo" version = "3.8.0" @@ -20,11 +62,57 @@ version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79c2681d6594606957bbb8631c4b90a7fcaaa72cdb714743a437b156d6a7eedd" +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "dbg-pls" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f28b65c59b1830ac65640335cf2ebef868e8c9982d1cbab01ce843ebe74d37a" +dependencies = [ + "dbg-pls-derive", + "itoa", + "once_cell", + "prettyplease", + "proc-macro2", + "quote", + "ryu", + "syn", + "syntect", + "textwrap", +] + +[[package]] +name = "dbg-pls-derive" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18ad0d32e09e083b0bf764cc9c2f1956518afb16b6ae0e1110c909d056f8271f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "dilaria" version = "0.1.0" dependencies = [ "bumpalo", + "dbg-pls", + "rustc-hash", ] [[package]] @@ -35,6 +123,64 @@ dependencies = [ "libfuzzer-sys", ] +[[package]] +name = "flate2" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b39522e96686d38f4bc984b9198e3a0613264abaebaff2c5c918bfa6b6da09af" +dependencies = [ + "cfg-if", + "crc32fast", + "libc", + "miniz_oxide", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "hashbrown" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" + +[[package]] +name = "indexmap" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "itoa" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "libc" +version = "0.2.124" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21a41fed9d98f27ab1c6d161da622a4fa35e8a54a8adc24bbf3ddd0ef70b0e50" + [[package]] name = "libfuzzer-sys" version = "0.4.2" @@ -46,8 +192,328 @@ dependencies = [ "once_cell", ] +[[package]] +name = "line-wrap" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" +dependencies = [ + "safemem", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" + +[[package]] +name = "memchr" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" + +[[package]] +name = "miniz_oxide" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2b29bd4bc3f33391105ebee3589c19197c4271e3e5a9ec9bfe8127eeff8f082" +dependencies = [ + "adler", +] + +[[package]] +name = "num_threads" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aba1801fb138d8e85e11d0fc70baf4fe1cdfffda7c6cd34a854905df588e5ed0" +dependencies = [ + "libc", +] + [[package]] name = "once_cell" version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" + +[[package]] +name = "onig" +version = "6.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67ddfe2c93bb389eea6e6d713306880c7f6dcc99a75b659ce145d962c861b225" +dependencies = [ + "bitflags", + "lazy_static", + "libc", + "onig_sys", +] + +[[package]] +name = "onig_sys" +version = "69.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dd3eee045c84695b53b20255bb7317063df090b68e18bfac0abb6c39cf7f33e" +dependencies = [ + "cc", + "pkg-config", +] + +[[package]] +name = "pkg-config" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" + +[[package]] +name = "plist" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd39bc6cdc9355ad1dc5eeedefee696bb35c34caf21768741e81826c0bbd7225" +dependencies = [ + "base64", + "indexmap", + "line-wrap", + "serde", + "time", + "xml-rs", +] + +[[package]] +name = "prettyplease" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9e07e3a46d0771a8a06b5f4441527802830b43e679ba12f44960f48dd4c6803" +dependencies = [ + "proc-macro2", + "syn", +] + +[[package]] +name = "proc-macro2" +version = "1.0.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "quote" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "regex" +version = "1.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "ryu" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" + +[[package]] +name = "safemem" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "serde" +version = "1.0.136" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" + +[[package]] +name = "serde_derive" +version = "1.0.136" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "smawk" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" + +[[package]] +name = "syn" +version = "1.0.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + +[[package]] +name = "syntect" +version = "4.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b20815bbe80ee0be06e6957450a841185fcf690fe0178f14d77a05ce2caa031" +dependencies = [ + "bincode", + "bitflags", + "flate2", + "fnv", + "lazy_static", + "lazycell", + "onig", + "plist", + "regex-syntax", + "serde", + "serde_derive", + "serde_json", + "walkdir", + "yaml-rust", +] + +[[package]] +name = "textwrap" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" +dependencies = [ + "smawk", + "unicode-linebreak", + "unicode-width", +] + +[[package]] +name = "time" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd" +dependencies = [ + "itoa", + "libc", + "num_threads", +] + +[[package]] +name = "unicode-linebreak" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a52dcaab0c48d931f7cc8ef826fa51690a08e1ea55117ef26f89864f532383f" +dependencies = [ + "regex", +] + +[[package]] +name = "unicode-width" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" + +[[package]] +name = "unicode-xid" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" + +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi", + "winapi-util", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "xml-rs" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" + +[[package]] +name = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] diff --git a/src/compile.rs b/src/compile.rs index e61a6fe..2daa92f 100644 --- a/src/compile.rs +++ b/src/compile.rs @@ -5,13 +5,13 @@ use std::{cell::RefCell, rc::Rc}; use bumpalo::{collections::Vec, Bump}; use crate::{ - ast::{ - Assignment, BinaryOp, BinaryOpKind, Block, Call, CallKind, Declaration, ElsePart, Expr, - FnDecl, Ident, IfStmt, Literal, Program, Stmt, UnaryOp, WhileStmt, - }, bytecode::{FnBlock, Instr}, errors::{CompilerError, Span}, gc::Symbol, + syntax::ast::{ + Assignment, BinaryOp, BinaryOpKind, Block, Call, CallKind, Declaration, ElsePart, Expr, + FnDecl, Ident, IfStmt, Literal, Program, Stmt, UnaryOp, WhileStmt, + }, vm::Value, HashMap, RtAlloc, }; diff --git a/src/lib.rs b/src/lib.rs index acce4f4..0cd4549 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,22 +1,22 @@ #![deny(clippy::disallowed_types)] -mod ast; mod bytecode; mod compile; mod errors; mod gc; -mod lex; -mod parse; +mod syntax; mod util; mod vm; use std::io::Write; pub use bumpalo::Bump; -pub use lex::*; -pub use parse::*; -use crate::{ast::Program, gc::RtAlloc}; +pub use crate::syntax::{lex::*, parse::*}; +use crate::{ + gc::RtAlloc, + syntax::{ast::Program, lex, parse}, +}; #[cfg(not(feature = "fxhash"))] #[allow(clippy::disallowed_types)] diff --git a/src/parse/snapshots/dilaria__parse__test__logical_and__number_literal.snap b/src/parse/snapshots/dilaria__parse__test__logical_and__number_literal.snap deleted file mode 100644 index a50803c..0000000 --- a/src/parse/snapshots/dilaria__parse__test__logical_and__number_literal.snap +++ /dev/null @@ -1,12 +0,0 @@ ---- -source: src/parse/test.rs -expression: ast ---- -Literal( - Number( - 10.0, - Span( - 0..0, - ), - ), -) diff --git a/src/parse/snapshots/dilaria__parse__test__logical_or__number_literal.snap b/src/parse/snapshots/dilaria__parse__test__logical_or__number_literal.snap deleted file mode 100644 index a50803c..0000000 --- a/src/parse/snapshots/dilaria__parse__test__logical_or__number_literal.snap +++ /dev/null @@ -1,12 +0,0 @@ ---- -source: src/parse/test.rs -expression: ast ---- -Literal( - Number( - 10.0, - Span( - 0..0, - ), - ), -) diff --git a/src/parse/snapshots/dilaria__parse__test__primary__string.snap b/src/parse/snapshots/dilaria__parse__test__primary__string.snap deleted file mode 100644 index a50803c..0000000 --- a/src/parse/snapshots/dilaria__parse__test__primary__string.snap +++ /dev/null @@ -1,12 +0,0 @@ ---- -source: src/parse/test.rs -expression: ast ---- -Literal( - Number( - 10.0, - Span( - 0..0, - ), - ), -) diff --git a/src/parse/snapshots/dilaria__parse__test__term__number_literal.snap b/src/parse/snapshots/dilaria__parse__test__term__number_literal.snap deleted file mode 100644 index a50803c..0000000 --- a/src/parse/snapshots/dilaria__parse__test__term__number_literal.snap +++ /dev/null @@ -1,12 +0,0 @@ ---- -source: src/parse/test.rs -expression: ast ---- -Literal( - Number( - 10.0, - Span( - 0..0, - ), - ), -) diff --git a/src/parse/snapshots/dilaria__parse__test__unary__number_literal.snap b/src/parse/snapshots/dilaria__parse__test__unary__number_literal.snap deleted file mode 100644 index a50803c..0000000 --- a/src/parse/snapshots/dilaria__parse__test__unary__number_literal.snap +++ /dev/null @@ -1,12 +0,0 @@ ---- -source: src/parse/test.rs -expression: ast ---- -Literal( - Number( - 10.0, - Span( - 0..0, - ), - ), -) diff --git a/src/ast.rs b/src/syntax/ast.rs similarity index 100% rename from src/ast.rs rename to src/syntax/ast.rs diff --git a/src/lex.rs b/src/syntax/lex.rs similarity index 100% rename from src/lex.rs rename to src/syntax/lex.rs diff --git a/src/syntax/mod.rs b/src/syntax/mod.rs new file mode 100644 index 0000000..d437c73 --- /dev/null +++ b/src/syntax/mod.rs @@ -0,0 +1,3 @@ +pub mod ast; +pub mod lex; +pub mod parse; diff --git a/src/parse.rs b/src/syntax/parse.rs similarity index 99% rename from src/parse.rs rename to src/syntax/parse.rs index 5e1209a..117d9c3 100644 --- a/src/parse.rs +++ b/src/syntax/parse.rs @@ -11,9 +11,9 @@ use std::iter::Peekable; use bumpalo::{collections::Vec, Bump}; use crate::{ - ast::*, errors::{CompilerError, Span}, lex::{Token, TokenKind}, + syntax::ast::*, }; #[derive(Debug)] diff --git a/src/parse/snapshots/dilaria__parse__test__assignment__call_expr.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__assignment__call_expr.snap similarity index 97% rename from src/parse/snapshots/dilaria__parse__test__assignment__call_expr.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__assignment__call_expr.snap index 62ce98e..5fd5afa 100644 --- a/src/parse/snapshots/dilaria__parse__test__assignment__call_expr.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__assignment__call_expr.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- Assignment( diff --git a/src/parse/snapshots/dilaria__parse__test__assignment__simple.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__assignment__simple.snap similarity index 92% rename from src/parse/snapshots/dilaria__parse__test__assignment__simple.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__assignment__simple.snap index add5052..0c159f5 100644 --- a/src/parse/snapshots/dilaria__parse__test__assignment__simple.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__assignment__simple.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- Assignment( diff --git a/src/parse/snapshots/dilaria__parse__test__block__empty.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__block__empty.snap similarity index 72% rename from src/parse/snapshots/dilaria__parse__test__block__empty.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__block__empty.snap index c1b9b60..1e4ae89 100644 --- a/src/parse/snapshots/dilaria__parse__test__block__empty.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__block__empty.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- Block { diff --git a/src/parse/snapshots/dilaria__parse__test__block__nested.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__block__nested.snap similarity index 88% rename from src/parse/snapshots/dilaria__parse__test__block__nested.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__block__nested.snap index 96380f3..a7c03b6 100644 --- a/src/parse/snapshots/dilaria__parse__test__block__nested.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__block__nested.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- Block { diff --git a/src/parse/snapshots/dilaria__parse__test__block__two_expressions.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__block__two_expressions.snap similarity index 93% rename from src/parse/snapshots/dilaria__parse__test__block__two_expressions.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__block__two_expressions.snap index 9fe61cf..7050a9f 100644 --- a/src/parse/snapshots/dilaria__parse__test__block__two_expressions.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__block__two_expressions.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- Block { diff --git a/src/parse/snapshots/dilaria__parse__test__call__field_simple.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__call__field_simple.snap similarity index 93% rename from src/parse/snapshots/dilaria__parse__test__call__field_simple.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__call__field_simple.snap index fec7ccc..c3963ac 100644 --- a/src/parse/snapshots/dilaria__parse__test__call__field_simple.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__call__field_simple.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- Call( diff --git a/src/parse/snapshots/dilaria__parse__test__call__fn_args.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__call__fn_args.snap similarity index 95% rename from src/parse/snapshots/dilaria__parse__test__call__fn_args.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__call__fn_args.snap index ff60c1b..2678290 100644 --- a/src/parse/snapshots/dilaria__parse__test__call__fn_args.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__call__fn_args.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- Call( diff --git a/src/parse/snapshots/dilaria__parse__test__call__nested.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__call__nested.snap similarity index 97% rename from src/parse/snapshots/dilaria__parse__test__call__nested.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__call__nested.snap index ea569e9..dbe89e4 100644 --- a/src/parse/snapshots/dilaria__parse__test__call__nested.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__call__nested.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- Call( diff --git a/src/parse/snapshots/dilaria__parse__test__call__simple.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__call__simple.snap similarity index 90% rename from src/parse/snapshots/dilaria__parse__test__call__simple.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__call__simple.snap index 7013462..60ad50d 100644 --- a/src/parse/snapshots/dilaria__parse__test__call__simple.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__call__simple.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- Call( diff --git a/src/parse/snapshots/dilaria__parse__test__call__with_exprs.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__call__with_exprs.snap similarity index 98% rename from src/parse/snapshots/dilaria__parse__test__call__with_exprs.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__call__with_exprs.snap index 322a5ca..e6640cc 100644 --- a/src/parse/snapshots/dilaria__parse__test__call__with_exprs.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__call__with_exprs.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- Call( diff --git a/src/parse/snapshots/dilaria__parse__test__comparison__greater.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__comparison__greater.snap similarity index 93% rename from src/parse/snapshots/dilaria__parse__test__comparison__greater.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__comparison__greater.snap index ea43586..fc8528d 100644 --- a/src/parse/snapshots/dilaria__parse__test__comparison__greater.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__comparison__greater.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- BinaryOp( diff --git a/src/parse/snapshots/dilaria__parse__test__comparison__greater_equal.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__comparison__greater_equal.snap similarity index 93% rename from src/parse/snapshots/dilaria__parse__test__comparison__greater_equal.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__comparison__greater_equal.snap index cb30e4e..af25ed3 100644 --- a/src/parse/snapshots/dilaria__parse__test__comparison__greater_equal.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__comparison__greater_equal.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- BinaryOp( diff --git a/src/parse/snapshots/dilaria__parse__test__comparison__less.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__comparison__less.snap similarity index 93% rename from src/parse/snapshots/dilaria__parse__test__comparison__less.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__comparison__less.snap index 5b0cb0d..f93fd1a 100644 --- a/src/parse/snapshots/dilaria__parse__test__comparison__less.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__comparison__less.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- BinaryOp( diff --git a/src/parse/snapshots/dilaria__parse__test__comparison__less_equal.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__comparison__less_equal.snap similarity index 93% rename from src/parse/snapshots/dilaria__parse__test__comparison__less_equal.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__comparison__less_equal.snap index ca20e57..4c6f048 100644 --- a/src/parse/snapshots/dilaria__parse__test__comparison__less_equal.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__comparison__less_equal.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- BinaryOp( diff --git a/src/parse/snapshots/dilaria__parse__test__comparison__number_literal.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__comparison__number_literal.snap similarity index 77% rename from src/parse/snapshots/dilaria__parse__test__comparison__number_literal.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__comparison__number_literal.snap index a50803c..f8a7dfe 100644 --- a/src/parse/snapshots/dilaria__parse__test__comparison__number_literal.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__comparison__number_literal.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- Literal( diff --git a/src/parse/snapshots/dilaria__parse__test__equality__equal.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__equality__equal.snap similarity index 93% rename from src/parse/snapshots/dilaria__parse__test__equality__equal.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__equality__equal.snap index 63eb776..5bc0fa7 100644 --- a/src/parse/snapshots/dilaria__parse__test__equality__equal.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__equality__equal.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- BinaryOp( diff --git a/src/parse/snapshots/dilaria__parse__test__equality__not_equal.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__equality__not_equal.snap similarity index 93% rename from src/parse/snapshots/dilaria__parse__test__equality__not_equal.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__equality__not_equal.snap index 425effa..86cf337 100644 --- a/src/parse/snapshots/dilaria__parse__test__equality__not_equal.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__equality__not_equal.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- BinaryOp( diff --git a/src/parse/snapshots/dilaria__parse__test__equality__number_literal.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__equality__number_literal.snap similarity index 77% rename from src/parse/snapshots/dilaria__parse__test__equality__number_literal.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__equality__number_literal.snap index a50803c..f8a7dfe 100644 --- a/src/parse/snapshots/dilaria__parse__test__equality__number_literal.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__equality__number_literal.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- Literal( diff --git a/src/parse/snapshots/dilaria__parse__test__expr__add_multiply.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__expr__add_multiply.snap similarity index 96% rename from src/parse/snapshots/dilaria__parse__test__expr__add_multiply.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__expr__add_multiply.snap index 4aab976..784ca7f 100644 --- a/src/parse/snapshots/dilaria__parse__test__expr__add_multiply.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__expr__add_multiply.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- BinaryOp( diff --git a/src/parse/snapshots/dilaria__parse__test__expr__equal_unary.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__expr__equal_unary.snap similarity index 95% rename from src/parse/snapshots/dilaria__parse__test__expr__equal_unary.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__expr__equal_unary.snap index 7c0820c..0f4a404 100644 --- a/src/parse/snapshots/dilaria__parse__test__expr__equal_unary.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__expr__equal_unary.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- BinaryOp( diff --git a/src/parse/snapshots/dilaria__parse__test__factor__number_literal.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__expr__number_literal.snap similarity index 77% rename from src/parse/snapshots/dilaria__parse__test__factor__number_literal.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__expr__number_literal.snap index a50803c..f8a7dfe 100644 --- a/src/parse/snapshots/dilaria__parse__test__factor__number_literal.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__expr__number_literal.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- Literal( diff --git a/src/parse/snapshots/dilaria__parse__test__expr__parentheses_mul_add.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__expr__parentheses_mul_add.snap similarity index 96% rename from src/parse/snapshots/dilaria__parse__test__expr__parentheses_mul_add.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__expr__parentheses_mul_add.snap index ec32f2f..cfaa29b 100644 --- a/src/parse/snapshots/dilaria__parse__test__expr__parentheses_mul_add.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__expr__parentheses_mul_add.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- BinaryOp( diff --git a/src/parse/snapshots/dilaria__parse__test__factor__divide.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__factor__divide.snap similarity index 93% rename from src/parse/snapshots/dilaria__parse__test__factor__divide.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__factor__divide.snap index 96b556f..d8c4665 100644 --- a/src/parse/snapshots/dilaria__parse__test__factor__divide.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__factor__divide.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- BinaryOp( diff --git a/src/parse/snapshots/dilaria__parse__test__factor__modulo.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__factor__modulo.snap similarity index 93% rename from src/parse/snapshots/dilaria__parse__test__factor__modulo.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__factor__modulo.snap index efd8751..cecae46 100644 --- a/src/parse/snapshots/dilaria__parse__test__factor__modulo.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__factor__modulo.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- BinaryOp( diff --git a/src/parse/snapshots/dilaria__parse__test__factor__multiply.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__factor__multiply.snap similarity index 93% rename from src/parse/snapshots/dilaria__parse__test__factor__multiply.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__factor__multiply.snap index 0860bb9..261a53e 100644 --- a/src/parse/snapshots/dilaria__parse__test__factor__multiply.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__factor__multiply.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- BinaryOp( diff --git a/src/parse/snapshots/dilaria__parse__test__expr__number_literal.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__factor__number_literal.snap similarity index 77% rename from src/parse/snapshots/dilaria__parse__test__expr__number_literal.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__factor__number_literal.snap index a50803c..f8a7dfe 100644 --- a/src/parse/snapshots/dilaria__parse__test__expr__number_literal.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__factor__number_literal.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- Literal( diff --git a/src/parse/snapshots/dilaria__parse__test__logical_and__and.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__logical_and__and.snap similarity index 93% rename from src/parse/snapshots/dilaria__parse__test__logical_and__and.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__logical_and__and.snap index 5577e84..45450e9 100644 --- a/src/parse/snapshots/dilaria__parse__test__logical_and__and.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__logical_and__and.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- BinaryOp( diff --git a/src/syntax/parse/snapshots/dilaria__syntax__parse__test__logical_and__number_literal.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__logical_and__number_literal.snap new file mode 100644 index 0000000..f8a7dfe --- /dev/null +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__logical_and__number_literal.snap @@ -0,0 +1,12 @@ +--- +source: src/syntax/parse/test.rs +expression: ast +--- +Literal( + Number( + 10.0, + Span( + 0..0, + ), + ), +) diff --git a/src/syntax/parse/snapshots/dilaria__syntax__parse__test__logical_or__number_literal.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__logical_or__number_literal.snap new file mode 100644 index 0000000..f8a7dfe --- /dev/null +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__logical_or__number_literal.snap @@ -0,0 +1,12 @@ +--- +source: src/syntax/parse/test.rs +expression: ast +--- +Literal( + Number( + 10.0, + Span( + 0..0, + ), + ), +) diff --git a/src/parse/snapshots/dilaria__parse__test__logical_or__or.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__logical_or__or.snap similarity index 92% rename from src/parse/snapshots/dilaria__parse__test__logical_or__or.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__logical_or__or.snap index f0b1d72..fe5b48d 100644 --- a/src/parse/snapshots/dilaria__parse__test__logical_or__or.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__logical_or__or.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- BinaryOp( diff --git a/src/parse/snapshots/dilaria__parse__test__primary__empty_array.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__empty_array.snap similarity index 76% rename from src/parse/snapshots/dilaria__parse__test__primary__empty_array.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__empty_array.snap index eabfdf1..f3bf3e9 100644 --- a/src/parse/snapshots/dilaria__parse__test__primary__empty_array.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__empty_array.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- Literal( diff --git a/src/parse/snapshots/dilaria__parse__test__primary__empty_array_literal.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__empty_array_literal.snap similarity index 76% rename from src/parse/snapshots/dilaria__parse__test__primary__empty_array_literal.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__empty_array_literal.snap index eabfdf1..f3bf3e9 100644 --- a/src/parse/snapshots/dilaria__parse__test__primary__empty_array_literal.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__empty_array_literal.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- Literal( diff --git a/src/parse/snapshots/dilaria__parse__test__primary__empty_object.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__empty_object.snap similarity index 74% rename from src/parse/snapshots/dilaria__parse__test__primary__empty_object.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__empty_object.snap index 2c9e45e..5dcf1ce 100644 --- a/src/parse/snapshots/dilaria__parse__test__primary__empty_object.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__empty_object.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- Literal( diff --git a/src/parse/snapshots/dilaria__parse__test__primary__false.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__false.snap similarity index 77% rename from src/parse/snapshots/dilaria__parse__test__primary__false.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__false.snap index 007bbf6..58f3d35 100644 --- a/src/parse/snapshots/dilaria__parse__test__primary__false.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__false.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- Literal( diff --git a/src/parse/snapshots/dilaria__parse__test__primary__ident_test.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__ident_test.snap similarity index 78% rename from src/parse/snapshots/dilaria__parse__test__primary__ident_test.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__ident_test.snap index 4258edb..0aa33eb 100644 --- a/src/parse/snapshots/dilaria__parse__test__primary__ident_test.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__ident_test.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- Ident( diff --git a/src/parse/snapshots/dilaria__parse__test__primary__null.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__null.snap similarity index 74% rename from src/parse/snapshots/dilaria__parse__test__primary__null.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__null.snap index 83a1cec..a4e14d8 100644 --- a/src/parse/snapshots/dilaria__parse__test__primary__null.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__null.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- Literal( diff --git a/src/parse/snapshots/dilaria__parse__test__primary__number.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__number.snap similarity index 77% rename from src/parse/snapshots/dilaria__parse__test__primary__number.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__number.snap index 706516b..6aec4e5 100644 --- a/src/parse/snapshots/dilaria__parse__test__primary__number.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__number.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- Literal( diff --git a/src/parse/snapshots/dilaria__parse__test__primary__single_array_literal_trailing_comma.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__single_array_literal.snap similarity index 90% rename from src/parse/snapshots/dilaria__parse__test__primary__single_array_literal_trailing_comma.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__single_array_literal.snap index c7a46b9..a1fb071 100644 --- a/src/parse/snapshots/dilaria__parse__test__primary__single_array_literal_trailing_comma.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__single_array_literal.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- Literal( diff --git a/src/parse/snapshots/dilaria__parse__test__primary__single_array_literal.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__single_array_literal_trailing_comma.snap similarity index 90% rename from src/parse/snapshots/dilaria__parse__test__primary__single_array_literal.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__single_array_literal_trailing_comma.snap index c7a46b9..a1fb071 100644 --- a/src/parse/snapshots/dilaria__parse__test__primary__single_array_literal.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__single_array_literal_trailing_comma.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- Literal( diff --git a/src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__string.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__string.snap new file mode 100644 index 0000000..f8a7dfe --- /dev/null +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__string.snap @@ -0,0 +1,12 @@ +--- +source: src/syntax/parse/test.rs +expression: ast +--- +Literal( + Number( + 10.0, + Span( + 0..0, + ), + ), +) diff --git a/src/parse/snapshots/dilaria__parse__test__primary__true.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__true.snap similarity index 77% rename from src/parse/snapshots/dilaria__parse__test__primary__true.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__true.snap index e59695e..22db17f 100644 --- a/src/parse/snapshots/dilaria__parse__test__primary__true.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__true.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- Literal( diff --git a/src/parse/snapshots/dilaria__parse__test__primary__two_array_literal_trailing_comma.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__two_array_literal.snap similarity index 93% rename from src/parse/snapshots/dilaria__parse__test__primary__two_array_literal_trailing_comma.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__two_array_literal.snap index c984d81..9593d6a 100644 --- a/src/parse/snapshots/dilaria__parse__test__primary__two_array_literal_trailing_comma.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__two_array_literal.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- Literal( diff --git a/src/parse/snapshots/dilaria__parse__test__primary__two_array_literal.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__two_array_literal_trailing_comma.snap similarity index 93% rename from src/parse/snapshots/dilaria__parse__test__primary__two_array_literal.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__two_array_literal_trailing_comma.snap index c984d81..9593d6a 100644 --- a/src/parse/snapshots/dilaria__parse__test__primary__two_array_literal.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__primary__two_array_literal_trailing_comma.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- Literal( diff --git a/src/parse/snapshots/dilaria__parse__test__print__print_true.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__print__print_true.snap similarity index 84% rename from src/parse/snapshots/dilaria__parse__test__print__print_true.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__print__print_true.snap index 11e41eb..7bd9516 100644 --- a/src/parse/snapshots/dilaria__parse__test__print__print_true.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__print__print_true.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- Print( diff --git a/src/parse/snapshots/dilaria__parse__test__r#fn__empty.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#fn__empty.snap similarity index 91% rename from src/parse/snapshots/dilaria__parse__test__r#fn__empty.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#fn__empty.snap index 3883639..7ae8acd 100644 --- a/src/parse/snapshots/dilaria__parse__test__r#fn__empty.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#fn__empty.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- FnDecl( diff --git a/src/parse/snapshots/dilaria__parse__test__r#fn__params_body.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#fn__params_body.snap similarity index 97% rename from src/parse/snapshots/dilaria__parse__test__r#fn__params_body.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#fn__params_body.snap index 186e4a6..cfc7a6c 100644 --- a/src/parse/snapshots/dilaria__parse__test__r#fn__params_body.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#fn__params_body.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- FnDecl( diff --git a/src/parse/snapshots/dilaria__parse__test__r#if__empty.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#if__empty.snap similarity index 90% rename from src/parse/snapshots/dilaria__parse__test__r#if__empty.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#if__empty.snap index 22c79fe..f4e66b3 100644 --- a/src/parse/snapshots/dilaria__parse__test__r#if__empty.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#if__empty.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- IfStmt { diff --git a/src/parse/snapshots/dilaria__parse__test__r#if__if_else.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#if__if_else.snap similarity index 94% rename from src/parse/snapshots/dilaria__parse__test__r#if__if_else.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#if__if_else.snap index 4e8b7e3..14102a5 100644 --- a/src/parse/snapshots/dilaria__parse__test__r#if__if_else.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#if__if_else.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- IfStmt { diff --git a/src/parse/snapshots/dilaria__parse__test__r#if__if_else_if.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#if__if_else_if.snap similarity index 96% rename from src/parse/snapshots/dilaria__parse__test__r#if__if_else_if.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#if__if_else_if.snap index 3b47a87..119d3cb 100644 --- a/src/parse/snapshots/dilaria__parse__test__r#if__if_else_if.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#if__if_else_if.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- IfStmt { diff --git a/src/parse/snapshots/dilaria__parse__test__r#if__if_else_if_else.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#if__if_else_if_else.snap similarity index 97% rename from src/parse/snapshots/dilaria__parse__test__r#if__if_else_if_else.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#if__if_else_if_else.snap index 76ca16c..d540a21 100644 --- a/src/parse/snapshots/dilaria__parse__test__r#if__if_else_if_else.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#if__if_else_if_else.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- IfStmt { diff --git a/src/parse/snapshots/dilaria__parse__test__r#loop__break_after_inner.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#loop__break_after_inner.snap similarity index 94% rename from src/parse/snapshots/dilaria__parse__test__r#loop__break_after_inner.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#loop__break_after_inner.snap index 2120461..f9c0e70 100644 --- a/src/parse/snapshots/dilaria__parse__test__r#loop__break_after_inner.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#loop__break_after_inner.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- Loop( diff --git a/src/parse/snapshots/dilaria__parse__test__r#loop__empty.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#loop__empty.snap similarity index 81% rename from src/parse/snapshots/dilaria__parse__test__r#loop__empty.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#loop__empty.snap index 59d8bc7..6dc43e1 100644 --- a/src/parse/snapshots/dilaria__parse__test__r#loop__empty.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#loop__empty.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- Loop( diff --git a/src/parse/snapshots/dilaria__parse__test__r#loop__with_break.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#loop__with_break.snap similarity index 88% rename from src/parse/snapshots/dilaria__parse__test__r#loop__with_break.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#loop__with_break.snap index 75a34c5..d604981 100644 --- a/src/parse/snapshots/dilaria__parse__test__r#loop__with_break.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#loop__with_break.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- Loop( diff --git a/src/parse/snapshots/dilaria__parse__test__r#while__empty.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#while__empty.snap similarity index 92% rename from src/parse/snapshots/dilaria__parse__test__r#while__empty.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#while__empty.snap index bdc83c7..f5a6f8f 100644 --- a/src/parse/snapshots/dilaria__parse__test__r#while__empty.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#while__empty.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- While( diff --git a/src/parse/snapshots/dilaria__parse__test__r#while__or_condition_break.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#while__or_condition_break.snap similarity index 96% rename from src/parse/snapshots/dilaria__parse__test__r#while__or_condition_break.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#while__or_condition_break.snap index ee2ea06..5a40ad4 100644 --- a/src/parse/snapshots/dilaria__parse__test__r#while__or_condition_break.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__r#while__or_condition_break.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- While( diff --git a/src/parse/snapshots/dilaria__parse__test__term__add.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__term__add.snap similarity index 93% rename from src/parse/snapshots/dilaria__parse__test__term__add.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__term__add.snap index 0a77ff2..1b2e4d2 100644 --- a/src/parse/snapshots/dilaria__parse__test__term__add.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__term__add.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- BinaryOp( diff --git a/src/syntax/parse/snapshots/dilaria__syntax__parse__test__term__number_literal.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__term__number_literal.snap new file mode 100644 index 0000000..f8a7dfe --- /dev/null +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__term__number_literal.snap @@ -0,0 +1,12 @@ +--- +source: src/syntax/parse/test.rs +expression: ast +--- +Literal( + Number( + 10.0, + Span( + 0..0, + ), + ), +) diff --git a/src/parse/snapshots/dilaria__parse__test__term__sub.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__term__sub.snap similarity index 93% rename from src/parse/snapshots/dilaria__parse__test__term__sub.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__term__sub.snap index f3b2bbb..72694df 100644 --- a/src/parse/snapshots/dilaria__parse__test__term__sub.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__term__sub.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- BinaryOp( diff --git a/src/parse/snapshots/dilaria__parse__test__unary__neg.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__unary__neg.snap similarity index 89% rename from src/parse/snapshots/dilaria__parse__test__unary__neg.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__unary__neg.snap index f36c2dc..e58c836 100644 --- a/src/parse/snapshots/dilaria__parse__test__unary__neg.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__unary__neg.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- UnaryOp( diff --git a/src/parse/snapshots/dilaria__parse__test__unary__not.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__unary__not.snap similarity index 89% rename from src/parse/snapshots/dilaria__parse__test__unary__not.snap rename to src/syntax/parse/snapshots/dilaria__syntax__parse__test__unary__not.snap index 23b73e9..6c41e89 100644 --- a/src/parse/snapshots/dilaria__parse__test__unary__not.snap +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__unary__not.snap @@ -1,5 +1,5 @@ --- -source: src/parse/test.rs +source: src/syntax/parse/test.rs expression: ast --- UnaryOp( diff --git a/src/syntax/parse/snapshots/dilaria__syntax__parse__test__unary__number_literal.snap b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__unary__number_literal.snap new file mode 100644 index 0000000..f8a7dfe --- /dev/null +++ b/src/syntax/parse/snapshots/dilaria__syntax__parse__test__unary__number_literal.snap @@ -0,0 +1,12 @@ +--- +source: src/syntax/parse/test.rs +expression: ast +--- +Literal( + Number( + 10.0, + Span( + 0..0, + ), + ), +) diff --git a/src/parse/test.rs b/src/syntax/parse/test.rs similarity index 99% rename from src/parse/test.rs rename to src/syntax/parse/test.rs index ac39495..4faaeb1 100644 --- a/src/parse/test.rs +++ b/src/syntax/parse/test.rs @@ -11,8 +11,8 @@ use crate::{errors::Span, parse::Parser, RtAlloc}; mod prelude { pub(super) use super::{parser, rt, test_literal_bin_op, test_number_literal, token}; pub(super) use crate::{ - ast::{Expr, Stmt}, lex::TokenKind::*, + syntax::ast::{Expr, Stmt}, }; pub type Token = crate::lex::Token; pub type TokenType = crate::lex::TokenKind; @@ -165,7 +165,7 @@ mod r#fn { mod r#if { use super::prelude::*; - use crate::ast::IfStmt; + use crate::syntax::ast::IfStmt; fn parse_if(tokens: Vec, alloc: &Bump) -> IfStmt { let mut parser = parser(tokens, alloc); @@ -294,7 +294,7 @@ mod r#loop { mod block { use super::prelude::*; - use crate::ast::Block; + use crate::syntax::ast::Block; fn parse_block(tokens: Vec, alloc: &Bump) -> Block { let mut parser = parser(tokens, alloc); diff --git a/src/snapshots/dilaria__lex__test__braces_brackets_parens.snap b/src/syntax/snapshots/dilaria__syntax__lex__test__braces_brackets_parens.snap similarity index 80% rename from src/snapshots/dilaria__lex__test__braces_brackets_parens.snap rename to src/syntax/snapshots/dilaria__syntax__lex__test__braces_brackets_parens.snap index 366ee8c..9ae4554 100644 --- a/src/snapshots/dilaria__lex__test__braces_brackets_parens.snap +++ b/src/syntax/snapshots/dilaria__syntax__lex__test__braces_brackets_parens.snap @@ -1,5 +1,5 @@ --- -source: src/lex.rs +source: src/syntax/lex.rs expression: tokens --- [ diff --git a/src/snapshots/dilaria__lex__test__braces_brackets_parens_whitespace.snap b/src/syntax/snapshots/dilaria__syntax__lex__test__braces_brackets_parens_whitespace.snap similarity index 80% rename from src/snapshots/dilaria__lex__test__braces_brackets_parens_whitespace.snap rename to src/syntax/snapshots/dilaria__syntax__lex__test__braces_brackets_parens_whitespace.snap index 366ee8c..9ae4554 100644 --- a/src/snapshots/dilaria__lex__test__braces_brackets_parens_whitespace.snap +++ b/src/syntax/snapshots/dilaria__syntax__lex__test__braces_brackets_parens_whitespace.snap @@ -1,5 +1,5 @@ --- -source: src/lex.rs +source: src/syntax/lex.rs expression: tokens --- [ diff --git a/src/snapshots/dilaria__lex__test__comments.snap b/src/syntax/snapshots/dilaria__syntax__lex__test__comments.snap similarity index 60% rename from src/snapshots/dilaria__lex__test__comments.snap rename to src/syntax/snapshots/dilaria__syntax__lex__test__comments.snap index ac6af2e..e449644 100644 --- a/src/snapshots/dilaria__lex__test__comments.snap +++ b/src/syntax/snapshots/dilaria__syntax__lex__test__comments.snap @@ -1,5 +1,5 @@ --- -source: src/lex.rs +source: src/syntax/lex.rs expression: tokens --- [ diff --git a/src/snapshots/dilaria__lex__test__countdown.snap b/src/syntax/snapshots/dilaria__syntax__lex__test__countdown.snap similarity index 89% rename from src/snapshots/dilaria__lex__test__countdown.snap rename to src/syntax/snapshots/dilaria__syntax__lex__test__countdown.snap index 716fa85..ee21a74 100644 --- a/src/snapshots/dilaria__lex__test__countdown.snap +++ b/src/syntax/snapshots/dilaria__syntax__lex__test__countdown.snap @@ -1,5 +1,5 @@ --- -source: src/lex.rs +source: src/syntax/lex.rs expression: tokens --- [ diff --git a/src/snapshots/dilaria__lex__test__fancy_stuff.snap b/src/syntax/snapshots/dilaria__syntax__lex__test__fancy_stuff.snap similarity index 80% rename from src/snapshots/dilaria__lex__test__fancy_stuff.snap rename to src/syntax/snapshots/dilaria__syntax__lex__test__fancy_stuff.snap index e2584b4..64349c1 100644 --- a/src/snapshots/dilaria__lex__test__fancy_stuff.snap +++ b/src/syntax/snapshots/dilaria__syntax__lex__test__fancy_stuff.snap @@ -1,5 +1,5 @@ --- -source: src/lex.rs +source: src/syntax/lex.rs expression: tokens --- [ diff --git a/src/snapshots/dilaria__lex__test__greater_than_less_than_equal.snap b/src/syntax/snapshots/dilaria__syntax__lex__test__greater_than_less_than_equal.snap similarity index 81% rename from src/snapshots/dilaria__lex__test__greater_than_less_than_equal.snap rename to src/syntax/snapshots/dilaria__syntax__lex__test__greater_than_less_than_equal.snap index 07329ad..0a9039a 100644 --- a/src/snapshots/dilaria__lex__test__greater_than_less_than_equal.snap +++ b/src/syntax/snapshots/dilaria__syntax__lex__test__greater_than_less_than_equal.snap @@ -1,5 +1,5 @@ --- -source: src/lex.rs +source: src/syntax/lex.rs expression: tokens --- [ diff --git a/src/snapshots/dilaria__lex__test__greeting.snap b/src/syntax/snapshots/dilaria__syntax__lex__test__greeting.snap similarity index 76% rename from src/snapshots/dilaria__lex__test__greeting.snap rename to src/syntax/snapshots/dilaria__syntax__lex__test__greeting.snap index 360b20c..ed60e5b 100644 --- a/src/snapshots/dilaria__lex__test__greeting.snap +++ b/src/syntax/snapshots/dilaria__syntax__lex__test__greeting.snap @@ -1,5 +1,5 @@ --- -source: src/lex.rs +source: src/syntax/lex.rs expression: tokens --- [ diff --git a/src/snapshots/dilaria__lex__test__keyword_and_ident.snap b/src/syntax/snapshots/dilaria__syntax__lex__test__keyword_and_ident.snap similarity index 89% rename from src/snapshots/dilaria__lex__test__keyword_and_ident.snap rename to src/syntax/snapshots/dilaria__syntax__lex__test__keyword_and_ident.snap index 00cc94c..8010e99 100644 --- a/src/snapshots/dilaria__lex__test__keyword_and_ident.snap +++ b/src/syntax/snapshots/dilaria__syntax__lex__test__keyword_and_ident.snap @@ -1,5 +1,5 @@ --- -source: src/lex.rs +source: src/syntax/lex.rs expression: tokens --- [ diff --git a/src/snapshots/dilaria__lex__test__keywords.snap b/src/syntax/snapshots/dilaria__syntax__lex__test__keywords.snap similarity index 87% rename from src/snapshots/dilaria__lex__test__keywords.snap rename to src/syntax/snapshots/dilaria__syntax__lex__test__keywords.snap index ea62480..dd4fd3d 100644 --- a/src/snapshots/dilaria__lex__test__keywords.snap +++ b/src/syntax/snapshots/dilaria__syntax__lex__test__keywords.snap @@ -1,5 +1,5 @@ --- -source: src/lex.rs +source: src/syntax/lex.rs expression: tokens --- [ diff --git a/src/snapshots/dilaria__lex__test__larger_numbers.snap b/src/syntax/snapshots/dilaria__syntax__lex__test__larger_numbers.snap similarity index 87% rename from src/snapshots/dilaria__lex__test__larger_numbers.snap rename to src/syntax/snapshots/dilaria__syntax__lex__test__larger_numbers.snap index 5769ba7..d1cfeaa 100644 --- a/src/snapshots/dilaria__lex__test__larger_numbers.snap +++ b/src/syntax/snapshots/dilaria__syntax__lex__test__larger_numbers.snap @@ -1,5 +1,5 @@ --- -source: src/lex.rs +source: src/syntax/lex.rs expression: tokens --- [ diff --git a/src/snapshots/dilaria__lex__test__long_multiline_comment.snap b/src/syntax/snapshots/dilaria__syntax__lex__test__long_multiline_comment.snap similarity index 68% rename from src/snapshots/dilaria__lex__test__long_multiline_comment.snap rename to src/syntax/snapshots/dilaria__syntax__lex__test__long_multiline_comment.snap index 830d4a1..03b4571 100644 --- a/src/snapshots/dilaria__lex__test__long_multiline_comment.snap +++ b/src/syntax/snapshots/dilaria__syntax__lex__test__long_multiline_comment.snap @@ -1,5 +1,5 @@ --- -source: src/lex.rs +source: src/syntax/lex.rs expression: tokens --- [ diff --git a/src/snapshots/dilaria__lex__test__no_no_no.snap b/src/syntax/snapshots/dilaria__syntax__lex__test__no_no_no.snap similarity index 76% rename from src/snapshots/dilaria__lex__test__no_no_no.snap rename to src/syntax/snapshots/dilaria__syntax__lex__test__no_no_no.snap index 255af14..fe770ee 100644 --- a/src/snapshots/dilaria__lex__test__no_no_no.snap +++ b/src/syntax/snapshots/dilaria__syntax__lex__test__no_no_no.snap @@ -1,5 +1,5 @@ --- -source: src/lex.rs +source: src/syntax/lex.rs expression: tokens --- [ diff --git a/src/snapshots/dilaria__lex__test__not_quite_a_keyword.snap b/src/syntax/snapshots/dilaria__syntax__lex__test__not_quite_a_keyword.snap similarity index 96% rename from src/snapshots/dilaria__lex__test__not_quite_a_keyword.snap rename to src/syntax/snapshots/dilaria__syntax__lex__test__not_quite_a_keyword.snap index bc32abd..d350556 100644 --- a/src/snapshots/dilaria__lex__test__not_quite_a_keyword.snap +++ b/src/syntax/snapshots/dilaria__syntax__lex__test__not_quite_a_keyword.snap @@ -1,5 +1,5 @@ --- -source: src/lex.rs +source: src/syntax/lex.rs expression: tokens --- [ diff --git a/src/snapshots/dilaria__lex__test__serious_program.snap b/src/syntax/snapshots/dilaria__syntax__lex__test__serious_program.snap similarity index 96% rename from src/snapshots/dilaria__lex__test__serious_program.snap rename to src/syntax/snapshots/dilaria__syntax__lex__test__serious_program.snap index 4698c9d..ee1d1dc 100644 --- a/src/snapshots/dilaria__lex__test__serious_program.snap +++ b/src/syntax/snapshots/dilaria__syntax__lex__test__serious_program.snap @@ -1,5 +1,5 @@ --- -source: src/lex.rs +source: src/syntax/lex.rs expression: tokens --- [ diff --git a/src/snapshots/dilaria__lex__test__smiley_face.snap b/src/syntax/snapshots/dilaria__syntax__lex__test__smiley_face.snap similarity index 76% rename from src/snapshots/dilaria__lex__test__smiley_face.snap rename to src/syntax/snapshots/dilaria__syntax__lex__test__smiley_face.snap index 8628db0..bddee6c 100644 --- a/src/snapshots/dilaria__lex__test__smiley_face.snap +++ b/src/syntax/snapshots/dilaria__syntax__lex__test__smiley_face.snap @@ -1,5 +1,5 @@ --- -source: src/lex.rs +source: src/syntax/lex.rs expression: tokens --- [ diff --git a/src/snapshots/dilaria__lex__test__string.snap b/src/syntax/snapshots/dilaria__syntax__lex__test__string.snap similarity index 71% rename from src/snapshots/dilaria__lex__test__string.snap rename to src/syntax/snapshots/dilaria__syntax__lex__test__string.snap index 4c8e0a0..c47f3c6 100644 --- a/src/snapshots/dilaria__lex__test__string.snap +++ b/src/syntax/snapshots/dilaria__syntax__lex__test__string.snap @@ -1,5 +1,5 @@ --- -source: src/lex.rs +source: src/syntax/lex.rs expression: tokens --- [ diff --git a/src/snapshots/dilaria__lex__test__strings.snap b/src/syntax/snapshots/dilaria__syntax__lex__test__strings.snap similarity index 88% rename from src/snapshots/dilaria__lex__test__strings.snap rename to src/syntax/snapshots/dilaria__syntax__lex__test__strings.snap index a62885b..60879ef 100644 --- a/src/snapshots/dilaria__lex__test__strings.snap +++ b/src/syntax/snapshots/dilaria__syntax__lex__test__strings.snap @@ -1,5 +1,5 @@ --- -source: src/lex.rs +source: src/syntax/lex.rs expression: tokens --- [ diff --git a/src/snapshots/dilaria__lex__test__terminate_multiline_comment_correctly.snap b/src/syntax/snapshots/dilaria__syntax__lex__test__terminate_multiline_comment_correctly.snap similarity index 68% rename from src/snapshots/dilaria__lex__test__terminate_multiline_comment_correctly.snap rename to src/syntax/snapshots/dilaria__syntax__lex__test__terminate_multiline_comment_correctly.snap index 8e590c1..d9596f9 100644 --- a/src/snapshots/dilaria__lex__test__terminate_multiline_comment_correctly.snap +++ b/src/syntax/snapshots/dilaria__syntax__lex__test__terminate_multiline_comment_correctly.snap @@ -1,5 +1,5 @@ --- -source: src/lex.rs +source: src/syntax/lex.rs expression: tokens --- [ diff --git a/src/snapshots/dilaria__lex__test__trailing_underscore_number.snap b/src/syntax/snapshots/dilaria__syntax__lex__test__trailing_underscore_number.snap similarity index 71% rename from src/snapshots/dilaria__lex__test__trailing_underscore_number.snap rename to src/syntax/snapshots/dilaria__syntax__lex__test__trailing_underscore_number.snap index 96b6195..03d3dd0 100644 --- a/src/snapshots/dilaria__lex__test__trailing_underscore_number.snap +++ b/src/syntax/snapshots/dilaria__syntax__lex__test__trailing_underscore_number.snap @@ -1,5 +1,5 @@ --- -source: src/lex.rs +source: src/syntax/lex.rs expression: tokens --- [ diff --git a/src/snapshots/dilaria__lex__test__underscore_number.snap b/src/syntax/snapshots/dilaria__syntax__lex__test__underscore_number.snap similarity index 72% rename from src/snapshots/dilaria__lex__test__underscore_number.snap rename to src/syntax/snapshots/dilaria__syntax__lex__test__underscore_number.snap index 7f00923..6d8e9fd 100644 --- a/src/snapshots/dilaria__lex__test__underscore_number.snap +++ b/src/syntax/snapshots/dilaria__syntax__lex__test__underscore_number.snap @@ -1,5 +1,5 @@ --- -source: src/lex.rs +source: src/syntax/lex.rs expression: tokens --- [ diff --git a/tests/common.rs b/tests/common.rs index 2ab7e16..a9c0d7f 100644 --- a/tests/common.rs +++ b/tests/common.rs @@ -1,6 +1,7 @@ #[macro_export] macro_rules! run_test { - ($name:ident, $code:expr) => { + ($(#[$attr:tt])* $name:ident, $code:expr) => { + $(#[$attr])* #[test] fn $name() { let code = $code; diff --git a/tests/functions.rs b/tests/functions.rs index d4c8a55..7e14364 100644 --- a/tests/functions.rs +++ b/tests/functions.rs @@ -43,6 +43,7 @@ print "correct3"; ); run_test!( + #[ignore] parameters, r#" fn fancy_print(str) { @@ -54,6 +55,7 @@ fancy_print("correct"); ); run_test!( + #[ignore] parameters_and_return, r#" fn add(a, b) { @@ -71,6 +73,7 @@ if added == 6 { ); run_test!( + #[ignore] fib5, r#" fn fib(n) {