lit tests added

PLC-lang · Feb 6, 2025 · dcd03c7 · dcd03c7
1 parent d43b231
commit dcd03c7
Show file tree

Hide file tree

Showing 13 changed files with 62 additions and 4 deletions.
diff --git a/src/codegen/tests/oop_tests.rs b/src/codegen/tests/oop_tests.rs
@@ -83,7 +83,7 @@ fn write_to_parent_variable_qualified_access() {
         VAR 
             myFb : fb2;
         END_VAR
-            myFb.x = 1;
+            myFb.x := 1;
         END_FUNCTION_BLOCK
        ",
     );
@@ -119,9 +119,7 @@ fn write_to_parent_variable_qualified_access() {
       %myFb = getelementptr inbounds %foo, %foo* %0, i32 0, i32 0
       %__BASE = getelementptr inbounds %fb2, %fb2* %myFb, i32 0, i32 0
       %x = getelementptr inbounds %fb, %fb* %__BASE, i32 0, i32 0
-      %load_x = load i16, i16* %x, align 2
-      %1 = sext i16 %load_x to i32
-      %tmpVar = icmp eq i32 %1, 1
+      store i16 1, i16* %x, align 2
       ret void
     }
 

diff --git a/...ingle/methods/aggregate_return_complex.st → ...it/single/oop/aggregate_return_complex.st b/...ingle/methods/aggregate_return_complex.st → ...it/single/oop/aggregate_return_complex.st
diff --git a/.../single/methods/aggregate_return_types.st → .../lit/single/oop/aggregate_return_types.st b/.../single/methods/aggregate_return_types.st → .../lit/single/oop/aggregate_return_types.st
diff --git a/tests/lit/single/oop/fb_access_members_from_base.st b/tests/lit/single/oop/fb_access_members_from_base.st
@@ -0,0 +1,25 @@
+// RUN: (%COMPILE %s && %RUN) | %CHECK %s
+FUNCTION_BLOCK fb
+VAR
+    x : INT;
+    y : INT;
+END_VAR
+END_FUNCTION_BLOCK
+
+FUNCTION_BLOCK fb2 EXTENDS fb
+END_FUNCTION_BLOCK
+
+FUNCTION_BLOCK foo
+VAR 
+    myFb : fb2;
+END_VAR
+    myFb.x := 1;
+    printf('%d$N', myFb.x); //CHECK: 1
+END_FUNCTION_BLOCK
+
+FUNCTION main : DINT
+    VAR
+        fb :foo;
+    END_VAR
+    fb();
+END_FUNCTION
diff --git a/tests/lit/single/oop/fb_complex_access_of_super_members.st b/tests/lit/single/oop/fb_complex_access_of_super_members.st
@@ -0,0 +1,35 @@
+// RUN: (%COMPILE %s && %RUN) | %CHECK %s
+FUNCTION_BLOCK grandparent
+VAR
+    y : ARRAY[0..5] OF INT;
+    a : INT;
+END_VAR
+END_FUNCTION_BLOCK
+
+FUNCTION_BLOCK parent extends grandparent
+    VAR
+        x : ARRAY[0..10] OF INT;
+        b : INT;
+    END_VAR
+END_FUNCTION_BLOCK
+
+FUNCTION_BLOCK child EXTENDS parent
+    VAR
+        z : ARRAY[0..10] OF INT;
+    END_VAR
+    y[b + z[b*2] - a] := 20;
+    b := 1; 
+    z[b] := 3;
+    z[b*2] := 4;
+    a := 2;
+    y[b + z[b*2] - a] := 60;
+    printf('%d$N', y[0]); //CHECK: 20
+    printf('%d$N', y[3]); //CHECK: 60
+END_FUNCTION_BLOCK
+
+FUNCTION main : DINT
+    VAR
+        fb : child;
+    END_VAR
+    fb();
+END_FUNCTION
diff --git a/...s/lit/single/methods/fb_method_callled.st → tests/lit/single/oop/fb_method_callled.st b/...s/lit/single/methods/fb_method_callled.st → tests/lit/single/oop/fb_method_callled.st
diff --git a/...lit/single/methods/fb_method_shadowing.st → tests/lit/single/oop/fb_method_shadowing.st b/...lit/single/methods/fb_method_shadowing.st → tests/lit/single/oop/fb_method_shadowing.st
diff --git a/...methods/fb_method_with_explicit_return.st → ...gle/oop/fb_method_with_explicit_return.st b/...methods/fb_method_with_explicit_return.st → ...gle/oop/fb_method_with_explicit_return.st
diff --git a/...lit/single/methods/fb_with_super_class.st → ...e/oop/fb_with_super_class_method_calls.st b/...lit/single/methods/fb_with_super_class.st → ...e/oop/fb_with_super_class_method_calls.st
diff --git a/...t/single/methods/method_initial_values.st → ...s/lit/single/oop/method_initial_values.st b/...t/single/methods/method_initial_values.st → ...s/lit/single/oop/method_initial_values.st
diff --git a/...s/lit/single/methods/method_var_output.st → tests/lit/single/oop/method_var_output.st b/...s/lit/single/methods/method_var_output.st → tests/lit/single/oop/method_var_output.st
diff --git a/...t/single/methods/program_method_called.st → ...s/lit/single/oop/program_method_called.st b/...t/single/methods/program_method_called.st → ...s/lit/single/oop/program_method_called.st
diff --git a/...ingle/methods/program_method_shadowing.st → ...it/single/oop/program_method_shadowing.st b/...ingle/methods/program_method_shadowing.st → ...it/single/oop/program_method_shadowing.st