Update Aspectator and test cases

eunovm · eunovm · commit a3e66dc2f971 · 2019-03-05T09:34:58.000+03:00
diff --git a/aspectator b/aspectator
@@ -1 +1 @@
-Subproject commit 9b543e367448049509c9e778e60af49ce1c0bbce
+Subproject commit ff26854bcdb6fd1e35018c6f3fced6b39e7e45e1
diff --git a/tests/aspect/info_call_all.aspect b/tests/aspect/info_call_all.aspect
@@ -1,3 +1,3 @@
 info: call($ $(..)) {
-  $fprintf<"work/info.txt","%s %s %s %s\n",$func_context_path,$func_context_name,$func_name,$call_line>
+  $fprintf<"work/info.txt","%s %s %s %d\n",$func_context_path,$func_context_name,$func_name,$call_line>
 }
diff --git a/tests/aspect/info_call_args.aspect b/tests/aspect/info_call_args.aspect
@@ -1,3 +1,3 @@
 info: call($ $($)) {
-    $fprintf<"work/info.txt","%s %s %s %s arg1='%s'\n",$func_context_path,$func_context_name,$func_name,$call_line,$arg_value1>
+    $fprintf<"work/info.txt","%s %s %s %d arg1='%s'\n",$func_context_path,$func_context_name,$func_name,$call_line,$arg_value1>
 }
diff --git a/tests/aspect/info_callp_all.aspect b/tests/aspect/info_callp_all.aspect
@@ -1,3 +1,3 @@
 info: callp($ $(..)) {
-  $fprintf<"work/info.txt","%s %s %s %s\n",$func_context_path,$func_context_name,$func_ptr_name,$call_line>
+  $fprintf<"work/info.txt","%s %s %s %d\n",$func_context_path,$func_context_name,$func_ptr_name,$call_line>
 }
diff --git a/tests/aspect/info_declare_func_all.aspect b/tests/aspect/info_declare_func_all.aspect
@@ -1,3 +1,3 @@
 info: declare_func($ $(..)) {
-  $fprintf<"work/info.txt","%s %s %s %s\n",$path,$func_name,$decl_line,$signature>
+  $fprintf<"work/info.txt","%s %s %d %s\n",$path,$func_name,$decl_line,$signature>
 }
diff --git a/tests/aspect/info_define_all.aspect b/tests/aspect/info_define_all.aspect
@@ -1,7 +1,7 @@
 info: define($) {
-  $fprintf<"work/info.txt","%s %s %s\n",$path,$macro_name,$line>
+  $fprintf<"work/info.txt","%s %s %d\n",$path,$macro_name,$line>
 }
 
 info: define($(..)) {
-  $fprintf<"work/info.txt","%s %s %s\n",$path,$macro_name,$line>
+  $fprintf<"work/info.txt","%s %s %d\n",$path,$macro_name,$line>
 }
diff --git a/tests/aspect/info_execution_all.aspect b/tests/aspect/info_execution_all.aspect
@@ -1,3 +1,3 @@
 info: execution($ $(..)) {
-  $fprintf<"work/info.txt","%s %s %s %s\n",$path,$func_name,$decl_line,$signature>
+  $fprintf<"work/info.txt","%s %s %d %s\n",$path,$func_name,$decl_line,$signature>
 }
diff --git a/tests/aspect/info_use_func_all.aspect b/tests/aspect/info_use_func_all.aspect
@@ -1,3 +1,3 @@
 info: use_func($ $(..)) {
-  $fprintf<"work/info.txt","%s %s %s %s\n",$func_context_path,$func_context_name,$func_name,$use_line>
+  $fprintf<"work/info.txt","%s %s %s %d\n",$func_context_path,$func_context_name,$func_name,$use_line>
 }
diff --git a/tests/aspect/info_use_var_all.aspect b/tests/aspect/info_use_var_all.aspect
@@ -1,3 +1,3 @@
 info: use_var($ $) {
-  $fprintf<"work/info.txt","%s %s %s %s\n",$func_context_path,$func_context_name,$var_name,$use_line>
+  $fprintf<"work/info.txt","%s %s %s %d\n",$func_context_path,$func_context_name,$var_name,$use_line>
 }
diff --git a/tests/aspect/makedirs.aspect b/tests/aspect/makedirs.aspect
@@ -1,3 +1,3 @@
 info: call($ $(..)) {
-  $fprintf<"work/" $path,"%s %s\n",$func_name,$call_line>
+  $fprintf<"work/" $path,"%s %d\n",$func_name,$call_line>
 }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`info: call($ $(..)) {`
`2`		`- $fprintf<"work/info.txt","%s %s %s %s\n",$func_context_path,$func_context_name,$func_name,$call_line>`
	`2`	`+ $fprintf<"work/info.txt","%s %s %s %d\n",$func_context_path,$func_context_name,$func_name,$call_line>`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`info: call($ $($)) {`
`2`		`- $fprintf<"work/info.txt","%s %s %s %s arg1='%s'\n",$func_context_path,$func_context_name,$func_name,$call_line,$arg_value1>`
	`2`	`+ $fprintf<"work/info.txt","%s %s %s %d arg1='%s'\n",$func_context_path,$func_context_name,$func_name,$call_line,$arg_value1>`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`info: callp($ $(..)) {`
`2`		`- $fprintf<"work/info.txt","%s %s %s %s\n",$func_context_path,$func_context_name,$func_ptr_name,$call_line>`
	`2`	`+ $fprintf<"work/info.txt","%s %s %s %d\n",$func_context_path,$func_context_name,$func_ptr_name,$call_line>`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`info: declare_func($ $(..)) {`
`2`		`- $fprintf<"work/info.txt","%s %s %s %s\n",$path,$func_name,$decl_line,$signature>`
	`2`	`+ $fprintf<"work/info.txt","%s %s %d %s\n",$path,$func_name,$decl_line,$signature>`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`info: define($) {`
`2`		`- $fprintf<"work/info.txt","%s %s %s\n",$path,$macro_name,$line>`
	`2`	`+ $fprintf<"work/info.txt","%s %s %d\n",$path,$macro_name,$line>`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`info: define($(..)) {`
`6`		`- $fprintf<"work/info.txt","%s %s %s\n",$path,$macro_name,$line>`
	`6`	`+ $fprintf<"work/info.txt","%s %s %d\n",$path,$macro_name,$line>`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`info: execution($ $(..)) {`
`2`		`- $fprintf<"work/info.txt","%s %s %s %s\n",$path,$func_name,$decl_line,$signature>`
	`2`	`+ $fprintf<"work/info.txt","%s %s %d %s\n",$path,$func_name,$decl_line,$signature>`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`info: use_func($ $(..)) {`
`2`		`- $fprintf<"work/info.txt","%s %s %s %s\n",$func_context_path,$func_context_name,$func_name,$use_line>`
	`2`	`+ $fprintf<"work/info.txt","%s %s %s %d\n",$func_context_path,$func_context_name,$func_name,$use_line>`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`info: use_var($ $) {`
`2`		`- $fprintf<"work/info.txt","%s %s %s %s\n",$func_context_path,$func_context_name,$var_name,$use_line>`
	`2`	`+ $fprintf<"work/info.txt","%s %s %s %d\n",$func_context_path,$func_context_name,$var_name,$use_line>`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`info: call($ $(..)) {`
`2`		`- $fprintf<"work/" $path,"%s %s\n",$func_name,$call_line>`
	`2`	`+ $fprintf<"work/" $path,"%s %d\n",$func_name,$call_line>`
`3`	`3`	`}`