X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src-wsl%2Fmetrics.wsl;h=d5638474a05b127cafec5d7f584be28c4bbda00c;hp=0b86ee7cbe4e1c65a5de6478d582ce12b49da284;hb=968e49ab157bc3fa62d175bc588f54ac459d0bc0;hpb=c4e5462be705c72716cc6a610cf878c1f1e84eab

diff --git a/src-wsl/metrics.wsl b/src-wsl/metrics.wsl
index 0b86ee7..d563847 100644
--- a/src-wsl/metrics.wsl
+++ b/src-wsl/metrics.wsl
@@ -91,14 +91,14 @@ MW_PROC @Write_Metrics(metrics VAR) ==
 			OD
 END;
 
-MW_PROC @Write_Metrics_List() ==
-			@WS("McCabe Cyclo");@WS(Field_Separator);
-			@WS("McCabe Essential");@WS(Field_Separator);
-			@WS("Statements");@WS(Field_Separator);
-			@WS("Expressions");@WS(Field_Separator);
-			@WS("CFDF");@WS(Field_Separator);
-			@WS("Size");@WS(Field_Separator);
-			@WS("Structure")
+MW_PROC @Write_Metrics_List(prefix VAR) ==
+			@WS(prefix);@WS("McCabe Cyclo");@WS(Field_Separator);
+			@WS(prefix);@WS("McCabe Essential");@WS(Field_Separator);
+			@WS(prefix);@WS("Statements");@WS(Field_Separator);
+			@WS(prefix);@WS("Expressions");@WS(Field_Separator);
+			@WS(prefix);@WS("CFDF");@WS(Field_Separator);
+			@WS(prefix);@WS("Size");@WS(Field_Separator);
+			@WS(prefix);@WS("Structure")
 END;
 
 MW_PROC @Metrics_Main() ==
@@ -122,15 +122,15 @@ ELSE
 			SKIP
 		ELSIF filename = "-H" OR filename = "--header" THEN
 			@WS("filename");@WS(Field_Separator);
-			@Write_Metrics_List();
+			@Write_Metrics_List("");
 			@WL("");
 		ELSIF filename = "-HC" THEN
 			C:"Header for comparison";
 			@WS("filename");@WS(Field_Separator);
-			@Write_Metrics_List();@WS(Field_Separator);
-			@Write_Metrics_List();@WS(Field_Separator);
-			@WS("DIF");@Write_Metrics_List();@WS(Field_Separator);
-			@WS("%");@Write_Metrics_List();
+			@Write_Metrics_List("P1-");@WS(Field_Separator);
+			@Write_Metrics_List("P2-");@WS(Field_Separator);
+			@Write_Metrics_List("DIFF-");@WS(Field_Separator);
+			@Write_Metrics_List("%-");
 			@WL("");
 		ELSIF filename = "-o" THEN
 			C:"set output";