Multiple system packages (#744)

* Find multiple system packages

* Rename wrong method

* Use multiple system packages

* Rename --main-function-interface-file option

* Refactor

* Rename error

* Fix context options

* Refactor

* Rename multiple FFI build scripts error

* Fix error message

* Refactor external package configuration reader

* Fix linting

* Compile with multiple context files

* Fix context names

* Fix bugs

* Fix examples

* Fix package creation

* Fix feature tests

* Fix os features

* Fix os-sync features

* Comment on unmangled context type names

* Fix smoke tests

* Fix other bugs

* Fix example

cmd/pen/src/application_configuration.rs

@@ -9,8 +9,9 @@ pub static APPLICATION_CONFIGURATION: Lazy<Arc<app::ApplicationConfiguration>> =
         main_module: app::MainModuleConfiguration {
             source_main_function_name: "main".into(),
             object_main_function_name: "_pen_main".into(),
-            context_type_name: "Context".into(),
-            new_context_function_name: "UnsafeNew".into(),
+            main_context_type_name: "context".into(),
+            system_context_type_name: "Context".into(),
+            new_system_context_function_name: "UnsafeNew".into(),
         },
     }
     .into()

cmd/pen/src/main.rs

@@ -71,11 +71,11 @@ fn run() -> Result<(), Box<dyn std::error::Error>> {
                 .setting(clap::AppSettings::Hidden)
                 .about("Compiles a main module")
                 .arg(
-                    clap::Arg::new("main function interface file")
-                        .short('f')
-                        .long("main-function-interface-file")
+                    clap::Arg::new("context interface file")
+                        .short('c')
+                        .long("context-interface-file")
                         .required(true)
-                        .takes_value(true),
+                        .number_of_values(2),
                 )
                 .arg(clap::Arg::new("source file").required(true))
                 .arg(clap::Arg::new("dependency file").required(true))
@@ -186,13 +186,25 @@ fn run() -> Result<(), Box<dyn std::error::Error>> {
             matches.value_of("interface file").unwrap(),
             matches.value_of("target"),
         ),
-        ("compile-main", matches) => main_module_compiler::compile(
-            matches.value_of("source file").unwrap(),
-            matches.value_of("dependency file").unwrap(),
-            matches.value_of("object file").unwrap(),
-            matches.value_of("main function interface file").unwrap(),
-            matches.value_of("target"),
-        ),
+        ("compile-main", matches) => {
+            let context_options = matches
+                .values_of("context interface file")
+                .unwrap()
+                .collect::<Vec<_>>();
+
+            main_module_compiler::compile(
+                matches.value_of("source file").unwrap(),
+                matches.value_of("dependency file").unwrap(),
+                matches.value_of("object file").unwrap(),
+                &context_options
+                    .iter()
+                    .step_by(2)
+                    .cloned()
+                    .zip(context_options.iter().skip(1).step_by(2).cloned())
+                    .collect(),
+                matches.value_of("target"),
+            )
+        }
         ("compile-prelude", matches) => prelude_module_compiler::compile(
             matches.value_of("source file").unwrap(),
             matches.value_of("object file").unwrap(),

cmd/pen/src/main_module_compiler.rs

@@ -1,12 +1,12 @@
 use super::{compile_configuration::COMPILE_CONFIGURATION, main_package_directory_finder};
 use crate::{application_configuration::APPLICATION_CONFIGURATION, infrastructure};
-use std::sync::Arc;
+use std::{collections::BTreeMap, error::Error, sync::Arc};
 
 pub fn compile(
     source_file: &str,
     dependency_file: &str,
     object_file: &str,
-    context_interface_file: &str,
+    context_interface_files: &BTreeMap<&str, &str>,
     target_triple: Option<&str>,
 ) -> Result<(), Box<dyn std::error::Error>> {
     let main_package_directory = main_package_directory_finder::find()?;
@@ -17,7 +17,10 @@ pub fn compile(
         &file_path_converter.convert_to_file_path(source_file)?,
         &file_path_converter.convert_to_file_path(dependency_file)?,
         &file_path_converter.convert_to_file_path(object_file)?,
-        &file_path_converter.convert_to_file_path(context_interface_file)?,
+        &context_interface_files
+            .iter()
+            .map(|(&key, path)| Ok((key.into(), file_path_converter.convert_to_file_path(path)?)))
+            .collect::<Result<BTreeMap<_, _>, Box<dyn Error>>>()?,
         target_triple,
         &COMPILE_CONFIGURATION,
         &APPLICATION_CONFIGURATION,

cmd/pen/src/package_creator.rs

@@ -32,11 +32,10 @@ pub fn create(package_directory: &str, library: bool) -> Result<(), Box<dyn std:
             &infrastructure,
             indoc::indoc!(
                 "
-                import Os'Context { Context }
                 import Os'File
 
-                main = \\(ctx Context) none {
-                  File'Write(ctx, File'StdOut(), \"Hello, world!\\n\")
+                main = \\(ctx context) none {
+                  File'Write(ctx.Os, File'StdOut(), \"Hello, world!\\n\")
 
                   none
                 }

examples/cat/main.pen

@@ -6,12 +6,12 @@ import Os'Process
 
 bufferSize = \() number { 4096 }
 
-main = \(ctx Context) none {
-  if e = run(ctx) as none {
+main = \(ctx context) none {
+  if e = run(ctx.Os) as none {
     none
   } else {
-    Print'Line(ctx, if s = source(e) as string { s } else { "unknown error" })
-    Process'Exit(ctx, 1)
+    Print'Line(ctx.Os, if s = source(e) as string { s } else { "unknown error" })
+    Process'Exit(ctx.Os, 1)
   }
 }
 

examples/echo/main.pen

@@ -4,12 +4,12 @@ import Os'Context { Context }
 import Os'Environment
 import Os'Process
 
-main = \(ctx Context) none {
-  if e = run(ctx) as none {
+main = \(ctx context) none {
+  if e = run(ctx.Os) as none {
     none
   } else {
-    Print'Line(ctx, if s = source(e) as string { s } else { "unknown error" })
-    Process'Exit(ctx, 1)
+    Print'Line(ctx.Os, if s = source(e) as string { s } else { "unknown error" })
+    Process'Exit(ctx.Os, 1)
   }
 }
 

examples/hello-world/main.pen

@@ -1,8 +1,8 @@
 import Os'Context { Context }
 import Os'File
 
-main = \(ctx Context) none {
-  _ = File'Write(ctx, File'StdOut(), "Hello, world!\n")
+main = \(ctx context) none {
+  _ = File'Write(ctx.Os, File'StdOut(), "Hello, world!\n")
 
   none
 }

examples/life-game/main.pen

@@ -13,12 +13,12 @@ import 'lifeGame
 rows = \() number { 20 }
 columns = \() number { 40 }
 
-main = \(ctx Context) none {
-  if e = run(ctx) as none {
+main = \(ctx context) none {
+  if e = run(ctx.Os) as none {
     none
   } else {
-    Print'Line(ctx, if s = source(e) as string { s } else { "unknown error" })
-    Process'Exit(ctx, 1)
+    Print'Line(ctx.Os, if s = source(e) as string { s } else { "unknown error" })
+    Process'Exit(ctx.Os, 1)
   }
 }
 

examples/ls/main.pen

@@ -6,12 +6,12 @@ import Os'Process
 
 import 'arguments
 
-main = \(ctx Context) none {
-  if e = run(ctx) as none {
+main = \(ctx context) none {
+  if e = run(ctx.Os) as none {
     none
   } else {
-    Print'Line(ctx, if s = source(e) as string { s } else { "unknown error" })
-    Process'Exit(ctx, 1)
+    Print'Line(ctx.Os, if s = source(e) as string { s } else { "unknown error" })
+    Process'Exit(ctx.Os, 1)
   }
 }
 

examples/tcp-client/main.pen

@@ -7,12 +7,12 @@ import Os'Process
 
 import 'arguments
 
-main = \(ctx Context) none {
-  if e = run(ctx) as none {
+main = \(ctx context) none {
+  if e = run(ctx.Os) as none {
     none
   } else {
-    Print'Line(ctx, if s = source(e) as string { s } else { "unknown error" })
-    Process'Exit(ctx, 1)
+    Print'Line(ctx.Os, if s = source(e) as string { s } else { "unknown error" })
+    Process'Exit(ctx.Os, 1)
   }
 }
 

examples/tcp-server/main.pen

@@ -10,12 +10,12 @@ import Os'Process
 
 import 'arguments
 
-main = \(ctx Context) none {
-  if e = run(ctx) as none {
+main = \(ctx context) none {
+  if e = run(ctx.Os) as none {
     none
   } else {
-    Print'Line(ctx, if s = source(e) as string { s } else { "unknown error" })
-    Process'Exit(ctx, 1)
+    Print'Line(ctx.Os, if s = source(e) as string { s } else { "unknown error" })
+    Process'Exit(ctx.Os, 1)
   }
 }
 

examples/udp-client/main.pen

@@ -10,12 +10,12 @@ import Os'Process
 
 import 'arguments
 
-main = \(ctx Context) none {
-  if e = run(ctx) as none {
+main = \(ctx context) none {
+  if e = run(ctx.Os) as none {
     none
   } else {
-    Print'Line(ctx, if s = source(e) as string { s } else { "unknown error" })
-    Process'Exit(ctx, 1)
+    Print'Line(ctx.Os, if s = source(e) as string { s } else { "unknown error" })
+    Process'Exit(ctx.Os, 1)
   }
 }
 

examples/udp-server/main.pen

@@ -9,12 +9,12 @@ import Os'Process
 
 import 'arguments
 
-main = \(ctx Context) none {
-  if e = run(ctx) as none {
+main = \(ctx context) none {
+  if e = run(ctx.Os) as none {
     none
   } else {
-    Print'Line(ctx, if s = source(e) as string { s } else { "unknown error" })
-    Process'Exit(ctx, 1)
+    Print'Line(ctx.Os, if s = source(e) as string { s } else { "unknown error" })
+    Process'Exit(ctx.Os, 1)
   }
 }
 

examples/yes/main.pen

@@ -5,12 +5,12 @@ import Os'Process
 
 import 'arguments
 
-main = \(ctx Context) none {
-  if e = run(ctx) as none {
+main = \(ctx context) none {
+  if e = run(ctx.Os) as none {
     none
   } else {
-    Print'Line(ctx, if s = source(e) as string { s } else { "unknown error" })
-    Process'Exit(ctx, 1)
+    Print'Line(ctx.Os, if s = source(e) as string { s } else { "unknown error" })
+    Process'Exit(ctx.Os, 1)
   }
 }
 

features/commands/build.feature

@@ -12,7 +12,7 @@ Feature: Building packages
     """pen
     import Os'Context { Context }
 
-    main = \(ctx Context) none {
+    main = \(ctx context) none {
       none
     }
     """
@@ -46,7 +46,7 @@ Feature: Building packages
     """pen
     import Os'Context { Context }
 
-    main = \(ctx Context) none {
+    main = \(ctx context) none {
       none
     }
     """

features/smoke/function.feature

@@ -28,7 +28,7 @@ Feature: Function
       }
     }
 
-    main = \(ctx Context) none {
+    main = \(ctx context) none {
       f(1)()
 
       none
@@ -46,7 +46,7 @@ Feature: Function
       [none \(x none) none { x }(none)]
     }
 
-    main = \(ctx Context) none {
+    main = \(ctx context) none {
       f()
 
       none

features/smoke/list.feature

@@ -12,16 +12,16 @@ Feature: List
   Scenario: Force multiple elements of a list
     Given a file named "main.pen" with:
     """pen
-    import Os'Context { Context }
+    import Os'Process
 
-    main = \(ctx Context) none {
+    main = \(ctx context) none {
       if [x, ...xs] = [none ...[none none]] {
         x()
-      } else {
+
         none
+      } else {
+        Process'Exit(ctx.Os, 1)
       }
-
-      none
     }
     """
     When I successfully run `pen build`
@@ -30,16 +30,15 @@ Feature: List
   Scenario: Force an element in a list of any type
     Given a file named "main.pen" with:
     """pen
-    import Os'Context { Context }
     import Os'Process
 
-    main = \(ctx Context) none {
+    main = \(ctx context) none {
       if [x, ..._] = [any "foo"] {
         x()
 
         none
       } else {
-        Process'Exit(ctx, 1)
+        Process'Exit(ctx.Os, 1)
       }
     }
     """
@@ -59,13 +58,13 @@ Feature: List
       ]
     }
 
-    main = \(ctx Context) none {
+    main = \(ctx context) none {
       if [x, ..._] = f([[boolean] [boolean true, false]]) {
         x()
 
         none
       } else {
-        Process'Exit(ctx, 1)
+        Process'Exit(ctx.Os, 1)
       }
     }
     """
@@ -75,9 +74,7 @@ Feature: List
   Scenario: Compile list comprehension with wrong typing
     Given a file named "main.pen" with:
     """pen
-    import Os'Context
-
-    main = \(ctx Context) none {
+    main = \(ctx context) none {
       [none y() for y in [none 1]]
 
       none