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
package com.quemaster.transformations.mjc2wsl;
/*
package com.quemaster.transformations.mjc2wsl;
/*
- Copyright (C) 2014 Doni Pracner
+ Copyright (C) 2014,2015, 2016 Doni Pracner
This file is part of mjc2wsl.
This file is part of mjc2wsl.
*/
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 = "v0.2.x";
private String versionFile = "/version.properties";
private String versionFile = "/version.properties";
public String createStandardStart(int numWords){
StringBuilder ret = new StringBuilder(
"C:\" This file automatically converted from microjava bytecode\";\n"
public String createStandardStart(int numWords){
StringBuilder ret = new StringBuilder(
"C:\" This file automatically converted from microjava bytecode\";\n"
- +"C:\" with mjc2wsl v "+getVersion()+"\";\n");
+ +"C:\" with mjc2wsl "+getVersion()+"\";\n");
ret.append("\nBEGIN");
ret.append("\nVAR <\n\t");
ret.append("\nBEGIN");
ret.append("\nVAR <\n\t");
ret.append("\nWHERE\n");
ret.append("\nFUNCT CHR(num) ==:\n");
ret.append("\nWHERE\n");
ret.append("\nFUNCT CHR(num) ==:\n");
- ret.append("\t@List_To_String(< num >)\n");
+ ret.append("\t(@List_To_String(< num >))\n");
ret.append("END\n");
if (!genInlinePrint) {
ret.append("\nPROC Print_MJ(val, format VAR)==\n");
ret.append("END\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(val))) 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");
}
public void printVersion() {
}
public void printVersion() {
- System.out.println("MicroJava bytecode to WSL converter. v " + getVersion()
+ System.out.println("MicroJava bytecode to WSL converter " + getVersion()
+ ", by Doni Pracner");
}
+ ", by Doni Pracner");
}
printHelp();
} else {
int i = 0;
printHelp();
} else {
int i = 0;
- while (i < args.length && args[i].charAt(0) == '-') {
+ while (i < args.length && args[i].length() > 0 && args[i].charAt(0) == '-') {
if (args[i].compareTo("-h") == 0) {
printHelp();
return;
if (args[i].compareTo("-h") == 0) {
printHelp();
return;
}
Path p = FileSystems.getDefault().getPath(args[i]);
}
Path p = FileSystems.getDefault().getPath(args[i]);
- if (!Files.exists(p)){
+ if (!Files.isRegularFile(p)){
System.err.println("input file does not exist");
System.exit(1);
}
System.err.println("input file does not exist");
System.exit(1);
}