gitweb on Svarog
projekti pod git sistemom za održavanje verzija -- projects under the git version control systemdiff --git a/src-wsl/transf-exp.wsl b/src-wsl/transf-exp.wsl
--- a/src-wsl/transf-exp.wsl
+++ b/src-wsl/transf-exp.wsl
C:"
C:"
-Copyright (C) 2012 Doni Pracner http://perun.dmi.rs/pracner
+Copyright (C) 2012,2014,2015 Doni Pracner http://perun.dmi.rs/pracner
This program is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public
This program is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public
==========================================================";
C:"Automatic transformation tool for simplification of WSL";
==========================================================";
C:"Automatic transformation tool for simplification of WSL";
-C:"code automaticaly translated from assembly using asm2wsl.";
+C:"code automaticaly translated from a low level language.";
+C:"such as assembly or bytecode generated by our translators.";
+
C:"experimental version";
C:"set the following so that Action Systems are not automaticaly treated as regular";
Assume_A_S_Regular := 0;
MW_PROC @Process_Prog() ==
C:"experimental version";
C:"set the following so that Action Systems are not automaticaly treated as regular";
Assume_A_S_Regular := 0;
MW_PROC @Process_Prog() ==
- FOREACH Statement DO
- IF @Trans?(TR_Push_Pop) THEN
- @Trans(TR_Push_Pop, "");
- FI
- OD;
- @Trans(TR_Constant_Propagation, "");
- FOREACH Statement DO
- IF @ST(@I) = T_A_S THEN
- C:"don't need to test for this, works for T_A_S";
- @Trans(TR_Simplify_Action_System, "");
- IF @Trans?(TR_Collapse_Action_System) THEN
- @Trans(TR_Collapse_Action_System, "");
- FI;
- ELSIF @Trans?(TR_Remove_All_Redundant_Vars) THEN
- @Trans(TR_Remove_All_Redundant_Vars, "");
- ELSIF @ST(@I) = T_Skip THEN
- @Delete
- FI
- OD;
- FOREACH Statement DO
- IF @Trans?(TR_Flag_Removal) THEN
- @Trans(TR_Flag_Removal, "");
- FI
- OD;
+
+ C:"start with a few 'sure' ones, that don't need to be repeated";
+
+ @Trans(TR_Delete_All_Skips, "");
+
C:"remove all the comments ";
FOREACH Statement DO
C:"remove all the comments ";
FOREACH Statement DO
- IF @ST(@I) = T_Comment THEN
- @Delete
- FI
+ IF @ST(@I) = T_Comment THEN
+ @Delete
+ FI
OD;
OD;
- FOREACH Statement DO
- IF @Trans?(TR_Simplify_Item) THEN
- @Trans(TR_Simplify_Item,"")
- FI
+
+ old := < >;
+ anotherrun := 1;
+ C:"main loop that applies transformations while we have changes";
+ WHILE anotherrun > 0 DO
+
+ C:"remember the previous version of the program";
+ old := @Program;
+
+ FOREACH Statement DO
+ IF @Trans?(TR_Simplify_Item) THEN
+ @Trans(TR_Simplify_Item,"")
+ FI
+ OD;
+
+ C:"Convert DO loops into WHILE loops";
+ FOREACH Statement DO
+ IF @Trans?(TR_Floop_To_While) THEN
+ @Trans(TR_Floop_To_While, "");
+ FI
+ OD;
+ FOREACH Statement DO
+ IF @Trans?(TR_Flag_Removal) THEN
+ @Trans(TR_Flag_Removal, "");
+ FI
+ OD;
+ C:"Go back to the start, and remove redundant";
+ @Goto(< >);
+ IF @Trans?(TR_Delete_All_Redundant) THEN
+ @Trans(TR_Delete_All_Redundant, "");
+ FI;
+ IF @Trans?(TR_Constant_Propagation) THEN
+ @Trans(TR_Constant_Propagation, "");
+ FI;
+
+
+ FOREACH Statement DO
+ IF @ST(@I) = T_A_S THEN
+ IF @Trans?(TR_Simplify_Action_System) THEN
+ @Trans(TR_Simplify_Action_System, "")
+ FI;
+ IF @Trans?(TR_Collapse_Action_System) THEN
+ @Trans(TR_Collapse_Action_System, "");
+ FI;
+ FI
+ OD;
+
+ ATEACH Statement DO
+ IF @Trans?(TR_Stack_To_Var) THEN
+ @Trans(TR_Stack_To_Var,"")
+ FI
+ OD;
+
+ FOREACH Statement DO
+ IF @Trans?(TR_Push_Pop) THEN
+ @Trans(TR_Push_Pop, "");
+ FI
+ OD;
+
+ C:"test if there were actuall changes from the
+ transformations and decide to go anotherrun";
+ IF @Equal?(old,@Program) THEN
+ anotherrun := 0;
+ ELSE
+ anotherrun := 1;
+ FI;
+
OD;
OD;
- C:"Convert DO loops into WHILE loops";
+ C:"This makes sense after all of the other
+ transformations, there are probably no procedures at
+ the start of the process";
+
+ C:"start of the program";
+ @Goto(< >);
+ C:"'manual' navigating to find the procedures";
+
FOREACH Statement DO
FOREACH Statement DO
- IF @Trans?(TR_Floop_To_While) THEN
- @Trans(TR_Floop_To_While, "");
- FI
- OD;
- C:"Go back to the start, and remove redundant";
- @GOTO(< >);
- @Trans(TR_Delete_All_Redundant, "");
+ IF @ST(@I) = T_Where
+ THEN @Down_To(2); @Down; C:" to first defn ";
+ DO IF @ST(@I) = T_Proc THEN
+ IF @Trans?(TR_Stack_To_Par) THEN
+ @Trans(TR_Stack_To_Par, "") FI;
+ FI;
+ IF @Right? THEN @Right ELSE EXIT(1) FI OD;
+ @Up; @Up FI OD;
+
+
+ IF @Trans?(TR_Remove_All_Redundant_Vars) THEN
+ @Trans(TR_Remove_All_Redundant_Vars, "");
+ FI;
+
SKIP
END;
SKIP
END;
-BEGIN
-VAR< prog := < >, inifilename := "transf.ini",
- filename:="", file := "", inifile:= ""
->:
-IF @File_Exists?(inifilename) THEN
- inifile := @Open_Input_File(inifilename);
- filename := @Read_Line(inifile);
- WHILE NOT @EOF?(filename) DO
+MW_PROC @Prog_Stat_Comp(Pro, After VAR)==
+ VAR < ma := 0, mb :=1 > :
+ ma := @McCabe(Pro);
+ mb := @McCabe(After);
+ PRINT ("McCabe ", ma, " ", mb, " ",(mb-ma));
+ ma := @Stat_Count(Pro);
+ mb := @Stat_Count(After);
+ PRINT ("Statem ", ma, " ",mb, " ",(mb-ma));
+ ma := @CFDF_Metric(Pro);
+ mb := @CFDF_Metric(After);
+ PRINT ("CF/DF ", ma," ", mb," ", (mb-ma));
+ ma := @Total_Size(Pro);
+ mb := @Total_Size(After);
+ PRINT ("Size ", ma," ", mb, " ",(mb-ma));
+ ma := @Struct_Metric(Pro);
+ mb := @Struct_Metric(After);
+ PRINT ("Struct ", ma, " ",mb, " ",(mb-ma));
+ SKIP
+ ENDVAR
+END;
+
+MW_PROC @Get_New_Name(VAR str) ==
+ IF @Ends_With?(str, ".wsl") THEN
+ str := SUBSTR(str, 0, SLENGTH(str)-4)
+ FI;
+ str := str ++ "_t.wsl"
+END;
+
+MW_PROC @Process_File(filename) ==
IF @File_Exists?(filename) THEN
IF @File_Exists?(filename) THEN
- PRINT("");
@New_Program(@Parse_File(filename, T_Statements));
PRINT("Processing: ", filename);
prog := @Program;
@Process_Prog();
@New_Program(@Parse_File(filename, T_Statements));
PRINT("Processing: ", filename);
prog := @Program;
@Process_Prog();
- Get_New_Name(VAR filename);
+ @Get_New_Name(VAR filename);
@PP_Item(@Program, 80, filename);
PRINT("<Metrics>");
PRINT(filename);
@PP_Item(@Program, 80, filename);
PRINT("<Metrics>");
PRINT(filename);
- Prog_Stat_Comp(prog, @Program);
+ @Prog_Stat_Comp(prog, @Program);
PRINT("</Metrics>")
PRINT("</Metrics>")
- FI;
- filename := @Read_Line(inifile)
- OD;
- @Close_Input_Port(inifile);
+ ELSE
+ PRINT("ERROR: File ",filename," not found");
+ FI
+END;
+
+C:"Main program - processes the arguments";
+VAR< prog := < >, inifilename := "transf.ini",
+ filename:="", file := "", inifile:= "",
+ Argv := @Argv
+>:
+C:"First one is the script name that is being executed";
+Argv := TAIL(Argv);
+
+IF Argv = < > THEN
+ PRINT("no arguments passed; using ",inifilename);
+ IF @File_Exists?(inifilename) THEN
+ inifile := @Open_Input_File(inifilename);
+ filename := @Read_Line(inifile);
+ WHILE NOT @EOF?(filename) DO
+ PRINT("");
+ @Process_File(filename);
+ filename := @Read_Line(inifile)
+ OD;
+ @Close_Input_Port(inifile);
+ ELSE
+ PRINT("ini file (",inifilename,") not found.",
+ " it should contain a list of filenames to be converted");
+ PRINT("OR you can give command line arguments to be processed");
+ FI
ELSE
ELSE
- PRINT("ini file (",inifilename,") not found.",
- " it should contain a list of filenames to be converted");
- PRINT("you can input a filename now:");
- filename := @Read_Line(Standard_Input_Port);
- IF @File_Exists?(filename) THEN
- @New_Program(@Parse_File(filename, T_Statements));
- @Process_Prog();
- Get_New_Name(VAR filename);
- @PP_Item(@Program, 80, filename)
- FI;
+ FOR arg IN Argv DO
+ @Process_File(arg);
+ OD
FI
ENDVAR
FI
ENDVAR
-WHERE
-
-PROC Prog_Stat(Pro VAR)==
- PRINT ("Mc ", @McCabe(Pro));
- PRINT ("Statements ", @Stat_Count(Pro));
- PRINT ("Control/data Flow ", @CFDF_Metric(Pro));
- PRINT ("Size(nodes) ", @Total_Size(Pro));
- PRINT ("Struct ", @Struct_Metric(Pro));
- SKIP
-END
-
-PROC Prog_Stat_Comp(Pro, After VAR)==
- VAR < ma := 0, mb :=1 > :
- ma := @McCabe(Pro);
- mb := @McCabe(After);
- PRINT ("McCabe ", ma, " ", mb, " ",(mb-ma));
- ma := @Stat_Count(Pro);
- mb := @Stat_Count(After);
- PRINT ("Statem ", ma, " ",mb, " ",(mb-ma));
- ma := @CFDF_Metric(Pro);
- mb := @CFDF_Metric(After);
- PRINT ("CF/DF ", ma," ", mb," ", (mb-ma));
- ma := @Total_Size(Pro);
- mb := @Total_Size(After);
- PRINT ("Size ", ma," ", mb, " ",(mb-ma));
- ma := @Struct_Metric(Pro);
- mb := @Struct_Metric(After);
- PRINT ("Struct ", ma, " ",mb, " ",(mb-ma));
- SKIP
- ENDVAR
-END
-
-PROC Get_New_Name(VAR str) ==
- IF @Ends_With?(str, ".wsl") THEN
- str := SUBSTR(str, 0, SLENGTH(str)-4)
- FI;
- str := str ++ "_t.wsl"
-END
-
-PROC Get_Before_Name(VAR str) ==
- IF @Ends_With?(str, ".wsl") THEN
- str := SUBSTR(str, 0, SLENGTH(str)-4)
- FI;
- str := str ++ "_b.wsl"
-END
-
-END