default implementation not allowed

PLC-lang · Feb 6, 2025 · 2da769a · 2da769a
1 parent 84d945d
commit 2da769a
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 24 deletions.
diff --git a/compiler/plc_diagnostics/src/diagnostics/diagnostics_registry.rs b/compiler/plc_diagnostics/src/diagnostics/diagnostics_registry.rs
@@ -218,6 +218,7 @@ lazy_static! {
         E114,   Error,      include_str!("./error_codes/E114.md"),  // Property in unsupported POU type
         E115,   Error,      include_str!("./error_codes/E115.md"),  // Property defined in non-supported variable block
         E116,   Error,      include_str!("./error_codes/E116.md"),  // Property with invalid number of GET and/or SET blocks
+        E117,   Warning,      include_str!("./error_codes/E117.md"),  // Interface default Property implementation
     );
 }
 

diff --git a/src/lowering/property.rs b/src/lowering/property.rs
@@ -424,24 +424,6 @@ mod tests {
         unit
     }
 
-    #[test]
-    // TODO this code should fail because get/set in interaces
-    // are not allowed to have an implementation
-    fn property_in_interface_must_not_have_an_implementation() {
-        let source = r"
-            INTERFACE myInterface
-                PROPERTY foo : DINT
-                    GET
-                      foo := 5;
-                    END_GET
-                END_PROPERTY
-            END_INTERFACE
-        ";
-
-        let unit = lower(source);
-        insta::assert_debug_snapshot!(unit.implementations, @"[]");
-    }
-
     #[test]
     fn properties_are_used_within_each_other() {
         let source = r"

diff --git a/src/parser.rs b/src/parser.rs
@@ -199,7 +199,7 @@ fn parse_interface(lexer: &mut ParseSession) -> (Interface, Vec<Implementation>)
                     // This is temporary? At some point we'll support them but for now it's a diagnostic
                     if !imp.statements.is_empty() {
                         lexer.accept_diagnostic(
-                            Diagnostic::new("Interfaces can not have a default implementations")
+                            Diagnostic::new("Interfaces can not have a default implementations in a Method")
                                 .with_error_code("E113")
                                 .with_location(&imp.location),
                         );
@@ -212,6 +212,13 @@ fn parse_interface(lexer: &mut ParseSession) -> (Interface, Vec<Implementation>)
 
             KeywordProperty => {
                 if let Some(prop) = parse_property(lexer, &name, &location_name, &PouType::FunctionBlock) {
+                    if !prop.implementations.iter().all(|statement| statement.body.is_empty()) {
+                        lexer.accept_diagnostic(
+                            Diagnostic::new("Interfaces can not have a default implementation in a Property")
+                                .with_error_code("E117")
+                                .with_location(prop.name_location.clone()),
+                        );
+                    }
                     properties.push(prop);
                 }
             }

diff --git a/src/parser/tests/interface_parser_tests.rs b/src/parser/tests/interface_parser_tests.rs
@@ -378,6 +378,49 @@ fn pou_implementing_multiple_interfaces() {
     "###);
 }
 
+#[test]
+// TODO: make the error nicer (error per occurence and better location?)
+fn property_in_interface_must_not_have_an_implementation() {
+    let source = r"
+            INTERFACE myInterface
+                PROPERTY foo : DINT
+                    GET
+                       foo := 5;
+                    END_GET
+                    SET
+                       foo := 5;
+                    END_SET
+                END_PROPERTY
+            END_INTERFACE
+        ";
+
+    let (unit, diagnostics) = parse(source);
+    insta::assert_debug_snapshot!(diagnostics, @r#"
+    [
+        Diagnostic {
+            message: "Interfaces can not have a default implementation in a Property",
+            primary_location: SourceLocation {
+                span: Range(
+                    TextLocation {
+                        line: 2,
+                        column: 25,
+                        offset: 60,
+                    }..TextLocation {
+                        line: 2,
+                        column: 28,
+                        offset: 63,
+                    },
+                ),
+            },
+            secondary_locations: None,
+            error_code: "E117",
+            sub_diagnostics: [],
+            internal_error: None,
+        },
+    ]
+    "#);
+}
+
 #[test]
 fn property_inside_interface() {
     let source = r#"
@@ -517,15 +560,14 @@ mod error_handling {
         ";
 
         let diagnostics = parse_and_validate_buffered(source);
-        insta::assert_snapshot!(diagnostics, @r###"
-        warning[E113]: Interfaces can not have a default implementations
+        insta::assert_snapshot!(diagnostics, @r"
+        warning[E113]: Interfaces can not have a default implementations in a Method
           ┌─ <internal>:4:17
           │  
         4 │ ╭                 1 > 2;
         5 │ │                 methodA := 5;
-          │ ╰─────────────────────────────^ Interfaces can not have a default implementations
-
-        "###);
+          │ ╰─────────────────────────────^ Interfaces can not have a default implementations in a Method
+        ");
     }
 
     #[test]