more tests, more validation, some cleanups

Author: abroooo

src/codegen/generators/expression_generator.rs

@@ -220,15 +220,14 @@ impl<'ink, 'b> ExpressionCodeGenerator<'ink, 'b> {
             AstStatement::This => {
                 // TODO: #THIS meaningful errors
                 // [ ] add tests
-                let function_context = self.function_context.ok_or_else(|| {
+                self.function_context.ok_or_else(|| {
                     Diagnostic::codegen_error("Cannot use 'this' without context", expression)
                 })?;
-                let this_name = self.annotations.get_call_name(expression).unwrap();
                 let Some(this_name) = self.annotations.get_call_name(expression) else {
                     todo!("error handling")
                 };
                 let this_value =
-                    self.llvm_index.find_loaded_associated_variable_value(&this_name).ok_or_else(|| {
+                    self.llvm_index.find_loaded_associated_variable_value(this_name).ok_or_else(|| {
                         let message = format!("Cannot find '{}' in associated variable values", this_name);
                         Diagnostic::codegen_error(message, expression)
                     })?;

src/parser/tests/expressions_parser_tests.rs

@@ -2019,32 +2019,6 @@ fn this_keyword_can_be_mixed_with_super() {
     let parse_result = parse(src).0;
     assert_debug_snapshot!(parse_result.implementations[0].statements, @r#"
     [
-        ReferenceExpr {
-            kind: Member(
-                Identifier {
-                    name: "x",
-                },
-            ),
-            base: Some(
-                This,
-            ),
-        },
-        ReferenceExpr {
-            kind: Member(
-                Identifier {
-                    name: "y",
-                },
-            ),
-            base: Some(
-                ReferenceExpr {
-                    kind: Deref,
-                    base: Some(
-                        This,
-                    ),
-                },
-            ),
-        },
-        This,
         CallStatement {
             operator: ReferenceExpr {
                 kind: Member(
@@ -2054,9 +2028,16 @@ fn this_keyword_can_be_mixed_with_super() {
                 ),
                 base: Some(
                     ReferenceExpr {
-                        kind: Deref,
+                        kind: Member(
+                            Super(derefed),
+                        ),
                         base: Some(
-                            This,
+                            ReferenceExpr {
+                                kind: Deref,
+                                base: Some(
+                                    This,
+                                ),
+                            },
                         ),
                     },
                 ),
@@ -2071,7 +2052,12 @@ fn this_keyword_can_be_mixed_with_super() {
                             },
                         ),
                         base: Some(
-                            This,
+                            ReferenceExpr {
+                                kind: Deref,
+                                base: Some(
+                                    This,
+                                ),
+                            },
                         ),
                     },
                     right: ReferenceExpr {
@@ -2092,33 +2078,6 @@ fn this_keyword_can_be_mixed_with_super() {
                 },
             ),
         },
-        CallStatement {
-            operator: This,
-            parameters: None,
-        },
-        Assignment {
-            left: This,
-            right: CallStatement {
-                operator: ReferenceExpr {
-                    kind: Member(
-                        Identifier {
-                            name: "REF",
-                        },
-                    ),
-                    base: None,
-                },
-                parameters: Some(
-                    ReferenceExpr {
-                        kind: Member(
-                            Identifier {
-                                name: "fb2",
-                            },
-                        ),
-                        base: None,
-                    },
-                ),
-            },
-        },
     ]
     "#);
 }

src/parser/tests/parse_errors/parse_error_containers_tests.rs

@@ -307,7 +307,7 @@ fn this_is_a_reserved_keyword() {
     error[E007]: Unexpected token: expected KeywordSemicolon but found 'VAR
                 this'
       ┌─ <internal>:4:9
-      │
+      │  
     4 │ ╭         VAR
     5 │ │             this : INT;
       │ ╰────────────────^ Unexpected token: expected KeywordSemicolon but found 'VAR
@@ -322,7 +322,7 @@ fn this_is_a_reserved_keyword() {
     error[E007]: Unexpected token: expected KeywordSemicolon but found 'END_VAR
             METHOD this END_METHOD'
       ┌─ <internal>:6:9
-      │
+      │  
     6 │ ╭         END_VAR
     7 │ │         METHOD this END_METHOD
       │ ╰──────────────────────────────^ Unexpected token: expected KeywordSemicolon but found 'END_VAR
@@ -345,5 +345,11 @@ fn this_is_a_reserved_keyword() {
       │
     3 │     PROGRAM this
       │             ^^^^ Case condition used outside of case statement! Did you mean to use ';'?
+
+    error[E120]: Invalid use of `THIS`. Usage is only allowed within POU of type `FUNCTION_BLOCK` or type `METHOD`
+      ┌─ <internal>:3:13
+      │
+    3 │     PROGRAM this
+      │             ^^^^ Invalid use of `THIS`. Usage is only allowed within POU of type `FUNCTION_BLOCK` or type `METHOD`
     ");
 }

src/resolver.rs

@@ -1650,7 +1650,7 @@ impl<'i> TypeAnnotator<'i> {
                 let name = match ctx.pou.and_then(|name| self.index.find_pou(name)) {
                     Some(PouIndexEntry::FunctionBlock { name, .. }) => name,
                     Some(PouIndexEntry::Method { parent_name: name, .. })
-                        if self.index.find_pou(&name).is_some_and(|it| it.is_function_block()) =>
+                        if self.index.find_pou(name).is_some_and(|it| it.is_function_block()) =>
                     {
                         name
                     }

src/validation/statement.rs

@@ -152,22 +152,27 @@ pub fn visit_statement<T: AnnotationMap>(
             }
         }
         AstStatement::This => {
-            dbg!(statement);
-            // TODO: check if I have an annotation. Only this in fb or method has annoation. If I
-            // dont have an annotation then something is wrong.
-            // if context.annotations.get_type(statement, context.index).is_none() {
-            // if context.annotations.get_type(statement, context.index).is_none() {
             if !context.qualifier.is_some_and(|it| {
-                context.index.find_pou(it).is_some_and(|it| it.is_method() || it.is_function_block())
+                context
+                    .index
+                    .find_pou(it)
+                    .and_then(|it| {
+                        if it.is_function_block() {
+                            Some(it)
+                        } else {
+                            context.index.find_pou(it.get_parent_pou_name().unwrap_or_default())
+                        }
+                    })
+                    .is_some_and(|it| it.is_function_block())
             }) {
-                //error
                 validator.push_diagnostic(
-                    Diagnostic::new("Invalid use of `THIS`. Usage is only allowed within POU of type `FUNCTION_BLOCK` or type `METHOD`")
-                        .with_error_code("E120")
-                        .with_location(statement),
+                    Diagnostic::new(
+                        "Invalid use of `THIS`. Usage is only allowed within POU of type `FUNCTION_BLOCK`",
+                    )
+                    .with_error_code("E120")
+                    .with_location(statement),
                 );
             }
-            // todo!()
         }
         _ => {}
     }