Add 'exec'

releasenotes.md

@@ -3,6 +3,8 @@
 ## 0.5.0 Change List
 
 ### Changes / improvements
+- 'exec' directive to run scripts at compile time.
+- Project key descriptions in --list command.
 - Added `init-lib` to simplify library creation.
 - Local `const` work like namespaced global `const`.
 - Added `$$atomic_fetch_*` builtins.

resources/testfragments/pwd2.c3

@@ -0,0 +1,3 @@
+module pwd;
+
+fn int getnum() => 3;

src/build/build.h

@@ -355,6 +355,7 @@ typedef struct BuildOptions_
 	const char *llvm_out;
 	const char *asm_out;
 	const char *obj_out;
+	const char *script_dir;
 	RelocModel reloc_model;
 	X86VectorCapability x86_vector_capability;
 	X86CpuSet x86_cpu_set;
@@ -429,6 +430,7 @@ typedef struct
 	const char *object_file_dir;
 	const char *ir_file_dir;
 	const char *asm_file_dir;
+	const char *script_dir;
 	bool run_after_compile;
 	bool generate_benchmark_runner;
 	bool generate_test_runner;
@@ -470,6 +472,7 @@ typedef struct
 	const char *testfn;
 	const char *cc;
 	const char *cflags;
+	const char **exec;
 	const char **csource_dirs;
 	const char **csources;
 	const char **feature_list;

src/build/build_internal.h

@@ -25,6 +25,12 @@ static const char *wincrt_linking[3] = {
 	[WIN_CRT_STATIC] = "static",
 };
 
+static const char *trust_level[3] = {
+	[TRUST_NONE] = "none",
+	[TRUST_INCLUDE] = "include",
+	[TRUST_FULL] = "full",
+};
+
 static const char *optsizes[3] = {
 	[SIZE_OPTIMIZATION_NONE] = "none",
 	[SIZE_OPTIMIZATION_SMALL] = "small",

src/build/build_options.c

@@ -96,13 +96,12 @@ static void usage(void)
 	OUTPUT("  -O5                       - Unsafe, highest optimization, fast maths, single module, emit debug info.");
 	OUTPUT("  -Os                       - Unsafe, high optimization, small code, single module, no debug info.");
 	OUTPUT("  -Oz                       - Unsafe, high optimization, tiny code, single module, no debug info.");
-	OUTPUT("  -t1                       - Trust level 1 - don't allow $include nor $exec (default).");
-	OUTPUT("  -t2                       - Trust level 2 - allow $include but not $exec / exec directives.");
-	OUTPUT("  -t3                       - Trust level 3 - full trust, allow both include and exec.");
 	OUTPUT("  -D <name>                 - Add feature flag <name>.");
 	OUTPUT("  -U <name>                 - Remove feature flag <name>.");
+	OUTPUT("  --trust=<option>          - Trust level: none (default), include ($include allowed), full ($exec / exec allowed).");
 	OUTPUT("  --build-dir <dir>         - Override build output directory.");
 	OUTPUT("  --obj-out <dir>           - Override object file output directory.");
+	OUTPUT("  --script-dir <dir>        - Override the base directory for $exec.");
 	OUTPUT("  --llvm-out <dir>          - Override llvm output directory for '--emit-llvm'.");
 	OUTPUT("  --emit-llvm               - Emit LLVM IR as a .ll file per module.");
 	OUTPUT("  --asm-out <dir>           - Override asm output directory for '--emit-asm'.");
@@ -887,6 +886,11 @@ static void parse_option(BuildOptions *options)
 				options->win.sdk = check_dir(next_arg());
 				return;
 			}
+			if ((argopt = match_argopt("trust")))
+			{
+				options->trust_level = (TrustLevel) parse_multi_option(argopt, 3, trust_level);
+				return;
+			}
 			if ((argopt = match_argopt("wincrt")))
 			{
 				options->win.crt_linking = (WinCrtLinking)parse_multi_option(argopt, 3, wincrt_linking);
@@ -916,6 +920,12 @@ static void parse_option(BuildOptions *options)
 				options->obj_out = next_arg();
 				return;
 			}
+			if (match_longopt("script-dir"))
+			{
+				if (at_end() || next_is_opt()) error_exit("error: --script-dir needs a directory.");
+				options->script_dir = next_arg();
+				return;
+			}
 			if (match_longopt("llvm-out"))
 			{
 				if (at_end() || next_is_opt()) error_exit("error: --llvm-out needs a directory.");
@@ -1044,6 +1054,7 @@ BuildOptions parse_arguments(int argc, const char *argv[])
 		.single_module = SINGLE_MODULE_NOT_SET,
 		.files = NULL,
 		.build_dir = NULL,
+		.script_dir = NULL,
 
 	};
 	for (int i = DIAG_NONE; i < DIAG_WARNING_TYPE; i++)

src/build/builder.c

@@ -312,13 +312,16 @@ static void update_build_target_from_options(BuildTarget *target, BuildOptions *
 		target->object_file_dir = options->obj_out ? options->obj_out : target->build_dir;
 		target->ir_file_dir = options->llvm_out ? options->llvm_out : target->build_dir;
 		target->asm_file_dir = options->asm_out ? options->asm_out : target->build_dir;
+		target->script_dir = options->script_dir ? options->script_dir : target->script_dir;
 	}
 	else
 	{
 		target->build_dir = options->build_dir ? options->build_dir : "build";
 		target->object_file_dir = options->obj_out ? options->obj_out : file_append_path(target->build_dir, "tmp");
 		target->ir_file_dir = options->llvm_out ? options->llvm_out : file_append_path(target->build_dir, "llvm_ir");
 		target->asm_file_dir = options->asm_out ? options->asm_out : file_append_path(target->build_dir, "asm");
+		target->script_dir = options->script_dir ? options->script_dir : target->script_dir;
+		if (!target->script_dir) target->script_dir = "scripts";
 	}
 	switch (options->compile_option)
 	{