Merge branch 'master' into features/refactor-bin

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## **[Unreleased]**
 
 - [#1357](https://github.com/wasmerio/wasmer/pull/1357) Refactored bin commands into separate files
+- [#1331](https://github.com/wasmerio/wasmer/pull/1331) Implement the `record` type and instrutions for WIT
 - [#1345](https://github.com/wasmerio/wasmer/pull/1345) Adding ARM testing in Azure Pipelines
 - [#1335](https://github.com/wasmerio/wasmer/pull/1335) Change mutability of `memory` to `const` in `wasmer_memory_data_length` in the C API
 - [#1329](https://github.com/wasmerio/wasmer/pull/1329) New numbers and strings instructions for WIT

lib/interface-types/Cargo.toml

@@ -10,3 +10,11 @@ edition = "2018"
 [dependencies]
 nom = "5.1"
 wast = "8.0"
+
+# `serde` is useful only to simplify the users' life. It is not
+# required by WIT itself, is is used to cross the boundary between the
+# host and WIT more easily, but it is not used inside Wasm.
+serde = { version = "1.0", features = ["derive"], optional = true }
+
+[features]
+default = ["serde"]

lib/interface-types/src/ast.rs

@@ -1,7 +1,7 @@
 //! Represents the WIT language as a tree. This is the central
 //! representation of the language.
 
-use crate::interpreter::Instruction;
+use crate::{interpreter::Instruction, vec1::Vec1};
 use std::str;
 
 /// Represents the types supported by WIT.
@@ -48,20 +48,50 @@ pub enum InterfaceType {
 
     /// A 64-bits integer (as defiend in WebAssembly core).
     I64,
+
+    /// A record.
+    Record(RecordType),
+}
+
+/// Represents a record type.
+#[derive(PartialEq, Debug, Clone)]
+pub struct RecordType {
+    /// Types representing the fields.
+    pub fields: Vec1<InterfaceType>,
 }
 
-/// Represents a type signature.
-///
-/// ```wasm,ignore
-/// (@interface type (param i32 i32) (result string))
-/// ```
+/// Represents the kind of type.
 #[derive(PartialEq, Debug)]
-pub struct Type {
-    /// Types for the parameters (`(param …)`).
-    pub inputs: Vec<InterfaceType>,
+pub enum TypeKind {
+    /// A function type.
+    Function,
 
-    /// Types for the results (`(result …)`).
-    pub outputs: Vec<InterfaceType>,
+    /// A record type.
+    Record,
+}
+
+/// Represents a type.
+#[derive(PartialEq, Debug)]
+pub enum Type {
+    /// A function type, like:
+    ///
+    /// ```wasm,ignore
+    /// (@interface type (func (param i32 i32) (result string)))
+    /// ```
+    Function {
+        /// Types for the parameters (`(param …)`).
+        inputs: Vec<InterfaceType>,
+
+        /// Types for the results (`(result …)`).
+        outputs: Vec<InterfaceType>,
+    },
+
+    /// A record type, like:
+    ///
+    /// ```wasm,ignore
+    /// (@interface type (record string i32))
+    /// ```
+    Record(RecordType),
 }
 
 /// Represents an imported function.