Repair compound type weaving

This fixes issue https://forge.ispras.ru/issues/11369.

The fix includes:
- Update of Aspectator fixing the raw issue.
- Enabling the appropriate test case (it was slightly extended and
line directives were added to the expected output).
- Describing one more related example in the tutorial.

Author: eunovm

aspectator

@@ -4,7 +4,7 @@ before: introduce(struct rectangle)
     unsigned int perimeter;
 }
 
-around: call(unsigned int calculate_rectangle_square(struct rectangle *r))
+before: call(unsigned int calculate_rectangle_square(struct rectangle *r))
 {
     /* Calculate, store and print rectangle perimeter in addition to square. */
     r->perimeter = r->height + r->width;

docs/samples/weave-struct-rectangle.aspect

@@ -111,6 +111,32 @@ To test this aspect you can run the following commands::
    $ ./calculate-max-rectangle-square 2 5 7 3 4 4 8 9
    Maximum rectangle square is 21
 
+Weaving compound types
+----------------------
+
+CIF suggests means to modify compound types such as structures, unions and enumerations.
+For instance, you can find an example of an appropriate aspect in :numref:`weave-struct-rectangle-aspect`
+(:file:`weave-struct-rectangle.aspect` in :file:`docs/samples`).
+
+.. literalinclude:: samples/weave-struct-rectangle.aspect
+    :caption: Aspect file intended for weaving structure **rectangle**
+    :name: weave-struct-rectangle-aspect
+    :language: c
+
+This aspect adds extra field *perimeter* to the definition of structure *rectangle*.
+Besides, through weaving of function *calculate_rectangle_square()* it calculates, stores and prints out perimeters for
+all rectangles.
+
+To test this aspect you can run the following commands::
+
+   $ ../../inst/bin/cif --in calculate-max-rectangle-square.c --aspect weave-struct-rectangle.aspect --out calculate-max-rectangle-square --back-end bin
+   $ ./calculate-max-rectangle-square 2 5 7 3 4 4 8 9
+   Calculated rectangle perimeter is 7 (2 * 5)
+   Calculated rectangle perimeter is 10 (7 * 3)
+   Calculated rectangle perimeter is 8 (4 * 4)
+   Calculated rectangle perimeter is 17 (8 * 9)
+   Maximum rectangle square is 72
+
 Querying source code
 --------------------
 

docs/tutorial.rst

@@ -54,18 +54,28 @@ before: introduce (struct b35)
 {
   int z;
 }
+after: introduce (struct b36)
+{
+  int z;
+}
+
 before: introduce (union b41)
 {
   int z;
 }
+after: introduce (union b42)
+{
+  int z;
+}
+
 before: introduce (enum b51)
 {
   C,
   D,
 }
 after: introduce (enum b52)
 {
-  , 
+  ,
   G,
   H
 }

tests/aspect/legacy_type.aspect

@@ -60,12 +60,22 @@ struct b35
   int x;
   struct b35 *y;
 };
+struct b36
+{
+  int x;
+  struct b36 *y;
+};
 
 union b41
 {
   int x:1;
   int y:2;
 };
+union b42
+{
+  int x:1;
+  int y:2;
+};
 
 enum b51
 {

tests/input/legacy_type.c

@@ -2,99 +2,144 @@ struct b11
 {
   int z;
 };
+#line 4 "/home/novikov/work/cif/tests/input/legacy_type.c"
 struct b12
 {
   int z;
-  int x;
+  int
+#line 6 "/home/novikov/work/cif/tests/input/legacy_type.c"
+  x;
 };
 struct b13
 {
   int z;
-  int x;
+  int
+#line 10 "/home/novikov/work/cif/tests/input/legacy_type.c"
+  x;
   int y;
 };
 struct b14
 {
   int z;
-  int x;
+  int
+#line 15 "/home/novikov/work/cif/tests/input/legacy_type.c"
+  x;
   int
 #line 15 "/home/novikov/work/cif/tests/input/legacy_type.c"
   y;
 };
 struct b15
 {
   int z;
-  int x;
+  int
+#line 19 "/home/novikov/work/cif/tests/input/legacy_type.c"
+  x;
   double y;
 };
 struct b21
 {
   int z;
-  int x;
+  int
+#line 24 "/home/novikov/work/cif/tests/input/legacy_type.c"
+  x;
 };
 struct b22
 {
   int z;
-  struct b21 x;
+  struct b21
+#line 28 "/home/novikov/work/cif/tests/input/legacy_type.c"
+  x;
 };
 struct b23
 {
   int z;
-  struct b21 x;
+  struct b21
+#line 32 "/home/novikov/work/cif/tests/input/legacy_type.c"
+  x;
   int y;
 };
 struct b24
 {
   int z;
-  int x;
+  int
+#line 37 "/home/novikov/work/cif/tests/input/legacy_type.c"
+  x;
   struct b21 y;
 };
 struct b31
 {
   int z;
-  int x;
+  int
+#line 42 "/home/novikov/work/cif/tests/input/legacy_type.c"
+  x;
 };
 struct b32
 {
   int z;
-  struct b31 *x;
+  struct b31
+#line 46 "/home/novikov/work/cif/tests/input/legacy_type.c"
+  *x;
 };
 struct b33
 {
   int z;
-  struct b31 *x;
+  struct b31
+#line 50 "/home/novikov/work/cif/tests/input/legacy_type.c"
+  *x;
   int y;
 };
 struct b34
 {
   int z;
-  int x;
+  int
+#line 55 "/home/novikov/work/cif/tests/input/legacy_type.c"
+  x;
   struct b31 *y;
 };
 struct b35
 {
   int z;
-  int x;
+  int
+#line 60 "/home/novikov/work/cif/tests/input/legacy_type.c"
+  x;
   struct b35 *y;
 };
-#line 64 "/home/novikov/work/cif/tests/input/legacy_type.c"
+struct b36
+{
+  int x;
+  struct b36 *y;
+  int
+#line 68 "/home/novikov/work/cif/tests/input/legacy_type.c"
+  z;
+};
+#line 69 "/home/novikov/work/cif/tests/input/legacy_type.c"
 union b41
 {
   int z;
+  int
+#line 71 "/home/novikov/work/cif/tests/input/legacy_type.c"
+  x : 1U;
+  int y : 2U;
+};
+union b42
+{
   int x : 1U;
   int y : 2U;
+  int
+#line 79 "/home/novikov/work/cif/tests/input/legacy_type.c"
+  z;
 };
 enum b51
 {
-  C,
-  D,
-  A = 0,
-  B = 1
+  C = 0,
+  D = 1,
+  A = 2,
+  B = 3
 };
 enum b52
 {
   E = 0,
   F = 1,
-  G,
-  H
+  G = 2,
+  H = 3
 };

tests/output/legacy_type.c

@@ -11,8 +11,6 @@ def test_macro(self):
         self.cif.run(cif_input='input/legacy_macro.c', aspect='aspect/legacy_macro.aspect', cif_output='work/legacy_macro.c')
         self.compare(output='work/legacy_macro.c', expected='output/legacy_macro.c')
 
-    # Indeed, weaving complex types does not work at all (this is not the case for querying them).
-    @pytest.mark.xfail
     def test_type(self):
         self.cif.run(cif_input='input/legacy_type.c', aspect='aspect/legacy_type.aspect', cif_output='work/legacy_type.c')
         self.compare(output='work/legacy_type.c', expected='output/legacy_type.c')