Fix bugs for test22

templates/concurrency_view/pohic_wrappers_body/ri.tmplt

@@ -12,6 +12,9 @@
 @@-- @_Remote_Interface_Names_@ :   |_ callee's interface name
 @@-- @_Calling_Threads_@        : Calling threads of the containing block
 // Required interface @_Name_@ in function @_Parent_Function_@
+@@IF@@ @_Param_Names'Length_@ = 0
+   @@SET@@ No_Param=True
+@@END_IF@@
 @@IF@@ @_Param_Names'Length_@ = 0
 void vm_@_LOWER:Parent_Function_@_@_LOWER:Name_@(void)
 @@ELSE@@
@@ -56,9 +59,6 @@ size_IN_buf_@_LOWER:Param_Names_@;
 @@END_TABLE@@
    // calling threads: @_Calling_Threads_@ partition: @_Partition_Name_@
 @@ELSIF@@ @_Kind_@ = UNPROTECTED_OPERATION
-@@IF@@ @_Param_Names'Length_@ = 0
-   @@SET@@ No_Param=True
-@@END_IF@@
    // Unprotected call
 @@TABLE@@
 @@IF@@ @_No_Param_@
@@ -79,6 +79,9 @@ size_IN_buf_@_LOWER:Param_Names_@;
 @@ELSE@@ @@-- Protected call
    // puts("[TASTE] Protected call of @_Name_@");
 @@TABLE@@
+@@IF@@ @_No_Param_@
+   pro_@_LOWER:Remote_Function_Names_@_@_Remote_Interface_Names_@();
+@@ELSE@@
    pro_@_LOWER:Remote_Function_Names_@_@_Remote_Interface_Names_@
 @@INLINE(        \()(,\n         )(\);\n)@@
    @@TABLE@@
@@ -89,6 +92,7 @@ size_IN_buf_@_LOWER:Param_Names_@;
       @@END_IF@@
    @@END_TABLE@@
 @@END_INLINE@@
+@@END_IF@@
 @@END_TABLE@@
 @@END_IF@@
 }

test/test22/Makefile

 KAZOO=../../kazoo
 
 all: test-parse
-	cd output && make
+	$(MAKE) -C output.pohic
 
 test-parse: clean
-	$(KAZOO) --gw \
-	               -o output \
+	$(KAZOO) --gw -p \
+	               -o output.pohic \
 	               --glue \
 		       --debug
 
 clean:
-	rm -rf output
+	rm -rf output.pohic
 
 .PHONY: clean test-parse