Update Aspectator and add one more test case

Author: eunovm

aspectator

@@ -0,0 +1,3 @@
+info: expand($(..)) {
+    $fprintf<"work/info.txt","%s %s %s\n",$path,$macro_name,$actual_args>
+}

tests/aspect/macro_actual_args.aspect

@@ -0,0 +1,9 @@
+#define NOARG
+#define ONE_ARG(x) (x)
+#define TWO_ARGS(x, y) (x + y)
+#define THREE_ARGS(x, y, z) (x + y + z)
+
+int func(void)
+{
+  return NOARG + ONE_ARG(1) + TWO_ARGS(2, 3) + THREE_ARGS(4, 5, 6);
+}

tests/input/macro_actual_args.c

@@ -0,0 +1,3 @@
+input/macro_actual_args.c ONE_ARG actual_arg1=1
+input/macro_actual_args.c TWO_ARGS actual_arg1=2, actual_arg2= 3
+input/macro_actual_args.c THREE_ARGS actual_arg1=4, actual_arg2= 5, actual_arg3= 6

tests/output/macro_actual_args.txt

@@ -8,6 +8,11 @@ def test_simple_info_expand_all(self):
         self.skip_os_specific_defines('work/info.txt')
         self.compare(output='work/info.txt', expected='output/simple_call_info_expand_all.txt')
 
+    def test_macro_actual_args(self):
+        self.cif.run(cif_input='input/macro_actual_args.c', aspect='aspect/macro_actual_args.aspect', stage='instrumentation')
+        self.skip_os_specific_defines('work/info.txt')
+        self.compare(output='work/info.txt', expected='output/macro_actual_args.txt')
+
 
 if __name__ == '__main__':
     unittest.main()