Merge remote-tracking branch 'origin/trunk' into wasm-gen-test

compiler/builtins/bitcode/build.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-set -euxo pipefail
-
-zig build-obj src/main.zig -O ReleaseFast -femit-llvm-ir=builtins.ll -femit-bin=builtins.o --strip

compiler/builtins/build.rs

@@ -24,9 +24,6 @@ fn main() {
         return;
     }
 
-    let big_sur_path = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib";
-    let use_build_script = Path::new(big_sur_path).exists();
-
     // "." is relative to where "build.rs" is
     let build_script_dir_path = fs::canonicalize(Path::new(".")).unwrap();
     let bitcode_path = build_script_dir_path.join("bitcode");
@@ -40,26 +37,18 @@ fn main() {
     let dest_ir_path = bitcode_path.join("builtins-64bit.ll");
     let dest_ir_64bit = dest_ir_path.to_str().expect("Invalid dest ir path");
 
-    if use_build_script {
-        println!(
-            "Compiling zig object & ir to: {} and {}",
-            src_obj, dest_ir_64bit
-        );
-        run_command_with_no_args(&bitcode_path, "./build.sh");
-    } else {
-        println!("Compiling zig object to: {}", src_obj);
-        run_command(&bitcode_path, "zig", &["build", "object", "-Drelease=true"]);
+    println!("Compiling zig object to: {}", src_obj);
+    run_command(&bitcode_path, "zig", &["build", "object", "-Drelease=true"]);
 
-        println!("Compiling 64-bit ir to: {}", dest_ir_64bit);
-        run_command(&bitcode_path, "zig", &["build", "ir", "-Drelease=true"]);
+    println!("Compiling 64-bit ir to: {}", dest_ir_64bit);
+    run_command(&bitcode_path, "zig", &["build", "ir", "-Drelease=true"]);
 
-        println!("Compiling 32-bit ir to: {}", dest_ir_32bit);
-        run_command(
-            &bitcode_path,
-            "zig",
-            &["build", "ir-32bit", "-Drelease=true"],
-        );
-    }
+    println!("Compiling 32-bit ir to: {}", dest_ir_32bit);
+    run_command(
+        &bitcode_path,
+        "zig",
+        &["build", "ir-32bit", "-Drelease=true"],
+    );
 
     println!("Moving zig object to: {}", dest_obj);
 
@@ -119,25 +108,6 @@ where
     }
 }
 
-fn run_command_with_no_args<P: AsRef<Path>>(path: P, command_str: &str) {
-    let output_result = Command::new(OsStr::new(&command_str))
-        .current_dir(path)
-        .output();
-    match output_result {
-        Ok(output) => match output.status.success() {
-            true => (),
-            false => {
-                let error_str = match str::from_utf8(&output.stderr) {
-                    Ok(stderr) => stderr.to_string(),
-                    Err(_) => format!("Failed to run \"{}\"", command_str),
-                };
-                panic!("{} failed: {}", command_str, error_str);
-            }
-        },
-        Err(reason) => panic!("{} failed: {}", command_str, reason),
-    }
-}
-
 fn get_zig_files(dir: &Path, cb: &dyn Fn(&Path)) -> io::Result<()> {
     if dir.is_dir() {
         for entry in fs::read_dir(dir)? {

compiler/gen_llvm/src/llvm/build.rs

@@ -1,3 +1,4 @@
+use std::convert::TryFrom;
 use std::path::Path;
 
 use crate::llvm::bitcode::{call_bitcode_fn, call_void_bitcode_fn};
@@ -4432,6 +4433,11 @@ fn run_higher_order_low_level<'a, 'ctx, 'env>(
     }
 }
 
+// TODO: Fix me! I should be different in tests vs. user code!
+fn expect_failed() {
+    panic!("An expectation failed!");
+}
+
 #[allow(clippy::too_many_arguments)]
 fn run_low_level<'a, 'ctx, 'env>(
     env: &Env<'a, 'ctx, 'env>,
@@ -4442,6 +4448,7 @@ fn run_low_level<'a, 'ctx, 'env>(
     op: LowLevel,
     args: &[Symbol],
     update_mode: Option<UpdateMode>,
+    // expect_failed: *const (),
 ) -> BasicValueEnum<'ctx> {
     use LowLevel::*;
 
@@ -5160,8 +5167,20 @@ fn run_low_level<'a, 'ctx, 'env>(
 
             bd.position_at_end(throw_block);
 
-            throw_exception(env, "assert failed!");
+            let fn_ptr_type = context
+                .void_type()
+                .fn_type(&[], false)
+                .ptr_type(AddressSpace::Generic);
+            let fn_addr = env
+                .ptr_int()
+                .const_int(expect_failed as *const () as u64, false);
+            let func: PointerValue<'ctx> =
+                bd.build_int_to_ptr(fn_addr, fn_ptr_type, "cast_expect_failed_addr_to_ptr");
+            let callable = CallableValue::try_from(func).unwrap();
 
+            bd.build_call(callable, &[], "call_expect_failed");
+
+            bd.build_unconditional_branch(then_block);
             bd.position_at_end(then_block);
 
             cond

compiler/test_gen/src/gen_primitives.rs

@@ -2401,7 +2401,7 @@ fn call_invalid_layout() {
 }
 
 #[test]
-#[should_panic(expected = "assert failed!")]
+#[should_panic(expected = "An expectation failed!")]
 fn expect_fail() {
     assert_evals_to!(
         indoc!(

editor/editor-ideas.md

@@ -78,6 +78,14 @@ e.g. you have a test `calculate_sum_test` that only uses the function `add`, whe
 * [Utopia](https://utopia.app/) integrated design and development environment for React. Design and code update each other, in real time.
 * [Paredit](https://calva.io/paredit/) structural clojure editing, navigation and selection. [Another overview](http://danmidwood.com/content/2014/11/21/animated-paredit.html)
 
+### Project exploration
+
+* Tree view or circle view (like Github Next) of project where exposed values and functions can be seen on hover.
+
+#### Inspiration
+
+* [Github Next](https://next.github.com/projects/repo-visualization) each file and folder is visualised as a circle: the circle’s color is the type of file, and the circle’s size represents the size of the file. Sidenote, a cool addition to this might be to use heatmap colors for the circles; circles for files that have had lots of commits could be more red, files with few commits would be blue.
+
 ### Voice Interaction Related
 
 * We should label as many things as possible and expose jumps to those labels as shortkeys.
@@ -231,6 +239,11 @@ e.g. you have a test `calculate_sum_test` that only uses the function `add`, whe
     The API and documentation are meant to interface with humans.
 * [DocC](https://developer.apple.com/videos/play/wwdc2021/10166/) neat documentation approach for swift. 
 
+## Tutorials
+
+* Inclusion of step-by-step tutrials in Roc libraries, platforms or business specific code.
+* Having to set up your own website for a tutorial can be a lot of work, making it easy to make quality tutorials would make for a more delightful experience.
+
 ## General Plugin Ideas
 
 ### Ideas