Merge pull request #35 from iwillspeak/treebuild

.editorconfig

@@ -0,0 +1,9 @@
+
+root = true
+
+[*.rs]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 4

Cargo.toml

@@ -12,14 +12,14 @@ categories = [ "parsing" ]
 edition = "2018"
 
 [features]
-default = [ "llvm-9" ]
+default = [ "llvm-13" ]
 
 [dependencies]
 llvm-9 = { package = "llvm-sys", version = "90", optional = true }
 llvm-10 = { package = "llvm-sys", version = "100", optional = true }
+llvm-13 = { package = "llvm-sys", version = "130", optional = true }
 docopt = "1.1"
 serde = { version = "1.0", features = ["derive"] }
 tempfile = "3.1"
-failure = "0.1"
 libc = "0.2"
 indexmap = "1.5"

justfile

@@ -1,4 +1,4 @@
-features := "llvm-10"
+features := "llvm-13"
 
 build:
     cargo build --release --no-default-features --features={{features}}

spec/malformed/invalid_calls.ulg

@@ -0,0 +1,13 @@
+fn foo(n: Number, b: Bool): Number
+   n if b else 2
+end
+
+# !> 6:4:error: unexpected token: expected expression but found ','
+foo(,)
+
+# it's OK to have a trailing `,`
+foo(100, false,)
+
+# don't go nuts though...
+# !> 13:15:error: unexpected token: expected expression but found ','
+foo(969, true, ,)

src/compile.rs

@@ -5,14 +5,16 @@ use crate::diag::Diagnostic;
 use crate::low_loader::prelude::*;
 use crate::sem;
 use crate::syntax;
+use linker::Linker;
 use std::path::Path;
 use std::process::Command;
 use tempfile::Builder;
 
 pub use self::error::{CompError, CompResult};
-pub use self::options::{CompilationOptions, LinkKind, OptimisationLevel};
+pub use self::options::{CompilationOptions, OptimisationLevel};
 
 pub mod error;
+pub mod linker;
 pub mod options;
 
 mod lower;
@@ -105,13 +107,13 @@ impl Compilation {
         fun.verify_or_panic();
         module.verify_or_panic();
 
+        let linker = self.options.linker.unwrap_or_else(Linker::default);
+
         // Create a tempdir to write the LLVM IR or bitcode to
-        let (suffix, kind) = match self.options.link_kind {
-            LinkKind::IL => (".il", OutputFileKind::LLVMIl),
-            LinkKind::Bitcode => (".bc", OutputFileKind::Bitcode),
-            LinkKind::Object => (".o", OutputFileKind::NativeObject),
-        };
-        let temp_file = Builder::new().prefix("ullage").suffix(suffix).tempfile()?;
+        let temp_file = Builder::new()
+            .prefix("ullage")
+            .suffix(linker.asset_ty.extension())
+            .tempfile()?;
 
         // check if we have optimiation enabled and run the
         // corresponding optimisations if we do.
@@ -123,10 +125,10 @@ impl Compilation {
         if self.options.dump_ir {
             module.dump();
         }
-        module.write_to_file(&target, temp_file.path(), kind)?;
+        module.write_to_file(&target, temp_file.path(), linker.asset_ty.file_kind())?;
 
         // Shell out to Clang to link the final assembly
-        let output = Command::new("clang")
+        let output = Command::new(linker.cmd.executable())
             .arg(temp_file.path())
             .arg(format!("--target={}", target.triple()))
             .arg("-o")