Update Aspectator and enhance test case

eunovm · eunovm · commit 422c2d8c2c25 · 2019-08-21T11:38:42.000+03:00
diff --git a/aspectator b/aspectator
@@ -1 +1 @@
-Subproject commit 06f70ff99f3cbfb29bf9596455c87504b596fa36
+Subproject commit 28cd3a0ba32d154fbbc9b99d157445f21313c3b8
diff --git a/tests/aspect/info_expand_all.aspect b/tests/aspect/info_expand_all.aspect
@@ -1,6 +1,6 @@
 info: expand($) {
-    $fprintf<"work/info.txt","%s %d %s\n",$path,$line,$macro_name>
+    $fprintf<"work/info.txt","%s %d %s %s %d\n",$expansion_path,$expansion_line,$macro_name,$path,$line>
 }
 info: expand($(..)) {
-    $fprintf<"work/info.txt","%s %d %s\n",$path,$line,$macro_name>
+    $fprintf<"work/info.txt","%s %d %s %s %d\n",$expansion_path,$expansion_line,$macro_name,$path,$line>
 }
diff --git a/tests/output/simple_call_info_expand_all.txt b/tests/output/simple_call_info_expand_all.txt
@@ -1,2 +1,2 @@
-input/simple.c 30 CONST
-input/simple.c 40 ZERO
+input/simple.c 30 CONST input/simple.c 2
+input/simple.c 40 ZERO input/simple.c 3

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`info: expand($) {`
`2`		`- $fprintf<"work/info.txt","%s %d %s\n",$path,$line,$macro_name>`
	`2`	`+ $fprintf<"work/info.txt","%s %d %s %s %d\n",$expansion_path,$expansion_line,$macro_name,$path,$line>`
`3`	`3`	`}`
`4`	`4`	`info: expand($(..)) {`
`5`		`- $fprintf<"work/info.txt","%s %d %s\n",$path,$line,$macro_name>`
	`5`	`+ $fprintf<"work/info.txt","%s %d %s %s %d\n",$expansion_path,$expansion_line,$macro_name,$path,$line>`
`6`	`6`	`}`