Changeset ec5d599 for tests

Timestamp:

Dec 5, 2020, 8:48:42 AM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

e91a255

Parents:

7c1144b (diff), ad915e0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

tests

Files:

• .expect/KRfunctions.nast.x86.txt (added)
• .expect/KRfunctions.oast.x86.txt (moved) (moved from tests/.expect/KRfunctions.x86.txt )
• .expect/attributes.nast.x86.txt (added)
• .expect/attributes.oast.x86.txt (moved) (moved from tests/.expect/attributes.x86.txt )
• .expect/functions.nast.x86.txt (added)
• .expect/functions.oast.x86.txt (moved) (moved from tests/.expect/functions.x86.txt )
• .expect/manipulatorsOutput2.arm64.txt (modified) (1 diff)
• errors/.expect/completeType.nast.x86.txt (added)
• errors/.expect/completeType.oast.x86.txt (moved) (moved from tests/errors/.expect/completeType.x86.txt ) (4 diffs)
• meta/.expect/archVast.nast.x86.txt (modified) (2 diffs)
• meta/.expect/archVast.oast.x86.txt (modified) (2 diffs)

tests/.expect/manipulatorsOutput2.arm64.txt

@@ -1 +1 @@
 
 0b0 0b11011 0b11011 0b11011 0b11011
-0b11100101 0b1111111111100101 0b11111111111111111111111111100101 0b11111111111111111111111111100101
+0b11100101 0b1111111111100101 0b11111111111111111111111111100101 0b1111111111111111111111111111111111111111111111111111111111100101
 0 033 033 033 033
-0345 0177745 037777777745 037777777745
+0345 0177745 037777777745 01777777777777777777745
 0 0x1b 0x1b 0x1b 0x1b
-0xe5 0xffe5 0xffffffe5 0xffffffe5
-0x0p+0. 0x1.b8p+4 0x1.b8p+4 0xd.cp+1
--0x1.b8p+4 -0x1.b8p+4 -0xd.cp+1
+0xe5 0xffe5 0xffffffe5 0xffffffffffffffe5
+0x0p+0. 0x1.b8p+4 0x1.b8p+4 0x1.b8p+4
+-0x1.b8p+4 -0x1.b8p+4 -0x1.b8p+4
 0.000000e+00 2.750000e+01 -2.750000e+01
 0B11011 0X1B 2.75E-09 0X1.B8P+4

tests/errors/.expect/completeType.oast.x86.txt

@@ -6 +6 @@
     Name: x
 
-... to: nothing Alternatives are:
+... to: nothing
+with resolved type:
+  void  Alternatives are:
 Cost ( 0, 1, 2, 0, 1, -1, 0 ): Generated Cast of:
       Application of
@@ -20 +22 @@
 
 
+        with resolved type:
+          pointer to forall
+            [unbound]:data type
+            function
+          ... with parameters
+            intrinsic pointer to instance of type [unbound] (not function type)
+          ... returning
+            _retval__operator_deref: reference to instance of type [unbound] (not function type)
+            ... with attributes:
+              Attribute with name: unused
+
+
       ... to arguments
         Variable Expression: x: pointer to instance of struct A with body 0
-
+        with resolved type:
+          pointer to instance of struct A with body 0
+
+      with resolved type:
+        reference to instance of struct A with body 0
     ... to: nothing
+    with resolved type:
+      void 
   (types:
     void 
   )
-  Environment: -> instance of struct A with body 0 (no widening)
+  Environment:([unbound]) -> instance of struct A with body 0 (no widening)
 
 
@@ -43 +63 @@
 
 
+        with resolved type:
+          pointer to forall
+            [unbound]:data type
+            function
+          ... with parameters
+            intrinsic pointer to instance of type [unbound] (not function type)
+          ... returning
+            _retval__operator_deref: reference to instance of type [unbound] (not function type)
+            ... with attributes:
+              Attribute with name: unused
+
+
       ... to arguments
         Variable Expression: x: pointer to instance of struct B with body 1
-
+        with resolved type:
+          pointer to instance of struct B with body 1
+
+      with resolved type:
+        reference to instance of struct B with body 1
     ... to: nothing
+    with resolved type:
+      void 
   (types:
     void 
   )
-  Environment: -> instance of struct B with body 1 (no widening)
+  Environment:([unbound]) -> instance of struct B with body 1 (no widening)
 
 
@@ -121 +159 @@
             ... returning nothing
 
+            with resolved type:
+              pointer to forall
+                [unbound]:sized data type
+                ... with assertions
+                  ?=?: pointer to function
+                  ... with parameters
+                    reference to instance of type [unbound] (not function type)
+                    instance of type [unbound] (not function type)
+                  ... returning
+                    _retval__operator_assign: instance of type [unbound] (not function type)
+                    ... with attributes:
+                      Attribute with name: unused
+
+
+                  ?{}: pointer to function
+                  ... with parameters
+                    reference to instance of type [unbound] (not function type)
+                  ... returning nothing
+
+                  ?{}: pointer to function
+                  ... with parameters
+                    reference to instance of type [unbound] (not function type)
+                    instance of type [unbound] (not function type)
+                  ... returning nothing
+
+                  ^?{}: pointer to function
+                  ... with parameters
+                    reference to instance of type [unbound] (not function type)
+                  ... returning nothing
+
+
+                function
+              ... with parameters
+                pointer to instance of type [unbound] (not function type)
+              ... returning nothing
+
           ... to arguments
             Variable Expression: z: pointer to instance of type T (not function type)
-
+            with resolved type:
+              pointer to instance of type T (not function type)
+
+          with resolved type:
+            void 
         (types:
           void 
         )
-        Environment: -> instance of type T (not function type) (no widening)
+        Environment:([unbound]) -> instance of type T (not function type) (no widening)
 
       Could not satisfy assertion:
 ?=?: pointer to function
         ... with parameters
-          reference to instance of type _109_0_T (not function type)
-          instance of type _109_0_T (not function type)
+          reference to instance of type [unbound] (not function type)
+          instance of type [unbound] (not function type)
         ... returning
-          _retval__operator_assign: instance of type _109_0_T (not function type)
+          _retval__operator_assign: instance of type [unbound] (not function type)
           ... with attributes:
             Attribute with name: unused

tests/meta/.expect/archVast.nast.x86.txt

@@ -7 +7 @@
   char Alternatives are:
 Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
-      Variable Expression: FX86: signed int
+      Variable Expression: FX86: double
       ... with resolved type:
-        signed int
+        double
     ... to:
       char
@@ -39 +39 @@
 
 Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
-      Variable Expression: FX86: double
+      Variable Expression: FX86: signed int
       ... with resolved type:
-        double
+        signed int
     ... to:
       char

tests/meta/.expect/archVast.oast.x86.txt

@@ -6 +6 @@
 with resolved type:
   char Alternatives are:
+Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
+      Variable Expression: FX86: double
+      with resolved type:
+        double
+    ... to:
+      char
+    with resolved type:
+      char
+  (types:
+    char
+  )
+  Environment:
+
 Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
       Variable Expression: FX86: function
@@ -16 +29 @@
         ... returning nothing
 
-    ... to:
-      char
-    with resolved type:
-      char
-  (types:
-    char
-  )
-  Environment:
-
-Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
-      Variable Expression: FX86: double
-      with resolved type:
-        double
     ... to:
       char