Require KWargs for struct initialization

ethereum · Feb 19, 2021 · 9f2d8e8 · 9f2d8e8
1 parent 27ad463
commit 9f2d8e8
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 2 deletions.
diff --git a/analyzer/src/errors.rs b/analyzer/src/errors.rs
@@ -8,6 +8,7 @@ use fe_parser::span::Span;
 pub enum ErrorKind {
     BreakWithoutLoop,
     ContinueWithoutLoop,
+    KeyWordArgsRequired,
     MissingReturn,
     NotSubscriptable,
     NumericCapacityMismatch,
@@ -48,6 +49,14 @@ impl SemanticError {
         }
     }
 
+    /// Create a new error with kind `KeyWordArgsRequired`
+    pub fn kw_args_required() -> Self {
+        SemanticError {
+            kind: ErrorKind::KeyWordArgsRequired,
+            context: vec![],
+        }
+    }
+
     /// Create a new error with kind `MissingReturn`
     pub fn missing_return() -> Self {
         SemanticError {

diff --git a/analyzer/src/traversal/expressions.rs b/analyzer/src/traversal/expressions.rs
@@ -530,6 +530,7 @@ fn expr_call_struct_constructor(
     typ: Struct,
     args: &Spanned<Vec<Spanned<fe::CallArg>>>,
 ) -> Result<ExpressionAttributes, SemanticError> {
+    validate_are_kw_args(&args.node)?;
     let argument_attributes = expr_call_args(Rc::clone(&scope), Rc::clone(&context), args)?;
 
     if typ.get_field_types() != expression_attributes_to_types(argument_attributes) {
@@ -888,6 +889,17 @@ fn expr_attribute_call_type(
     unreachable!()
 }
 
+fn validate_are_kw_args(args: &[Spanned<fe::CallArg>]) -> Result<(), SemanticError> {
+    if args
+        .iter()
+        .any(|arg| matches!(arg.node, fe::CallArg::Arg(_)))
+    {
+        return Err(SemanticError::kw_args_required());
+    }
+
+    Ok(())
+}
+
 fn validate_is_numeric_literal(call_arg: &fe::CallArg) -> Result<String, SemanticError> {
     if let fe::CallArg::Arg(fe::Expr::UnaryOperation { operand, op: _ }) = call_arg {
         if let fe::Expr::Num(num) = (*operand).node {

diff --git a/compiler/tests/compile_errors.rs b/compiler/tests/compile_errors.rs
@@ -28,6 +28,7 @@ use std::fs;
     case("type_constructor_from_variable.fe", "NumericLiteralExpected"),
     case("needs_mem_copy.fe", "CannotMove"),
     case("string_capacity_mismatch.fe", "StringCapacityMismatch"),
+    case("struct_call_without_kw_args.fe", "KeyWordArgsRequired"),
     case("numeric_capacity_mismatch/u8_neg.fe", "NumericCapacityMismatch"),
     case("numeric_capacity_mismatch/u8_pos.fe", "NumericCapacityMismatch"),
     case("numeric_capacity_mismatch/u16_neg.fe", "NumericCapacityMismatch"),

diff --git a/compiler/tests/fixtures/compile_errors/struct_call_without_kw_args.fe b/compiler/tests/fixtures/compile_errors/struct_call_without_kw_args.fe
@@ -0,0 +1,8 @@
+struct House:
+    vacant: bool
+    price: u256
+
+contract Foo:
+
+    pub def bar():
+        my_house: House = House(true, price=1000000)
diff --git a/compiler/tests/fixtures/structs.fe b/compiler/tests/fixtures/structs.fe
@@ -7,7 +7,7 @@ contract Foo:
     my_house: House
 
     pub def create_house():
-        self.my_house = House(1,2,false)
+        self.my_house = House(price=1, size=2, vacant=false)
         assert self.my_house.price == 1
         assert self.my_house.size == 2
         assert self.my_house.vacant == false
@@ -25,7 +25,7 @@ contract Foo:
 
 
     pub def bar() -> u256:
-        building: House = House(300, 500, true)
+        building: House = House(price=300, size=500, vacant=true)
         assert building.size == 500
         assert building.price == 300
         assert building.vacant