gitweb on Svarog
projekti pod git sistemom za održavanje verzija -- projects under the git version control systemdiff --git a/src/com/quemaster/transformations/mjc2wsl/mjc2wsl.java b/src/com/quemaster/transformations/mjc2wsl/mjc2wsl.java
*/
public class mjc2wsl{
//default version name, used if the file is not found
*/
public class mjc2wsl{
//default version name, used if the file is not found
- private static String versionN = "0.1.x";
+ private static String versionN = "0.2.x";
private String versionFile = "/version.properties";
private String versionFile = "/version.properties";
if (!genInlinePrint) {
ret.append("\nPROC Print_MJ(val, format VAR)==\n");
if (!genInlinePrint) {
ret.append("\nPROC Print_MJ(val, format VAR)==\n");
- ret.append(createComment("print spacing", C_SPEC));
- ret.append("\n\tIF format>1 THEN\n\t\tFOR i:=1 TO ");
- ret.append("MAX(0, format-SLENGTH(@String(tempb))) STEP 1 DO PRINFLUSH(\" \") OD\n");
- ret.append("\tFI;\n\tPRINFLUSH(val)\nEND\n");
+ ret.append("PRINFLUSH(@Format(format, val ))");
+ ret.append("\nEND\n");
ret.append("\nPROC Print_MJ_CHAR(val, format VAR)==\n");
ret.append("\nPROC Print_MJ_CHAR(val, format VAR)==\n");
- ret.append(createComment("print spacing", C_SPEC));
- ret.append("\n\tIF format>1 THEN\n\t\tFOR i:=2 TO ");
- ret.append("format STEP 1 DO PRINFLUSH(\" \") OD\n");
- ret.append("\tFI;\n\tPRINFLUSH(CHR(val))\n");
- ret.append("END\n");
+ ret.append("PRINFLUSH(@Format(format, CHR(val)))");
+ ret.append("\nEND\n");
}
ret.append("\nEND");
}
ret.append("\nEND");
if (genPrintForEachAddress) {
prl("PRINT(\"a" + mjInput.getCounter() + "\");");
if (genPauseAfterEachAddress)
if (genPrintForEachAddress) {
prl("PRINT(\"a" + mjInput.getCounter() + "\");");
if (genPauseAfterEachAddress)
- prl("debug_disposable_string := @Read_Line(Standard_Input_Port);");
+ prl("@Read_Line_Proc(VAR debug_disposable_string, Standard_Input_Port);");
}
switch (op) {
case load: {
}
switch (op) {
case load: {
// read, print
case bread: {
// read, print
case bread: {
- // TODO make it a char for read
- messages.message("char is read like a number", TransMessages.M_WAR);
- prl(createComment("char is read like a number", C_SPEC));
+ // TODO maybe we'll need a bufer for multi chars!
+ prl(createStartVar("tempa"));
+ prl("@Read_Line_Proc(VAR tempa, Standard_Input_Port);");
+ prl("tempa := @String_To_List(tempa)[1];");
+ prl(createToEStack("tempa"));
+ prl(createEndVar());
+ break;
}
case read: {
prl(createStartVar("tempa"));
}
case read: {
prl(createStartVar("tempa"));
- prl("tempa := @String_To_Num(@Read_Line(Standard_Input_Port));");
+ prl("@Read_Line_Proc(VAR tempa, Standard_Input_Port);");
+ prl("tempa := @String_To_Num(tempa);");
prl(createToEStack("tempa"));
prl(createEndVar());
break;
prl(createToEStack("tempa"));
prl(createEndVar());
break;
prl(createTopTwoEStack());
if (genInlinePrint){
prl(createComment("print spacing and transformation",C_SPEC));
prl(createTopTwoEStack());
if (genInlinePrint){
prl(createComment("print spacing and transformation",C_SPEC));
- prl("PRINFLUSH(SUBSTR(\" \", 0, MIN(10, MAX(0,tempa-1))), @List_To_String(< tempb >));");
+ prl("PRINFLUSH(@Format(tempa, @List_To_String(< tempb >)));");
} else
prl("Print_MJ_CHAR(tempb,tempa);");
prl(createEndVar());
} else
prl("Print_MJ_CHAR(tempb,tempa);");
prl(createEndVar());
prl(createTopTwoEStack());
if (genInlinePrint){
prl(createComment("print spacing",C_SPEC));
prl(createTopTwoEStack());
if (genInlinePrint){
prl(createComment("print spacing",C_SPEC));
- prl("PRINFLUSH(SUBSTR(\" \", 0, MIN(10, MAX(0, tempa-SLENGTH(@String(tempb))))), tempb);");
+ prl("PRINFLUSH(@Format(tempa,tempb));");
}
else
prl("Print_MJ(tempb,tempa);");
}
else
prl("Print_MJ(tempb,tempa);");