X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src-wsl%2Fmetrics.wsl;h=b73a4663e5b4a7f8e7d73087f603a71ec06ebf0c;hp=8dff9dba81793749185d99dd1d0ef9c53f8c7a64;hb=3bca9a5dd50b6ccd0bdb482911f597c9182aa17d;hpb=1651254b6e5417301752ea7b7e3b06e592ed95bf

diff --git a/src-wsl/metrics.wsl b/src-wsl/metrics.wsl
index 8dff9db..b73a466 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() ==
@@ -106,7 +106,7 @@ VAR< prog := < >,
 	filename:="", filename2 := "",
 	metrics := < >, met2 := < >,
 	opened := 0,
-	Argv := @Argv 
+	Argv := ARGV 
 >:
 C:"First one is the script name that is being executed";
 Argv := TAIL(Argv);
@@ -122,18 +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);
-			@WS("P2 ");
-			@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";