X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=src%2Fcom%2Fquemaster%2Ftransformations%2Fmjc2wsl%2Fmjc2wsl.java;h=14ef154be9ced6c9ef7a5907541a958f25a201c7;hp=6488efd0f062bace281c731a6ddbeba262858003;hb=5784a409ab5314e3a524b2725bac6f073c7fd2a0;hpb=a0f862272b073ded2ff0f7e8c992c47246473e5c

diff --git a/src/com/quemaster/transformations/mjc2wsl/mjc2wsl.java b/src/com/quemaster/transformations/mjc2wsl/mjc2wsl.java
index 6488efd..14ef154 100644
--- a/src/com/quemaster/transformations/mjc2wsl/mjc2wsl.java
+++ b/src/com/quemaster/transformations/mjc2wsl/mjc2wsl.java
@@ -1,6 +1,6 @@
 package com.quemaster.transformations.mjc2wsl;
 /*
-   Copyright (C) 2014,2015, 2016  Doni Pracner
+   Copyright (C) 2014,2015, 2016, 2018  Doni Pracner
    
     This file is part of mjc2wsl.
 
@@ -152,7 +152,7 @@ public class mjc2wsl{
 			return versionN;
 	}
 	
-	MicroJavaInput mjInput = new MicroJavaInput();
+	private MicroJavaInput mjInput;
 
 	private PrintWriter out = null;
 
@@ -364,12 +364,10 @@ public class mjc2wsl{
 	}
 
 	public void convertStream(InputStream ins) throws Exception{
-		mjInput.setStream(ins);
-		//process start 
-		mjInput.processHeader(this);
-		
-		prl(createStandardStart(mjInput.getNumberOfWords(this)));
-		prl("SKIP;\n ACTIONS a" + (14 + mjInput.getMainAdr(this)) + " :");
+		mjInput = new MicroJavaInput(ins);
+
+		prl(createStandardStart(mjInput.getNumberOfWords()));
+		prl("SKIP;\n ACTIONS a" + (14 + mjInput.getMainAdr()) + " :");
 
 		// the number of Locals for procedures; need to remember it for exits
 		int numberOfLocals = 0;
@@ -683,7 +681,7 @@ public class mjc2wsl{
 
 			// read, print
 			case bread: {
-				// TODO maybe we'll need a bufer for multi chars!
+				// TODO maybe we'll need a buffer for multi chars!
 				prl(createStartVar("tempa"));
 				prl("@Read_Line_Proc(VAR tempa, Standard_Input_Port);");
 				prl("tempa := @String_To_List(tempa)[1];");
@@ -903,7 +901,8 @@ public class mjc2wsl{
 				} else if (args[i].compareToIgnoreCase("--genLocalsSeparate") == 0) {
 					genLocalsAsArray = false;
 				} else {
-					System.err.println("unknown option: "+args[i]);
+					System.err.println("unknown option, refusing to continue: "+args[i]);
+					System.exit(1);
 				}
 				i++;
 			}
@@ -940,7 +939,7 @@ public class mjc2wsl{
 			try {
 				convertStream(Files.newInputStream(p));
 			} catch (Exception e) {
-				// TODO Auto-generated catch block
+				System.err.println("Failed converting the stream");
 				e.printStackTrace();
 			}
 			long mili = Calendar.getInstance().getTimeInMillis()