diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index 58e0ee422c..275fa5ddbe 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -20,7 +20,7 @@ jobs: steps: - uses: actions/checkout@v3 with: - ref: "main" + # TODO re-enable>> ref: "main" clean: "true" - name: Earthly version diff --git a/.github/workflows/test_nightly_macos_apple_silicon.yml b/.github/workflows/test_nightly_macos_apple_silicon.yml index 3f2dc315cf..10ec5dbcde 100644 --- a/.github/workflows/test_nightly_macos_apple_silicon.yml +++ b/.github/workflows/test_nightly_macos_apple_silicon.yml @@ -28,7 +28,7 @@ jobs: run: ls | grep "roc_nightly.*tar\.gz" | xargs tar -xzvf - name: test roc hello world - run: ./roc examples/hello-world/main.roc + run: ./roc examples/helloWorld.roc diff --git a/.github/workflows/test_nightly_many_os.yml b/.github/workflows/test_nightly_many_os.yml index 20002356c3..6bd5a4e5e8 100644 --- a/.github/workflows/test_nightly_many_os.yml +++ b/.github/workflows/test_nightly_many_os.yml @@ -41,7 +41,7 @@ jobs: run: ls | grep "roc_nightly.*tar\.gz" | xargs tar -xzvf - name: test roc hello world - run: ./roc examples/hello-world/main.roc + run: ./roc examples/helloWorld.roc diff --git a/Cargo.lock b/Cargo.lock index d973816c6f..be118ad6ae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3466,8 +3466,6 @@ dependencies = [ "roc_tracing", "serial_test", "signal-hook", - "strum", - "strum_macros", "target-lexicon", "tempfile", "ven_pretty", diff --git a/Cargo.toml b/Cargo.toml index e1ce6b2323..ac055aca3e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -57,9 +57,10 @@ members = [ "crates/wasi-libc-sys", ] exclude = [ - # Examples sometimes have Rust hosts in their platforms. The compiler should ignore those. - "examples", "ci/bench-runner", + # Examples sometimes have Rust hosts in their platforms. The compiler should ignore those. + "crates/cli_testing_examples", + "examples", # Ignore building these normally. They are only imported by tests. # The tests will still correctly build them. "crates/cli_utils", diff --git a/Earthfile b/Earthfile index d67866328b..7c59196695 100644 --- a/Earthfile +++ b/Earthfile @@ -50,7 +50,7 @@ install-zig-llvm-valgrind: copy-dirs: FROM +install-zig-llvm-valgrind - COPY --dir crates examples Cargo.toml Cargo.lock version.txt www ./ + COPY --dir crates Cargo.toml Cargo.lock version.txt www ./ # compile everything needed for benchmarks and output a self-contained dir from which benchmarks can be run. prep-bench-folder: @@ -60,11 +60,11 @@ prep-bench-folder: ARG BENCH_SUFFIX=branch RUN cargo criterion -V RUN --mount=type=cache,target=$SCCACHE_DIR cd crates/cli && cargo criterion --no-run + RUN mkdir -p bench-folder/crates/cli_testing_examples/benchmarks RUN mkdir -p bench-folder/crates/compiler/builtins/bitcode/src RUN mkdir -p bench-folder/target/release/deps - RUN mkdir -p bench-folder/examples/benchmarks - RUN cp examples/benchmarks/*.roc bench-folder/examples/benchmarks/ - RUN cp -r examples/benchmarks/platform bench-folder/examples/benchmarks/ + RUN cp crates/cli_testing_examples/benchmarks/*.roc bench-folder/crates/cli_testing_examples/benchmarks/ + RUN cp -r crates/cli_testing_examples/benchmarks/platform bench-folder/crates/cli_testing_examples/benchmarks/ RUN cp crates/compiler/builtins/bitcode/src/str.zig bench-folder/crates/compiler/builtins/bitcode/src RUN cp target/release/roc bench-folder/target/release # copy the most recent time bench to bench-folder diff --git a/TUTORIAL.md b/TUTORIAL.md index 83056417f0..7ad755b7bf 100644 --- a/TUTORIAL.md +++ b/TUTORIAL.md @@ -115,7 +115,7 @@ Create a new file called `Hello.roc` and put this inside it: ```coffee app "hello" - packages { pf: "examples/interactive/cli-platform/main.roc" } + packages { pf: "examples/cli/cli-platform/main.roc" } imports [pf.Stdout, pf.Program] provides [main] to pf @@ -124,8 +124,8 @@ main = Stdout.line "I'm a Roc application!" |> Program.quick > **NOTE:** This assumes you've put Hello.roc in the root directory of the Roc > source code. If you'd like to put it somewhere else, you'll need to replace -> `"examples/interactive/cli-platform/main.roc"` with the path to the -> `examples/interactive/cli-platform/main.roc` file in that source code. In the future, +> `"examples/cli/cli-platform/main.roc"` with the path to the +> `examples/cli/cli-platform/main.roc` file in that source code. In the future, > Roc will have the tutorial built in, and this aside will no longer be > necessary! @@ -1273,7 +1273,7 @@ Let's take a closer look at the part of `Hello.roc` above `main`: ```coffee app "hello" - packages { pf: "examples/interactive/cli-platform/main.roc" } + packages { pf: "examples/cli/cli-platform/main.roc" } imports [pf.Stdout, pf.Program] provides main to pf ``` @@ -1291,14 +1291,14 @@ without running it by running `roc build Hello.roc`. The remaining lines all involve the *platform* this application is built on: ```coffee -packages { pf: "examples/interactive/cli-platform/main.roc" } +packages { pf: "examples/cli/cli-platform/main.roc" } imports [pf.Stdout, pf.Program] provides main to pf ``` -The `packages { pf: "examples/interactive/cli-platform/main.roc" }` part says two things: +The `packages { pf: "examples/cli/cli-platform/main.roc" }` part says two things: -- We're going to be using a *package* (that is, a collection of modules) called `"examples/interactive/cli-platform/main.roc"` +- We're going to be using a *package* (that is, a collection of modules) called `"examples/cli/cli-platform/main.roc"` - We're going to name that package `pf` so we can refer to it more concisely in the future. The `imports [pf.Stdout, pf.Program]` line says that we want to import the `Stdout` and `Program` modules @@ -1320,16 +1320,16 @@ which effectively makes it a simple Roc program. When we write `imports [pf.Stdout, pf.Program]`, it specifies that the `Stdout` and `Program` modules come from the `pf` package. -Since `pf` was the name we chose for the `examples/interactive/cli-platform/main.roc` -package (when we wrote `packages { pf: "examples/interactive/cli-platform/main.roc" }`), +Since `pf` was the name we chose for the `examples/cli/cli-platform/main.roc` +package (when we wrote `packages { pf: "examples/cli/cli-platform/main.roc" }`), this `imports` line tells the Roc compiler that when we call `Stdout.line`, it should look for that `line` function in the `Stdout` module of the -`examples/interactive/cli-platform/main.roc` package. +`examples/cli/cli-platform/main.roc` package. ## Tasks Tasks are technically not part of the Roc language, but they're very common in -platforms. Let's use the CLI platform in `examples/interactive/cli-platform/main.roc` as an example! +platforms. Let's use the CLI platform in `examples/cli/cli-platform/main.roc` as an example! In the CLI platform, we have four operations we can do: @@ -1344,7 +1344,7 @@ First, let's do a basic "Hello World" using the tutorial app. ```coffee app "cli-tutorial" - packages { pf: "examples/interactive/cli-platform/main.roc" } + packages { pf: "examples/cli/cli-platform/main.roc" } imports [pf.Stdout, pf.Program] provides [main] to pf @@ -1382,7 +1382,7 @@ Let's change `main` to read a line from `stdin`, and then print it back out agai ```swift app "cli-tutorial" - packages { pf: "examples/interactive/cli-platform/main.roc" } + packages { pf: "examples/cli/cli-platform/main.roc" } imports [pf.Stdout, pf.Stdin, pf.Task, pf.Program] provides [main] to pf @@ -1434,7 +1434,7 @@ This works, but we can make it a little nicer to read. Let's change it to the fo ```haskell app "cli-tutorial" - packages { pf: "examples/interactive/cli-platform/main.roc" } + packages { pf: "examples/cli/cli-platform/main.roc" } imports [pf.Stdout, pf.Stdin, pf.Task.{ await }, pf.Program] provides [main] to pf diff --git a/ci/bench-runner/src/main.rs b/ci/bench-runner/src/main.rs index bb44247ea9..44d7e1c027 100644 --- a/ci/bench-runner/src/main.rs +++ b/ci/bench-runner/src/main.rs @@ -227,9 +227,10 @@ fn calc_hashes_for_folder(benches_path_str: &str) -> HashMap { } fn check_if_bench_executables_changed() -> bool { - let bench_folder_str = "/examples/benchmarks/"; + let bench_folder_str = "/crates/cli_testing_examples/benchmarks/"; let main_benches_path_str = [BENCH_FOLDER_MAIN, bench_folder_str].join(""); + let main_bench_hashes = calc_hashes_for_folder(&main_benches_path_str); let branch_benches_path_str = [BENCH_FOLDER_BRANCH, bench_folder_str].join(""); diff --git a/ci/package_release.sh b/ci/package_release.sh index 6e17f0d150..4c03da969e 100755 --- a/ci/package_release.sh +++ b/ci/package_release.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash cp target/release/roc ./roc # to be able to exclude "target" later in the tar command cp -r target/release/lib ./lib -tar -czvf $1 --exclude="target" --exclude="zig-cache" roc lib LICENSE LEGAL_DETAILS examples/hello-world crates/roc_std +tar -czvf $1 --exclude="target" --exclude="zig-cache" roc lib LICENSE LEGAL_DETAILS examples/helloWorld.roc examples/cli crates/roc_std diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index 594a582d3a..c4caf732d9 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -99,8 +99,6 @@ indoc = "1.0.7" serial_test = "0.9.0" criterion = { git = "https://github.com/Anton-4/criterion.rs"} cli_utils = { path = "../cli_utils" } -strum = "0.24.0" -strum_macros = "0.24" once_cell = "1.14.0" parking_lot = "0.12" diff --git a/crates/cli/tests/cli_run.rs b/crates/cli/tests/cli_run.rs index 6ce5ac151c..ffd4466bf1 100644 --- a/crates/cli/tests/cli_run.rs +++ b/crates/cli/tests/cli_run.rs @@ -10,22 +10,16 @@ extern crate roc_module; #[cfg(test)] mod cli_run { use cli_utils::helpers::{ - example_file, examples_dir, extract_valgrind_errors, fixture_file, fixtures_dir, - known_bad_file, run_cmd, run_roc, run_with_valgrind, strip_colors, Out, ValgrindError, - ValgrindErrorXWhat, + extract_valgrind_errors, file_path_from_root, fixture_file, fixtures_dir, known_bad_file, + run_cmd, run_roc, run_with_valgrind, strip_colors, Out, ValgrindError, ValgrindErrorXWhat, }; use const_format::concatcp; use indoc::indoc; - use once_cell::sync::Lazy; - use parking_lot::{Mutex, RwLock}; use roc_cli::{CMD_BUILD, CMD_CHECK, CMD_FORMAT, CMD_RUN}; use roc_test_utils::assert_multiline_str_eq; use serial_test::serial; use std::iter; - use std::path::{Path, PathBuf}; - use std::sync::Once; - use strum::IntoEnumIterator; - use strum_macros::EnumIter; + use std::path::Path; const OPTIMIZE_FLAG: &str = concatcp!("--", roc_cli::FLAG_OPTIMIZE); const LINKER_FLAG: &str = concatcp!("--", roc_cli::FLAG_LINKER); @@ -34,30 +28,13 @@ mod cli_run { #[allow(dead_code)] const TARGET_FLAG: &str = concatcp!("--", roc_cli::FLAG_TARGET); - static BENCHMARKS_BUILD_PLATFORM: Once = Once::new(); - static POPULATED_EXAMPLE_LOCKS: Once = Once::new(); - - use std::collections::HashMap; - static EXAMPLE_PLATFORM_LOCKS: Lazy>>> = - once_cell::sync::Lazy::new(|| RwLock::new(HashMap::default())); - - fn populate_example_locks(examples: impl Iterator) { - let mut locks = EXAMPLE_PLATFORM_LOCKS.write(); - for example in examples { - locks.insert(example, Default::default()); - } - } - - #[derive(Debug, EnumIter)] + #[derive(Debug)] enum CliMode { - RocBuild, - RocRun, - Roc, + RocBuild, // buildOnly + RocRun, // buildAndRun + Roc, // buildAndRunIfNoErrors } - #[cfg(not(debug_assertions))] - use roc_collections::all::MutMap; - #[cfg(all(target_os = "linux", target_arch = "x86_64"))] const TEST_LEGACY_LINKER: bool = true; @@ -82,7 +59,7 @@ mod cli_run { } #[derive(Debug, PartialEq, Eq)] - struct Example<'a> { + struct CliTest<'a> { filename: &'a str, executable_filename: &'a str, stdin: &'a [&'a str], @@ -118,7 +95,7 @@ mod cli_run { file: &'a Path, args: I, stdin: &[&str], - app_args: &[String], + roc_app_args: &[String], env: &[(&str, &str)], ) -> Out { let compile_out = run_roc( @@ -126,7 +103,7 @@ mod cli_run { args.into_iter() .map(|arg| arg.to_string()) .chain([file.to_str().unwrap().to_string(), "--".to_string()]) - .chain(app_args.iter().cloned()), + .chain(roc_app_args.iter().cloned()), stdin, env, ); @@ -149,10 +126,11 @@ mod cli_run { stdin: &[&str], executable_filename: &str, flags: &[&str], - app_args: &[String], + roc_app_args: &[String], extra_env: &[(&str, &str)], expected_ending: &str, use_valgrind: bool, + test_many_cli_commands: bool, // buildOnly, buildAndRun and buildAndRunIfNoErrors ) { // valgrind does not yet support avx512 instructions, see #1963. // we can't enable this only when testing with valgrind because of host re-use between tests @@ -161,7 +139,13 @@ mod cli_run { std::env::set_var("NO_AVX512", "1"); } - for cli_mode in CliMode::iter() { + let cli_commands = if test_many_cli_commands { + vec![CliMode::RocBuild, CliMode::RocRun, CliMode::Roc] + } else { + vec![CliMode::Roc] + }; + + for cli_mode in cli_commands.iter() { let flags = { let mut vec = flags.to_vec(); @@ -186,7 +170,7 @@ mod cli_run { .to_str() .unwrap() .to_string()]; - valgrind_args.extend(app_args.iter().cloned()); + valgrind_args.extend(roc_app_args.iter().cloned()); let (valgrind_out, raw_xml) = run_with_valgrind(stdin.iter().copied(), &valgrind_args); if valgrind_out.status.success() { @@ -228,7 +212,7 @@ mod cli_run { run_cmd( file.with_file_name(executable_filename).to_str().unwrap(), stdin.iter().copied(), - app_args, + roc_app_args, extra_env.iter().copied(), ) } @@ -238,13 +222,13 @@ mod cli_run { // TODO: `roc` and `roc dev` are currently buggy for `env.roc` continue; } - run_roc_on(file, flags.clone(), stdin, app_args, extra_env) + run_roc_on(file, flags.clone(), stdin, roc_app_args, extra_env) } CliMode::RocRun => run_roc_on( file, iter::once(CMD_RUN).chain(flags.clone()), stdin, - app_args, + roc_app_args, extra_env, ), }; @@ -266,773 +250,663 @@ mod cli_run { } } - #[cfg(feature = "wasm32-cli-run")] - fn check_wasm_output_with_stdin( - file: &Path, - stdin: &[&str], + // when you don't need args, stdin or extra_env + fn test_roc_app_slim( + dir_name: &str, + roc_filename: &str, executable_filename: &str, - flags: &[&str], - args: &[&Arg], expected_ending: &str, + use_valgrind: bool, ) { - assert!(input_paths.is_empty(), "Wasm does not support input files"); - let mut flags = flags.to_vec(); - flags.push(concatcp!(TARGET_FLAG, "=wasm32")); + test_roc_app( + dir_name, + roc_filename, + executable_filename, + &[], + &[], + &[], + expected_ending, + use_valgrind, + false, + ) + } - let compile_out = run_roc( - [CMD_BUILD, file.to_str().unwrap()] - .iter() - .chain(flags.as_slice()), - ); - if !compile_out.stderr.is_empty() { - panic!("{}", compile_out.stderr); + #[allow(clippy::too_many_arguments)] + fn test_roc_app( + dir_name: &str, + roc_filename: &str, + executable_filename: &str, + stdin: &[&str], + args: &[Arg], + extra_env: &[(&str, &str)], + expected_ending: &str, + use_valgrind: bool, + test_many_cli_commands: bool, // buildOnly, buildAndRun and buildAndRunIfNoErrors + ) { + let file_name = file_path_from_root(dir_name, roc_filename); + + let mut roc_app_args: Vec = vec![]; + for arg in args { + match arg { + Arg::ExamplePath(file) => { + roc_app_args.push( + file_path_from_root(dir_name, file) + .to_str() + .unwrap() + .to_string(), + ); + } + Arg::PlainText(arg) => { + roc_app_args.push(arg.to_string()); + } + } } - assert!(compile_out.status.success(), "bad status {:?}", compile_out); + // workaround for surgical linker issue, see PR #3990 + let mut custom_flags: Vec<&str> = vec![]; - let path = file.with_file_name(executable_filename); - let stdout = crate::run_with_wasmer(&path, stdin); + match executable_filename { + "form" | "hello-gui" | "breakout" | "ruby" => { + // Since these require things the build system often doesn't have + // (e.g. GUIs open a window, Ruby needs ruby installed, WASM needs a browser) + // we do `roc build` on them but don't run them. + run_roc_on(&file_name, [CMD_BUILD, OPTIMIZE_FLAG], &[], &[], &[]); + return; + } + "swiftui" | "rocLovesSwift" => { + if cfg!(not(target_os = "macos")) { + eprintln!( + "WARNING: skipping testing example {} because it only works on MacOS.", + roc_filename + ); + return; + } else { + run_roc_on(&file_name, [CMD_BUILD, OPTIMIZE_FLAG], &[], &[], &[]); + return; + } + } + "rocLovesWebAssembly" => { + // this is a web assembly example, but we don't test with JS at the moment + eprintln!( + "WARNING: skipping testing example {} because it only works in a browser!", + roc_filename + ); + return; + } + "args" => { + custom_flags = vec![LINKER_FLAG, "legacy"]; + } + _ => {} + } - if !stdout.ends_with(expected_ending) { - panic!( - "expected output to end with {:?} but instead got {:#?}", - expected_ending, stdout + // Check with and without optimizations + check_output_with_stdin( + &file_name, + stdin, + executable_filename, + &custom_flags, + &roc_app_args, + extra_env, + expected_ending, + use_valgrind, + test_many_cli_commands, + ); + + custom_flags.push(OPTIMIZE_FLAG); + // This is mostly because the false interpreter is still very slow - + // 25s for the cli tests is just not acceptable during development! + #[cfg(not(debug_assertions))] + check_output_with_stdin( + &file_name, + stdin, + executable_filename, + &custom_flags, + &roc_app_args, + extra_env, + expected_ending, + use_valgrind, + test_many_cli_commands, + ); + + // Also check with the legacy linker. + + if TEST_LEGACY_LINKER { + check_output_with_stdin( + &file_name, + stdin, + executable_filename, + &[LINKER_FLAG, "legacy"], + &roc_app_args, + extra_env, + expected_ending, + use_valgrind, + test_many_cli_commands, ); } } - /// This macro does two things. - /// - /// First, it generates and runs a separate test for each of the given - /// Example expressions. Each of these should test a particular .roc file - /// in the examples/ directory. - /// - /// Second, it generates an extra test which (non-recursively) traverses the - /// examples/ directory and verifies that each of the .roc files in there - /// has had a corresponding test generated in the previous step. This test - /// will fail if we ever add a new .roc file to examples/ and forget to - /// add a test for it here! - macro_rules! examples { - ($($test_name:ident:$name:expr => $example:expr,)+) => { - static EXAMPLE_NAMES: &[&str] = &[$($name,)+]; - - $( - #[test] - #[allow(non_snake_case)] - fn $test_name() { - POPULATED_EXAMPLE_LOCKS.call_once( || { - populate_example_locks(EXAMPLE_NAMES.iter().map(|name| examples_dir(name))) - }); - - let dir_name = $name; - let example = $example; - let example_dir = examples_dir(dir_name); - let file_name = example_file(dir_name, example.filename); - - let mut app_args: Vec = vec![]; - for arg in example.arguments { - match arg { - Arg::ExamplePath(file) => { - app_args.push(example_file(dir_name, file).to_str().unwrap().to_string()); - } - Arg::PlainText(arg) => { - app_args.push(arg.to_string()); - } - } - } - - // workaround for surgical linker issue, see PR #3990 - let mut custom_flags : Vec<&str> = vec![]; - - match example.executable_filename { - "form" | "hello-gui" | "breakout" | "ruby" => { - // Since these require things the build system often doesn't have - // (e.g. GUIs open a window, Ruby needs ruby installed, WASM needs a browser) - // we do `roc build` on them but don't run them. - run_roc_on(&file_name, [CMD_BUILD, OPTIMIZE_FLAG], &[], &[], &[]); - return; - } - "swiftui" | "rocLovesSwift" => { - if cfg!(not(target_os = "macos")) { - eprintln!("WARNING: skipping testing example {} because it only works on MacOS.", example.filename); - return; - } else { - run_roc_on(&file_name, [CMD_BUILD, OPTIMIZE_FLAG], &[], &[], &[]); - return; - } - } - "rocLovesWebAssembly" => { - // this is a web assembly example, but we don't test with JS at the moment - eprintln!("WARNING: skipping testing example {} because it only works in a browser!", example.filename); - return; - } - "args" => { - custom_flags = vec![LINKER_FLAG, "legacy"]; - } - _ => {} - } - - // To avoid concurrent examples tests overwriting produced host binaries, lock - // on the example's directory, so that only one example per directory runs at a - // time. - // NOTE: we are assuming that each example corresponds to one platform, under - // the subdirectory. This is not necessarily true, and moreover is too - // restrictive. To increase throughput we only need to lock the produced host - // file, however, it is not trivial to recover what that file is today (without - // enumerating all examples and their platforms). - let locks = EXAMPLE_PLATFORM_LOCKS.read(); - let _example_guard = locks.get(&example_dir).unwrap().lock(); - - // Check with and without optimizations - check_output_with_stdin( - &file_name, - example.stdin, - example.executable_filename, - &custom_flags, - &app_args, - example.env, - example.expected_ending, - example.use_valgrind, - ); - - custom_flags.push(OPTIMIZE_FLAG); - // This is mostly because the false interpreter is still very slow - - // 25s for the cli tests is just not acceptable during development! - #[cfg(not(debug_assertions))] - check_output_with_stdin( - &file_name, - example.stdin, - example.executable_filename, - &custom_flags, - &app_args, - example.env, - example.expected_ending, - example.use_valgrind, - ); - - // Also check with the legacy linker. - - if TEST_LEGACY_LINKER { - check_output_with_stdin( - &file_name, - example.stdin, - example.executable_filename, - &[LINKER_FLAG, "legacy"], - &app_args, - example.env, - example.expected_ending, - example.use_valgrind, - ); - } - } - )* - - #[test] - #[cfg(not(debug_assertions))] - fn all_examples_have_tests() { - let mut all_examples: MutMap<&str, Example<'_>> = MutMap::default(); - - $( - all_examples.insert($name, $example); - )* - - check_for_tests("../../examples", &mut all_examples); - } - } + #[test] + #[serial(cli_platform)] + fn hello_world() { + test_roc_app_slim( + "examples", + "helloWorld.roc", + "helloWorld", + "Hello, World!\n", + true, + ) } - // examples! macro format: - // - // "name-of-subdirectory-inside-examples-dir" => [ - // test_name_1: Example { - // ... - // }, - // test_name_2: Example { - // ... - // }, - // ] - examples! { - helloWorld:"hello-world" => Example { - filename: "main.roc", - executable_filename: "helloWorld", - stdin: &[], - arguments: &[], - env: &[], - expected_ending:"Hello, World!\n", - use_valgrind: true, - }, - platformSwitching:"platform-switching" => Example { - filename: "main.roc", - executable_filename: "rocLovesPlatforms", - stdin: &[], - arguments: &[], - env: &[], - expected_ending:"Which platform am I running on now?\n", - use_valgrind: true, - }, - // We exclude the C platforming switching example - // because the main platform switching example runs the c platform. - // If we don't a race condition leads to test flakiness. - // platformSwitchingC:"platform-switching" => Example { - // filename: "rocLovesC.roc", - // executable_filename: "rocLovesC", - // stdin: &[], - // arguments: &[], - // expected_ending:"Roc <3 C!\n", - // use_valgrind: true, - // }, - platformSwitchingRust:"platform-switching" => Example { - filename: "rocLovesRust.roc", - executable_filename: "rocLovesRust", - stdin: &[], - arguments: &[], - env: &[], - expected_ending:"Roc <3 Rust!\n", - use_valgrind: true, - }, - platformSwitchingSwift:"platform-switching" => Example { - filename: "rocLovesSwift.roc", - executable_filename: "rocLovesSwift", - stdin: &[], - arguments: &[], - env: &[], - expected_ending:"Roc <3 Swift!\n", - use_valgrind: true, - }, - platformSwitchingWebAssembly:"platform-switching" => Example { - filename: "rocLovesWebAssembly.roc", - executable_filename: "rocLovesWebAssembly", - stdin: &[], - arguments: &[], - env: &[], - expected_ending:"Roc <3 Web Assembly!\n", - use_valgrind: true, - }, - platformSwitchingZig:"platform-switching" => Example { - filename: "rocLovesZig.roc", - executable_filename: "rocLovesZig", - stdin: &[], - arguments: &[], - env: &[], - expected_ending:"Roc <3 Zig!\n", - use_valgrind: true, - }, - ruby:"ruby-interop" => Example { - filename: "main.roc", - executable_filename: "libhello", - stdin: &[], - arguments: &[], - env: &[], - expected_ending:"", - use_valgrind: true, - }, - fib:"algorithms" => Example { - filename: "fibonacci.roc", - executable_filename: "fibonacci", - stdin: &[], - arguments: &[], - env: &[], - expected_ending:"55\n", - use_valgrind: true, - }, - gui:"gui" => Example { - filename: "Hello.roc", - executable_filename: "hello-gui", - stdin: &[], - arguments: &[], - env: &[], - expected_ending: "", - use_valgrind: false, - }, - breakout:"breakout" => Example { - filename: "breakout.roc", - executable_filename: "breakout", - stdin: &[], - arguments: &[], - env: &[], - expected_ending: "", - use_valgrind: false, - }, - quicksort:"algorithms" => Example { - filename: "quicksort.roc", - executable_filename: "quicksort", - stdin: &[], - arguments: &[], - env: &[], - expected_ending: "[0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2]\n", - use_valgrind: true, - }, - // shared_quicksort:"shared-quicksort" => Example { - // filename: "Quicksort.roc", - // executable_filename: "quicksort", - // stdin: &[], - // arguments: &[], - // expected_ending: "[0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2]\n", - // use_valgrind: true, - // }, - cli_args:"interactive" => Example { - filename: "args.roc", - executable_filename: "args", - stdin: &[], - arguments: &[Arg::PlainText("log"), Arg::PlainText("-b"), Arg::PlainText("3"), Arg::PlainText("--num"), Arg::PlainText("81")], - env: &[], - expected_ending: "4\n", - use_valgrind: false, - }, - env:"interactive" => Example { - filename: "env.roc", - executable_filename: "env", - stdin: &[], - arguments: &[], - env: &[("EDITOR", "roc-editor"), ("SHLVL", "3"), ("LETTERS", "a,c,e,j")], - expected_ending: ( - "Your favorite editor is roc-editor!\n\ - Your current shell level is 3!\n\ - Your favorite letters are: a c e j\n"), - use_valgrind: false, - }, - effects:"interactive" => Example { - filename: "effects.roc", - executable_filename: "effects", - stdin: &["hi there!"], - arguments: &[], - env: &[], - expected_ending: "hi there!\nIt is known\n", - use_valgrind: true, - }, - // tui_tea:"tea" => Example { - // filename: "Main.roc", - // executable_filename: "tea-example", - // stdin: &[], - // arguments: &[], - // expected_ending: "", - // use_valgrind: true, - // }, - cli_form:"interactive" => Example { - filename: "form.roc", - executable_filename: "form", - stdin: &["Giovanni\n", "Giorgio\n"], - arguments: &[], - env: &[], - expected_ending: "Hi, Giovanni Giorgio! 👋\n", - use_valgrind: false, - }, - tui:"interactive" => Example { - filename: "tui.roc", - executable_filename: "tui", - stdin: &["foo\n"], // NOTE: adding more lines leads to memory leaks - arguments: &[], - env: &[], - expected_ending: "Hello Worldfoo!\n", - use_valgrind: true, - }, - // custom_malloc:"custom-malloc" => Example { - // filename: "Main.roc", - // executable_filename: "custom-malloc-example", - // stdin: &[], - // arguments: &[], - // expected_ending: "ms!\nThe list was small!\n", - // use_valgrind: true, - // }, - // task:"task" => Example { - // filename: "Main.roc", - // executable_filename: "task-example", - // stdin: &[], - // arguments: &[], - // expected_ending: "successfully wrote to file\n", - // use_valgrind: true, - // }, - false_interpreter:"false-interpreter" => { - Example { - filename: "False.roc", - executable_filename: "false", - stdin: &[], - arguments: &[Arg::ExamplePath("examples/hello.false")], - env: &[], - expected_ending:"Hello, World!\n", - use_valgrind: false, - } - }, - swiftui:"swiftui" => Example { - filename: "main.roc", - executable_filename: "swiftui", - stdin: &[], - arguments: &[], - env: &[], - expected_ending: "", - use_valgrind: false, - }, - static_site_gen: "static-site-gen" => { - Example { - filename: "static-site.roc", - executable_filename: "static-site", - stdin: &[], - arguments: &[Arg::ExamplePath("input"), Arg::ExamplePath("output")], - env: &[], - expected_ending: "Processed 3 files with 3 successes and 0 errors\n", - use_valgrind: false, - } - }, - parse_movies_csv: "parser" => { - Example { - filename: "parse-movies-csv.roc", - executable_filename: "parse-movies-csv", - stdin: &[], - arguments: &[], - env: &[], - expected_ending: "Parse success!\n", - use_valgrind: false, - } - }, + #[test] + // uses C platform + fn platform_switching_main() { + test_roc_app_slim( + "crates/cli_testing_examples/platform-switching", + "main.roc", + "rocLovesPlatforms", + "Which platform am I running on now?\n", + true, + ) } - macro_rules! benchmarks { - ($($test_name:ident => $benchmark:expr,)+) => { + // We exclude the C platforming switching example + // because the main platform switching example runs the c platform. + // If we don't, a race condition leads to test flakiness. - $( - #[test] - #[cfg_attr(not(debug_assertions), serial(benchmark))] - #[cfg(all(not(feature = "wasm32-cli-run"), not(feature = "i386-cli-run")))] - fn $test_name() { - let benchmark = $benchmark; - let file_name = examples_dir("benchmarks").join(benchmark.filename); + #[test] + fn platform_switching_rust() { + test_roc_app_slim( + "crates/cli_testing_examples/platform-switching", + "rocLovesRust.roc", + "rocLovesRust", + "Roc <3 Rust!\n", + true, + ) + } - // TODO fix QuicksortApp and then remove this! - match benchmark.filename { - "QuicksortApp.roc" => { - eprintln!("WARNING: skipping testing benchmark {} because the test is broken right now!", benchmark.filename); - return; - } - _ => {} - } + #[test] + fn platform_switching_zig() { + test_roc_app_slim( + "crates/cli_testing_examples/platform-switching", + "rocLovesZig.roc", + "rocLovesZig", + "Roc <3 Zig!\n", + true, + ) + } - let mut ran_without_optimizations = false; + #[test] + fn platform_switching_wasm() { + test_roc_app_slim( + "crates/cli_testing_examples/platform-switching", + "rocLovesWebAssembly.roc", + "rocLovesWebAssembly", + "Roc <3 Web Assembly!\n", + true, + ) + } - let mut app_args: Vec = vec![]; - for arg in benchmark.arguments { - match arg { - Arg::ExamplePath(file) => { - app_args.push(examples_dir("benchmarks").join(file).to_str().unwrap().to_string()); - } - Arg::PlainText(arg) => { - app_args.push(arg.to_string()); - } - } - } + #[test] + fn platform_switching_swift() { + test_roc_app_slim( + "crates/cli_testing_examples/platform-switching", + "rocLovesSwift.roc", + "rocLovesSwift", + "Roc <3 Swift!\n", + true, + ) + } - BENCHMARKS_BUILD_PLATFORM.call_once( || { - // Check with and without optimizations - check_output_with_stdin( - &file_name, - benchmark.stdin, - benchmark.executable_filename, - &[], - &app_args, - benchmark.env, - benchmark.expected_ending, - benchmark.use_valgrind, - ); + #[test] + fn ruby_interop() { + test_roc_app_slim("examples/ruby-interop", "main.roc", "libhello", "", true) + } - ran_without_optimizations = true; - }); + #[test] + fn fibonacci() { + test_roc_app_slim( + "crates/cli_testing_examples/algorithms", + "fibonacci.roc", + "fibonacci", + "", + true, + ) + } - // now we can pass the `PREBUILT_PLATFORM` flag, because the - // `call_once` will have built the platform + #[test] + fn hello_gui() { + test_roc_app_slim("examples/gui", "hello.roc", "hello-gui", "", false) + } - if !ran_without_optimizations { - // Check with and without optimizations - check_output_with_stdin( - &file_name, - benchmark.stdin, - benchmark.executable_filename, - &[PREBUILT_PLATFORM], - &app_args, - benchmark.env, - benchmark.expected_ending, - benchmark.use_valgrind, - ); - } + #[test] + fn breakout() { + test_roc_app_slim( + "examples/gui/breakout", + "breakout.roc", + "breakout", + "", + false, + ) + } - check_output_with_stdin( - &file_name, - benchmark.stdin, - benchmark.executable_filename, - &[PREBUILT_PLATFORM, OPTIMIZE_FLAG], - &app_args, - benchmark.env, - benchmark.expected_ending, - benchmark.use_valgrind, - ); - } + #[test] + fn quicksort() { + test_roc_app_slim( + "crates/cli_testing_examples/algorithms", + "quicksort.roc", + "quicksort", + "[0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2]\n", + true, + ) + } - )* + #[test] + #[serial(cli_platform)] + fn cli_args() { + test_roc_app( + "examples/cli", + "args.roc", + "args", + &[], + &[ + Arg::PlainText("log"), + Arg::PlainText("-b"), + Arg::PlainText("3"), + Arg::PlainText("--num"), + Arg::PlainText("81"), + ], + &[], + "4\n", + false, + false, + ) + } + + #[test] + fn interactive_effects() { + test_roc_app( + "examples/cli", + "effects.roc", + "effects", + &["hi there!"], + &[], + &[], + "hi there!\nIt is known\n", + true, + false, + ) + } + + #[test] + // tea = The Elm Architecture + fn terminal_ui_tea() { + test_roc_app( + "examples/cli", + "tui.roc", + "tui", + &["foo\n"], // NOTE: adding more lines leads to memory leaks + &[], + &[], + "Hello Worldfoo!\n", + true, + false, + ) + } + + #[test] + fn false_interpreter() { + test_roc_app( + "examples/cli/false-interpreter", + "False.roc", + "false", + &[], + &[Arg::ExamplePath("examples/hello.false")], + &[], + "Hello, World!\n", + false, + true, + ) + } + + #[test] + fn swift_ui() { + test_roc_app_slim("examples/swiftui", "main.roc", "swiftui", "", false) + } + + #[test] + fn static_site_gen() { + test_roc_app( + "examples/static-site-gen", + "static-site.roc", + "static-site", + &[], + &[Arg::ExamplePath("input"), Arg::ExamplePath("output")], + &[], + "Processed 3 files with 3 successes and 0 errors\n", + false, + false, + ) + } + + #[test] + #[serial(cli_platform)] + fn with_env_vars() { + test_roc_app( + "examples/cli", + "env.roc", + "env", + &[], + &[], + &[ + ("EDITOR", "roc-editor"), + ("SHLVL", "3"), + ("LETTERS", "a,c,e,j"), + ], + "Your favorite editor is roc-editor!\n\ + Your current shell level is 3!\n\ + Your favorite letters are: a c e j\n", + false, + false, + ) + } + + #[test] + fn parse_movies_csv() { + test_roc_app_slim( + "examples/parser", + "parse-movies-csv.roc", + "parse-movies-csv", + "Parse success!\n", + false, + ) + } + + // TODO not sure if this cfg should still be here: #[cfg(not(debug_assertions))] + // this is for testing the benchmarks, to perform proper benchmarks see crates/cli/benches/README.md + mod test_benchmarks { + use cli_utils::helpers::cli_testing_dir; + + use super::{check_output_with_stdin, OPTIMIZE_FLAG, PREBUILT_PLATFORM}; + + use std::{path::Path, sync::Once}; + + static BENCHMARKS_BUILD_PLATFORM: Once = Once::new(); + + fn test_benchmark( + roc_filename: &str, + executable_filename: &str, + stdin: &[&str], + expected_ending: &str, + use_valgrind: bool, + ) { + let file_name = cli_testing_dir("benchmarks").join(roc_filename); + + // TODO fix QuicksortApp and then remove this! + if roc_filename == "QuicksortApp.roc" { + eprintln!( + "WARNING: skipping testing benchmark {} because the test is broken right now!", + roc_filename + ); + return; + } + + #[cfg(all(not(feature = "wasm32-cli-run"), not(feature = "i386-cli-run")))] + check_output_regular( + &file_name, + stdin, + executable_filename, + expected_ending, + use_valgrind, + ); #[cfg(feature = "wasm32-cli-run")] - mod wasm32 { - use super::*; - $( - #[test] - #[cfg_attr(not(debug_assertions), serial(benchmark))] - fn $test_name() { - let benchmark = $benchmark; - let file_name = examples_dir("benchmarks").join(benchmark.filename); - - // TODO fix QuicksortApp and then remove this! - match benchmark.filename { - "QuicksortApp.roc" => { - eprintln!("WARNING: skipping testing benchmark {} because the test is broken right now!", benchmark.filename); - return; - } - _ => {} - } - - // Check with and without optimizations - check_wasm_output_with_stdin( - &file_name, - benchmark.stdin, - benchmark.executable_filename, - &[], - benchmark.input_paths.iter().map(|file| examples_dir("benchmarks").join(file)), - benchmark.expected_ending, - ); - - check_wasm_output_with_stdin( - &file_name, - benchmark.stdin, - benchmark.executable_filename, - &[OPTIMIZE_FLAG], - benchmark.input_paths.iter().map(|file| examples_dir("benchmarks").join(file)), - benchmark.expected_ending, - ); - } - )* - } + check_output_wasm(&file_name, stdin, executable_filename, expected_ending); #[cfg(feature = "i386-cli-run")] - mod i386 { - use super::*; - $( - #[test] - #[cfg_attr(not(debug_assertions), serial(benchmark))] - fn $test_name() { - let benchmark = $benchmark; - let file_name = examples_dir("benchmarks").join(benchmark.filename); - - // TODO fix QuicksortApp and then remove this! - match benchmark.filename { - "QuicksortApp.roc" => { - eprintln!("WARNING: skipping testing benchmark {} because the test is broken right now!", benchmark.filename); - return; - } - _ => {} - } - - // Check with and without optimizations - check_output_with_stdin( - &file_name, - benchmark.stdin, - benchmark.executable_filename, - [concatcp!(TARGET_FLAG, "=x86_32")], - benchmark.input_paths.iter().map(|file| Some(examples_dir("benchmarks").join(file))), - benchmark.expected_ending, - benchmark.use_valgrind, - ); - - check_output_with_stdin( - &file_name, - benchmark.stdin, - benchmark.executable_filename, - [concatcp!(TARGET_FLAG, "=x86_32"), OPTIMIZE_FLAG], - benchmark.input_paths.iter().map(|file| Some(examples_dir("benchmarks").join(file))), - benchmark.expected_ending, - benchmark.use_valgrind, - ); - } - )* - } - - #[test] - #[cfg(not(debug_assertions))] - fn all_benchmarks_have_tests() { - let mut all_benchmarks: MutMap<&str, Example<'_>> = MutMap::default(); - - $( - let benchmark = $benchmark; - - all_benchmarks.insert(benchmark.filename, benchmark); - )* - - check_for_benchmarks("../../examples/benchmarks", &mut all_benchmarks); - } - } - } - - benchmarks! { - nqueens => Example { - filename: "NQueens.roc", - executable_filename: "nqueens", - stdin: &["6"], - arguments: &[], - env: &[], - expected_ending: "4\n", - use_valgrind: true, - }, - cfold => Example { - filename: "CFold.roc", - executable_filename: "cfold", - stdin: &["3"], - arguments: &[], - env: &[], - expected_ending: "11 & 11\n", - use_valgrind: true, - }, - deriv => Example { - filename: "Deriv.roc", - executable_filename: "deriv", - stdin: &["2"], - arguments: &[], - env: &[], - expected_ending: "1 count: 6\n2 count: 22\n", - use_valgrind: true, - }, - rbtree_ck => Example { - filename: "RBTreeCk.roc", - executable_filename: "rbtree-ck", - stdin: &["100"], - arguments: &[], - env: &[], - expected_ending: "10\n", - use_valgrind: true, - }, - rbtree_insert => Example { - filename: "RBTreeInsert.roc", - executable_filename: "rbtree-insert", - stdin: &[], - arguments: &[], - env: &[], - expected_ending: "Node Black 0 {} Empty Empty\n", - use_valgrind: true, - }, - // rbtree_del => Example { - // filename: "RBTreeDel.roc", - // executable_filename: "rbtree-del", - // stdin: &["420"], - // arguments: &[], - // env: &[], - // expected_ending: "30\n", - // use_valgrind: true, - // }, - astar => Example { - filename: "TestAStar.roc", - executable_filename: "test-astar", - stdin: &[], - arguments: &[], - env: &[], - expected_ending: "True\n", - use_valgrind: false, - }, - base64 => Example { - filename: "TestBase64.roc", - executable_filename: "test-base64", - stdin: &[], - arguments: &[], - env: &[], - expected_ending: "encoded: SGVsbG8gV29ybGQ=\ndecoded: Hello World\n", - use_valgrind: true, - }, - closure => Example { - filename: "Closure.roc", - executable_filename: "closure", - stdin: &[], - arguments: &[], - env: &[], - expected_ending: "", - use_valgrind: false, - }, - issue2279 => Example { - filename: "Issue2279.roc", - executable_filename: "issue2279", - stdin: &[], - arguments: &[], - env: &[], - expected_ending: "Hello, world!\n", - use_valgrind: true, - }, - quicksort_app => Example { - filename: "QuicksortApp.roc", - executable_filename: "quicksortapp", - stdin: &[], - arguments: &[], - env: &[], - expected_ending: "todo put the correct quicksort answer here", - use_valgrind: true, - }, - } - - #[cfg(not(debug_assertions))] - fn check_for_tests(examples_dir: &str, all_examples: &mut MutMap<&str, Example<'_>>) { - let entries = std::fs::read_dir(examples_dir).unwrap_or_else(|err| { - panic!( - "Error trying to read {} as an examples directory: {}", - examples_dir, err + check_output_i386( + &file_name, + stdin, + executable_filename, + expected_ending, + use_valgrind, ); - }); - - for entry in entries { - let entry = entry.unwrap(); - - if entry.file_type().unwrap().is_dir() { - let example_dir_name = entry.file_name().into_string().unwrap(); - - // We test benchmarks separately - if example_dir_name != "benchmarks" { - all_examples.remove(example_dir_name.as_str()).unwrap_or_else(|| { - panic!("The example directory {}/{} does not have any corresponding tests in cli_run. Please add one, so if it ever stops working, we'll know about it right away!", examples_dir, example_dir_name); - }); - } - } } - assert_eq!(all_examples, &mut MutMap::default()); - } + #[cfg(all(not(feature = "wasm32-cli-run"), not(feature = "i386-cli-run")))] + fn check_output_regular( + file_name: &Path, + stdin: &[&str], + executable_filename: &str, + expected_ending: &str, + use_valgrind: bool, + ) { + let mut ran_without_optimizations = false; - #[cfg(not(debug_assertions))] - fn check_for_benchmarks(benchmarks_dir: &str, all_benchmarks: &mut MutMap<&str, Example<'_>>) { - use std::ffi::OsStr; - use std::fs::File; - use std::io::Read; + BENCHMARKS_BUILD_PLATFORM.call_once(|| { + // Check with and without optimizations + check_output_with_stdin( + file_name, + stdin, + executable_filename, + &[], + &[], + &[], + expected_ending, + use_valgrind, + false, + ); - let entries = std::fs::read_dir(benchmarks_dir).unwrap_or_else(|err| { - panic!( - "Error trying to read {} as a benchmark directory: {}", - benchmarks_dir, err + ran_without_optimizations = true; + }); + + // now we can pass the `PREBUILT_PLATFORM` flag, because the + // `call_once` will have built the platform + + if !ran_without_optimizations { + // Check with and without optimizations + check_output_with_stdin( + file_name, + stdin, + executable_filename, + &[PREBUILT_PLATFORM], + &[], + &[], + expected_ending, + use_valgrind, + false, + ); + } + + check_output_with_stdin( + file_name, + stdin, + executable_filename, + &[PREBUILT_PLATFORM, OPTIMIZE_FLAG], + &[], + &[], + expected_ending, + use_valgrind, + false, ); - }); + } - for entry in entries { - let entry = entry.unwrap(); - let path = entry.path(); + #[cfg(feature = "wasm32-cli-run")] + fn check_output_wasm( + file_name: &Path, + stdin: &[&str], + executable_filename: &str, + expected_ending: &str, + ) { + // Check with and without optimizations + check_wasm_output_with_stdin( + file_name, + stdin, + executable_filename, + &[], + expected_ending, + ); - if let Some("roc") = path.extension().and_then(OsStr::to_str) { - let benchmark_file_name = entry.file_name().into_string().unwrap(); + check_wasm_output_with_stdin( + file_name, + stdin, + executable_filename, + &[OPTIMIZE_FLAG], + expected_ending, + ); + } - // Verify that this is an app module by reading the first 3 - // bytes of the file. - let buf: &mut [u8] = &mut [0, 0, 0]; - let mut file = File::open(path).unwrap(); + #[cfg(feature = "wasm32-cli-run")] + fn check_wasm_output_with_stdin( + file: &Path, + stdin: &[&str], + executable_filename: &str, + flags: &[&str], + expected_ending: &str, + ) { + let mut flags = flags.to_vec(); + flags.push(concatcp!(TARGET_FLAG, "=wasm32")); - file.read_exact(buf).unwrap(); + let compile_out = run_roc( + [CMD_BUILD, file.to_str().unwrap()] + .iter() + .chain(flags.as_slice()), + &[], + ); + if !compile_out.stderr.is_empty() { + panic!("{}", compile_out.stderr); + } - // Only app modules in this directory are considered benchmarks. - if "app".as_bytes() == buf && !benchmark_file_name.contains("RBTreeDel") { - all_benchmarks.remove(benchmark_file_name.as_str()).unwrap_or_else(|| { - panic!("The benchmark {}/{} does not have any corresponding tests in cli_run. Please add one, so if it ever stops working, we'll know about it right away!", benchmarks_dir, benchmark_file_name); - }); - } + assert!(compile_out.status.success(), "bad status {:?}", compile_out); + + let path = file.with_file_name(executable_filename); + let stdout = crate::run_with_wasmer(&path, stdin); + + if !stdout.ends_with(expected_ending) { + panic!( + "expected output to end with {:?} but instead got {:#?}", + expected_ending, stdout + ); } } - assert_eq!(all_benchmarks, &mut MutMap::default()); + #[cfg(feature = "i386-cli-run")] + fn check_output_i386( + file_name: &Path, + stdin: &[&str], + executable_filename: &str, + expected_ending: &str, + use_valgrind: bool, + ) { + check_output_with_stdin( + &file_name, + stdin, + executable_filename, + &[concatcp!(TARGET_FLAG, "=x86_32")], + &[], + expected_ending, + use_valgrind, + false, + ); + + check_output_with_stdin( + &file_name, + stdin, + executable_filename, + &[concatcp!(TARGET_FLAG, "=x86_32"), OPTIMIZE_FLAG], + &[], + expected_ending, + use_valgrind, + false, + ); + } + + #[test] + fn nqueens() { + test_benchmark("NQueens.roc", "nqueens", &["6"], "4\n", true) + } + + #[test] + fn cfold() { + test_benchmark("CFold.roc", "cfold", &["3"], "11 & 11\n", true) + } + + #[test] + fn deriv() { + test_benchmark( + "Deriv.roc", + "deriv", + &["2"], + "1 count: 6\n2 count: 22\n", + true, + ) + } + + #[test] + fn rbtree_ck() { + test_benchmark("RBTreeCk.roc", "rbtree-ck", &["100"], "10\n", true) + } + + #[test] + fn rbtree_insert() { + test_benchmark( + "RBTreeInsert.roc", + "rbtree-insert", + &[], + "Node Black 0 {} Empty Empty\n", + true, + ) + } + + /* + // rbtree_del does not work + #[test] + fn rbtree_del() { + test_benchmark( + "RBTreeDel.roc", + "rbtree-del", + &["420"], + &[], + "30\n", + true + ) + }*/ + + #[test] + fn astar() { + test_benchmark("TestAStar.roc", "test-astar", &[], "True\n", false) + } + + #[test] + fn base64() { + test_benchmark( + "TestBase64.roc", + "test-base64", + &[], + "encoded: SGVsbG8gV29ybGQ=\ndecoded: Hello World\n", + true, + ) + } + + #[test] + fn closure() { + test_benchmark("Closure.roc", "closure", &[], "", false) + } + + #[test] + fn issue2279() { + test_benchmark("Issue2279.roc", "issue2279", &[], "Hello, world!\n", true) + } + + #[test] + fn quicksort_app() { + test_benchmark( + "QuicksortApp.roc", + "quicksortapp", + &[], + "todo put the correct quicksort answer here", + true, + ) + } } #[test] @@ -1047,6 +921,7 @@ mod cli_run { &[], "I am Dep2.str2\n", true, + false, ); } @@ -1062,6 +937,7 @@ mod cli_run { &[], "I am Dep2.str2\n", true, + false, ); } @@ -1077,6 +953,7 @@ mod cli_run { &[], "I am Dep2.value2\n", true, + false, ); } @@ -1092,6 +969,7 @@ mod cli_run { &[], "I am Dep2.value2\n", true, + false, ); } @@ -1102,7 +980,7 @@ mod cli_run { &[], indoc!( r#" - ── TYPE MISMATCH ─ ...d/../../../../examples/interactive/cli-platform/main.roc ─ + ── TYPE MISMATCH ─ ...known_bad/../../../../examples/cli/cli-platform/main.roc ─ Something is off with the type annotation of the main required symbol: @@ -1123,7 +1001,7 @@ mod cli_run { an instance of this opaque type by doing @Age 23. - ── TYPE MISMATCH ─ ...d/../../../../examples/interactive/cli-platform/main.roc ─ + ── TYPE MISMATCH ─ ...known_bad/../../../../examples/cli/cli-platform/main.roc ─ This 1st argument to toEffect has an unexpected type: diff --git a/crates/cli/tests/known_bad/TypeError.roc b/crates/cli/tests/known_bad/TypeError.roc index fa6060e81a..0d7e15f6d7 100644 --- a/crates/cli/tests/known_bad/TypeError.roc +++ b/crates/cli/tests/known_bad/TypeError.roc @@ -1,5 +1,5 @@ app "type-error" - packages { pf: "../../../../examples/interactive/cli-platform/main.roc" } + packages { pf: "../../../../examples/cli/cli-platform/main.roc" } imports [pf.Stdout.{ line }, pf.Task.{ await }, pf.Program] provides [main] to pf diff --git a/crates/cli_testing_examples/.gitignore b/crates/cli_testing_examples/.gitignore new file mode 100644 index 0000000000..58cb449bb9 --- /dev/null +++ b/crates/cli_testing_examples/.gitignore @@ -0,0 +1,6 @@ +*.dSYM +libhost.a +libapp.so +dynhost +preprocessedhost +metadata diff --git a/examples/algorithms/.gitignore b/crates/cli_testing_examples/algorithms/.gitignore similarity index 100% rename from examples/algorithms/.gitignore rename to crates/cli_testing_examples/algorithms/.gitignore diff --git a/examples/algorithms/README.md b/crates/cli_testing_examples/algorithms/README.md similarity index 100% rename from examples/algorithms/README.md rename to crates/cli_testing_examples/algorithms/README.md diff --git a/examples/algorithms/fibonacci-platform/host.zig b/crates/cli_testing_examples/algorithms/fibonacci-platform/host.zig similarity index 100% rename from examples/algorithms/fibonacci-platform/host.zig rename to crates/cli_testing_examples/algorithms/fibonacci-platform/host.zig diff --git a/examples/algorithms/fibonacci-platform/main.roc b/crates/cli_testing_examples/algorithms/fibonacci-platform/main.roc similarity index 100% rename from examples/algorithms/fibonacci-platform/main.roc rename to crates/cli_testing_examples/algorithms/fibonacci-platform/main.roc diff --git a/examples/algorithms/fibonacci.roc b/crates/cli_testing_examples/algorithms/fibonacci.roc similarity index 100% rename from examples/algorithms/fibonacci.roc rename to crates/cli_testing_examples/algorithms/fibonacci.roc diff --git a/examples/algorithms/quicksort-platform/host.zig b/crates/cli_testing_examples/algorithms/quicksort-platform/host.zig similarity index 100% rename from examples/algorithms/quicksort-platform/host.zig rename to crates/cli_testing_examples/algorithms/quicksort-platform/host.zig diff --git a/examples/algorithms/quicksort-platform/main.roc b/crates/cli_testing_examples/algorithms/quicksort-platform/main.roc similarity index 100% rename from examples/algorithms/quicksort-platform/main.roc rename to crates/cli_testing_examples/algorithms/quicksort-platform/main.roc diff --git a/examples/algorithms/quicksort.roc b/crates/cli_testing_examples/algorithms/quicksort.roc similarity index 100% rename from examples/algorithms/quicksort.roc rename to crates/cli_testing_examples/algorithms/quicksort.roc diff --git a/examples/benchmarks/.gitignore b/crates/cli_testing_examples/benchmarks/.gitignore similarity index 100% rename from examples/benchmarks/.gitignore rename to crates/cli_testing_examples/benchmarks/.gitignore diff --git a/examples/benchmarks/AStar.roc b/crates/cli_testing_examples/benchmarks/AStar.roc similarity index 100% rename from examples/benchmarks/AStar.roc rename to crates/cli_testing_examples/benchmarks/AStar.roc diff --git a/examples/benchmarks/Base64.roc b/crates/cli_testing_examples/benchmarks/Base64.roc similarity index 100% rename from examples/benchmarks/Base64.roc rename to crates/cli_testing_examples/benchmarks/Base64.roc diff --git a/examples/benchmarks/Base64/Decode.roc b/crates/cli_testing_examples/benchmarks/Base64/Decode.roc similarity index 100% rename from examples/benchmarks/Base64/Decode.roc rename to crates/cli_testing_examples/benchmarks/Base64/Decode.roc diff --git a/examples/benchmarks/Base64/Encode.roc b/crates/cli_testing_examples/benchmarks/Base64/Encode.roc similarity index 100% rename from examples/benchmarks/Base64/Encode.roc rename to crates/cli_testing_examples/benchmarks/Base64/Encode.roc diff --git a/examples/benchmarks/Bytes/Decode.roc b/crates/cli_testing_examples/benchmarks/Bytes/Decode.roc similarity index 100% rename from examples/benchmarks/Bytes/Decode.roc rename to crates/cli_testing_examples/benchmarks/Bytes/Decode.roc diff --git a/examples/benchmarks/Bytes/Encode.roc b/crates/cli_testing_examples/benchmarks/Bytes/Encode.roc similarity index 100% rename from examples/benchmarks/Bytes/Encode.roc rename to crates/cli_testing_examples/benchmarks/Bytes/Encode.roc diff --git a/examples/benchmarks/CFold.roc b/crates/cli_testing_examples/benchmarks/CFold.roc similarity index 100% rename from examples/benchmarks/CFold.roc rename to crates/cli_testing_examples/benchmarks/CFold.roc diff --git a/examples/benchmarks/Closure.roc b/crates/cli_testing_examples/benchmarks/Closure.roc similarity index 100% rename from examples/benchmarks/Closure.roc rename to crates/cli_testing_examples/benchmarks/Closure.roc diff --git a/examples/benchmarks/Deriv.roc b/crates/cli_testing_examples/benchmarks/Deriv.roc similarity index 100% rename from examples/benchmarks/Deriv.roc rename to crates/cli_testing_examples/benchmarks/Deriv.roc diff --git a/examples/benchmarks/Issue2279.roc b/crates/cli_testing_examples/benchmarks/Issue2279.roc similarity index 100% rename from examples/benchmarks/Issue2279.roc rename to crates/cli_testing_examples/benchmarks/Issue2279.roc diff --git a/examples/benchmarks/Issue2279Help.roc b/crates/cli_testing_examples/benchmarks/Issue2279Help.roc similarity index 100% rename from examples/benchmarks/Issue2279Help.roc rename to crates/cli_testing_examples/benchmarks/Issue2279Help.roc diff --git a/examples/benchmarks/NQueens.roc b/crates/cli_testing_examples/benchmarks/NQueens.roc similarity index 100% rename from examples/benchmarks/NQueens.roc rename to crates/cli_testing_examples/benchmarks/NQueens.roc diff --git a/examples/benchmarks/Quicksort.roc b/crates/cli_testing_examples/benchmarks/Quicksort.roc similarity index 100% rename from examples/benchmarks/Quicksort.roc rename to crates/cli_testing_examples/benchmarks/Quicksort.roc diff --git a/examples/benchmarks/QuicksortApp.roc b/crates/cli_testing_examples/benchmarks/QuicksortApp.roc similarity index 100% rename from examples/benchmarks/QuicksortApp.roc rename to crates/cli_testing_examples/benchmarks/QuicksortApp.roc diff --git a/examples/benchmarks/RBTreeCk.roc b/crates/cli_testing_examples/benchmarks/RBTreeCk.roc similarity index 100% rename from examples/benchmarks/RBTreeCk.roc rename to crates/cli_testing_examples/benchmarks/RBTreeCk.roc diff --git a/examples/benchmarks/RBTreeDel.roc b/crates/cli_testing_examples/benchmarks/RBTreeDel.roc similarity index 100% rename from examples/benchmarks/RBTreeDel.roc rename to crates/cli_testing_examples/benchmarks/RBTreeDel.roc diff --git a/examples/benchmarks/RBTreeInsert.roc b/crates/cli_testing_examples/benchmarks/RBTreeInsert.roc similarity index 100% rename from examples/benchmarks/RBTreeInsert.roc rename to crates/cli_testing_examples/benchmarks/RBTreeInsert.roc diff --git a/examples/benchmarks/TestAStar.roc b/crates/cli_testing_examples/benchmarks/TestAStar.roc similarity index 100% rename from examples/benchmarks/TestAStar.roc rename to crates/cli_testing_examples/benchmarks/TestAStar.roc diff --git a/examples/benchmarks/TestBase64.roc b/crates/cli_testing_examples/benchmarks/TestBase64.roc similarity index 100% rename from examples/benchmarks/TestBase64.roc rename to crates/cli_testing_examples/benchmarks/TestBase64.roc diff --git a/examples/benchmarks/platform/Effect.roc b/crates/cli_testing_examples/benchmarks/platform/Effect.roc similarity index 100% rename from examples/benchmarks/platform/Effect.roc rename to crates/cli_testing_examples/benchmarks/platform/Effect.roc diff --git a/examples/benchmarks/platform/Task.roc b/crates/cli_testing_examples/benchmarks/platform/Task.roc similarity index 100% rename from examples/benchmarks/platform/Task.roc rename to crates/cli_testing_examples/benchmarks/platform/Task.roc diff --git a/examples/benchmarks/platform/host.zig b/crates/cli_testing_examples/benchmarks/platform/host.zig similarity index 100% rename from examples/benchmarks/platform/host.zig rename to crates/cli_testing_examples/benchmarks/platform/host.zig diff --git a/examples/benchmarks/platform/main.roc b/crates/cli_testing_examples/benchmarks/platform/main.roc similarity index 100% rename from examples/benchmarks/platform/main.roc rename to crates/cli_testing_examples/benchmarks/platform/main.roc diff --git a/examples/platform-switching/.gitignore b/crates/cli_testing_examples/platform-switching/.gitignore similarity index 100% rename from examples/platform-switching/.gitignore rename to crates/cli_testing_examples/platform-switching/.gitignore diff --git a/examples/platform-switching/README.md b/crates/cli_testing_examples/platform-switching/README.md similarity index 100% rename from examples/platform-switching/README.md rename to crates/cli_testing_examples/platform-switching/README.md diff --git a/examples/hello-world/platform/host.c b/crates/cli_testing_examples/platform-switching/c-platform/host.c similarity index 100% rename from examples/hello-world/platform/host.c rename to crates/cli_testing_examples/platform-switching/c-platform/host.c diff --git a/examples/platform-switching/c-platform/main.roc b/crates/cli_testing_examples/platform-switching/c-platform/main.roc similarity index 100% rename from examples/platform-switching/c-platform/main.roc rename to crates/cli_testing_examples/platform-switching/c-platform/main.roc diff --git a/examples/platform-switching/main.roc b/crates/cli_testing_examples/platform-switching/main.roc similarity index 100% rename from examples/platform-switching/main.roc rename to crates/cli_testing_examples/platform-switching/main.roc diff --git a/examples/platform-switching/rocLovesC.roc b/crates/cli_testing_examples/platform-switching/rocLovesC.roc similarity index 100% rename from examples/platform-switching/rocLovesC.roc rename to crates/cli_testing_examples/platform-switching/rocLovesC.roc diff --git a/examples/platform-switching/rocLovesRust.roc b/crates/cli_testing_examples/platform-switching/rocLovesRust.roc similarity index 100% rename from examples/platform-switching/rocLovesRust.roc rename to crates/cli_testing_examples/platform-switching/rocLovesRust.roc diff --git a/examples/platform-switching/rocLovesSwift.roc b/crates/cli_testing_examples/platform-switching/rocLovesSwift.roc similarity index 100% rename from examples/platform-switching/rocLovesSwift.roc rename to crates/cli_testing_examples/platform-switching/rocLovesSwift.roc diff --git a/examples/platform-switching/rocLovesWebAssembly.roc b/crates/cli_testing_examples/platform-switching/rocLovesWebAssembly.roc similarity index 100% rename from examples/platform-switching/rocLovesWebAssembly.roc rename to crates/cli_testing_examples/platform-switching/rocLovesWebAssembly.roc diff --git a/examples/platform-switching/rocLovesZig.roc b/crates/cli_testing_examples/platform-switching/rocLovesZig.roc similarity index 100% rename from examples/platform-switching/rocLovesZig.roc rename to crates/cli_testing_examples/platform-switching/rocLovesZig.roc diff --git a/examples/platform-switching/rust-platform/Cargo.lock b/crates/cli_testing_examples/platform-switching/rust-platform/Cargo.lock similarity index 100% rename from examples/platform-switching/rust-platform/Cargo.lock rename to crates/cli_testing_examples/platform-switching/rust-platform/Cargo.lock diff --git a/examples/platform-switching/rust-platform/Cargo.toml b/crates/cli_testing_examples/platform-switching/rust-platform/Cargo.toml similarity index 85% rename from examples/platform-switching/rust-platform/Cargo.toml rename to crates/cli_testing_examples/platform-switching/rust-platform/Cargo.toml index 8d10ce6eea..29083ca183 100644 --- a/examples/platform-switching/rust-platform/Cargo.toml +++ b/crates/cli_testing_examples/platform-switching/rust-platform/Cargo.toml @@ -16,7 +16,7 @@ name = "host" path = "src/main.rs" [dependencies] -roc_std = { path = "../../../crates/roc_std" } +roc_std = { path = "../../../../crates/roc_std" } libc = "0.2" [workspace] diff --git a/examples/breakout/platform/build.rs b/crates/cli_testing_examples/platform-switching/rust-platform/build.rs similarity index 100% rename from examples/breakout/platform/build.rs rename to crates/cli_testing_examples/platform-switching/rust-platform/build.rs diff --git a/examples/breakout/platform/host.c b/crates/cli_testing_examples/platform-switching/rust-platform/host.c similarity index 100% rename from examples/breakout/platform/host.c rename to crates/cli_testing_examples/platform-switching/rust-platform/host.c diff --git a/examples/platform-switching/rust-platform/main.roc b/crates/cli_testing_examples/platform-switching/rust-platform/main.roc similarity index 100% rename from examples/platform-switching/rust-platform/main.roc rename to crates/cli_testing_examples/platform-switching/rust-platform/main.roc diff --git a/examples/platform-switching/rust-platform/src/lib.rs b/crates/cli_testing_examples/platform-switching/rust-platform/src/lib.rs similarity index 100% rename from examples/platform-switching/rust-platform/src/lib.rs rename to crates/cli_testing_examples/platform-switching/rust-platform/src/lib.rs diff --git a/examples/breakout/platform/src/main.rs b/crates/cli_testing_examples/platform-switching/rust-platform/src/main.rs similarity index 100% rename from examples/breakout/platform/src/main.rs rename to crates/cli_testing_examples/platform-switching/rust-platform/src/main.rs diff --git a/examples/platform-switching/swift-platform/host.h b/crates/cli_testing_examples/platform-switching/swift-platform/host.h similarity index 100% rename from examples/platform-switching/swift-platform/host.h rename to crates/cli_testing_examples/platform-switching/swift-platform/host.h diff --git a/examples/platform-switching/swift-platform/host.swift b/crates/cli_testing_examples/platform-switching/swift-platform/host.swift similarity index 100% rename from examples/platform-switching/swift-platform/host.swift rename to crates/cli_testing_examples/platform-switching/swift-platform/host.swift diff --git a/examples/platform-switching/swift-platform/main.roc b/crates/cli_testing_examples/platform-switching/swift-platform/main.roc similarity index 100% rename from examples/platform-switching/swift-platform/main.roc rename to crates/cli_testing_examples/platform-switching/swift-platform/main.roc diff --git a/examples/platform-switching/web-assembly-platform/README.md b/crates/cli_testing_examples/platform-switching/web-assembly-platform/README.md similarity index 77% rename from examples/platform-switching/web-assembly-platform/README.md rename to crates/cli_testing_examples/platform-switching/web-assembly-platform/README.md index 76f5720e29..a1dba338dc 100644 --- a/examples/platform-switching/web-assembly-platform/README.md +++ b/crates/cli_testing_examples/platform-switching/web-assembly-platform/README.md @@ -3,12 +3,12 @@ To run this website, first compile either of these identical apps: ```bash -# Option A: Compile examples/platform-switching/rocLovesWebAssembly.roc -cargo run -- build --target=wasm32 examples/platform-switching/rocLovesWebAssembly.roc +# Option A: Compile crates/cli_testing_examples/platform-switching/rocLovesWebAssembly.roc +cargo run -- build --target=wasm32 crates/cli_testing_examples/platform-switching/rocLovesWebAssembly.roc -# Option B: Compile examples/platform-switching/main.roc with `pf: "web-assembly-platform/main.roc"` and move the result -cargo run -- build --target=wasm32 examples/platform-switching/main.roc -(cd examples/platform-switching && mv rocLovesPlatforms.wasm web-assembly-platform/rocLovesWebAssembly.wasm) +# Option B: Compile crates/cli_testing_examples/platform-switching/main.roc with `pf: "web-assembly-platform/main.roc"` and move the result +cargo run -- build --target=wasm32 crates/cli_testing_examples/platform-switching/main.roc +(cd crates/cli_testing_examples/platform-switching && mv rocLovesPlatforms.wasm web-assembly-platform/rocLovesWebAssembly.wasm) ``` Then `cd` into the website directory @@ -16,7 +16,7 @@ and run any web server that can handle WebAssembly. For example, with `http-server`: ```bash -cd examples/platform-switching/web-assembly-platform +cd crates/cli_testing_examples/platform-switching/web-assembly-platform npm install -g http-server http-server ``` diff --git a/examples/platform-switching/web-assembly-platform/host.js b/crates/cli_testing_examples/platform-switching/web-assembly-platform/host.js similarity index 100% rename from examples/platform-switching/web-assembly-platform/host.js rename to crates/cli_testing_examples/platform-switching/web-assembly-platform/host.js diff --git a/examples/platform-switching/web-assembly-platform/host.test.js b/crates/cli_testing_examples/platform-switching/web-assembly-platform/host.test.js similarity index 100% rename from examples/platform-switching/web-assembly-platform/host.test.js rename to crates/cli_testing_examples/platform-switching/web-assembly-platform/host.test.js diff --git a/examples/platform-switching/web-assembly-platform/host.zig b/crates/cli_testing_examples/platform-switching/web-assembly-platform/host.zig similarity index 100% rename from examples/platform-switching/web-assembly-platform/host.zig rename to crates/cli_testing_examples/platform-switching/web-assembly-platform/host.zig diff --git a/examples/platform-switching/web-assembly-platform/index.html b/crates/cli_testing_examples/platform-switching/web-assembly-platform/index.html similarity index 100% rename from examples/platform-switching/web-assembly-platform/index.html rename to crates/cli_testing_examples/platform-switching/web-assembly-platform/index.html diff --git a/examples/platform-switching/web-assembly-platform/main.roc b/crates/cli_testing_examples/platform-switching/web-assembly-platform/main.roc similarity index 100% rename from examples/platform-switching/web-assembly-platform/main.roc rename to crates/cli_testing_examples/platform-switching/web-assembly-platform/main.roc diff --git a/examples/platform-switching/zig-platform/host.zig b/crates/cli_testing_examples/platform-switching/zig-platform/host.zig similarity index 100% rename from examples/platform-switching/zig-platform/host.zig rename to crates/cli_testing_examples/platform-switching/zig-platform/host.zig diff --git a/examples/platform-switching/zig-platform/main.roc b/crates/cli_testing_examples/platform-switching/zig-platform/main.roc similarity index 100% rename from examples/platform-switching/zig-platform/main.roc rename to crates/cli_testing_examples/platform-switching/zig-platform/main.roc diff --git a/crates/cli_utils/src/bench_utils.rs b/crates/cli_utils/src/bench_utils.rs index fd1e874cdc..31da15a8e7 100644 --- a/crates/cli_utils/src/bench_utils.rs +++ b/crates/cli_utils/src/bench_utils.rs @@ -1,4 +1,4 @@ -use crate::helpers::{example_file, run_cmd, run_roc}; +use crate::helpers::{file_path_from_root, run_cmd, run_roc}; use criterion::{black_box, measurement::Measurement, BenchmarkGroup}; use std::{path::Path, thread}; @@ -111,7 +111,7 @@ fn bench_cmd( pub fn bench_nqueens(bench_group_opt: Option<&mut BenchmarkGroup>) { exec_bench_w_input( - &example_file("benchmarks", "NQueens.roc"), + &file_path_from_root("crates/cli_testing_examples/benchmarks", "NQueens.roc"), "11", "nqueens", "2680\n", //2680-14200 @@ -121,7 +121,7 @@ pub fn bench_nqueens(bench_group_opt: Option<&mut BenchmarkGroup pub fn bench_cfold(bench_group_opt: Option<&mut BenchmarkGroup>) { exec_bench_w_input( - &example_file("benchmarks", "CFold.roc"), + &file_path_from_root("crates/cli_testing_examples/benchmarks", "CFold.roc"), "17", "cfold", "396354 & 396354\n", @@ -131,7 +131,7 @@ pub fn bench_cfold(bench_group_opt: Option<&mut BenchmarkGroup(bench_group_opt: Option<&mut BenchmarkGroup>) { exec_bench_w_input( - &example_file("benchmarks", "Deriv.roc"), + &file_path_from_root("crates/cli_testing_examples/benchmarks", "Deriv.roc"), "8", "deriv", "1 count: 6\n2 count: 22\n3 count: 90\n4 count: 420\n5 count: 2202\n6 count: 12886\n7 count: 83648\n8 count: 598592\n", @@ -141,7 +141,7 @@ pub fn bench_deriv(bench_group_opt: Option<&mut BenchmarkGroup(bench_group_opt: Option<&mut BenchmarkGroup>) { exec_bench_w_input( - &example_file("benchmarks", "RBTreeCk.roc"), + &file_path_from_root("crates/cli_testing_examples/benchmarks", "RBTreeCk.roc"), "80000", "rbtree-ck", "8000\n", @@ -152,7 +152,7 @@ pub fn bench_rbtree_ck(bench_group_opt: Option<&mut BenchmarkGro #[allow(dead_code)] pub fn bench_rbtree_delete(bench_group_opt: Option<&mut BenchmarkGroup>) { exec_bench_w_input( - &example_file("benchmarks", "RBTreeDel.roc"), + &file_path_from_root("crates/cli_testing_examples/benchmarks", "RBTreeDel.roc"), "100000", "rbtree-del", "7000\n", @@ -162,7 +162,7 @@ pub fn bench_rbtree_delete(bench_group_opt: Option<&mut Benchmar pub fn bench_quicksort(bench_group_opt: Option<&mut BenchmarkGroup>) { exec_bench_w_input( - &example_file("benchmarks", "QuicksortApp.roc"), + &file_path_from_root("crates/cli_testing_examples/benchmarks", "QuicksortApp.roc"), "1", // 1 for sorting large list, 0 for a small list "quicksortapp", "[0, 0, 1, 1, 2, 2, 2, 3, 3, 4, 6, 6, 7, 7, 8, 8, 8, 8, 8, 8, 9, 10, 10, 11, 11, 12, 13, 13, 14, 14, 14, 15, 15, 15, 16, 16, 18, 18, 19, 19, 19, 20, 21, 21, 21, 21, 22, 23, 23, 23, 25, 26, 27, 27, 28, 28, 28, 29, 29, 29, 29, 30, 31, 32, 33, 34, 35, 35, 35, 36, 36, 36, 37, 38, 38, 39, 39, 39, 39, 39, 39, 40, 40, 41, 42, 42, 42, 42, 42, 43, 43, 44, 46, 47, 47, 47, 48, 50, 51, 51, 52, 52, 52, 53, 54, 54, 55, 55, 55, 56, 57, 57, 58, 58, 58, 58, 58, 59, 59, 60, 60, 61, 62, 63, 63, 63, 63, 64, 65, 65, 65, 66, 66, 66, 66, 67, 67, 68, 69, 69, 70, 70, 71, 71, 71, 72, 72, 73, 73, 73, 74, 75, 75, 75, 76, 78, 79, 79, 80, 81, 81, 82, 82, 83, 83, 84, 84, 86, 86, 87, 87, 88, 88, 88, 89, 89, 90, 90, 90, 91, 92, 92, 92, 93, 93, 93, 94, 95, 95, 96, 97, 98, 99, 100, 100, 101, 102, 102, 102, 104, 104, 105, 106, 106, 106, 106, 106, 106, 107, 107, 108, 108, 108, 109, 109, 109, 109, 110, 112, 112, 112, 113, 113, 113, 113, 113, 114, 115, 117, 117, 117, 118, 119, 119, 119, 120, 120, 121, 123, 124, 125, 125, 126, 126, 126, 126, 127, 129, 131, 131, 131, 131, 131, 131, 131, 132, 133, 133, 134, 134, 134, 135, 135, 135, 135, 135, 137, 138, 138, 138, 139, 139, 140, 141, 142, 142, 142, 144, 144, 145, 145, 145, 147, 147, 147, 147, 148, 149, 149, 149, 150, 150, 151, 151, 151, 151, 153, 155, 156, 159, 160, 160, 160, 161, 161, 162, 162, 162, 162, 162, 162, 163, 163, 163, 163, 163, 163, 164, 164, 164, 164, 164, 165, 165, 165, 165, 165, 166, 166, 166, 166, 166, 167, 167, 167, 167, 168, 169, 170, 170, 170, 170, 172, 172, 172, 173, 173, 173, 174, 175, 176, 177, 177, 178, 178, 178, 178, 179, 179, 180, 180, 181, 181, 182, 183, 183, 185, 186, 186, 186, 186, 186, 186, 186, 187, 187, 187, 188, 188, 188, 190, 190, 190, 190, 190, 192, 193, 194, 194, 194, 195, 195, 196, 197, 198, 198, 198, 199, 199, 199, 200, 200, 201, 201, 201, 204, 205, 205, 205, 207, 207, 207, 208, 208, 208, 208, 210, 210, 210, 210, 211, 211, 213, 214, 214, 214, 218, 218, 218, 218, 218, 218, 219, 221, 222, 223, 223, 223, 224, 224, 224, 224, 224, 224, 224, 225, 226, 226, 226, 226, 226, 227, 227, 228, 228, 229, 229, 229, 229, 230, 230, 230, 230, 232, 233, 233, 234, 235, 236, 236, 237, 237, 238, 240, 240, 242, 242, 243, 244, 246, 247, 247, 247, 247, 248, 248, 248, 249, 249, 249, 249, 249, 250, 250, 250, 251, 251, 252, 252, 253, 255, 255, 256, 256, 256, 257, 257, 257, 258, 258, 258, 258, 258, 259, 259, 260, 260, 260, 261, 261, 261, 262, 263, 265, 265, 266, 267, 267, 267, 268, 268, 268, 270, 270, 270, 271, 271, 273, 274, 274, 274, 275, 277, 277, 279, 279, 280, 281, 281, 282, 283, 283, 285, 286, 288, 288, 289, 289, 290, 290, 290, 290, 290, 291, 291, 291, 291, 292, 292, 292, 293, 294, 294, 295, 295, 295, 295, 295, 298, 298, 301, 301, 301, 302, 302, 303, 304, 305, 305, 306, 307, 307, 308, 308, 309, 309, 309, 309, 310, 310, 311, 311, 311, 312, 313, 313, 313, 314, 315, 316, 316, 316, 316, 317, 318, 318, 319, 319, 319, 320, 321, 321, 322, 322, 322, 322, 323, 323, 323, 324, 324, 324, 325, 326, 326, 328, 329, 329, 330, 330, 330, 331, 331, 331, 331, 332, 332, 333, 333, 333, 333, 334, 334, 334, 335, 336, 336, 337, 337, 337, 337, 339, 339, 340, 341, 341, 343, 344, 344, 345, 345, 345, 346, 346, 347, 348, 348, 348, 349, 350, 351, 351, 351, 352, 353, 354, 354, 354, 355, 356, 356, 357, 358, 358, 358, 359, 359, 360, 361, 361, 362, 362, 363, 364, 364, 365, 365, 365, 366, 366, 367, 367, 368, 368, 369, 369, 369, 370, 370, 370, 370, 370, 371, 372, 373, 373, 374, 374, 375, 375, 376, 377, 377, 378, 379, 381, 381, 383, 384, 385, 385, 385, 385, 386, 386, 387, 388, 388, 388, 389, 389, 390, 391, 391, 391, 392, 392, 393, 393, 394, 394, 394, 395, 395, 396, 396, 397, 397, 398, 399, 400, 400, 401, 401, 402, 402, 403, 404, 404, 405, 406, 406, 407, 407, 407, 408, 408, 408, 408, 408, 409, 409, 409, 411, 411, 412, 412, 413, 413, 413, 413, 413, 414, 414, 414, 415, 416, 416, 416, 416, 417, 417, 418, 418, 418, 418, 419, 420, 420, 420, 421, 421, 422, 422, 423, 423, 423, 424, 424, 424, 424, 425, 425, 425, 426, 426, 427, 427, 427, 428, 428, 429, 429, 429, 430, 430, 431, 432, 433, 433, 433, 434, 434, 434, 434, 437, 438, 438, 438, 438, 438, 439, 440, 441, 441, 442, 442, 443, 444, 444, 444, 445, 445, 445, 447, 447, 447, 448, 448, 449, 449, 450, 450, 450, 451, 452, 453, 453, 453, 453, 455, 455, 456, 456, 457, 458, 459, 459, 460, 460, 461, 461, 464, 465, 465, 465, 466, 466, 467, 467, 467, 467, 468, 469, 469, 470, 470, 471, 471, 471, 472, 473, 473, 473, 473, 474, 475, 475, 475, 476, 476, 476, 477, 477, 477, 478, 478, 479, 481, 481, 481, 482, 482, 482, 483, 483, 483, 484, 484, 485, 488, 488, 488, 488, 489, 490, 491, 491, 491, 492, 492, 493, 493, 493, 493, 493, 495, 495, 496, 496, 496, 496, 496, 496, 497, 497, 498, 498, 498, 498, 498, 499, 500, 500, 501, 501, 501, 502, 502, 502, 502, 503, 503, 503, 505, 505, 506, 507, 507, 507, 507, 508, 508, 510, 510, 510, 511, 511, 512, 512, 513, 513, 513, 513, 514, 514, 515, 516, 517, 518, 519, 519, 519, 520, 521, 521, 522, 522, 523, 523, 523, 525, 525, 526, 527, 527, 527, 528, 528, 528, 530, 531, 532, 532, 532, 532, 532, 535, 535, 537, 538, 538, 538, 540, 540, 540, 541, 541, 541, 541, 541, 542, 543, 543, 543, 543, 544, 544, 545, 545, 545, 546, 547, 547, 547, 548, 549, 549, 551, 552, 552, 553, 553, 553, 554, 554, 554, 555, 556, 557, 557, 557, 558, 558, 558, 559, 559, 559, 560, 560, 560, 561, 561, 561, 561, 562, 562, 562, 563, 563, 565, 566, 566, 567, 568, 569, 570, 570, 571, 571, 571, 571, 572, 572, 572, 574, 575, 576, 576, 577, 580, 581, 581, 582, 582, 582, 583, 583, 584, 585, 585, 585, 586, 587, 587, 588, 588, 588, 589, 591, 591, 591, 592, 592, 592, 593, 593, 593, 594, 594, 594, 594, 595, 595, 595, 596, 596, 596, 596, 596, 597, 597, 599, 599, 600, 600, 601, 601, 601, 602, 602, 603, 603, 604, 605, 605, 605, 606, 607, 608, 610, 612, 612, 613, 613, 614, 614, 615, 615, 615, 616, 616, 616, 617, 617, 619, 619, 619, 619, 620, 621, 621, 622, 624, 624, 624, 624, 625, 625, 628, 628, 628, 629, 629, 630, 630, 630, 630, 632, 633, 633, 634, 635, 638, 638, 639, 640, 641, 641, 643, 643, 644, 644, 644, 645, 645, 645, 646, 646, 646, 647, 647, 647, 647, 648, 648, 649, 650, 650, 650, 650, 650, 650, 651, 652, 652, 652, 653, 653, 653, 653, 654, 655, 655, 655, 655, 656, 657, 657, 657, 658, 658, 659, 659, 659, 659, 659, 660, 660, 661, 662, 663, 664, 665, 666, 666, 666, 667, 667, 667, 667, 667, 668, 668, 669, 670, 670, 670, 671, 672, 672, 672, 672, 672, 673, 673, 674, 674, 674, 675, 676, 676, 677, 678, 678, 679, 679, 680, 681, 681, 682, 683, 683, 684, 684, 685, 686, 686, 686, 686, 687, 687, 688, 690, 690, 691, 691, 693, 693, 694, 694, 697, 697, 698, 700, 701, 702, 702, 703, 703, 703, 704, 705, 706, 706, 707, 708, 708, 709, 709, 710, 710, 711, 712, 712, 712, 712, 712, 712, 713, 713, 714, 714, 716, 716, 716, 717, 717, 717, 718, 718, 718, 718, 719, 719, 719, 720, 720, 721, 721, 722, 723, 724, 725, 726, 726, 727, 729, 729, 729, 730, 730, 731, 731, 732, 732, 734, 734, 734, 735, 735, 736, 736, 736, 737, 737, 738, 739, 740, 740, 740, 741, 741, 742, 742, 742, 742, 744, 744, 744, 744, 745, 745, 745, 745, 746, 748, 749, 749, 749, 750, 750, 751, 751, 751, 752, 752, 753, 753, 754, 755, 756, 756, 756, 757, 757, 757, 757, 757, 761, 761, 762, 762, 762, 763, 763, 763, 763, 763, 764, 764, 764, 764, 765, 765, 766, 766, 766, 766, 767, 767, 767, 770, 770, 770, 770, 770, 771, 772, 772, 772, 773, 774, 775, 775, 775, 775, 776, 778, 778, 779, 779, 780, 780, 780, 781, 784, 784, 784, 786, 786, 786, 786, 787, 788, 789, 789, 789, 790, 791, 791, 792, 793, 793, 793, 794, 794, 795, 796, 797, 797, 798, 799, 799, 799, 800, 800, 800, 800, 801, 802, 802, 802, 802, 804, 806, 806, 806, 807, 807, 807, 807, 808, 809, 810, 810, 811, 812, 812, 812, 812, 812, 813, 813, 813, 814, 814, 814, 815, 816, 816, 817, 817, 817, 818, 818, 818, 819, 820, 820, 820, 820, 820, 821, 821, 823, 824, 824, 824, 825, 826, 826, 826, 826, 828, 828, 829, 829, 829, 829, 829, 830, 831, 831, 831, 831, 831, 832, 832, 833, 833, 833, 834, 834, 835, 835, 835, 835, 835, 836, 836, 836, 837, 839, 839, 839, 839, 839, 840, 840, 840, 841, 841, 842, 843, 844, 844, 844, 845, 845, 845, 845, 845, 846, 846, 846, 847, 847, 848, 848, 848, 849, 849, 850, 850, 851, 852, 852, 852, 852, 853, 855, 856, 857, 857, 858, 858, 858, 859, 860, 861, 861, 861, 861, 862, 863, 863, 863, 865, 865, 865, 866, 867, 867, 867, 868, 868, 870, 871, 872, 872, 873, 873, 873, 874, 874, 874, 875, 875, 875, 876, 877, 878, 878, 878, 878, 878, 879, 879, 879, 879, 880, 881, 881, 881, 882, 883, 885, 886, 886, 887, 887, 888, 888, 889, 889, 890, 890, 890, 892, 892, 892, 892, 893, 893, 894, 894, 894, 895, 896, 896, 896, 897, 899, 899, 900, 901, 901, 901, 901, 905, 905, 905, 905, 906, 907, 907, 907, 908, 908, 908, 908, 908, 908, 909, 909, 910, 910, 910, 912, 913, 913, 914, 914, 914, 915, 916, 916, 916, 916, 917, 917, 918, 919, 919, 919, 920, 920, 920, 920, 921, 921, 922, 923, 923, 923, 923, 923, 924, 925, 927, 927, 927, 928, 928, 929, 929, 929, 929, 930, 930, 931, 932, 932, 932, 933, 933, 934, 934, 935, 935, 936, 937, 937, 937, 939, 940, 940, 941, 941, 941, 941, 942, 942, 943, 943, 945, 946, 946, 946, 948, 949, 949, 951, 953, 953, 954, 954, 954, 954, 954, 955, 956, 956, 956, 957, 957, 957, 957, 959, 960, 960, 961, 961, 963, 963, 963, 964, 964, 964, 964, 965, 966, 967, 968, 969, 969, 970, 972, 972, 973, 973, 974, 975, 975, 975, 976, 977, 978, 978, 979, 979, 980, 980, 980, 980, 981, 982, 982, 984, 986, 986, 986, 986, 986, 987, 988, 988, 990, 990, 990, 990, 990, 991, 991, 991, 991, 991, 991, 992, 992, 992, 992, 992, 993, 993, 993, 993, 995, 996, 996, 996, 997, 997, 997, 997, 997, 998, 998, 998, 999, 999, 1000, 1001, 1001, 1002, 1003, 1003, 1004, 1004, 1004, 1006, 1007, 1007, 1007, 1008, 1008, 1008, 1009, 1010, 1010, 1011, 1011, 1012, 1012, 1012, 1013, 1013, 1013, 1014, 1014, 1014, 1016, 1016, 1016, 1017, 1017, 1017, 1018, 1018, 1018, 1019, 1019, 1020, 1020, 1021, 1021, 1021, 1022, 1023, 1023, 1023, 1024, 1024, 1024, 1025, 1026, 1026, 1027, 1028, 1028, 1028, 1028, 1029, 1029, 1029, 1030, 1031, 1031, 1032, 1033, 1034, 1034, 1035, 1035, 1036, 1038, 1039, 1039, 1040, 1040, 1040, 1040, 1040, 1040, 1042, 1042, 1043, 1043, 1043, 1043, 1044, 1045, 1045, 1045, 1045, 1047, 1047, 1048, 1048, 1049, 1049, 1050, 1050, 1051, 1051, 1053, 1053, 1053, 1054, 1054, 1055, 1055, 1056, 1056, 1057, 1057, 1058, 1058, 1058, 1058, 1059, 1059, 1059, 1061, 1061, 1061, 1061, 1062, 1062, 1062, 1063, 1063, 1063, 1063, 1064, 1064, 1064, 1064, 1064, 1065, 1065, 1066, 1066, 1067, 1067, 1069, 1069, 1069, 1070, 1071, 1071, 1072, 1072, 1072, 1073, 1073, 1074, 1074, 1074, 1075, 1076, 1077, 1077, 1078, 1078, 1078, 1079, 1079, 1079, 1081, 1082, 1082, 1083, 1084, 1084, 1084, 1084, 1085, 1085, 1086, 1086, 1087, 1087, 1088, 1088, 1089, 1089, 1090, 1090, 1090, 1091, 1093, 1093, 1093, 1094, 1094, 1094, 1094, 1095, 1095, 1095, 1095, 1095, 1095, 1096, 1097, 1098, 1098, 1098, 1098, 1100, 1102, 1102, 1103, 1103, 1103, 1104, 1104, 1105, 1105, 1105, 1105, 1106, 1106, 1106, 1106, 1107, 1107, 1107, 1108, 1110, 1111, 1111, 1112, 1113, 1113, 1113, 1113, 1115, 1115, 1115, 1115, 1115, 1116, 1116, 1117, 1117, 1119, 1119, 1119, 1121, 1122, 1122, 1122, 1122, 1123, 1124, 1124, 1125, 1125, 1127, 1127, 1127, 1128, 1129, 1129, 1129, 1130, 1130, 1131, 1131, 1132, 1132, 1132, 1132, 1134, 1135, 1137, 1137, 1138, 1138, 1138, 1138, 1139, 1140, 1140, 1140, 1140, 1142, 1142, 1142, 1142, 1142, 1142, 1143, 1143, 1145, 1145, 1148, 1148, 1150, 1150, 1151, 1151, 1151, 1152, 1152, 1152, 1153, 1153, 1154, 1155, 1156, 1156, 1156, 1156, 1157, 1158, 1158, 1158, 1159, 1159, 1159, 1160, 1160, 1161, 1161, 1161, 1162, 1162, 1163, 1163, 1163, 1164, 1164, 1165, 1165, 1167, 1167, 1167, 1168, 1168, 1168, 1169, 1170, 1170, 1171, 1171, 1171, 1172, 1172, 1172, 1173, 1173, 1173, 1174, 1174, 1174, 1174, 1176, 1176, 1176, 1176, 1176, 1177, 1178, 1178, 1178, 1179, 1179, 1179, 1180, 1180, 1181, 1181, 1182, 1182, 1182, 1183, 1183, 1184, 1184, 1184, 1184, 1184, 1185, 1186, 1186, 1188, 1188, 1189, 1189, 1190, 1190, 1191, 1191, 1191, 1192, 1192, 1193, 1193, 1195, 1197, 1197, 1198, 1198, 1198, 1199, 1199, 1199, 1200, 1201, 1201, 1201, 1202, 1202, 1202, 1202, 1204, 1204, 1205, 1205, 1205, 1205, 1205, 1206, 1206, 1206, 1207, 1207, 1207, 1207, 1207, 1207, 1209, 1210, 1210, 1211, 1212, 1213, 1213, 1214, 1214, 1215, 1215, 1216, 1216, 1217, 1217, 1217, 1219, 1219, 1219, 1219, 1220, 1220, 1222, 1222, 1223, 1224, 1224, 1225, 1225, 1226, 1226, 1226, 1227, 1227, 1227, 1227, 1227, 1227, 1228, 1228, 1228, 1229, 1230, 1230, 1232, 1232, 1232, 1232, 1232, 1232, 1233, 1234, 1235, 1235, 1235, 1236, 1237, 1238, 1239, 1240, 1240, 1240, 1240, 1240, 1240, 1241, 1241, 1242, 1243, 1243, 1243, 1243, 1244, 1244, 1246, 1246, 1247, 1247, 1249, 1250, 1251, 1251, 1252, 1252, 1252, 1252, 1252, 1252, 1253, 1253, 1253, 1253, 1254, 1254, 1255, 1256, 1257, 1257, 1257, 1259, 1259, 1261, 1261, 1262, 1263, 1263, 1264, 1265, 1265, 1265, 1266, 1266, 1268, 1268, 1269, 1270, 1270, 1270, 1270, 1271, 1271, 1271, 1271, 1272, 1272, 1273, 1273, 1274, 1274, 1274, 1274, 1275, 1275, 1275, 1275, 1276, 1276, 1276, 1276, 1276, 1277, 1278, 1279, 1279, 1280, 1280, 1281, 1282, 1282, 1283, 1283, 1284, 1284, 1284, 1286, 1286, 1289, 1290, 1290, 1290, 1291, 1292, 1292, 1293, 1293, 1294, 1296, 1296, 1296, 1296, 1297, 1297, 1297, 1298, 1299, 1300, 1300, 1301, 1302, 1303, 1304, 1304, 1305, 1305, 1306, 1306, 1307, 1307, 1307, 1307, 1307, 1308, 1308, 1308, 1308, 1309, 1309, 1310, 1311, 1312, 1312, 1313, 1313, 1313, 1314, 1315, 1316, 1316, 1316, 1317, 1319, 1320, 1320, 1320, 1320, 1321, 1322, 1322, 1323, 1323, 1323, 1324, 1324, 1325, 1327, 1328, 1329, 1329, 1330, 1330, 1330, 1330, 1332, 1332, 1332, 1333, 1333, 1334, 1335, 1335, 1336, 1336, 1336, 1338, 1338, 1338, 1339, 1339, 1340, 1340, 1340, 1341, 1341, 1341, 1342, 1343, 1343, 1345, 1345, 1345, 1346, 1346, 1346, 1346, 1346, 1346, 1347, 1348, 1349, 1349, 1349, 1349, 1351, 1352, 1353, 1353, 1353, 1354, 1354, 1355, 1355, 1356, 1356, 1356, 1356, 1358, 1358, 1359, 1359, 1359, 1359, 1359, 1360, 1360, 1360, 1361, 1361, 1361, 1362, 1362, 1363, 1363, 1363, 1365, 1365, 1366, 1367, 1367, 1370, 1371, 1371, 1372, 1372, 1373, 1373, 1373, 1374, 1375, 1375, 1375, 1377, 1377, 1378, 1378, 1378, 1380, 1380, 1381, 1381, 1381, 1382, 1382, 1382, 1382, 1382, 1382, 1383, 1383, 1383, 1384, 1384, 1384, 1385, 1385, 1385, 1385, 1386, 1386, 1387, 1387, 1388, 1388, 1388, 1389, 1389, 1389, 1392, 1393, 1393, 1394, 1394, 1395, 1395, 1395, 1396, 1397, 1398, 1398, 1398, 1399, 1399, 1399, 1400, 1401, 1402, 1402, 1402, 1403, 1404, 1405, 1406, 1406, 1406, 1406, 1407, 1407, 1407, 1407, 1409, 1409, 1409, 1410, 1410, 1410, 1410, 1410, 1411, 1411, 1412, 1413, 1413, 1413, 1414, 1414, 1415, 1415, 1415, 1416, 1416, 1416, 1417, 1417, 1417, 1417, 1417, 1419, 1420, 1420, 1420, 1421, 1422, 1422, 1422, 1422, 1425, 1426, 1427, 1427, 1428, 1428, 1430, 1431, 1431, 1432, 1432, 1432, 1433, 1433, 1434, 1434, 1434, 1434, 1434, 1435, 1436, 1436, 1436, 1436, 1436, 1437, 1438, 1438, 1438, 1438, 1439, 1439, 1440, 1440, 1440, 1440, 1441, 1441, 1442, 1443, 1444, 1444, 1444, 1444, 1444, 1444, 1444, 1444, 1445, 1446, 1446, 1446, 1447, 1448, 1449, 1449, 1450, 1450, 1450, 1451, 1451, 1452, 1452, 1452, 1453, 1454, 1455, 1456, 1458, 1459, 1459, 1459, 1459, 1460, 1460, 1461, 1461, 1461, 1462, 1462, 1462, 1462, 1462, 1462, 1463, 1463, 1465, 1465, 1465, 1466, 1467, 1468, 1469, 1470, 1472, 1472, 1473, 1474, 1474, 1474, 1474, 1475, 1476, 1477, 1477, 1477, 1477, 1478, 1478, 1480, 1481, 1481, 1481, 1481, 1481, 1481, 1482, 1482, 1482, 1483, 1484, 1485, 1485, 1486, 1486, 1486, 1488, 1488, 1489, 1489, 1489, 1491, 1491, 1492, 1492, 1493, 1495, 1495, 1495, 1496, 1496, 1497, 1497, 1497, 1497, 1497, 1498, 1498, 1499, 1500, 1500, 1501, 1501, 1501, 1501, 1502, 1503, 1503, 1503, 1503, 1503, 1503, 1504, 1505, 1505, 1505, 1506, 1506, 1506, 1506, 1509, 1509, 1509, 1510, 1510, 1511, 1511, 1511, 1511, 1512, 1513, 1513, 1513, 1514, 1514, 1515, 1516, 1516, 1517, 1517, 1518, 1518, 1519, 1519, 1520, 1521, 1522, 1522, 1524, 1525, 1525, 1525, 1525, 1526, 1526, 1526, 1526, 1526, 1526, 1528, 1528, 1528, 1529, 1532, 1532, 1532, 1534, 1534, 1535, 1536, 1536, 1536, 1537, 1537, 1538, 1538, 1538, 1539, 1539, 1539, 1539, 1540, 1541, 1542, 1542, 1543, 1544, 1544, 1544, 1545, 1545, 1545, 1546, 1547, 1547, 1547, 1547, 1547, 1548, 1550, 1551, 1551, 1551, 1551, 1552, 1552, 1552, 1552, 1553, 1554, 1554, 1554, 1555, 1555, 1555, 1555, 1556, 1556, 1557, 1558, 1559, 1559, 1559, 1560, 1560, 1560, 1560, 1561, 1561, 1562, 1562, 1563, 1564, 1564, 1565, 1565, 1565, 1566, 1567, 1567, 1568, 1568, 1569, 1569, 1570, 1570, 1570, 1571, 1571, 1571, 1571, 1572, 1572, 1572, 1573, 1573, 1573, 1573, 1574, 1574, 1575, 1575, 1575, 1575, 1575, 1576, 1576, 1576, 1576, 1576, 1578, 1578, 1578, 1579, 1579, 1579, 1580, 1581, 1581, 1581, 1581, 1581, 1582, 1582, 1582, 1582, 1583, 1583, 1586, 1586, 1586, 1586, 1586, 1587, 1588, 1589, 1590, 1591, 1591, 1591, 1594, 1595, 1595, 1595, 1596, 1598, 1598, 1599, 1600, 1600, 1601, 1601, 1601, 1602, 1602, 1602, 1603, 1603, 1605, 1605, 1606, 1607, 1608, 1608, 1608, 1609, 1609, 1609, 1609, 1611, 1611, 1612, 1612, 1612, 1612, 1612, 1612, 1614, 1615, 1615, 1615, 1615, 1616, 1618, 1618, 1619, 1620, 1621, 1621, 1621, 1622, 1623, 1623, 1624, 1624, 1624, 1624, 1625, 1625, 1625, 1626, 1626, 1627, 1627, 1627, 1629, 1629, 1630, 1630, 1631, 1631, 1634, 1634, 1634, 1634, 1634, 1634, 1635, 1636, 1639, 1639, 1640, 1641, 1641, 1641, 1642, 1642, 1643, 1645, 1645, 1645, 1646, 1647, 1647, 1647, 1648, 1649, 1649, 1649, 1649, 1649, 1651, 1652, 1653, 1653, 1655, 1655, 1655, 1655, 1655, 1655, 1657, 1657, 1657, 1658, 1658, 1659, 1659, 1659, 1659, 1660, 1660, 1660, 1660, 1662, 1663, 1663, 1664, 1664, 1666, 1666, 1666, 1666, 1668, 1669, 1669, 1669, 1671, 1671, 1672, 1672, 1673, 1673, 1673, 1673, 1674, 1674, 1675, 1675, 1675, 1677, 1677, 1677, 1677, 1678, 1678, 1678, 1679, 1679, 1679, 1679, 1680, 1680, 1680, 1681, 1681, 1681, 1682, 1682, 1682, 1683, 1683, 1683, 1684, 1684, 1684, 1685, 1685, 1686, 1687, 1688, 1688, 1688, 1689, 1689, 1691, 1691, 1691, 1692, 1693, 1693, 1693, 1696, 1697, 1697, 1698, 1699, 1700, 1700, 1701, 1702, 1703, 1703, 1705, 1705, 1705, 1707, 1708, 1708, 1708, 1709, 1711, 1712, 1712, 1712, 1714, 1714, 1714, 1714, 1715, 1716, 1716, 1717, 1718, 1718, 1719, 1719, 1719, 1720, 1720, 1720, 1721, 1721, 1722, 1722, 1722, 1722, 1722, 1723, 1723, 1724, 1724, 1725, 1726, 1726, 1727, 1727, 1728, 1728, 1730, 1731, 1731, 1734, 1735, 1735, 1735, 1736, 1737, 1737, 1738, 1738, 1738, 1739, 1739, 1739, 1739, 1739, 1740, 1740, 1740, 1740, 1740, 1741, 1741, 1741, 1741, 1741, 1742, 1743, 1744, 1744, 1744, 1745, 1746, 1746, 1747, 1748, 1749, 1749, 1749, 1749, 1751, 1751, 1751, 1752, 1752, 1752, 1752, 1753, 1754, 1755, 1755, 1755, 1756, 1756, 1757, 1757, 1757, 1757, 1758, 1759, 1759, 1759, 1760, 1760, 1762, 1764, 1766, 1766, 1767, 1767, 1768, 1769, 1769, 1770, 1770, 1770, 1771, 1772, 1773, 1774, 1775, 1775, 1775, 1776, 1776, 1776, 1777, 1777, 1778, 1778, 1779, 1779, 1780, 1780, 1781, 1782, 1784, 1784, 1784, 1785, 1785, 1785, 1785, 1787, 1788, 1789, 1789, 1789, 1790, 1790, 1790, 1791, 1791, 1791, 1791, 1791, 1792, 1792, 1793, 1793, 1793, 1793, 1794, 1794, 1795, 1795, 1796, 1796, 1797, 1797, 1798, 1798, 1798, 1799, 1799, 1800, 1800, 1800, 1801, 1801, 1802, 1802, 1804, 1804, 1804, 1806, 1806, 1808, 1809, 1810, 1810, 1811, 1811, 1814, 1814, 1814, 1815, 1815, 1816, 1816, 1816, 1816, 1817, 1817, 1818, 1819, 1819, 1819, 1820, 1820, 1820, 1821, 1821, 1822, 1823, 1823, 1824, 1824, 1824, 1825, 1825, 1825, 1826, 1826, 1826, 1827, 1827, 1827, 1828, 1828, 1830, 1831, 1832, 1832, 1832, 1832, 1833, 1833, 1833, 1833, 1835, 1837, 1838, 1839, 1840, 1840, 1840, 1840, 1840, 1840, 1841, 1842, 1842, 1843, 1843, 1844, 1844, 1844, 1844, 1844, 1845, 1846, 1847, 1847, 1847, 1848, 1849, 1849, 1849, 1850, 1850, 1850, 1851, 1851, 1851, 1852, 1852, 1853, 1853, 1853, 1854, 1854, 1855, 1855, 1855, 1855, 1855, 1855, 1856, 1856, 1856, 1856, 1857, 1857, 1857, 1857, 1858, 1859, 1859, 1860, 1860, 1860, 1860, 1861, 1861, 1863, 1863, 1865, 1865, 1866, 1866, 1866, 1866, 1866, 1867, 1867, 1867, 1867, 1867, 1868, 1869, 1869, 1869, 1869, 1869, 1869, 1870, 1870, 1870, 1870, 1871, 1872, 1873, 1874, 1875, 1875, 1876, 1876, 1876, 1876, 1877, 1877, 1878, 1878, 1878, 1879, 1879, 1880, 1880, 1880, 1881, 1881, 1883, 1883, 1885, 1885, 1885, 1885, 1885, 1885, 1886, 1886, 1886, 1887, 1887, 1887, 1887, 1888, 1888, 1890, 1891, 1891, 1891, 1892, 1894, 1894, 1894, 1894, 1896, 1896, 1896, 1896, 1897, 1899, 1899, 1900, 1900, 1901, 1901, 1902, 1903, 1904, 1905, 1905, 1905, 1906, 1906, 1906, 1907, 1907, 1908, 1908, 1909, 1910, 1910, 1911, 1912, 1912, 1912, 1913, 1914, 1914, 1914, 1915, 1915, 1915, 1916, 1916, 1916, 1917, 1918, 1918, 1919, 1919, 1920, 1920, 1920, 1920, 1921, 1921, 1922, 1923, 1925, 1925, 1925, 1925, 1926, 1928, 1929, 1929, 1930, 1930, 1931, 1931, 1931, 1931, 1932, 1932, 1932, 1932, 1932, 1933, 1933, 1933, 1933, 1934, 1934, 1934, 1934, 1934, 1935, 1935, 1935, 1936, 1937, 1938, 1938, 1938, 1938, 1940, 1941, 1941, 1941, 1942, 1942, 1943, 1943, 1944, 1944, 1944, 1944, 1945, 1946, 1946, 1947, 1948, 1948, 1948, 1949, 1949, 1949, 1949, 1949, 1950, 1950, 1950, 1951, 1951, 1951, 1951, 1951, 1952, 1953, 1955, 1955, 1956, 1956, 1956, 1957, 1957, 1957, 1958, 1958, 1960, 1960, 1960, 1960, 1961, 1963, 1965, 1965, 1965, 1967, 1967, 1968, 1968, 1969, 1969, 1969, 1969, 1970, 1970, 1971, 1971, 1971, 1972, 1972, 1973, 1973, 1973, 1973, 1973, 1974, 1974, 1975, 1975, 1976, 1976, 1976, 1976, 1977, 1978, 1978, 1979, 1979, 1979, 1980, 1980, 1981, 1981, 1982, 1982, 1982, 1983, 1983, 1983, 1984, 1984, 1986, 1986, 1987, 1989, 1989, 1989, 1989, 1989, 1990, 1990, 1990, 1991, 1991, 1991, 1991, 1992, 1992, 1994, 1994, 1994, 1995, 1995, 1995, 1995, 1995, 1996, 1996, 1996, 1997, 1997, 1998, 1998, 1998, 1998, 1999, 1999, 2000, 2000, 2002, 2003, 2003, 2005, 2009, 2010, 2010, 2011, 2012, 2013, 2014, 2014, 2015, 2016, 2016, 2016, 2016, 2016, 2017, 2018, 2019, 2020, 2020, 2021, 2021, 2021, 2021, 2024, 2026, 2027, 2027, 2028, 2028, 2029, 2029, 2030, 2031, 2032, 2032, 2033, 2034, 2035, 2035, 2036, 2036, 2036, 2036, 2036, 2037, 2037, 2037, 2037, 2038, 2038, 2039, 2039, 2039, 2040, 2041, 2041, 2042, 2042, 2042, 2042, 2042, 2042, 2042, 2043, 2044, 2044, 2045, 2045, 2045, 2046, 2047, 2047, 2048, 2048, 2049, 2051, 2051, 2052, 2052, 2054, 2054, 2054, 2054, 2055, 2056, 2056, 2057, 2058, 2058, 2059, 2059, 2062, 2063, 2063, 2063, 2063, 2063, 2063, 2064, 2064, 2065, 2065, 2065, 2065, 2066, 2066, 2067, 2067, 2068, 2068, 2068, 2068, 2068, 2069, 2070, 2070, 2071, 2071, 2071, 2072, 2073, 2073, 2073, 2075, 2075, 2075, 2076, 2077, 2077, 2078, 2078, 2079, 2079, 2079, 2079, 2080, 2080, 2080, 2081, 2082, 2082, 2082, 2082, 2083, 2083, 2083, 2084, 2084, 2084, 2085, 2085, 2086, 2086, 2086, 2087, 2087, 2087, 2088, 2088, 2088, 2088, 2088, 2089, 2089, 2089, 2089, 2089, 2089, 2089, 2090, 2091, 2091, 2091, 2091, 2092, 2093, 2093, 2094, 2094, 2095, 2096, 2096, 2097, 2097, 2097, 2097, 2098, 2098, 2098, 2098, 2099, 2100, 2102, 2102, 2102, 2102, 2102, 2104, 2104, 2104, 2105, 2105, 2106, 2106, 2107, 2108, 2109, 2109, 2110, 2110, 2111, 2111, 2112, 2114, 2115, 2115, 2116, 2117, 2117, 2118, 2119, 2119, 2119, 2120, 2121, 2121, 2121, 2122, 2122, 2122, 2123, 2124, 2124, 2125, 2125, 2125, 2125, 2127, 2127, 2127, 2127, 2128, 2128, 2128, 2128, 2128, 2129, 2129, 2130, 2131, 2131, 2131, 2132, 2132, 2132, 2133, 2133, 2133, 2133, 2133, 2133, 2133, 2133, 2134, 2135, 2136, 2137, 2137, 2137, 2138, 2138, 2139, 2140, 2140, 2140, 2140, 2142, 2143, 2144, 2144, 2145, 2145, 2145, 2145, 2146, 2146, 2146, 2147, 2147, 2147, 2147, 2147, 2148, 2148, 2148, 2148, 2149, 2149, 2149, 2150, 2151, 2151, 2153, 2153, 2153, 2153, 2154, 2154, 2154, 2155, 2155, 2156, 2157, 2157, 2157, 2157, 2158, 2158, 2158, 2158, 2158, 2159, 2159, 2160, 2160, 2160, 2160, 2161, 2162, 2162, 2162, 2162, 2162, 2163, 2164, 2164, 2167, 2168, 2169, 2169, 2169, 2170, 2172, 2172, 2172, 2172, 2172, 2173, 2173, 2174, 2174, 2175, 2175, 2176, 2176, 2176, 2176, 2177, 2177, 2179, 2179, 2180, 2180, 2180, 2183, 2183, 2183, 2183, 2184, 2185, 2185, 2185, 2185, 2186, 2186, 2186, 2187, 2187, 2188, 2189, 2189, 2189, 2190, 2190, 2191, 2191, 2191, 2191, 2191, 2192, 2193, 2194, 2194, 2195, 2195, 2195, 2195, 2196, 2196, 2197, 2197, 2197, 2198, 2198, 2198, 2199, 2199, 2199, 2200, 2200, 2201, 2201, 2202, 2202, 2202, 2203, 2203, 2204, 2205, 2205, 2205, 2205, 2205, 2206, 2206, 2206, 2207, 2207, 2207, 2210, 2210, 2212, 2213, 2214, 2214, 2215, 2216, 2216, 2216, 2217, 2217, 2219, 2219, 2219, 2219, 2220, 2220, 2221, 2221, 2222, 2222, 2223, 2223, 2224, 2224, 2225, 2225, 2226, 2226, 2226, 2226, 2227, 2228, 2228, 2228, 2229, 2229, 2229, 2230, 2230, 2231, 2231, 2232, 2232, 2232, 2234, 2234, 2234, 2235, 2235, 2236, 2237, 2237, 2238, 2238, 2239, 2239, 2239, 2240, 2240, 2241, 2241, 2241, 2242, 2244, 2244, 2245, 2245, 2245, 2245, 2246, 2248, 2249, 2250, 2251, 2251, 2251, 2251, 2252, 2252, 2253, 2254, 2254, 2255, 2256, 2256, 2256, 2258, 2258, 2258, 2259, 2259, 2259, 2259, 2260, 2260, 2261, 2261, 2262, 2262, 2262, 2263, 2265, 2265, 2265, 2265, 2266, 2266, 2267, 2268, 2269, 2269, 2270, 2270, 2271, 2271, 2272, 2273, 2273, 2273, 2275, 2275, 2276, 2276, 2277, 2277, 2278, 2278, 2280, 2280, 2281, 2282, 2282, 2282, 2282, 2284, 2284, 2284, 2284, 2285, 2285, 2286, 2287, 2287, 2288, 2288, 2289, 2291, 2292, 2292, 2293, 2294, 2295, 2296, 2296, 2297, 2298, 2298, 2299, 2299, 2299, 2300, 2300, 2301, 2301, 2301, 2302, 2302, 2302, 2302, 2303, 2303, 2303, 2304, 2304, 2306, 2306, 2307, 2307, 2307, 2307, 2309, 2309, 2309, 2310, 2310, 2310, 2310, 2311, 2311, 2311, 2312, 2312, 2312, 2313, 2313, 2316, 2317, 2317, 2317, 2317, 2317, 2317, 2317, 2318, 2318, 2319, 2319, 2319, 2320, 2322, 2323, 2323, 2324, 2324, 2324, 2325, 2326, 2327, 2327, 2328, 2329, 2330, 2331, 2332, 2333, 2333, 2334, 2334, 2336, 2336, 2337, 2337, 2338, 2338, 2339, 2339, 2339, 2340, 2340, 2340, 2341, 2342, 2343, 2344, 2345, 2345, 2345, 2345, 2346, 2346, 2347, 2347, 2347, 2347, 2349, 2349, 2349, 2350, 2350, 2351, 2351, 2351, 2351, 2352, 2352, 2353, 2354, 2355, 2356, 2356, 2358, 2359, 2360, 2361, 2362, 2362, 2362, 2363, 2363, 2363, 2364, 2365, 2365, 2365, 2365, 2366, 2367, 2367, 2367, 2367, 2368, 2370, 2370, 2370, 2372, 2372, 2372, 2372, 2372, 2373, 2373, 2373, 2374, 2374, 2375, 2375, 2375, 2376, 2376, 2377, 2377, 2377, 2377, 2378, 2379, 2379, 2380, 2380, 2380, 2381, 2382, 2382, 2382, 2382, 2384, 2384, 2384, 2385, 2387, 2387, 2387, 2388, 2389, 2389, 2389, 2389, 2389, 2390, 2391, 2391, 2392, 2392, 2392, 2394, 2394, 2395, 2395, 2395, 2396, 2396, 2397, 2397, 2397, 2397, 2398, 2398, 2398, 2399, 2400, 2401, 2402, 2404, 2404, 2405, 2405, 2405, 2407, 2408, 2409, 2409, 2409, 2409, 2410, 2410, 2410, 2410, 2410, 2410, 2410, 2411, 2411, 2412, 2412, 2414, 2414, 2415, 2415, 2416, 2416, 2417, 2417, 2418, 2418, 2420, 2421, 2422, 2424, 2424, 2424, 2425, 2425, 2426, 2426, 2426, 2426, 2427, 2427, 2427, 2427, 2427, 2428, 2430, 2432, 2432, 2432, 2432, 2433, 2433, 2433, 2433, 2433, 2434, 2435, 2435, 2435, 2435, 2436, 2437, 2437, 2437, 2437, 2438, 2438, 2439, 2439, 2439, 2440, 2440, 2441, 2441, 2441, 2442, 2443, 2443, 2444, 2444, 2444, 2444, 2447, 2447, 2448, 2448, 2448, 2449, 2449, 2449, 2450, 2451, 2451, 2451, 2453, 2453, 2454, 2454, 2454, 2454, 2455, 2456, 2456, 2457, 2457, 2457, 2458, 2458, 2458, 2459, 2459, 2459, 2459, 2460, 2460, 2461, 2461, 2462, 2463, 2463, 2463, 2463, 2464, 2464, 2464, 2464, 2464, 2465, 2465, 2465, 2466, 2467, 2467, 2467, 2467, 2469, 2470, 2471, 2471, 2472, 2472, 2473, 2473, 2473, 2474, 2474, 2474, 2474, 2475, 2475, 2476, 2476, 2477, 2478, 2479, 2482, 2482, 2483, 2483, 2485, 2485, 2485, 2485, 2486, 2487, 2488, 2489, 2489, 2490, 2490, 2491, 2491, 2491, 2493, 2494, 2494, 2495, 2495, 2495, 2495, 2495, 2495, 2496, 2496, 2496, 2496, 2497, 2497, 2497, 2498, 2498, 2499, 2501, 2502, 2503, 2504, 2504, 2505, 2506, 2506, 2507, 2508, 2508, 2508, 2509, 2509, 2513, 2513, 2513, 2513, 2514, 2514, 2515, 2515, 2516, 2516, 2516, 2518, 2518, 2519, 2519, 2519, 2519, 2520, 2520, 2520, 2520, 2521, 2521, 2521, 2522, 2523, 2523, 2523, 2524, 2524, 2524, 2524, 2525, 2525, 2527, 2527, 2527, 2527, 2527, 2528, 2528, 2529, 2531, 2531, 2532, 2532, 2532, 2533, 2534, 2534, 2535, 2535, 2535, 2536, 2537, 2537, 2537, 2538, 2538, 2539, 2539, 2539, 2539, 2539, 2541, 2541, 2541, 2542, 2542, 2543, 2544, 2544, 2544, 2544, 2545, 2545, 2545, 2546, 2546, 2546, 2546, 2547, 2547, 2547, 2548, 2548, 2548, 2550, 2550, 2550, 2550, 2550, 2551, 2552, 2552, 2553, 2554, 2554, 2554, 2555, 2555, 2556, 2556, 2557, 2557, 2557, 2558, 2560, 2561, 2561, 2561, 2561, 2562, 2563, 2563, 2564, 2564, 2564, 2566, 2566, 2566, 2566, 2566, 2566, 2567, 2567, 2567, 2568, 2569, 2569, 2569, 2571, 2572, 2573, 2573, 2574, 2574, 2576, 2576, 2577, 2577, 2578, 2580, 2580, 2581, 2581, 2581, 2581, 2584, 2584, 2585, 2586, 2587, 2587, 2588, 2588, 2588, 2589, 2589, 2590, 2590, 2591, 2591, 2591, 2592, 2592, 2592, 2593, 2593, 2593, 2594, 2594, 2594, 2596, 2596, 2597, 2598, 2599, 2599, 2599, 2600, 2601, 2601, 2602, 2603, 2603, 2604, 2604, 2604, 2605, 2607, 2608, 2608, 2609, 2609, 2609, 2609, 2611, 2611, 2612, 2612, 2613, 2613, 2613, 2613, 2613, 2614, 2614, 2615, 2615, 2615, 2615, 2615, 2616, 2616, 2617, 2617, 2617, 2618, 2619, 2619, 2620, 2621, 2622, 2622, 2622, 2623, 2624, 2625, 2627, 2628, 2628, 2628, 2628, 2629, 2630, 2630, 2630, 2630, 2631, 2632, 2632, 2632, 2632, 2633, 2633, 2633, 2633, 2633, 2634, 2634, 2635, 2636, 2636, 2636, 2636, 2637, 2637, 2637, 2637, 2637, 2638, 2638, 2638, 2638, 2640, 2640, 2644, 2646, 2646, 2647, 2648, 2649, 2650, 2650, 2650, 2651, 2651, 2651, 2651, 2652, 2652, 2653, 2654, 2654, 2654, 2654, 2655, 2655, 2656, 2656, 2657, 2657, 2657, 2659, 2659, 2660, 2660, 2660, 2660, 2661, 2661, 2662, 2662, 2663, 2663, 2663, 2664, 2665, 2665, 2665, 2666, 2667, 2668, 2670, 2670, 2670, 2670, 2672, 2672, 2673, 2673, 2674, 2674, 2675, 2676, 2676, 2676, 2676, 2677, 2677, 2677, 2677, 2677, 2677, 2679, 2680, 2681, 2683, 2683, 2684, 2684, 2684, 2684, 2685, 2686, 2687, 2688, 2688, 2688, 2689, 2689, 2689, 2689, 2690, 2690, 2690, 2690, 2691, 2691, 2692, 2692, 2692, 2692, 2693, 2693, 2694, 2694, 2694, 2694, 2694, 2695, 2695, 2695, 2696, 2697, 2698, 2699, 2700, 2700, 2701, 2702, 2702, 2704, 2704, 2704, 2705, 2705, 2705, 2705, 2706, 2707, 2707, 2708, 2708, 2710, 2710, 2710, 2711, 2711, 2711, 2711, 2711, 2711, 2712, 2713, 2713, 2714, 2715, 2716, 2717, 2717, 2718, 2718, 2718, 2718, 2719, 2719, 2720, 2722, 2723, 2723, 2724, 2724, 2725, 2726, 2726, 2727, 2728, 2729, 2729, 2729, 2729, 2730, 2731, 2732, 2733, 2734, 2734, 2734, 2735, 2735, 2736, 2736, 2736, 2737, 2738, 2739, 2739, 2740, 2740, 2741, 2741, 2742, 2742, 2743, 2743, 2743, 2744, 2744, 2746, 2747, 2748, 2748, 2748, 2748, 2749, 2749, 2749, 2750, 2750, 2750, 2752, 2752, 2754, 2754, 2754, 2755, 2755, 2756, 2756, 2757, 2757, 2758, 2758, 2759, 2759, 2759, 2759, 2761, 2762, 2762, 2762, 2762, 2762, 2763, 2763, 2763, 2764, 2764, 2764, 2765, 2766, 2766, 2766, 2766, 2767, 2767, 2768, 2769, 2770, 2770, 2770, 2770, 2771, 2771, 2771, 2772, 2772, 2772, 2772, 2774, 2776, 2776, 2776, 2776, 2776, 2777, 2778, 2779, 2779, 2779, 2780, 2780, 2780, 2781, 2781, 2782, 2783, 2783, 2784, 2784, 2784, 2785, 2785, 2786, 2786, 2786, 2787, 2787, 2787, 2787, 2788, 2788, 2789, 2789, 2789, 2789, 2790, 2790, 2790, 2790, 2791, 2791, 2791, 2791, 2792, 2792, 2792, 2792, 2792, 2793, 2793, 2794, 2795, 2795, 2796, 2796, 2797, 2797, 2798, 2800, 2800, 2801, 2801, 2801, 2802, 2802, 2803, 2803, 2804, 2804, 2805, 2805, 2805, 2805, 2805, 2805, 2806, 2806, 2806, 2807, 2808, 2809, 2809, 2809, 2809, 2809, 2809, 2810, 2810, 2811, 2811, 2811, 2812, 2812, 2812, 2813, 2816, 2816, 2816, 2817, 2817, 2818, 2818, 2818, 2818, 2818, 2819, 2819, 2819, 2820, 2820, 2820, 2821, 2821, 2821, 2822, 2823, 2823, 2823, 2824, 2824, 2824, 2825, 2826, 2826, 2826, 2827, 2827, 2827, 2827, 2827, 2827, 2828, 2828, 2830, 2830, 2830, 2831, 2831, 2833, 2833, 2833, 2833, 2835, 2836, 2838, 2838, 2838, 2839, 2839, 2840, 2840, 2841, 2842, 2842, 2843, 2844, 2845, 2845, 2846, 2846, 2848, 2848, 2848, 2849, 2850, 2851, 2852, 2852, 2852, 2853, 2853, 2853, 2854, 2854, 2855, 2855, 2856, 2856, 2857, 2857, 2857, 2857, 2858, 2858, 2859, 2859, 2859, 2860, 2861, 2861, 2861, 2862, 2862, 2863, 2863, 2863, 2864, 2865, 2868, 2868, 2868, 2868, 2868, 2869, 2869, 2870, 2870, 2870, 2871, 2871, 2871, 2872, 2873, 2874, 2875, 2875, 2876, 2876, 2877, 2877, 2878, 2879, 2880, 2880, 2881, 2882, 2884, 2884, 2884, 2885, 2885, 2886, 2887, 2887, 2887, 2887, 2887, 2888, 2888, 2888, 2888, 2889, 2889, 2889, 2890, 2890, 2890, 2891, 2893, 2894, 2895, 2896, 2896, 2897, 2897, 2898, 2898, 2898, 2900, 2900, 2901, 2901, 2902, 2902, 2902, 2902, 2903, 2904, 2904, 2904, 2904, 2905, 2905, 2905, 2906, 2907, 2907, 2908, 2908, 2908, 2908, 2909, 2909, 2910, 2911, 2911, 2911, 2912, 2913, 2914, 2915, 2916, 2916, 2918, 2918, 2919, 2919, 2919, 2920, 2921, 2921, 2922, 2922, 2922, 2923, 2923, 2923, 2924, 2925, 2926, 2926, 2926, 2927, 2927, 2927, 2928, 2929, 2930, 2931, 2931, 2932, 2932, 2932, 2934, 2934, 2934, 2935, 2935, 2935, 2936, 2937, 2938, 2939, 2940, 2940, 2941, 2942, 2942, 2943, 2943, 2943, 2944, 2944, 2944, 2944, 2944, 2945, 2946, 2946, 2947, 2947, 2948, 2949, 2950, 2950, 2951, 2952, 2954, 2954, 2954, 2955, 2955, 2956, 2957, 2958, 2958, 2959, 2959, 2960, 2960, 2960, 2962, 2962, 2964, 2964, 2965, 2965, 2965, 2966, 2966, 2967, 2967, 2968, 2969, 2969, 2969, 2970, 2970, 2971, 2972, 2972, 2972, 2972, 2972, 2974, 2974, 2974, 2976, 2976, 2977, 2978, 2979, 2980, 2980, 2980, 2980, 2981, 2981, 2982, 2982, 2983, 2984, 2984, 2986, 2987, 2987, 2988, 2988, 2988, 2989, 2989, 2989, 2990, 2990, 2991, 2991, 2991, 2992, 2993, 2994, 2995, 2995, 2995, 2995, 2996, 2996, 2997, 2997, 2997, 2998, 2999, 2999, 2999, 2999, 2999, 2999, 3000, 3000, 3000, 3000, 3001, 3001, 3002, 3003, 3003, 3004, 3005, 3005, 3005, 3007, 3007, 3008, 3008, 3009, 3009, 3009, 3010, 3010, 3010, 3010, 3011, 3011, 3013, 3013, 3014, 3015, 3015, 3016, 3016, 3016, 3016, 3017, 3018, 3018, 3018, 3018, 3019, 3020, 3020, 3021, 3021, 3021, 3022, 3024, 3026, 3026, 3026, 3026, 3027, 3028, 3028, 3028, 3028, 3030, 3030, 3031, 3035, 3036, 3036, 3036, 3037, 3037, 3038, 3038, 3039, 3039, 3041, 3041, 3041, 3042, 3043, 3043, 3044, 3044, 3045, 3045, 3045, 3045, 3045, 3046, 3047, 3048, 3048, 3048, 3049, 3049, 3049, 3050, 3050, 3051, 3051, 3051, 3051, 3052, 3052, 3052, 3053, 3054, 3054, 3054, 3054, 3055, 3055, 3055, 3055, 3057, 3057, 3057, 3058, 3059, 3060, 3060, 3060, 3060, 3061, 3062, 3063, 3063, 3063, 3064, 3065, 3065, 3066, 3068, 3068, 3068, 3068, 3068, 3068, 3069, 3071, 3072, 3072, 3072, 3073, 3074, 3074, 3074, 3075, 3077, 3077, 3078, 3078, 3079, 3079, 3079, 3079, 3081, 3081, 3081, 3082, 3082, 3082, 3082, 3083, 3083, 3084, 3084, 3084, 3086, 3086, 3087, 3087, 3087, 3087, 3088, 3089, 3089, 3090, 3091, 3092, 3092, 3093, 3093, 3094, 3094, 3094, 3095, 3095, 3096, 3097, 3097, 3098, 3099, 3100, 3101, 3101, 3102, 3102, 3104, 3104, 3105, 3107, 3108, 3108, 3109, 3109, 3109, 3110, 3110, 3111, 3111, 3111, 3112, 3112, 3112, 3112, 3112, 3113, 3113, 3113, 3113, 3113, 3114, 3115, 3116, 3116, 3116, 3117, 3117, 3117, 3118, 3118, 3119, 3119, 3119, 3120, 3120, 3120, 3121, 3121, 3121, 3122, 3122, 3122, 3122, 3123, 3123, 3124, 3126, 3127, 3127, 3127, 3127, 3128, 3128, 3128, 3128, 3129, 3130, 3130, 3131, 3131, 3131, 3131, 3131, 3132, 3132, 3132, 3133, 3133, 3134, 3135, 3136, 3136, 3136, 3137, 3138, 3140, 3140, 3141, 3142, 3142, 3143, 3143, 3143, 3143, 3143, 3144, 3145, 3146, 3146, 3146, 3147, 3148, 3149, 3149, 3150, 3150, 3150, 3150, 3150, 3150, 3151, 3151, 3152, 3152, 3154, 3154, 3155, 3155, 3155, 3156, 3156, 3157, 3158, 3158, 3159, 3160, 3160, 3161, 3161, 3161, 3162, 3162, 3163, 3164, 3164, 3165, 3165, 3166, 3166, 3166, 3167, 3167, 3168, 3168, 3168, 3169, 3169, 3170, 3170, 3170, 3170, 3171, 3172, 3172, 3173, 3175, 3175, 3177, 3177, 3178, 3178, 3179, 3180, 3180, 3180, 3181, 3182, 3182, 3182, 3183, 3184, 3184, 3184, 3185, 3186, 3187, 3187, 3188, 3189, 3189, 3189, 3190, 3190, 3191, 3192, 3192, 3193, 3193, 3193, 3194, 3194, 3194, 3194, 3195, 3195, 3196, 3196, 3196, 3196, 3198, 3198, 3198, 3198, 3198, 3199, 3199, 3199, 3200, 3200, 3202, 3202, 3203, 3203, 3203, 3205, 3206, 3207, 3207, 3207, 3208, 3208, 3208, 3208, 3209, 3209, 3210, 3210, 3211, 3211, 3211, 3212, 3212, 3213, 3213, 3213, 3214, 3214, 3215, 3216, 3216, 3217, 3218, 3218, 3219, 3219, 3220, 3222, 3223, 3223, 3223, 3224, 3224, 3224, 3224, 3225, 3225, 3225, 3225, 3226, 3227, 3228, 3228, 3228, 3228, 3228, 3228, 3229, 3230, 3230, 3231, 3233, 3234, 3234, 3234, 3235, 3235, 3236, 3236, 3237, 3237, 3239, 3239, 3239, 3240, 3240, 3241, 3241, 3241, 3241, 3243, 3243, 3243, 3243, 3243, 3243, 3243, 3243, 3245, 3245, 3246, 3246, 3246, 3247, 3247, 3247, 3247, 3248, 3248, 3249, 3250, 3250, 3251, 3251, 3252, 3252, 3253, 3253, 3254, 3254, 3255, 3256, 3257, 3257, 3257, 3259, 3259, 3260, 3260, 3261, 3262, 3263, 3263, 3263, 3264, 3266, 3266, 3266, 3267, 3267, 3267, 3267, 3267, 3268, 3268, 3268, 3269, 3269, 3269, 3270, 3270, 3270, 3270, 3271, 3272, 3272, 3272, 3272, 3273, 3273, 3273, 3274, 3274, 3275, 3275, 3276, 3276, 3276, 3278, 3278, 3279, 3280, 3280, 3280, 3280, 3281, 3282, 3284, 3284, 3284, 3285, 3285, 3285, 3285, 3286, 3286, 3287, 3288, 3288, 3289, 3289, 3289, 3289, 3290, 3292, 3292, 3292, 3293, 3293, 3293, 3293, 3294, 3294, 3297, 3297, 3298, 3299, 3301, 3301, 3302, 3302, 3302, 3302, 3303, 3304, 3305, 3305, 3305, 3305, 3306, 3306, 3306, 3306, 3306, 3306, 3308, 3308, 3308, 3308, 3309, 3309, 3310, 3310, 3311, 3311, 3311, 3311, 3312, 3313, 3313, 3313, 3314, 3314, 3315, 3315, 3316, 3318, 3320, 3320, 3321, 3321, 3321, 3322, 3322, 3323, 3323, 3323, 3324, 3324, 3327, 3329, 3329, 3330, 3330, 3330, 3331, 3331, 3331, 3331, 3331, 3333, 3334, 3335, 3336, 3336, 3336, 3337, 3337, 3337, 3338, 3338, 3339, 3339, 3339, 3339, 3340, 3340, 3340, 3340, 3341, 3341, 3341, 3344, 3345, 3345, 3346, 3347, 3347, 3347, 3347, 3347, 3348, 3348, 3348, 3348, 3349, 3349, 3349, 3350, 3350, 3351, 3351, 3352, 3352, 3352, 3352, 3353, 3354, 3357, 3358, 3358, 3358, 3358, 3359, 3359, 3359, 3360, 3360, 3361, 3361, 3361, 3362, 3363, 3363, 3363, 3365, 3365, 3367, 3367, 3367, 3368, 3369, 3369, 3369, 3370, 3370, 3371, 3372, 3372, 3373, 3374, 3374, 3377, 3377, 3377, 3377, 3378, 3379, 3379, 3380, 3380, 3381, 3381, 3382, 3383, 3383, 3383, 3384, 3384, 3385, 3385, 3385, 3386, 3386, 3387, 3387, 3388, 3388, 3388, 3389, 3389, 3389, 3390, 3392, 3393, 3394, 3394, 3394, 3395, 3396, 3397, 3397, 3397, 3398, 3398, 3398, 3398, 3399, 3399, 3400, 3400, 3400, 3401, 3401, 3402, 3402, 3402, 3402, 3403, 3403, 3405, 3405, 3405, 3405, 3405, 3406, 3407, 3407, 3408, 3410, 3410, 3411, 3411, 3411, 3412, 3412, 3412, 3413, 3414, 3414, 3414, 3414, 3415, 3415, 3417, 3419, 3419, 3420, 3420, 3420, 3421, 3421, 3421, 3422, 3422, 3423, 3423, 3423, 3423, 3424, 3425, 3425, 3425, 3426, 3427, 3427, 3428, 3428, 3429, 3429, 3430, 3431, 3431, 3431, 3432, 3432, 3432, 3434, 3435, 3435, 3435, 3436, 3437, 3438, 3438, 3438, 3439, 3439, 3439, 3440, 3440, 3441, 3441, 3442, 3443, 3443, 3443, 3444, 3444, 3444, 3445, 3445, 3445, 3446, 3446, 3447, 3447, 3447, 3448, 3448, 3449, 3449, 3449, 3450, 3450, 3450, 3451, 3452, 3452, 3453, 3453, 3454, 3454, 3454, 3454, 3455, 3456, 3456, 3456, 3457, 3457, 3460, 3461, 3461, 3461, 3462, 3462, 3462, 3463, 3463, 3463, 3463, 3463, 3464, 3464, 3464, 3466, 3467, 3467, 3467, 3468, 3468, 3469, 3470, 3471, 3472, 3473, 3473, 3473, 3474, 3475, 3475, 3475, 3476, 3476, 3476, 3478, 3479, 3479, 3480, 3481, 3481, 3481, 3482, 3483, 3484, 3484, 3485, 3485, 3486, 3486, 3486, 3486, 3487, 3487, 3487, 3487, 3489, 3489, 3490, 3490, 3490, 3491, 3491, 3491, 3492, 3492, 3493, 3493, 3494, 3494, 3494, 3495, 3495, 3495, 3495, 3495, 3495, 3495, 3496, 3497, 3497, 3498, 3498, 3499, 3499, 3499, 3499, 3500, 3501, 3501, 3503, 3503, 3503, 3504, 3504, 3504, 3504, 3504, 3505, 3505, 3505, 3506, 3507, 3508, 3508, 3508, 3511, 3511, 3511, 3511, 3511, 3511, 3511, 3512, 3512, 3512, 3512, 3513, 3514, 3514, 3514, 3515, 3515, 3516, 3517, 3517, 3518, 3518, 3518, 3518, 3519, 3520, 3520, 3520, 3520, 3521, 3521, 3521, 3521, 3521, 3524, 3525, 3527, 3528, 3528, 3530, 3530, 3531, 3532, 3532, 3533, 3534, 3534, 3534, 3535, 3535, 3535, 3535, 3536, 3537, 3537, 3538, 3539, 3539, 3539, 3539, 3540, 3540, 3540, 3541, 3541, 3541, 3543, 3544, 3544, 3547, 3548, 3548, 3549, 3549, 3550, 3551, 3551, 3551, 3551, 3552, 3553, 3553, 3553, 3553, 3554, 3554, 3554, 3554, 3555, 3555, 3556, 3556, 3557, 3558, 3558, 3558, 3558, 3559, 3559, 3560, 3560, 3560, 3561, 3561, 3562, 3562, 3563, 3565, 3566, 3566, 3566, 3566, 3567, 3567, 3567, 3567, 3568, 3569, 3569, 3570, 3570, 3571, 3572, 3572, 3573, 3573, 3573, 3574, 3574, 3575, 3575, 3576, 3577, 3578, 3579, 3581, 3581, 3582, 3582, 3582, 3583, 3583, 3583, 3583, 3583, 3584, 3584, 3585, 3586, 3586, 3587, 3587, 3588, 3588, 3588, 3589, 3591, 3591, 3593, 3594, 3594, 3595, 3596, 3596, 3597, 3599, 3599, 3599, 3600, 3600, 3600, 3601, 3601, 3602, 3602, 3602, 3603, 3604, 3605, 3607, 3608, 3609, 3609, 3609, 3609, 3610, 3610, 3611, 3612, 3612, 3613, 3614, 3614, 3615, 3615, 3615, 3615, 3615, 3616, 3617, 3617, 3617, 3617, 3619, 3619, 3619, 3621, 3621, 3621, 3622, 3623, 3624, 3624, 3625, 3627, 3628, 3628, 3628, 3628, 3629, 3630, 3630, 3630, 3631, 3631, 3631, 3631, 3632, 3633, 3633, 3633, 3634, 3634, 3634, 3636, 3637, 3638, 3638, 3638, 3639, 3639, 3639, 3639, 3641, 3642, 3642, 3642, 3643, 3643, 3643, 3643, 3644, 3644, 3645, 3646, 3646, 3647, 3647, 3647, 3647, 3648, 3648, 3649, 3649, 3650, 3650, 3651, 3652, 3652, 3653, 3653, 3654, 3655, 3656, 3656, 3657, 3658, 3659, 3660, 3661, 3662, 3663, 3664, 3664, 3664, 3665, 3666, 3667, 3667, 3668, 3669, 3669, 3669, 3670, 3670, 3671, 3671, 3672, 3672, 3673, 3677, 3678, 3678, 3678, 3678, 3679, 3679, 3679, 3681, 3681, 3681, 3682, 3682, 3683, 3683, 3684, 3684, 3685, 3685, 3685, 3687, 3687, 3687, 3688, 3688, 3688, 3688, 3688, 3689, 3690, 3690, 3690, 3693, 3693, 3694, 3694, 3695, 3695, 3696, 3698, 3698, 3699, 3699, 3700, 3702, 3703, 3704, 3705, 3705, 3705, 3705, 3706, 3706, 3706, 3706, 3706, 3707, 3707, 3707, 3708, 3708, 3710, 3710, 3710, 3711, 3712, 3713, 3713, 3713, 3713, 3714, 3714, 3714, 3715, 3715, 3716, 3716, 3717, 3717, 3717, 3717, 3718, 3718, 3718, 3718, 3719, 3719, 3719, 3720, 3720, 3721, 3721, 3722, 3722, 3722, 3722, 3722, 3723, 3724, 3725, 3726, 3727, 3727, 3728, 3728, 3729, 3729, 3731, 3731, 3731, 3731, 3731, 3732, 3734, 3734, 3734, 3734, 3735, 3735, 3736, 3736, 3736, 3736, 3737, 3738, 3739, 3739, 3739, 3740, 3740, 3740, 3741, 3741, 3741, 3742, 3742, 3743, 3744, 3744, 3744, 3745, 3745, 3745, 3746, 3746, 3747, 3747, 3747, 3748, 3748, 3749, 3751, 3751, 3751, 3751, 3751, 3752, 3753, 3753, 3753, 3753, 3754, 3755, 3756, 3757, 3757, 3758, 3758, 3758, 3759, 3759, 3759, 3762, 3763, 3763, 3763, 3763, 3764, 3765, 3765, 3766, 3766, 3766, 3766, 3767, 3767, 3768, 3768, 3769, 3769, 3770, 3770, 3770, 3770, 3771, 3771, 3772, 3772, 3773, 3773, 3774, 3775, 3775, 3776, 3776, 3776, 3776, 3776, 3777, 3777, 3779, 3779, 3779, 3779, 3780, 3780, 3781, 3781, 3782, 3783, 3783, 3784, 3785, 3785, 3787, 3787, 3787, 3788, 3788, 3788, 3788, 3789, 3789, 3790, 3790, 3791, 3792, 3792, 3792, 3793, 3793, 3794, 3794, 3795, 3795, 3796, 3797, 3797, 3797, 3797, 3798, 3798, 3799, 3800, 3800, 3800, 3800, 3801, 3801, 3801, 3802, 3802, 3802, 3802, 3803, 3804, 3805, 3806, 3806, 3807, 3808, 3808, 3809, 3809, 3811, 3813, 3814, 3814, 3816, 3816, 3816, 3817, 3818, 3819, 3820, 3820, 3821, 3821, 3821, 3822, 3822, 3822, 3825, 3825, 3825, 3825, 3826, 3828, 3828, 3828, 3829, 3830, 3830, 3830, 3830, 3831, 3831, 3831, 3832, 3832, 3833, 3833, 3833, 3833, 3834, 3835, 3835, 3836, 3837, 3837, 3837, 3837, 3838, 3838, 3838, 3839, 3841, 3841, 3842, 3842, 3842, 3842, 3843, 3843, 3843, 3843, 3843, 3844, 3844, 3844, 3845, 3846, 3847, 3847, 3848, 3849, 3850, 3850, 3851, 3851, 3851, 3854, 3854, 3854, 3855, 3855, 3856, 3857, 3858, 3858, 3858, 3859, 3859, 3859, 3859, 3860, 3860, 3861, 3861, 3861, 3861, 3862, 3862, 3862, 3862, 3863, 3863, 3865, 3865, 3865, 3865, 3866, 3866, 3867, 3867, 3867, 3867, 3868, 3868, 3869, 3869, 3870, 3871, 3871, 3871, 3872, 3873, 3873, 3873, 3874, 3874, 3874, 3875, 3875, 3876, 3877, 3878, 3878, 3878, 3879, 3879, 3879, 3880, 3880, 3881, 3881, 3881, 3881, 3883, 3883, 3884, 3884, 3884, 3884, 3884, 3886, 3887, 3887, 3887, 3887, 3888, 3888, 3889, 3890, 3890, 3891, 3891, 3891, 3891, 3892, 3892, 3892, 3892, 3893, 3893, 3893, 3893, 3894, 3894, 3894, 3895, 3895, 3895, 3895, 3897, 3897, 3897, 3899, 3899, 3900, 3901, 3902, 3904, 3904, 3905, 3905, 3906, 3906, 3906, 3907, 3907, 3907, 3908, 3909, 3910, 3911, 3911, 3912, 3913, 3914, 3915, 3915, 3915, 3915, 3916, 3917, 3917, 3917, 3919, 3919, 3919, 3920, 3921, 3921, 3922, 3922, 3923, 3923, 3923, 3924, 3924, 3925, 3925, 3926, 3926, 3926, 3928, 3928, 3928, 3929, 3929, 3930, 3930, 3930, 3931, 3931, 3931, 3932, 3932, 3932, 3932, 3932, 3933, 3933, 3933, 3934, 3934, 3934, 3935, 3935, 3935, 3935, 3936, 3937, 3937, 3937, 3938, 3938, 3939, 3942, 3942, 3943, 3943, 3943, 3945, 3945, 3945, 3946, 3947, 3947, 3948, 3948, 3948, 3948, 3948, 3951, 3952, 3952, 3952, 3952, 3953, 3954, 3954, 3956, 3957, 3957, 3957, 3957, 3958, 3958, 3958, 3959, 3960, 3961, 3961, 3961, 3962, 3963, 3964, 3964, 3964, 3965, 3965, 3965, 3965, 3967, 3968, 3969, 3969, 3970, 3970, 3971, 3972, 3972, 3973, 3973, 3974, 3974, 3975, 3975, 3976, 3976, 3977, 3977, 3977, 3977, 3978, 3978, 3979, 3979, 3979, 3979, 3979, 3980, 3980, 3981, 3981, 3981, 3981, 3982, 3982, 3982, 3982, 3983, 3984, 3984, 3984, 3984, 3984, 3984, 3986, 3986, 3986, 3987, 3988, 3988, 3988, 3988, 3989, 3989, 3989, 3990, 3990, 3991, 3992, 3993, 3994, 3995, 3996, 3996, 3998, 3998, 3998, 3999, 4000, 4000, 4000, 4001, 4001, 4001, 4001, 4002, 4002, 4002, 4002, 4003, 4004, 4004, 4004, 4005, 4006, 4006, 4007, 4007, 4008, 4008, 4008, 4009, 4010, 4010, 4010, 4010, 4011, 4011, 4013, 4014, 4015, 4016, 4017, 4018, 4018, 4019, 4020, 4020, 4020, 4021, 4021, 4022, 4022, 4022, 4023, 4023, 4023, 4024, 4024, 4025, 4025, 4025, 4026, 4026, 4027, 4027, 4028, 4028, 4028, 4029, 4030, 4031, 4031, 4031, 4031, 4032, 4032, 4032, 4032, 4033, 4033, 4033, 4033, 4035, 4035, 4035, 4035, 4035, 4037, 4038, 4038, 4038, 4038, 4038, 4039, 4039, 4039, 4040, 4040, 4040, 4041, 4041, 4041, 4041, 4041, 4041, 4041, 4042, 4042, 4043, 4043, 4043, 4043, 4044, 4044, 4045, 4045, 4045, 4047, 4047, 4048, 4048, 4049, 4050, 4050, 4050, 4051, 4052, 4052, 4053, 4053, 4054, 4055, 4055, 4056, 4056, 4057, 4058, 4058, 4059, 4059, 4060, 4060, 4060, 4061, 4061, 4061, 4062, 4063, 4063, 4064, 4065, 4065, 4065, 4066, 4067, 4068, 4068, 4068, 4069, 4069, 4069, 4070, 4070, 4070, 4071, 4071, 4072, 4072, 4072, 4072, 4072, 4073, 4073, 4074, 4074, 4075, 4076, 4076, 4076, 4076, 4077, 4077, 4078, 4078, 4078, 4080, 4081, 4081, 4082, 4082, 4082, 4083, 4083, 4085, 4085, 4085, 4085, 4085, 4086, 4086, 4086, 4087, 4087, 4087, 4088, 4088, 4089, 4089, 4090, 4090, 4091, 4091, 4092, 4093, 4093, 4093, 4094, 4095, 4096, 4096, 4096, 4097, 4097, 4098, 4099, 4099, 4099, 4099, 4100, 4100, 4101, 4101, 4102, 4102, 4103, 4104, 4104, 4104, 4104, 4104, 4105, 4106, 4106, 4106, 4106, 4107, 4108, 4108, 4109, 4109, 4109, 4109, 4110, 4111, 4112, 4112, 4112, 4112, 4112, 4113, 4113, 4114, 4114, 4114, 4115, 4115, 4116, 4116, 4117, 4117, 4117, 4118, 4118, 4118, 4119, 4119, 4121, 4121, 4122, 4122, 4122, 4123, 4124, 4125, 4125, 4126, 4127, 4129, 4129, 4130, 4131, 4131, 4132, 4132, 4132, 4134, 4134, 4134, 4135, 4135, 4135, 4135, 4135, 4135, 4135, 4135, 4136, 4136, 4136, 4136, 4136, 4136, 4137, 4137, 4137, 4139, 4140, 4140, 4140, 4141, 4141, 4142, 4142, 4142, 4143, 4144, 4144, 4144, 4144, 4145, 4145, 4145, 4145, 4146, 4147, 4147, 4147, 4148, 4148, 4148, 4149, 4149, 4149, 4149, 4149, 4150, 4150, 4151, 4153, 4153, 4154, 4155, 4155, 4156, 4156, 4156, 4157, 4158, 4158, 4159, 4159, 4160, 4160, 4161, 4161, 4161, 4161, 4163, 4163, 4163, 4164, 4164, 4164, 4164, 4165, 4165, 4165, 4166, 4166, 4166, 4167, 4168, 4169, 4170, 4170, 4170, 4171, 4171, 4172, 4173, 4173, 4173, 4173, 4174, 4175, 4175, 4176, 4176, 4176, 4177, 4177, 4177, 4177, 4178, 4178, 4179, 4179, 4179, 4179, 4179, 4179, 4179, 4180, 4180, 4180, 4181, 4181, 4181, 4181, 4182, 4182, 4183, 4184, 4185, 4186, 4187, 4187, 4187, 4188, 4188, 4188, 4189, 4189, 4189, 4189, 4190, 4190, 4190, 4190, 4190, 4191, 4192, 4192, 4192, 4192, 4194, 4195, 4196, 4196, 4196, 4196, 4197, 4197, 4198, 4198, 4198, 4198, 4200, 4200, 4201, 4202, 4202, 4203, 4203, 4204, 4205, 4205, 4207, 4210, 4210, 4210, 4210, 4211, 4211, 4213, 4214, 4214, 4215, 4215, 4215, 4216, 4216, 4216, 4217, 4217, 4218, 4218, 4218, 4218, 4218, 4219, 4220, 4220, 4220, 4221, 4222, 4223, 4223, 4223, 4225, 4225, 4226, 4226, 4227, 4227, 4228, 4228, 4228, 4228, 4229, 4230, 4230, 4232, 4233, 4233, 4233, 4233, 4234, 4235, 4235, 4235, 4235, 4236, 4236, 4236, 4237, 4238, 4238, 4238, 4238, 4238, 4239, 4239, 4239, 4239, 4239, 4240, 4240, 4241, 4243, 4243, 4243, 4243, 4243, 4243, 4244, 4244, 4244, 4244, 4244, 4245, 4245, 4245, 4247, 4247, 4247, 4248, 4248, 4249, 4249, 4249, 4250, 4250, 4250, 4251, 4251, 4252, 4252, 4253, 4253, 4253, 4253, 4253, 4254, 4255, 4255, 4255, 4256, 4256, 4257, 4257, 4257, 4258, 4258, 4258, 4258, 4259, 4259, 4260, 4260, 4261, 4261, 4261, 4261, 4261, 4261, 4262, 4262, 4262, 4263, 4264, 4265, 4265, 4265, 4266, 4267, 4268, 4269, 4269, 4269, 4270, 4270, 4271, 4271, 4271, 4272, 4272, 4273, 4273, 4273, 4273, 4274, 4274, 4274, 4275, 4275, 4277, 4279, 4279, 4280, 4280, 4280, 4281, 4281, 4282, 4282, 4282, 4282, 4282, 4283, 4283, 4283, 4283, 4284, 4285, 4285, 4285, 4285, 4285, 4286, 4286, 4287, 4287, 4287, 4287, 4288, 4289, 4290, 4290, 4291, 4291, 4291, 4292, 4293, 4293, 4293, 4293, 4294, 4294, 4295, 4296, 4297, 4297, 4297, 4297, 4297, 4297, 4298, 4299, 4299, 4299, 4299, 4300, 4300, 4301, 4301, 4302, 4302, 4302, 4302, 4303, 4304, 4305, 4306, 4306, 4306, 4307, 4307, 4308, 4308, 4309, 4309, 4309, 4309, 4310, 4311, 4311, 4312, 4312, 4312, 4312, 4312, 4313, 4314, 4315, 4315, 4316, 4316, 4317, 4317, 4317, 4318, 4318, 4319, 4319, 4320, 4320, 4321, 4322, 4322, 4323, 4325, 4327, 4327, 4327, 4327, 4327, 4328, 4328, 4330, 4330, 4330, 4331, 4331, 4332, 4332, 4334, 4335, 4335, 4336, 4336, 4337, 4337, 4338, 4338, 4338, 4338, 4339, 4339, 4339, 4340, 4340, 4340, 4340, 4340, 4340, 4341, 4341, 4341, 4343, 4343, 4344, 4344, 4344, 4345, 4346, 4347, 4347, 4348, 4348, 4348, 4352, 4353, 4355, 4356, 4356, 4357, 4357, 4358, 4358, 4358, 4358, 4359, 4360, 4360, 4360, 4361, 4361, 4361, 4361, 4362, 4362, 4363, 4363, 4364, 4365, 4365, 4365, 4368, 4370, 4370, 4370, 4371, 4371, 4371, 4372, 4372, 4372, 4372, 4374, 4374, 4374, 4375, 4375, 4376, 4376, 4377, 4377, 4380, 4380, 4381, 4381, 4381, 4382, 4382, 4384, 4386, 4386, 4387, 4387, 4389, 4389, 4389, 4389, 4389, 4389, 4390, 4391, 4391, 4392, 4393, 4393, 4394, 4394, 4394, 4394, 4395, 4395, 4396, 4398, 4398, 4398, 4399, 4400, 4400, 4400, 4401, 4401, 4402, 4403, 4403, 4403, 4404, 4405, 4405, 4405, 4407, 4408, 4408, 4408, 4409, 4410, 4410, 4410, 4410, 4411, 4411, 4412, 4412, 4413, 4413, 4414, 4414, 4414, 4414, 4414, 4415, 4415, 4419, 4419, 4419, 4419, 4420, 4420, 4420, 4421, 4421, 4421, 4421, 4423, 4424, 4425, 4426, 4427, 4427, 4428, 4429, 4429, 4430, 4430, 4430, 4431, 4431, 4431, 4431, 4432, 4432, 4432, 4432, 4432, 4432, 4433, 4433, 4434, 4434, 4435, 4435, 4435, 4435, 4436, 4436, 4436, 4436, 4437, 4437, 4438, 4438, 4438, 4438, 4438, 4439, 4439, 4440, 4440, 4441, 4441, 4442, 4443, 4444, 4444, 4446, 4446, 4447, 4447, 4447, 4448, 4448, 4448, 4449, 4450, 4451, 4452, 4453, 4453, 4454, 4454, 4455, 4455, 4455, 4456, 4456, 4456, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4457, 4459, 4460, 4460, 4461, 4462, 4462, 4462, 4462, 4465, 4465, 4466, 4467, 4468, 4468, 4469, 4470, 4470, 4471, 4471, 4471, 4471, 4471, 4471, 4471, 4471, 4472, 4472, 4472, 4473, 4473, 4474, 4474, 4474, 4475, 4475, 4476, 4477, 4479, 4479, 4479, 4479, 4481, 4481, 4481, 4481, 4482, 4482, 4482, 4483, 4483, 4484, 4484, 4486, 4487, 4487, 4487, 4487, 4487, 4488, 4488, 4488, 4489, 4491, 4491, 4492, 4492, 4493, 4493, 4494, 4494, 4494, 4494, 4494, 4495, 4495, 4495, 4496, 4496, 4496, 4497, 4498, 4499, 4500, 4500, 4501, 4501, 4503, 4503, 4503, 4504, 4504, 4506, 4509, 4509, 4509, 4509, 4510, 4510, 4511, 4511, 4511, 4512, 4513, 4513, 4514, 4514, 4514, 4515, 4517, 4518, 4521, 4521, 4521, 4521, 4522, 4523, 4523, 4524, 4524, 4525, 4525, 4525, 4525, 4525, 4526, 4526, 4527, 4527, 4528, 4528, 4528, 4529, 4529, 4529, 4529, 4530, 4531, 4532, 4533, 4533, 4534, 4535, 4536, 4536, 4536, 4536, 4537, 4537, 4538, 4539, 4539, 4542, 4542, 4542, 4543, 4543, 4543, 4544, 4544, 4546, 4547, 4547, 4548, 4548, 4549, 4549, 4550, 4550, 4551, 4552, 4552, 4552, 4553, 4553, 4554, 4554, 4554, 4554, 4554, 4555, 4555, 4556, 4556, 4557, 4557, 4558, 4558, 4559, 4559, 4559, 4560, 4560, 4562, 4563, 4563, 4564, 4565, 4566, 4566, 4566, 4567, 4567, 4567, 4567, 4567, 4568, 4568, 4568, 4569, 4569, 4570, 4571, 4572, 4572, 4572, 4572, 4573, 4574, 4574, 4574, 4575, 4575, 4575, 4575, 4575, 4575, 4576, 4576, 4577, 4577, 4578, 4578, 4578, 4579, 4579, 4579, 4579, 4580, 4580, 4580, 4580, 4580, 4581, 4581, 4582, 4583, 4584, 4584, 4586, 4586, 4587, 4588, 4589, 4590, 4590, 4592, 4592, 4592, 4593, 4594, 4594, 4594, 4595, 4595, 4595, 4596, 4597, 4597, 4597, 4598, 4598, 4600, 4600, 4600, 4600, 4601, 4601, 4602, 4602, 4602, 4603, 4604, 4604, 4605, 4605, 4605, 4606, 4607, 4608, 4608, 4608, 4609, 4609, 4609, 4610, 4611, 4611, 4612, 4612, 4614, 4614, 4614, 4614, 4615, 4615, 4616, 4616, 4616, 4616, 4617, 4617, 4617, 4617, 4618, 4618, 4618, 4618, 4620, 4621, 4621, 4621, 4622, 4623, 4623, 4623, 4624, 4624, 4625, 4625, 4626, 4626, 4627, 4627, 4627, 4629, 4629, 4630, 4630, 4631, 4631, 4631, 4631, 4631, 4631, 4632, 4633, 4634, 4634, 4634, 4635, 4635, 4635, 4635, 4636, 4636, 4636, 4636, 4637, 4637, 4638, 4639, 4639, 4640, 4640, 4640, 4641, 4641, 4642, 4643, 4643, 4643, 4644, 4644, 4645, 4646, 4646, 4647, 4648, 4649, 4649, 4649, 4649, 4651, 4651, 4653, 4654, 4655, 4655, 4656, 4656, 4657, 4658, 4658, 4658, 4659, 4659, 4659, 4659, 4659, 4660, 4661, 4662, 4662, 4663, 4663, 4664, 4664, 4665, 4665, 4666, 4666, 4666, 4667, 4667, 4668, 4669, 4669, 4669, 4669, 4670, 4670, 4670, 4671, 4673, 4673, 4674, 4674, 4674, 4674, 4675, 4675, 4675, 4676, 4677, 4678, 4678, 4679, 4679, 4679, 4679, 4680, 4680, 4681, 4681, 4683, 4683, 4683, 4683, 4684, 4684, 4685, 4685, 4686, 4686, 4687, 4687, 4688, 4690, 4690, 4690, 4690, 4691, 4691, 4693, 4693, 4693, 4693, 4693, 4695, 4695, 4697, 4697, 4698, 4699, 4699, 4700, 4700, 4700, 4701, 4701, 4701, 4702, 4703, 4703, 4704, 4704, 4704, 4705, 4705, 4705, 4706, 4707, 4707, 4707, 4708, 4708, 4709, 4709, 4710, 4710, 4710, 4711, 4711, 4712, 4712, 4714, 4715, 4716, 4716, 4717, 4718, 4718, 4718, 4718, 4719, 4719, 4720, 4720, 4720, 4720, 4721, 4721, 4721, 4722, 4722, 4725, 4725, 4726, 4726, 4727, 4728, 4728, 4728, 4728, 4728, 4729, 4729, 4730, 4730, 4731, 4731, 4732, 4732, 4733, 4733, 4733, 4733, 4733, 4734, 4734, 4734, 4734, 4735, 4735, 4735, 4736, 4737, 4738, 4738, 4738, 4738, 4738, 4739, 4739, 4740, 4740, 4741, 4741, 4743, 4743, 4743, 4744, 4744, 4744, 4744, 4744, 4746, 4746, 4746, 4746, 4747, 4747, 4747, 4748, 4748, 4748, 4749, 4749, 4749, 4750, 4751, 4751, 4751, 4752, 4753, 4753, 4753, 4755, 4755, 4756, 4756, 4757, 4757, 4757, 4758, 4758, 4760, 4760, 4760, 4761, 4761, 4762, 4762, 4762, 4763, 4764, 4764, 4765, 4766, 4767, 4767, 4768, 4768, 4769, 4770, 4771, 4771, 4771, 4773, 4774, 4774, 4774, 4774, 4775, 4778, 4779, 4780, 4780, 4780, 4781, 4781, 4782, 4782, 4782, 4783, 4785, 4785, 4786, 4787, 4787, 4787, 4787, 4788, 4788, 4788, 4788, 4788, 4789, 4790, 4790, 4790, 4791, 4791, 4791, 4792, 4792, 4792, 4792, 4792, 4792, 4793, 4794, 4794, 4796, 4796, 4796, 4796, 4797, 4798, 4798, 4799, 4799, 4799, 4799, 4801, 4801, 4802, 4802, 4802, 4803, 4805, 4805, 4808, 4808, 4808, 4810, 4810, 4810, 4811, 4811, 4811, 4811, 4812, 4812, 4813, 4814, 4815, 4815, 4816, 4816, 4816, 4816, 4816, 4817, 4817, 4817, 4818, 4818, 4818, 4819, 4819, 4820, 4822, 4822, 4822, 4822, 4822, 4822, 4823, 4823, 4823, 4824, 4824, 4825, 4826, 4826, 4827, 4827, 4828, 4828, 4828, 4829, 4829, 4830, 4830, 4830, 4831, 4831, 4831, 4832, 4832, 4833, 4834, 4834, 4834, 4834, 4835, 4835, 4835, 4836, 4837, 4838, 4838, 4838, 4838, 4838, 4838, 4839, 4839, 4839, 4839, 4840, 4840, 4841, 4842, 4842, 4842, 4843, 4843, 4843, 4843, 4843, 4844, 4844, 4845, 4846, 4846, 4847, 4847, 4847, 4847, 4847, 4848, 4848, 4849, 4849, 4849, 4849, 4849, 4850, 4850, 4851, 4853, 4853, 4853, 4854, 4854, 4856, 4856, 4857, 4857, 4857, 4858, 4858, 4859, 4859, 4859, 4859, 4860, 4860, 4861, 4862, 4862, 4863, 4863, 4863, 4863, 4864, 4864, 4864, 4864, 4865, 4865, 4866, 4866, 4867, 4867, 4869, 4870, 4870, 4870, 4870, 4870, 4870, 4871, 4871, 4871, 4872, 4873, 4873, 4874, 4874, 4875, 4875, 4876, 4876, 4876, 4876, 4877, 4879, 4879, 4879, 4881, 4882, 4882, 4883, 4883, 4883, 4884, 4884, 4886, 4888, 4888, 4888, 4889, 4890, 4890, 4890, 4891, 4891, 4892, 4892, 4892, 4892, 4893, 4893, 4893, 4894, 4894, 4894, 4894, 4894, 4894, 4895, 4898, 4899, 4899, 4900, 4901, 4901, 4901, 4901, 4902, 4902, 4903, 4904, 4904, 4904, 4904, 4904, 4905, 4906, 4908, 4908, 4909, 4910, 4910, 4911, 4911, 4912, 4912, 4913, 4913, 4914, 4914, 4914, 4915, 4915, 4916, 4917, 4917, 4918, 4918, 4920, 4921, 4921, 4921, 4921, 4922, 4922, 4922, 4922, 4923, 4923, 4924, 4924, 4924, 4925, 4926, 4926, 4926, 4927, 4928, 4928, 4928, 4928, 4928, 4928, 4929, 4930, 4930, 4931, 4932, 4934, 4934, 4935, 4935, 4936, 4936, 4937, 4937, 4937, 4937, 4937, 4938, 4939, 4939, 4939, 4939, 4939, 4939, 4942, 4943, 4943, 4944, 4944, 4944, 4944, 4944, 4945, 4946, 4946, 4946, 4947, 4948, 4948, 4948, 4949, 4949, 4950, 4950, 4950, 4950, 4951, 4951, 4952, 4956, 4956, 4957, 4957, 4957, 4957, 4958, 4960, 4960, 4960, 4961, 4961, 4961, 4962, 4962, 4962, 4963, 4963, 4964, 4964, 4964, 4965, 4966, 4967, 4967, 4968, 4968, 4968, 4971, 4971, 4972, 4972, 4974, 4975, 4975, 4975, 4976, 4976, 4977, 4978, 4978, 4979, 4979, 4979, 4980, 4980, 4980, 4981, 4981, 4981, 4981, 4982, 4982, 4982, 4982, 4982, 4983, 4983, 4983, 4983, 4984, 4985, 4985, 4986, 4986, 4986, 4986, 4987, 4987, 4988, 4989, 4989, 4989, 4990, 4991, 4992, 4992, 4993, 4993, 4994, 4995, 4995, 4996, 4997, 4997, 4997, 4997, 4997, 4998, 4998, 4999, 4999]\n", diff --git a/crates/cli_utils/src/helpers.rs b/crates/cli_utils/src/helpers.rs index 1e8f66555c..74618d6824 100644 --- a/crates/cli_utils/src/helpers.rs +++ b/crates/cli_utils/src/helpers.rs @@ -381,20 +381,31 @@ pub fn root_dir() -> PathBuf { path } +// start the dir with crates/cli_testing_examples #[allow(dead_code)] -pub fn examples_dir(dir_name: &str) -> PathBuf { +pub fn cli_testing_dir(dir_name: &str) -> PathBuf { let mut path = root_dir(); // Descend into examples/{dir_name} - path.push("examples"); + path.push("crates"); + path.push("cli_testing_examples"); path.extend(dir_name.split("/")); // Make slashes cross-target path } #[allow(dead_code)] -pub fn example_file(dir_name: &str, file_name: &str) -> PathBuf { - let mut path = examples_dir(dir_name); +pub fn dir_path_from_root(dir_name: &str) -> PathBuf { + let mut path = root_dir(); + + path.extend(dir_name.split("/")); // Make slashes cross-target + + path +} + +#[allow(dead_code)] +pub fn file_path_from_root(dir_name: &str, file_name: &str) -> PathBuf { + let mut path = dir_path_from_root(dir_name); path.push(file_name); diff --git a/crates/compiler/build/src/link.rs b/crates/compiler/build/src/link.rs index 202524210c..fa4eb1dfb8 100644 --- a/crates/compiler/build/src/link.rs +++ b/crates/compiler/build/src/link.rs @@ -374,7 +374,7 @@ pub fn build_zig_host_wasm32( "c", "-target", zig_target, - // "-femit-llvm-ir=/home/folkertdev/roc/roc/examples/benchmarks/platform/host.ll", + // "-femit-llvm-ir=/home/folkertdev/roc/roc/crates/cli_testing_examples/benchmarks/platform/host.ll", "-fPIC", "--strip", ]; @@ -635,6 +635,7 @@ pub fn rebuild_host( } else if cargo_host_src.exists() { // Compile and link Cargo.toml, if it exists let cargo_dir = host_input_path.parent().unwrap(); + let cargo_out_dir = cargo_dir.join("target").join( if matches!(opt_level, OptLevel::Optimize | OptLevel::Size) { "release" @@ -1215,7 +1216,7 @@ fn link_wasm32( "-O", "ReleaseSmall", // useful for debugging - // "-femit-llvm-ir=/home/folkertdev/roc/roc/examples/benchmarks/platform/host.ll", + // "-femit-llvm-ir=/home/folkertdev/roc/roc/crates/cli_testing_examples/benchmarks/platform/host.ll", ]) .spawn()?; diff --git a/crates/editor/src/editor/main.rs b/crates/editor/src/editor/main.rs index 9b2c55a4e0..b345815db5 100644 --- a/crates/editor/src/editor/main.rs +++ b/crates/editor/src/editor/main.rs @@ -521,7 +521,7 @@ fn read_main_roc_file(project_dir_path_opt: Option<&Path>) -> (PathBuf, String) // returns path and content of app file fn init_new_roc_project(project_dir_path: &Path) -> (PathBuf, String) { - let orig_platform_path = Path::new("./examples/hello-world").join(PLATFORM_DIR_NAME); + let orig_platform_path = Path::new("./examples/cli").join(PLATFORM_DIR_NAME); let roc_file_path = Path::new("./new-roc-project/main.roc"); diff --git a/crates/highlight/tests/peg_grammar.rs b/crates/highlight/tests/peg_grammar.rs index 655088e8cf..294c992b84 100644 --- a/crates/highlight/tests/peg_grammar.rs +++ b/crates/highlight/tests/peg_grammar.rs @@ -730,16 +730,24 @@ test1 = file_to_string(&file_path) } + fn cli_testing_path(sub_path: &str) -> String { + let examples_dir = "../cli_testing_examples/".to_string(); + + let file_path = examples_dir + sub_path; + + file_to_string(&file_path) + } + #[test] fn test_hello() { - let tokens = tokenize(&example_path("hello-world/main.roc")); + let tokens = tokenize(&example_path("helloWorld.roc")); assert_eq!(tokenparser::module(&tokens), Ok(())); } #[test] fn test_fibo() { - let tokens = tokenize(&example_path("algorithms/fibonacci.roc")); + let tokens = tokenize(&cli_testing_path("algorithms/fibonacci.roc")); assert_eq!(tokenparser::module(&tokens), Ok(())); } @@ -831,14 +839,14 @@ test1 = #[test] fn test_base64() { - let tokens = tokenize(&example_path("benchmarks/Base64.roc")); + let tokens = tokenize(&cli_testing_path("benchmarks/Base64.roc")); assert_eq!(tokenparser::module(&tokens), Ok(())); } #[test] fn test_base64_test() { - let tokens = tokenize(&example_path("benchmarks/TestBase64.roc")); + let tokens = tokenize(&cli_testing_path("benchmarks/TestBase64.roc")); assert_eq!(tokenparser::module(&tokens), Ok(())); } @@ -874,14 +882,14 @@ test1 = #[test] fn test_astar_test() { - let tokens = tokenize(&example_path("benchmarks/TestAStar.roc")); + let tokens = tokenize(&cli_testing_path("benchmarks/TestAStar.roc")); assert_eq!(tokenparser::module(&tokens), Ok(())); } #[test] fn test_cli_echo() { - let tokens = tokenize(&example_path("interactive/echo.roc")); + let tokens = tokenize(&example_path("cli/echo.roc")); assert_eq!(tokenparser::module(&tokens), Ok(())); } @@ -1106,7 +1114,7 @@ test1 = #[test] fn test_closure_file() { - let tokens = tokenize(&example_path("benchmarks/Closure.roc")); + let tokens = tokenize(&cli_testing_path("benchmarks/Closure.roc")); assert_eq!(tokenparser::module(&tokens), Ok(())); } @@ -1126,7 +1134,7 @@ test1 = #[test] fn test_nqueens() { - let tokens = tokenize(&example_path("benchmarks/NQueens.roc")); + let tokens = tokenize(&cli_testing_path("benchmarks/NQueens.roc")); assert_eq!(tokenparser::module(&tokens), Ok(())); } @@ -1149,7 +1157,7 @@ test1 = #[test] fn test_quicksort() { - let tokens = tokenize(&example_path("benchmarks/Quicksort.roc")); + let tokens = tokenize(&cli_testing_path("benchmarks/Quicksort.roc")); assert_eq!(tokenparser::module(&tokens), Ok(())); } @@ -1176,7 +1184,7 @@ test1 = #[test] fn test_task() { - let tokens = tokenize(&example_path("benchmarks/platform/Task.roc")); + let tokens = tokenize(&cli_testing_path("benchmarks/platform/Task.roc")); assert_eq!(tokenparser::module(&tokens), Ok(())); } @@ -1221,7 +1229,7 @@ test1 = #[test] fn test_cfold() { - let tokens = tokenize(&example_path("benchmarks/CFold.roc")); + let tokens = tokenize(&cli_testing_path("benchmarks/CFold.roc")); assert_eq!(tokenparser::module(&tokens), Ok(())); } @@ -1291,7 +1299,7 @@ balance = \color -> #[test] fn test_rbtree_insert() { - let tokens = tokenize(&example_path("benchmarks/RBTreeInsert.roc")); + let tokens = tokenize(&cli_testing_path("benchmarks/RBTreeInsert.roc")); assert_eq!(tokenparser::module(&tokens), Ok(())); } @@ -1357,7 +1365,7 @@ balance = \color -> #[test] fn test_rbtree_ck() { - let tokens = tokenize(&example_path("benchmarks/RBTreeCk.roc")); + let tokens = tokenize(&cli_testing_path("benchmarks/RBTreeCk.roc")); assert_eq!(tokenparser::module(&tokens), Ok(())); } @@ -1390,7 +1398,7 @@ balance = \color -> #[test] fn test_astar() { - let tokens = tokenize(&example_path("benchmarks/AStar.roc")); + let tokens = tokenize(&cli_testing_path("benchmarks/AStar.roc")); assert_eq!(tokenparser::module(&tokens), Ok(())); } @@ -1409,7 +1417,7 @@ balance = \color -> #[test] fn test_false_interpreter_context() { - let tokens = tokenize(&example_path("false-interpreter/Context.roc")); + let tokens = tokenize(&example_path("cli/false-interpreter/Context.roc")); assert_eq!(tokenparser::module(&tokens), Ok(())); } @@ -1437,7 +1445,7 @@ balance = \color -> #[test] fn test_deriv() { - let tokens = tokenize(&example_path("benchmarks/Deriv.roc")); + let tokens = tokenize(&cli_testing_path("benchmarks/Deriv.roc")); assert_eq!(tokenparser::module(&tokens), Ok(())); } diff --git a/examples/.gitignore b/examples/.gitignore index 58cb449bb9..9fb0c881bf 100644 --- a/examples/.gitignore +++ b/examples/.gitignore @@ -4,3 +4,5 @@ libapp.so dynhost preprocessedhost metadata + +helloWorld diff --git a/examples/README.md b/examples/README.md index 7097cb5397..0358683fdc 100644 --- a/examples/README.md +++ b/examples/README.md @@ -14,7 +14,7 @@ Run examples as follows: roc run hello-world/main.roc ``` -`examples/benchmarks/` contains some larger examples. +`crates/cli_testing_examples/benchmarks/` contains some larger examples. -Some examples like `examples/benchmarks/NQueens.roc` require input after running. +Some examples like `crates/cli_testing_examples/benchmarks/NQueens.roc` require input after running. For NQueens, input 10 in the terminal and press enter. diff --git a/examples/interactive/.gitignore b/examples/cli/.gitignore similarity index 100% rename from examples/interactive/.gitignore rename to examples/cli/.gitignore diff --git a/examples/interactive/README.md b/examples/cli/README.md similarity index 96% rename from examples/interactive/README.md rename to examples/cli/README.md index 545fd58f53..fd939f8b4e 100644 --- a/examples/interactive/README.md +++ b/examples/cli/README.md @@ -1,4 +1,4 @@ -# Interactive examples +# CLI examples These are examples of how to make basic CLI (command-line interface) and TUI (terminal user interface) apps in Roc. diff --git a/examples/interactive/args.roc b/examples/cli/args.roc similarity index 100% rename from examples/interactive/args.roc rename to examples/cli/args.roc diff --git a/examples/interactive/cli-platform/Arg.roc b/examples/cli/cli-platform/Arg.roc similarity index 100% rename from examples/interactive/cli-platform/Arg.roc rename to examples/cli/cli-platform/Arg.roc diff --git a/examples/interactive/cli-platform/Cargo.lock b/examples/cli/cli-platform/Cargo.lock similarity index 100% rename from examples/interactive/cli-platform/Cargo.lock rename to examples/cli/cli-platform/Cargo.lock diff --git a/examples/interactive/cli-platform/Cargo.toml b/examples/cli/cli-platform/Cargo.toml similarity index 100% rename from examples/interactive/cli-platform/Cargo.toml rename to examples/cli/cli-platform/Cargo.toml diff --git a/examples/interactive/cli-platform/Dir.roc b/examples/cli/cli-platform/Dir.roc similarity index 100% rename from examples/interactive/cli-platform/Dir.roc rename to examples/cli/cli-platform/Dir.roc diff --git a/examples/interactive/cli-platform/Effect.roc b/examples/cli/cli-platform/Effect.roc similarity index 100% rename from examples/interactive/cli-platform/Effect.roc rename to examples/cli/cli-platform/Effect.roc diff --git a/examples/interactive/cli-platform/Env.roc b/examples/cli/cli-platform/Env.roc similarity index 100% rename from examples/interactive/cli-platform/Env.roc rename to examples/cli/cli-platform/Env.roc diff --git a/examples/interactive/cli-platform/EnvDecoding.roc b/examples/cli/cli-platform/EnvDecoding.roc similarity index 100% rename from examples/interactive/cli-platform/EnvDecoding.roc rename to examples/cli/cli-platform/EnvDecoding.roc diff --git a/examples/interactive/cli-platform/File.roc b/examples/cli/cli-platform/File.roc similarity index 100% rename from examples/interactive/cli-platform/File.roc rename to examples/cli/cli-platform/File.roc diff --git a/examples/interactive/cli-platform/FileMetadata.roc b/examples/cli/cli-platform/FileMetadata.roc similarity index 100% rename from examples/interactive/cli-platform/FileMetadata.roc rename to examples/cli/cli-platform/FileMetadata.roc diff --git a/examples/interactive/cli-platform/Http.roc b/examples/cli/cli-platform/Http.roc similarity index 100% rename from examples/interactive/cli-platform/Http.roc rename to examples/cli/cli-platform/Http.roc diff --git a/examples/interactive/cli-platform/InternalDir.roc b/examples/cli/cli-platform/InternalDir.roc similarity index 100% rename from examples/interactive/cli-platform/InternalDir.roc rename to examples/cli/cli-platform/InternalDir.roc diff --git a/examples/interactive/cli-platform/InternalFile.roc b/examples/cli/cli-platform/InternalFile.roc similarity index 100% rename from examples/interactive/cli-platform/InternalFile.roc rename to examples/cli/cli-platform/InternalFile.roc diff --git a/examples/interactive/cli-platform/InternalHttp.roc b/examples/cli/cli-platform/InternalHttp.roc similarity index 100% rename from examples/interactive/cli-platform/InternalHttp.roc rename to examples/cli/cli-platform/InternalHttp.roc diff --git a/examples/interactive/cli-platform/InternalPath.roc b/examples/cli/cli-platform/InternalPath.roc similarity index 100% rename from examples/interactive/cli-platform/InternalPath.roc rename to examples/cli/cli-platform/InternalPath.roc diff --git a/examples/interactive/cli-platform/InternalProgram.roc b/examples/cli/cli-platform/InternalProgram.roc similarity index 100% rename from examples/interactive/cli-platform/InternalProgram.roc rename to examples/cli/cli-platform/InternalProgram.roc diff --git a/examples/interactive/cli-platform/InternalTask.roc b/examples/cli/cli-platform/InternalTask.roc similarity index 100% rename from examples/interactive/cli-platform/InternalTask.roc rename to examples/cli/cli-platform/InternalTask.roc diff --git a/examples/interactive/cli-platform/Path.roc b/examples/cli/cli-platform/Path.roc similarity index 100% rename from examples/interactive/cli-platform/Path.roc rename to examples/cli/cli-platform/Path.roc diff --git a/examples/interactive/cli-platform/Program.roc b/examples/cli/cli-platform/Program.roc similarity index 100% rename from examples/interactive/cli-platform/Program.roc rename to examples/cli/cli-platform/Program.roc diff --git a/examples/interactive/cli-platform/Stderr.roc b/examples/cli/cli-platform/Stderr.roc similarity index 100% rename from examples/interactive/cli-platform/Stderr.roc rename to examples/cli/cli-platform/Stderr.roc diff --git a/examples/interactive/cli-platform/Stdin.roc b/examples/cli/cli-platform/Stdin.roc similarity index 100% rename from examples/interactive/cli-platform/Stdin.roc rename to examples/cli/cli-platform/Stdin.roc diff --git a/examples/interactive/cli-platform/Stdout.roc b/examples/cli/cli-platform/Stdout.roc similarity index 100% rename from examples/interactive/cli-platform/Stdout.roc rename to examples/cli/cli-platform/Stdout.roc diff --git a/examples/interactive/cli-platform/Task.roc b/examples/cli/cli-platform/Task.roc similarity index 100% rename from examples/interactive/cli-platform/Task.roc rename to examples/cli/cli-platform/Task.roc diff --git a/examples/interactive/cli-platform/Url.roc b/examples/cli/cli-platform/Url.roc similarity index 100% rename from examples/interactive/cli-platform/Url.roc rename to examples/cli/cli-platform/Url.roc diff --git a/examples/false-interpreter/platform/build.rs b/examples/cli/cli-platform/build.rs similarity index 100% rename from examples/false-interpreter/platform/build.rs rename to examples/cli/cli-platform/build.rs diff --git a/examples/interactive/cli-platform/host.c b/examples/cli/cli-platform/host.c similarity index 100% rename from examples/interactive/cli-platform/host.c rename to examples/cli/cli-platform/host.c diff --git a/examples/interactive/cli-platform/main.roc b/examples/cli/cli-platform/main.roc similarity index 100% rename from examples/interactive/cli-platform/main.roc rename to examples/cli/cli-platform/main.roc diff --git a/examples/interactive/cli-platform/src/file_glue.rs b/examples/cli/cli-platform/src/file_glue.rs similarity index 100% rename from examples/interactive/cli-platform/src/file_glue.rs rename to examples/cli/cli-platform/src/file_glue.rs diff --git a/examples/interactive/cli-platform/src/glue.rs b/examples/cli/cli-platform/src/glue.rs similarity index 100% rename from examples/interactive/cli-platform/src/glue.rs rename to examples/cli/cli-platform/src/glue.rs diff --git a/examples/interactive/cli-platform/src/lib.rs b/examples/cli/cli-platform/src/lib.rs similarity index 100% rename from examples/interactive/cli-platform/src/lib.rs rename to examples/cli/cli-platform/src/lib.rs diff --git a/examples/false-interpreter/platform/src/main.rs b/examples/cli/cli-platform/src/main.rs similarity index 100% rename from examples/false-interpreter/platform/src/main.rs rename to examples/cli/cli-platform/src/main.rs diff --git a/examples/interactive/countdown.roc b/examples/cli/countdown.roc similarity index 100% rename from examples/interactive/countdown.roc rename to examples/cli/countdown.roc diff --git a/examples/interactive/echo.roc b/examples/cli/echo.roc similarity index 100% rename from examples/interactive/echo.roc rename to examples/cli/echo.roc diff --git a/examples/interactive/effects-platform/Effect.roc b/examples/cli/effects-platform/Effect.roc similarity index 100% rename from examples/interactive/effects-platform/Effect.roc rename to examples/cli/effects-platform/Effect.roc diff --git a/examples/interactive/effects-platform/host.zig b/examples/cli/effects-platform/host.zig similarity index 100% rename from examples/interactive/effects-platform/host.zig rename to examples/cli/effects-platform/host.zig diff --git a/examples/interactive/effects-platform/main.roc b/examples/cli/effects-platform/main.roc similarity index 100% rename from examples/interactive/effects-platform/main.roc rename to examples/cli/effects-platform/main.roc diff --git a/examples/interactive/effects.roc b/examples/cli/effects.roc similarity index 100% rename from examples/interactive/effects.roc rename to examples/cli/effects.roc diff --git a/examples/interactive/env.roc b/examples/cli/env.roc similarity index 100% rename from examples/interactive/env.roc rename to examples/cli/env.roc diff --git a/examples/false-interpreter/.gitignore b/examples/cli/false-interpreter/.gitignore similarity index 100% rename from examples/false-interpreter/.gitignore rename to examples/cli/false-interpreter/.gitignore diff --git a/examples/false-interpreter/Context.roc b/examples/cli/false-interpreter/Context.roc similarity index 100% rename from examples/false-interpreter/Context.roc rename to examples/cli/false-interpreter/Context.roc diff --git a/examples/false-interpreter/False.roc b/examples/cli/false-interpreter/False.roc similarity index 100% rename from examples/false-interpreter/False.roc rename to examples/cli/false-interpreter/False.roc diff --git a/examples/false-interpreter/README.md b/examples/cli/false-interpreter/README.md similarity index 100% rename from examples/false-interpreter/README.md rename to examples/cli/false-interpreter/README.md diff --git a/examples/false-interpreter/Variable.roc b/examples/cli/false-interpreter/Variable.roc similarity index 100% rename from examples/false-interpreter/Variable.roc rename to examples/cli/false-interpreter/Variable.roc diff --git a/examples/false-interpreter/examples/bottles.false b/examples/cli/false-interpreter/examples/bottles.false similarity index 100% rename from examples/false-interpreter/examples/bottles.false rename to examples/cli/false-interpreter/examples/bottles.false diff --git a/examples/false-interpreter/examples/cksum.false b/examples/cli/false-interpreter/examples/cksum.false similarity index 100% rename from examples/false-interpreter/examples/cksum.false rename to examples/cli/false-interpreter/examples/cksum.false diff --git a/examples/false-interpreter/examples/copy.false b/examples/cli/false-interpreter/examples/copy.false similarity index 100% rename from examples/false-interpreter/examples/copy.false rename to examples/cli/false-interpreter/examples/copy.false diff --git a/examples/false-interpreter/examples/crc32.false b/examples/cli/false-interpreter/examples/crc32.false similarity index 100% rename from examples/false-interpreter/examples/crc32.false rename to examples/cli/false-interpreter/examples/crc32.false diff --git a/examples/false-interpreter/examples/hello.false b/examples/cli/false-interpreter/examples/hello.false similarity index 100% rename from examples/false-interpreter/examples/hello.false rename to examples/cli/false-interpreter/examples/hello.false diff --git a/examples/false-interpreter/examples/in.txt b/examples/cli/false-interpreter/examples/in.txt similarity index 100% rename from examples/false-interpreter/examples/in.txt rename to examples/cli/false-interpreter/examples/in.txt diff --git a/examples/false-interpreter/examples/odd_words.false b/examples/cli/false-interpreter/examples/odd_words.false similarity index 100% rename from examples/false-interpreter/examples/odd_words.false rename to examples/cli/false-interpreter/examples/odd_words.false diff --git a/examples/false-interpreter/examples/primes.false b/examples/cli/false-interpreter/examples/primes.false similarity index 100% rename from examples/false-interpreter/examples/primes.false rename to examples/cli/false-interpreter/examples/primes.false diff --git a/examples/false-interpreter/examples/queens.false b/examples/cli/false-interpreter/examples/queens.false similarity index 100% rename from examples/false-interpreter/examples/queens.false rename to examples/cli/false-interpreter/examples/queens.false diff --git a/examples/false-interpreter/examples/sqrt.false b/examples/cli/false-interpreter/examples/sqrt.false similarity index 100% rename from examples/false-interpreter/examples/sqrt.false rename to examples/cli/false-interpreter/examples/sqrt.false diff --git a/examples/false-interpreter/examples/test.false b/examples/cli/false-interpreter/examples/test.false similarity index 100% rename from examples/false-interpreter/examples/test.false rename to examples/cli/false-interpreter/examples/test.false diff --git a/examples/false-interpreter/platform/Cargo.lock b/examples/cli/false-interpreter/platform/Cargo.lock similarity index 100% rename from examples/false-interpreter/platform/Cargo.lock rename to examples/cli/false-interpreter/platform/Cargo.lock diff --git a/examples/false-interpreter/platform/Cargo.toml b/examples/cli/false-interpreter/platform/Cargo.toml similarity index 85% rename from examples/false-interpreter/platform/Cargo.toml rename to examples/cli/false-interpreter/platform/Cargo.toml index 9d98cfe0e8..eeeb74f517 100644 --- a/examples/false-interpreter/platform/Cargo.toml +++ b/examples/cli/false-interpreter/platform/Cargo.toml @@ -17,7 +17,7 @@ name = "host" path = "src/main.rs" [dependencies] -roc_std = { path = "../../../crates/roc_std" } +roc_std = { path = "../../../../crates/roc_std" } libc = "0.2" [workspace] diff --git a/examples/false-interpreter/platform/Effect.roc b/examples/cli/false-interpreter/platform/Effect.roc similarity index 100% rename from examples/false-interpreter/platform/Effect.roc rename to examples/cli/false-interpreter/platform/Effect.roc diff --git a/examples/false-interpreter/platform/File.roc b/examples/cli/false-interpreter/platform/File.roc similarity index 100% rename from examples/false-interpreter/platform/File.roc rename to examples/cli/false-interpreter/platform/File.roc diff --git a/examples/false-interpreter/platform/Stdin.roc b/examples/cli/false-interpreter/platform/Stdin.roc similarity index 100% rename from examples/false-interpreter/platform/Stdin.roc rename to examples/cli/false-interpreter/platform/Stdin.roc diff --git a/examples/false-interpreter/platform/Stdout.roc b/examples/cli/false-interpreter/platform/Stdout.roc similarity index 100% rename from examples/false-interpreter/platform/Stdout.roc rename to examples/cli/false-interpreter/platform/Stdout.roc diff --git a/examples/false-interpreter/platform/Task.roc b/examples/cli/false-interpreter/platform/Task.roc similarity index 100% rename from examples/false-interpreter/platform/Task.roc rename to examples/cli/false-interpreter/platform/Task.roc diff --git a/examples/interactive/cli-platform/build.rs b/examples/cli/false-interpreter/platform/build.rs similarity index 100% rename from examples/interactive/cli-platform/build.rs rename to examples/cli/false-interpreter/platform/build.rs diff --git a/examples/false-interpreter/platform/host.c b/examples/cli/false-interpreter/platform/host.c similarity index 100% rename from examples/false-interpreter/platform/host.c rename to examples/cli/false-interpreter/platform/host.c diff --git a/examples/false-interpreter/platform/main.roc b/examples/cli/false-interpreter/platform/main.roc similarity index 100% rename from examples/false-interpreter/platform/main.roc rename to examples/cli/false-interpreter/platform/main.roc diff --git a/examples/false-interpreter/platform/src/lib.rs b/examples/cli/false-interpreter/platform/src/lib.rs similarity index 100% rename from examples/false-interpreter/platform/src/lib.rs rename to examples/cli/false-interpreter/platform/src/lib.rs diff --git a/examples/interactive/cli-platform/src/main.rs b/examples/cli/false-interpreter/platform/src/main.rs similarity index 100% rename from examples/interactive/cli-platform/src/main.rs rename to examples/cli/false-interpreter/platform/src/main.rs diff --git a/examples/interactive/file.roc b/examples/cli/file.roc similarity index 100% rename from examples/interactive/file.roc rename to examples/cli/file.roc diff --git a/examples/interactive/form.roc b/examples/cli/form.roc similarity index 100% rename from examples/interactive/form.roc rename to examples/cli/form.roc diff --git a/examples/interactive/http-get.roc b/examples/cli/http-get.roc similarity index 100% rename from examples/interactive/http-get.roc rename to examples/cli/http-get.roc diff --git a/examples/interactive/tui-platform/Program.roc b/examples/cli/tui-platform/Program.roc similarity index 100% rename from examples/interactive/tui-platform/Program.roc rename to examples/cli/tui-platform/Program.roc diff --git a/examples/interactive/tui-platform/host.zig b/examples/cli/tui-platform/host.zig similarity index 100% rename from examples/interactive/tui-platform/host.zig rename to examples/cli/tui-platform/host.zig diff --git a/examples/interactive/tui-platform/main.roc b/examples/cli/tui-platform/main.roc similarity index 100% rename from examples/interactive/tui-platform/main.roc rename to examples/cli/tui-platform/main.roc diff --git a/examples/interactive/tui.roc b/examples/cli/tui.roc similarity index 100% rename from examples/interactive/tui.roc rename to examples/cli/tui.roc diff --git a/examples/breakout/.gitignore b/examples/gui/breakout/.gitignore similarity index 100% rename from examples/breakout/.gitignore rename to examples/gui/breakout/.gitignore diff --git a/examples/breakout/breakout.roc b/examples/gui/breakout/breakout.roc similarity index 100% rename from examples/breakout/breakout.roc rename to examples/gui/breakout/breakout.roc diff --git a/examples/breakout/hello.roc b/examples/gui/breakout/hello.roc similarity index 100% rename from examples/breakout/hello.roc rename to examples/gui/breakout/hello.roc diff --git a/examples/breakout/platform/.gitignore b/examples/gui/breakout/platform/.gitignore similarity index 100% rename from examples/breakout/platform/.gitignore rename to examples/gui/breakout/platform/.gitignore diff --git a/examples/breakout/platform/Action.roc b/examples/gui/breakout/platform/Action.roc similarity index 100% rename from examples/breakout/platform/Action.roc rename to examples/gui/breakout/platform/Action.roc diff --git a/examples/breakout/platform/Cargo.lock b/examples/gui/breakout/platform/Cargo.lock similarity index 100% rename from examples/breakout/platform/Cargo.lock rename to examples/gui/breakout/platform/Cargo.lock diff --git a/examples/breakout/platform/Cargo.toml b/examples/gui/breakout/platform/Cargo.toml similarity index 97% rename from examples/breakout/platform/Cargo.toml rename to examples/gui/breakout/platform/Cargo.toml index 8dfaa8a0c5..5b612df452 100644 --- a/examples/breakout/platform/Cargo.toml +++ b/examples/gui/breakout/platform/Cargo.toml @@ -15,7 +15,7 @@ name = "host" path = "src/main.rs" [dependencies] -roc_std = { path = "../../../crates/roc_std" } +roc_std = { path = "../../../../crates/roc_std" } libc = "0.2" arrayvec = "0.7.2" page_size = "0.4.2" diff --git a/examples/breakout/platform/Elem.roc b/examples/gui/breakout/platform/Elem.roc similarity index 100% rename from examples/breakout/platform/Elem.roc rename to examples/gui/breakout/platform/Elem.roc diff --git a/examples/breakout/platform/Game.roc b/examples/gui/breakout/platform/Game.roc similarity index 100% rename from examples/breakout/platform/Game.roc rename to examples/gui/breakout/platform/Game.roc diff --git a/examples/platform-switching/rust-platform/build.rs b/examples/gui/breakout/platform/build.rs similarity index 100% rename from examples/platform-switching/rust-platform/build.rs rename to examples/gui/breakout/platform/build.rs diff --git a/examples/platform-switching/rust-platform/host.c b/examples/gui/breakout/platform/host.c similarity index 100% rename from examples/platform-switching/rust-platform/host.c rename to examples/gui/breakout/platform/host.c diff --git a/examples/breakout/platform/main.roc b/examples/gui/breakout/platform/main.roc similarity index 100% rename from examples/breakout/platform/main.roc rename to examples/gui/breakout/platform/main.roc diff --git a/examples/breakout/platform/src/graphics/colors.rs b/examples/gui/breakout/platform/src/graphics/colors.rs similarity index 100% rename from examples/breakout/platform/src/graphics/colors.rs rename to examples/gui/breakout/platform/src/graphics/colors.rs diff --git a/examples/breakout/platform/src/graphics/lowlevel/buffer.rs b/examples/gui/breakout/platform/src/graphics/lowlevel/buffer.rs similarity index 100% rename from examples/breakout/platform/src/graphics/lowlevel/buffer.rs rename to examples/gui/breakout/platform/src/graphics/lowlevel/buffer.rs diff --git a/examples/breakout/platform/src/graphics/lowlevel/mod.rs b/examples/gui/breakout/platform/src/graphics/lowlevel/mod.rs similarity index 100% rename from examples/breakout/platform/src/graphics/lowlevel/mod.rs rename to examples/gui/breakout/platform/src/graphics/lowlevel/mod.rs diff --git a/examples/breakout/platform/src/graphics/lowlevel/ortho.rs b/examples/gui/breakout/platform/src/graphics/lowlevel/ortho.rs similarity index 100% rename from examples/breakout/platform/src/graphics/lowlevel/ortho.rs rename to examples/gui/breakout/platform/src/graphics/lowlevel/ortho.rs diff --git a/examples/breakout/platform/src/graphics/lowlevel/pipelines.rs b/examples/gui/breakout/platform/src/graphics/lowlevel/pipelines.rs similarity index 100% rename from examples/breakout/platform/src/graphics/lowlevel/pipelines.rs rename to examples/gui/breakout/platform/src/graphics/lowlevel/pipelines.rs diff --git a/examples/breakout/platform/src/graphics/lowlevel/quad.rs b/examples/gui/breakout/platform/src/graphics/lowlevel/quad.rs similarity index 100% rename from examples/breakout/platform/src/graphics/lowlevel/quad.rs rename to examples/gui/breakout/platform/src/graphics/lowlevel/quad.rs diff --git a/examples/breakout/platform/src/graphics/lowlevel/vertex.rs b/examples/gui/breakout/platform/src/graphics/lowlevel/vertex.rs similarity index 100% rename from examples/breakout/platform/src/graphics/lowlevel/vertex.rs rename to examples/gui/breakout/platform/src/graphics/lowlevel/vertex.rs diff --git a/examples/breakout/platform/src/graphics/mod.rs b/examples/gui/breakout/platform/src/graphics/mod.rs similarity index 100% rename from examples/breakout/platform/src/graphics/mod.rs rename to examples/gui/breakout/platform/src/graphics/mod.rs diff --git a/examples/breakout/platform/src/graphics/primitives/mod.rs b/examples/gui/breakout/platform/src/graphics/primitives/mod.rs similarity index 100% rename from examples/breakout/platform/src/graphics/primitives/mod.rs rename to examples/gui/breakout/platform/src/graphics/primitives/mod.rs diff --git a/examples/breakout/platform/src/graphics/primitives/rect.rs b/examples/gui/breakout/platform/src/graphics/primitives/rect.rs similarity index 100% rename from examples/breakout/platform/src/graphics/primitives/rect.rs rename to examples/gui/breakout/platform/src/graphics/primitives/rect.rs diff --git a/examples/breakout/platform/src/graphics/primitives/text.rs b/examples/gui/breakout/platform/src/graphics/primitives/text.rs similarity index 98% rename from examples/breakout/platform/src/graphics/primitives/text.rs rename to examples/gui/breakout/platform/src/graphics/primitives/text.rs index 6aa2844878..45189fdc96 100644 --- a/examples/breakout/platform/src/graphics/primitives/text.rs +++ b/examples/gui/breakout/platform/src/graphics/primitives/text.rs @@ -127,7 +127,7 @@ pub fn build_glyph_brush( render_format: wgpu::TextureFormat, ) -> Result, InvalidFont> { let inconsolata = FontArc::try_from_slice(include_bytes!( - "../../../../../../crates/editor/Inconsolata-Regular.ttf" + "../../../../../../../crates/editor/Inconsolata-Regular.ttf" ))?; Ok(GlyphBrushBuilder::using_font(inconsolata).build(gpu_device, render_format)) diff --git a/examples/breakout/platform/src/graphics/shaders/quad.wgsl b/examples/gui/breakout/platform/src/graphics/shaders/quad.wgsl similarity index 100% rename from examples/breakout/platform/src/graphics/shaders/quad.wgsl rename to examples/gui/breakout/platform/src/graphics/shaders/quad.wgsl diff --git a/examples/breakout/platform/src/graphics/style.rs b/examples/gui/breakout/platform/src/graphics/style.rs similarity index 100% rename from examples/breakout/platform/src/graphics/style.rs rename to examples/gui/breakout/platform/src/graphics/style.rs diff --git a/examples/breakout/platform/src/gui.rs b/examples/gui/breakout/platform/src/gui.rs similarity index 100% rename from examples/breakout/platform/src/gui.rs rename to examples/gui/breakout/platform/src/gui.rs diff --git a/examples/breakout/platform/src/lib.rs b/examples/gui/breakout/platform/src/lib.rs similarity index 100% rename from examples/breakout/platform/src/lib.rs rename to examples/gui/breakout/platform/src/lib.rs diff --git a/examples/platform-switching/rust-platform/src/main.rs b/examples/gui/breakout/platform/src/main.rs similarity index 100% rename from examples/platform-switching/rust-platform/src/main.rs rename to examples/gui/breakout/platform/src/main.rs diff --git a/examples/breakout/platform/src/roc.rs b/examples/gui/breakout/platform/src/roc.rs similarity index 100% rename from examples/breakout/platform/src/roc.rs rename to examples/gui/breakout/platform/src/roc.rs diff --git a/examples/gui/Hello.roc b/examples/gui/hello.roc similarity index 100% rename from examples/gui/Hello.roc rename to examples/gui/hello.roc diff --git a/examples/hello-world/.gitignore b/examples/hello-world/.gitignore deleted file mode 100644 index 7423c81faa..0000000000 --- a/examples/hello-world/.gitignore +++ /dev/null @@ -1 +0,0 @@ -helloWorld diff --git a/examples/hello-world/README.md b/examples/hello-world/README.md deleted file mode 100644 index b736613cd5..0000000000 --- a/examples/hello-world/README.md +++ /dev/null @@ -1,16 +0,0 @@ -# Hello, World! - -To run, `cd` into this directory and run this in your terminal: - -```bash -roc run -``` - -This will run `main.roc` because, unless you explicitly give it a filename, `roc run` -defaults to running a file named `main.roc`. Other `roc` commands (like `roc build`, `roc test`, and so on) also default to `main.roc` unless you explicitly give them a filename. - -## About this example - -This uses a very simple platform which does nothing more than printing the string you give it. - -The line `main = "Hello, World!\n"` sets this string to be `"Hello, World!"` with a newline at the end, and the lines `packages { pf: "platform/main.roc" }` and `provides [main] to pf` specify that the `platform/` directory contains this app's platform. diff --git a/examples/hello-world/main.roc b/examples/hello-world/main.roc deleted file mode 100644 index 9aba749648..0000000000 --- a/examples/hello-world/main.roc +++ /dev/null @@ -1,6 +0,0 @@ -app "helloWorld" - packages { pf: "platform/main.roc" } - imports [] - provides [main] to pf - -main = "Hello, World!\n" diff --git a/examples/hello-world/platform/main.roc b/examples/hello-world/platform/main.roc deleted file mode 100644 index 175f7070d5..0000000000 --- a/examples/hello-world/platform/main.roc +++ /dev/null @@ -1,9 +0,0 @@ -platform "hello-world" - requires {} { main : Str } - exposes [] - packages {} - imports [] - provides [mainForHost] - -mainForHost : Str -mainForHost = main diff --git a/examples/helloWorld.roc b/examples/helloWorld.roc new file mode 100644 index 0000000000..08c5230d8d --- /dev/null +++ b/examples/helloWorld.roc @@ -0,0 +1,11 @@ +app "helloWorld" + packages { pf: "cli/cli-platform/main.roc" } + imports [pf.Stdout, pf.Program.{ Program }] + provides [main] to pf + +main = Program.noArgs mainTask + +mainTask = + Stdout.line "Hello, World!" + |> Program.exit 0 + diff --git a/examples/platform-switching/c-platform/host.c b/examples/platform-switching/c-platform/host.c deleted file mode 100644 index 3f9a63c2a2..0000000000 --- a/examples/platform-switching/c-platform/host.c +++ /dev/null @@ -1,89 +0,0 @@ -#include -#include -#include -#include -#include -#include - -void* roc_alloc(size_t size, unsigned int alignment) { return malloc(size); } - -void* roc_realloc(void* ptr, size_t new_size, size_t old_size, - unsigned int alignment) { - return realloc(ptr, new_size); -} - -void roc_dealloc(void* ptr, unsigned int alignment) { free(ptr); } - -void roc_panic(void* ptr, unsigned int alignment) { - char* msg = (char*)ptr; - fprintf(stderr, - "Application crashed with message\n\n %s\n\nShutting down\n", msg); - exit(0); -} - -void* roc_memcpy(void* dest, const void* src, size_t n) { - return memcpy(dest, src, n); -} - -void* roc_memset(void* str, int c, size_t n) { return memset(str, c, n); } - -struct RocStr { - char* bytes; - size_t len; - size_t capacity; -}; - -bool is_small_str(struct RocStr str) { return ((ssize_t)str.capacity) < 0; } - -// Determine the length of the string, taking into -// account the small string optimization -size_t roc_str_len(struct RocStr str) { - char* bytes = (char*)&str; - char last_byte = bytes[sizeof(str) - 1]; - char last_byte_xored = last_byte ^ 0b10000000; - size_t small_len = (size_t)(last_byte_xored); - size_t big_len = str.len; - - // Avoid branch misprediction costs by always - // determining both small_len and big_len, - // so this compiles to a cmov instruction. - if (is_small_str(str)) { - return small_len; - } else { - return big_len; - } -} - -extern void roc__mainForHost_1_exposed_generic(struct RocStr *string); - -int main() { - - struct RocStr str; - roc__mainForHost_1_exposed_generic(&str); - - // Determine str_len and the str_bytes pointer, - // taking into account the small string optimization. - size_t str_len = roc_str_len(str); - char* str_bytes; - - if (is_small_str(str)) { - str_bytes = (char*)&str; - } else { - str_bytes = str.bytes; - } - - // Write to stdout - if (write(1, str_bytes, str_len) >= 0) { - // Writing succeeded! - - // NOTE: the string is a static string, read from in the binary - // if you make it a heap-allocated string, it'll be leaked here - return 0; - } else { - printf("Error writing to stdout: %s\n", strerror(errno)); - - // NOTE: the string is a static string, read from in the binary - // if you make it a heap-allocated string, it'll be leaked here - return 1; - } -} diff --git a/getting_started/README.md b/getting_started/README.md index 5215badf27..9c7b2870eb 100644 --- a/getting_started/README.md +++ b/getting_started/README.md @@ -6,7 +6,7 @@ play around with as long as you have a high tolerance for missing features and c The [tutorial](../TUTORIAL.md) is the best place to learn about how to use the language - it assumes no prior knowledge of Roc or similar languages. (If you already know [Elm](https://elm-lang.org/), then [Roc for Elm Programmers](https://github.com/roc-lang/roc/blob/main/roc-for-elm-programmers.md) may be of interest.) -There's also a folder of [examples](https://github.com/roc-lang/roc/tree/main/examples) - the [CLI form example](https://github.com/roc-lang/roc/tree/main/examples/interactive/form.roc) in particular is a reasonable starting point to build on. +There's also a folder of [examples](https://github.com/roc-lang/roc/tree/main/examples) - the [CLI form example](https://github.com/roc-lang/roc/tree/main/examples/cli/form.roc) in particular is a reasonable starting point to build on. If you have a specific question, the [FAQ](../FAQ.md) might have an answer, although [Roc Zulip chat](https://roc.zulipchat.com) is overall the best place to ask questions and get help! It's also where we discuss [ideas](https://roc.zulipchat.com/#narrow/stream/304641-ideas) for the language. If you want to get involved in contributing to the language, Zulip is also a great place to ask about good first projects. @@ -23,14 +23,14 @@ If you have a specific question, the [FAQ](../FAQ.md) might have an answer, alth You can run examples as follows: ```sh -cd examples/hello-world -roc run +cd examples +roc run helloWorld.roc ``` -Some examples like `examples/benchmarks/NQueens.roc` require input after running. +Some examples like `crates/cli_testing_examples/benchmarks/NQueens.roc` require input after running. For NQueens, input 10 in the terminal and press enter. -[examples/benchmarks](https://github.com/roc-lang/roc/tree/main/examples/benchmarks) contains larger examples. +[crates/cli_testing_examples/benchmarks](https://github.com/roc-lang/roc/tree/main/crates/cli_testing_examples/benchmarks) contains larger examples. **Tip:** when programming in roc, we recommend to execute `./roc check myproject/Foo.roc` before `./roc myproject/Foo.roc` or `./roc build myproject/Foo.roc`. `./roc check` can produce clear error messages in cases where building/running may panic. diff --git a/getting_started/linux_x86.md b/getting_started/linux_x86.md index e28ad62417..49cb30fd95 100644 --- a/getting_started/linux_x86.md +++ b/getting_started/linux_x86.md @@ -45,9 +45,9 @@ you need to install one or more of these platform language compilers, too. ```sh # Note: If you installed Rust in this terminal session, you'll need to open a new one first! - ./roc examples/platform-switching/rocLovesRust.roc + ./roc crates/cli_testing_examples/platform-switching/rocLovesRust.roc - ./roc examples/platform-switching/rocLovesZig.roc + ./roc crates/cli_testing_examples/platform-switching/rocLovesZig.roc - ./roc examples/platform-switching/rocLovesC.roc + ./roc crates/cli_testing_examples/platform-switching/rocLovesC.roc ``` diff --git a/getting_started/macos_apple_silicon.md b/getting_started/macos_apple_silicon.md index 2101c22da0..ed54cded01 100644 --- a/getting_started/macos_apple_silicon.md +++ b/getting_started/macos_apple_silicon.md @@ -48,9 +48,9 @@ you need to install one or more of these platform language compilers, too. ```sh # Note: If you installed rust in this terminal session, you'll need to open a new one first! - ./roc examples/platform-switching/rocLovesRust.roc + ./roc crates/cli_testing_examples/platform-switching/rocLovesRust.roc - ./roc examples/platform-switching/rocLovesZig.roc + ./roc crates/cli_testing_examples/platform-switching/rocLovesZig.roc - ./roc examples/platform-switching/rocLovesC.roc + ./roc crates/cli_testing_examples/platform-switching/rocLovesC.roc ``` diff --git a/getting_started/macos_x86.md b/getting_started/macos_x86.md index 455086f32d..a1efba5b49 100644 --- a/getting_started/macos_x86.md +++ b/getting_started/macos_x86.md @@ -42,9 +42,9 @@ you need to install one or more of these platform language compilers, too. ```sh # Note: If you installed rust in this terminal session, you'll need to open a new one first! - ./roc examples/platform-switching/rocLovesRust.roc + ./roc crates/cli_testing_examples/platform-switching/rocLovesRust.roc - ./roc examples/platform-switching/rocLovesZig.roc + ./roc crates/cli_testing_examples/platform-switching/rocLovesZig.roc - ./roc examples/platform-switching/rocLovesC.roc + ./roc crates/cli_testing_examples/platform-switching/rocLovesC.roc ``` diff --git a/getting_started/other.md b/getting_started/other.md index 70f01dd2e5..13c5c79db7 100644 --- a/getting_started/other.md +++ b/getting_started/other.md @@ -7,11 +7,11 @@ 1. Run examples: ```sh - cargo run examples/platform-switching/rocLovesRust.roc + cargo run crates/cli_testing_examples/platform-switching/rocLovesRust.roc # This requires installing the Zig compiler, too. - cargo run examples/platform-switching/rocLovesZig.roc + cargo run crates/cli_testing_examples/platform-switching/rocLovesZig.roc # This requires installing the `clang` C compiler, too. - cargo run examples/platform-switching/rocLovesC.roc + cargo run crates/cli_testing_examples/platform-switching/rocLovesC.roc ``` diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 681b87bf62..33b9b4dd1b 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,8 +1,9 @@ [toolchain] channel = "1.61.0" # make sure to update the rust version in Earthfile as well +# channel = "nightly-2022-04-03" # nightly to be able to use unstable features profile = "default" components = [ # for usages of rust-analyzer or similar tools inside `nix develop` "rust-src" ] -targets = [ "x86_64-unknown-linux-gnu" ] \ No newline at end of file +targets = [ "x86_64-unknown-linux-gnu" ] diff --git a/www/build.sh b/www/build.sh index b292377034..6797db6467 100755 --- a/www/build.sh +++ b/www/build.sh @@ -45,7 +45,7 @@ export ROC_DOCS_URL_ROOT=/examples/cli # Until https://github.com/roc-lang/roc/issues/3280 is done, # manually exclude the Internal* modules and `main.roc`. -ls examples/interactive/cli-platform/*.roc | grep -v Internal | grep -v main.roc | grep -v Effect.roc | xargs cargo run --bin roc-docs +ls examples/cli/cli-platform/*.roc | grep -v Internal | grep -v main.roc | grep -v Effect.roc | xargs cargo run --bin roc-docs mkdir www/build/examples rm generated-docs/*.* # we already copied over the *.js and *.css files earlier, so just drop these.