convert correctness tests to lit

Author: volsa

src/validation/statement.rs

@@ -787,10 +787,12 @@ fn validate_ref_assignment<T: AnnotationMap>(
     }
 
     // Lastly, assert the type the lhs references matches with the rhs
-    let type_lhs = context.annotations.get_type(&assignment.left, context.index).unwrap();
-    let type_rhs = context.annotations.get_type(&assignment.right, context.index).unwrap();
+    let type_lhs = context.annotations.get_type_or_void(&assignment.left, context.index);
+    let type_rhs = context.annotations.get_type_or_void(&assignment.right, context.index);
+    let type_info_lhs = context.index.find_elementary_pointer_type(type_lhs.get_type_information());
+    let type_info_rhs = context.index.find_elementary_pointer_type(type_rhs.get_type_information());
 
-    if type_lhs != type_rhs {
+    if type_info_lhs != type_info_rhs {
         validator.push_diagnostic(
             Diagnostic::new(format!(
                 "Invalid assignment, types {} and {} differ",

src/validation/tests/assignment_validation_tests.rs

@@ -1246,11 +1246,11 @@ fn reference_to_variables_and_ref_assignments() {
                 referenceToFooInitializedArray      : REFERENCE TO ARRAY[1..5] OF DINT;
             END_VAR
 
-            referenceToFoo REF= foo;
+            refToFoo        REF= foo;
+            referenceToFoo  REF= foo;
 
             // Invalid
             foo REF= foo;
-            refToFoo REF= foo;
             referenceToFoo REF= 0;
             referenceToFoo REF= referenceToFoo;
         END_FUNCTION
@@ -1293,12 +1293,6 @@ fn reference_to_variables_and_ref_assignments() {
        │                 │                                      
        │                 REFERENCE TO variables can not reference arrays, pointers or bits
 
-    error[E098]: Invalid assignment, types REF_TO DINT and DINT differ
-       ┌─ <internal>:30:13
-       │
-    30 │             refToFoo REF= foo;
-       │             ^^^^^^^^^^^^^^^^^ Invalid assignment, types REF_TO DINT and DINT differ
-
     error[E098]: Invalid assignment, expected a reference
        ┌─ <internal>:31:33
        │

tests/correctness/pointers.rs

@@ -242,108 +242,3 @@ fn value_behind_function_block_pointer_is_assigned_to_correctly() {
     assert!(!maintype.a);
     assert!(maintype.b);
 }
-
-#[test]
-fn reference_assignment() {
-    let function = r"
-        FUNCTION main : DINT
-            VAR
-                a : REF_TO DINT;
-                b : DINT := 5;
-            END_VAR
-
-            a REF= b;
-            main := a^;
-        END_FUNCTION
-    ";
-
-    let res: i32 = compile_and_run(function.to_string(), &mut MainType::default());
-    assert_eq!(5, res);
-}
-
-#[test]
-fn reference_to_assignment() {
-    let function = r"
-        FUNCTION main : DINT
-            VAR
-                a : REFERENCE TO DINT;
-                b : DINT := 5;
-            END_VAR
-            a REF= b;
-            main := a;
-        END_FUNCTION
-    ";
-
-    let res: i32 = compile_and_run(function, &mut MainType::default());
-    assert_eq!(5, res);
-}
-
-#[test]
-fn reference_to_variable_referencing_other_reference_to_variable() {
-    let function = r"
-        FUNCTION main : DINT
-            VAR
-                foo : REFERENCE TO DINT;
-                bar : REFERENCE TO DINT;
-                qux : DINT;
-            END_VAR
-            
-            bar REF= qux;
-            foo REF= bar;
-            qux := 5;
-
-            main := foo; // foo -> bar -> qux
-        END_FUNCTION
-    ";
-
-    let res: i32 = compile_and_run(function, &mut MainType::default());
-    assert_eq!(5, res);
-}
-
-#[test]
-fn reference_to_variable_referencing_itself() {
-    let function = r"
-        FUNCTION main : DINT
-            VAR
-                foo : REFERENCE TO DINT;
-                bar : REFERENCE TO DINT;
-                qux : DINT;
-            END_VAR
-            
-            foo REF= bar;
-            bar REF= qux;
-
-            bar REF= bar; 
-            qux := 5;
-
-            main := bar; // bar (-> bar) -> qux
-        END_FUNCTION
-    ";
-
-    let res: i32 = compile_and_run(function, &mut MainType::default());
-    assert_eq!(5, res);
-}
-
-#[test]
-fn reference_to_variable_referencing_struct() {
-    let function = r"
-        TYPE Transaction : STRUCT
-            id      : DINT;
-            amount  : DINT;
-            message : STRING;
-        END_STRUCT END_TYPE
-
-        FUNCTION main : DINT
-            VAR
-                txn     : Transaction := (id := 1, amount := 5, message := 'whats up');
-                refTxn  : REFERENCE TO Transaction;
-            END_VAR
-
-            refTxn REF= txn;
-            main := refTxn.amount;
-        END_FUNCTION
-    ";
-
-    let res: i32 = compile_and_run(function, &mut MainType::default());
-    assert_eq!(5, res);
-}

tests/lit/single/pointer/ref_assignment_operator.st

@@ -0,0 +1,11 @@
+// RUN: (%COMPILE %s && %RUN) | %CHECK %s
+// CHECK: 5
+FUNCTION main : DINT
+    VAR
+        a : REF_TO DINT;
+        b : DINT := 5;
+    END_VAR
+    a REF= b;
+
+    printf('%d$N', a^);
+END_FUNCTION

tests/lit/single/pointer/referenceto_variable_referencing_itself.st

@@ -0,0 +1,17 @@
+// RUN: (%COMPILE %s && %RUN) | %CHECK %s
+// CHECK: 5
+FUNCTION main : DINT
+    VAR
+        foo : REFERENCE TO DINT;
+        bar : REFERENCE TO DINT;
+        qux : DINT;
+    END_VAR
+
+    foo REF= bar;
+    bar REF= qux;
+
+    bar REF= bar;
+    qux := 5;
+
+    printf('%d$N', bar); // bar (-> bar) -> qux
+END_FUNCTION

tests/lit/single/pointer/referenceto_variable_referencing_other_referenceto_variable.st

@@ -0,0 +1,15 @@
+// RUN: (%COMPILE %s && %RUN) | %CHECK %s
+// CHECK: 5
+FUNCTION main : DINT
+    VAR
+        foo : REFERENCE TO DINT;
+        bar : REFERENCE TO DINT;
+        qux : DINT;
+    END_VAR
+
+    bar REF= qux;
+    foo REF= bar;
+    qux := 5;
+
+    printf('%d$N', foo); // foo -> bar -> qux
+END_FUNCTION

tests/lit/single/pointer/referenceto_variable_referencing_struct.st

@@ -0,0 +1,17 @@
+// RUN: (%COMPILE %s && %RUN) | %CHECK %s
+// CHECK: 5
+TYPE Transaction : STRUCT
+    id      : DINT;
+    amount  : DINT;
+    message : STRING;
+END_STRUCT END_TYPE
+
+FUNCTION main : DINT
+    VAR
+        txn     : Transaction := (id := 1, amount := 5, message := 'whats up');
+        refTxn  : REFERENCE TO Transaction;
+    END_VAR
+
+    refTxn REF= txn;
+    printf('%d$N', refTxn.amount);
+END_FUNCTION