Commit 53147edf authored by Anders Blomdell's avatar Anders Blomdell
Browse files

Renamed java to labcomm2014

parent 5b97cd63
......@@ -79,7 +79,7 @@ aspect Java_CodeGenEnv {
private Java_env(int version, int indent) {
this.version = version;
this.verStr = LabCommVersion.versionString(version);
this.verStr = "2014";
this.indent = indent;
}
......
......@@ -18,10 +18,10 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.Map;
import se.lth.control.labcomm.Decoder;
import se.lth.control.labcomm.DecoderChannel;
import se.lth.control.labcomm.Encoder;
import se.lth.control.labcomm.EncoderChannel;
import se.lth.control.labcomm2014.Decoder;
import se.lth.control.labcomm2014.DecoderChannel;
import se.lth.control.labcomm2014.Encoder;
import se.lth.control.labcomm2014.EncoderChannel;
import AST.Parser;
import AST.Scanner;
import AST.Program;
......
......@@ -6,7 +6,7 @@ import gen.bar;
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import se.lth.control.labcomm.DecoderChannel;
import se.lth.control.labcomm2014.DecoderChannel;
public class StaticDecoder implements foo.Handler, bar.Handler
......
......@@ -2,7 +2,7 @@ package test;
import java.io.File;
import java.io.FileOutputStream;
import java.io.OutputStream;
import se.lth.control.labcomm.EncoderChannel;
import se.lth.control.labcomm2014.EncoderChannel;
import gen.foo;
import gen.bar;
......
......@@ -16,10 +16,10 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.Map;
import se.lth.control.labcomm.Decoder;
import se.lth.control.labcomm.DecoderChannel;
import se.lth.control.labcomm.Encoder;
import se.lth.control.labcomm.EncoderChannel;
import se.lth.control.labcomm2014.Decoder;
import se.lth.control.labcomm2014.DecoderChannel;
import se.lth.control.labcomm2014.Encoder;
import se.lth.control.labcomm2014.EncoderChannel;
import AST.Parser;
import AST.Scanner;
import AST.Program;
......
......@@ -18,10 +18,10 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.Map;
import se.lth.control.labcomm.Decoder;
import se.lth.control.labcomm.DecoderChannel;
import se.lth.control.labcomm.Encoder;
import se.lth.control.labcomm.EncoderChannel;
import se.lth.control.labcomm2014.Decoder;
import se.lth.control.labcomm2014.DecoderChannel;
import se.lth.control.labcomm2014.Encoder;
import se.lth.control.labcomm2014.EncoderChannel;
import AST.Parser;
import AST.Scanner;
import AST.Program;
......
......@@ -6,8 +6,8 @@ import java.io.OutputStream;
import java.net.Socket;
import java.net.UnknownHostException;
import se.lth.control.labcomm.DecoderChannel;
import se.lth.control.labcomm.EncoderChannel;
import se.lth.control.labcomm2014.DecoderChannel;
import se.lth.control.labcomm2014.EncoderChannel;
import labcommTCPtest.gen.foo;
import labcommTCPtest.gen.foo.Handler;
......
......@@ -6,8 +6,8 @@ import java.io.OutputStream;
import java.net.Socket;
import java.net.UnknownHostException;
import se.lth.control.labcomm.DecoderChannel;
import se.lth.control.labcomm.EncoderChannel;
import se.lth.control.labcomm2014.DecoderChannel;
import se.lth.control.labcomm2014.EncoderChannel;
import labcommTCPtest.gen.FooSample;
import labcommTCPtest.gen.FooSample.Handler;
......
......@@ -8,8 +8,8 @@ import java.lang.reflect.Method;
import java.net.ServerSocket;
import java.net.Socket;
import se.lth.control.labcomm.DecoderChannel;
import se.lth.control.labcomm.EncoderChannel;
import se.lth.control.labcomm2014.DecoderChannel;
import se.lth.control.labcomm2014.EncoderChannel;
import labcommTCPtest.gen.foo;
import labcommTCPtest.gen.foo.Handler;
......
......@@ -2,7 +2,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import se.lth.control.labcomm.DecoderChannel;
import se.lth.control.labcomm2014.DecoderChannel;
public class Decoder
implements theTwoInts.Handler, anotherTwoInts.Handler, IntString.Handler, TwoArrays.Handler, TwoFixedArrays.Handler, doavoid.Handler
......
......@@ -2,7 +2,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.OutputStream;
import se.lth.control.labcomm.EncoderChannel;
import se.lth.control.labcomm2014.EncoderChannel;
/**
* Simple encoder
......
......@@ -2,7 +2,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.OutputStream;
import se.lth.control.labcomm.EncoderChannel;
import se.lth.control.labcomm2014.EncoderChannel;
/**
* Simple encoder
......
......@@ -6,8 +6,8 @@ import java.io.OutputStream;
import java.net.Socket;
import java.net.UnknownHostException;
import se.lth.control.labcomm.DecoderChannel;
import se.lth.control.labcomm.EncoderChannel;
import se.lth.control.labcomm2014.DecoderChannel;
import se.lth.control.labcomm2014.EncoderChannel;
import labcommTCPtest.gen.FooSample;
import labcommTCPtest.gen.FooSample.Handler;
......
......@@ -6,8 +6,8 @@ import java.io.OutputStream;
import java.net.Socket;
import java.net.UnknownHostException;
import se.lth.control.labcomm.DecoderChannel;
import se.lth.control.labcomm.EncoderChannel;
import se.lth.control.labcomm2014.DecoderChannel;
import se.lth.control.labcomm2014.EncoderChannel;
import labcommTCPtest.gen.FooSample;
import labcommTCPtest.gen.FooSample.Handler;
......
......@@ -6,8 +6,8 @@ import java.io.OutputStream;
import java.net.Socket;
import java.net.ServerSocket;
import se.lth.control.labcomm.DecoderChannel;
import se.lth.control.labcomm.EncoderChannel;
import se.lth.control.labcomm2014.DecoderChannel;
import se.lth.control.labcomm2014.EncoderChannel;
import labcommTCPtest.gen.FooSample;
public class OneShotServer {//implements Handler {
......
......@@ -8,8 +8,8 @@ import java.lang.reflect.Method;
import java.net.ServerSocket;
import java.net.Socket;
import se.lth.control.labcomm.DecoderChannel;
import se.lth.control.labcomm.EncoderChannel;
import se.lth.control.labcomm2014.DecoderChannel;
import se.lth.control.labcomm2014.EncoderChannel;
import labcommTCPtest.gen.FooSample;
import labcommTCPtest.gen.FooSample.Handler;
......
......@@ -3,10 +3,10 @@ import java.io.FileInputStream;
import java.io.InputStream;
import java.io.IOException;
import se.lth.control.labcomm.DecoderChannel;
import se.lth.control.labcomm.TypeDef;
import se.lth.control.labcomm.TypeDefParser;
//import se.lth.control.labcomm.TypeBinding;
import se.lth.control.labcomm2014.DecoderChannel;
import se.lth.control.labcomm2014.TypeDef;
import se.lth.control.labcomm2014.TypeDefParser;
//import se.lth.control.labcomm2014.TypeBinding;
public class Decoder
implements twoLines.Handler,
......
......@@ -2,7 +2,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.OutputStream;
import se.lth.control.labcomm.EncoderChannel;
import se.lth.control.labcomm2014.EncoderChannel;
/**
* Simple encoder
......
......@@ -3,11 +3,11 @@ import java.io.FileInputStream;
import java.io.InputStream;
import java.io.IOException;
import se.lth.control.labcomm.DecoderChannel;
import se.lth.control.labcomm.TypeDef;
import se.lth.control.labcomm.TypeDefParser;
import se.lth.control.labcomm.ASTbuilder;
//import se.lth.control.labcomm.TypeBinding;
import se.lth.control.labcomm2014.DecoderChannel;
import se.lth.control.labcomm2014.TypeDef;
import se.lth.control.labcomm2014.TypeDefParser;
import se.lth.control.labcomm2014.ASTbuilder;
//import se.lth.control.labcomm2014.TypeBinding;
import se.lth.control.labcomm2014.compiler.Program;
import java.io.FileOutputStream;
......
......@@ -4,8 +4,8 @@ import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.OutputStream;
import se.lth.control.labcomm.DecoderChannel;
import se.lth.control.labcomm.EncoderChannel;
import se.lth.control.labcomm2014.DecoderChannel;
import se.lth.control.labcomm2014.EncoderChannel;
public class example_decoder_encoder
implements data.Handler, log_message.Handler
......
......@@ -24,12 +24,12 @@ all: labcomm.jar labcomm2014.jar labcomm2006.jar
labcomm.jar: gen/JAVAC
echo $@
cd gen ; jar cf ../$@ \
se/lth/control/labcomm/*.class \
se/lth/control/labcomm2014/*.class \
se/lth/control/labcomm2006/*.class
labcomm2014.jar: gen/JAVAC
echo $@
cd gen ; jar cf ../$@ se/lth/control/labcomm/*.class
cd gen ; jar cf ../$@ se/lth/control/labcomm2014/*.class
labcomm2006.jar: gen/JAVAC
echo $@
......@@ -38,10 +38,10 @@ labcomm2006.jar: gen/JAVAC
gen:
mkdir gen
gen/JAVAC: $(MODULES:%=se/lth/control/labcomm/%.java) \
$(MODULES:%=se/lth/control/labcomm2006/%.java) \
gen/JAVAC: $(MODULES:%=se/lth/control/labcomm2006/%.java) \
$(MODULES:%=se/lth/control/labcomm2014/%.java) \
Makefile | gen
javac -cp ../../compiler/labcomm_compiler.jar -d gen \
javac -cp ../../compiler/labcomm2014_compiler.jar -d gen \
$(filter %.java, $^)
touch $@
......
package se.lth.control.labcomm;
package se.lth.control.labcomm2014;
import java.util.HashMap;
import java.util.HashSet;
......@@ -10,8 +10,8 @@ import java.io.DataInputStream;
import java.io.IOException;
import java.io.EOFException;
import se.lth.control.labcomm.TypeDef;
import se.lth.control.labcomm.TypeDefParser;
import se.lth.control.labcomm2014.TypeDef;
import se.lth.control.labcomm2014.TypeDefParser;
import se.lth.control.labcomm2014.compiler.LabComm;
import se.lth.control.labcomm2014.compiler.LabCommParser;
......
package se.lth.control.labcomm;
package se.lth.control.labcomm2014;
public interface BuiltinType extends SampleType{
......
package se.lth.control.labcomm;
package se.lth.control.labcomm2014;
public class Constant {
......
package se.lth.control.labcomm;
package se.lth.control.labcomm2014;
import java.io.IOException;
......
package se.lth.control.labcomm;
package se.lth.control.labcomm2014;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
......
package se.lth.control.labcomm;
package se.lth.control.labcomm2014;
import java.io.IOException;
import java.util.HashMap;
......
package se.lth.control.labcomm;
package se.lth.control.labcomm2014;
import java.io.IOException;
......
package se.lth.control.labcomm;
package se.lth.control.labcomm2014;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
......
package se.lth.control.labcomm;
package se.lth.control.labcomm2014;
import java.io.IOException;
import java.util.HashMap;
......
package se.lth.control.labcomm;
package se.lth.control.labcomm2014;
public interface Reader {
......
package se.lth.control.labcomm;
package se.lth.control.labcomm2014;
public interface Sample extends SampleType {
......
package se.lth.control.labcomm;
package se.lth.control.labcomm2014;
import java.io.IOException;
......
package se.lth.control.labcomm;
package se.lth.control.labcomm2014;
public interface SampleHandler {
}
package se.lth.control.labcomm;
package se.lth.control.labcomm2014;
public interface SampleType {
......
package se.lth.control.labcomm;
package se.lth.control.labcomm2014;
import java.io.IOException;
import java.io.ByteArrayOutputStream;
import java.io.ByteArrayInputStream;
import se.lth.control.labcomm.Decoder;
import se.lth.control.labcomm.DecoderChannel;
import se.lth.control.labcomm.SampleDispatcher;
import se.lth.control.labcomm.SampleHandler;
import se.lth.control.labcomm2014.Decoder;
import se.lth.control.labcomm2014.DecoderChannel;
import se.lth.control.labcomm2014.SampleDispatcher;
import se.lth.control.labcomm2014.SampleHandler;
public class TypeBinding implements BuiltinType {
private int sampleIndex;
......
package se.lth.control.labcomm;
package se.lth.control.labcomm2014;
import java.io.IOException;
import java.io.ByteArrayOutputStream;
import java.io.ByteArrayInputStream;
import se.lth.control.labcomm.Decoder;
import se.lth.control.labcomm.DecoderChannel;
import se.lth.control.labcomm.SampleDispatcher;
import se.lth.control.labcomm.SampleHandler;
import se.lth.control.labcomm2014.Decoder;
import se.lth.control.labcomm2014.DecoderChannel;
import se.lth.control.labcomm2014.SampleDispatcher;
import se.lth.control.labcomm2014.SampleHandler;
public class TypeDef implements BuiltinType {
private int index;
......
package se.lth.control.labcomm;
package se.lth.control.labcomm2014;
import java.util.HashMap;
import java.util.HashSet;
......@@ -10,10 +10,10 @@ import java.io.DataInputStream;
import java.io.IOException;
import java.io.EOFException;
import se.lth.control.labcomm.Decoder;
import se.lth.control.labcomm.DecoderChannel;
import se.lth.control.labcomm.TypeDef;
import se.lth.control.labcomm.TypeBinding;
import se.lth.control.labcomm2014.Decoder;
import se.lth.control.labcomm2014.DecoderChannel;
import se.lth.control.labcomm2014.TypeDef;
import se.lth.control.labcomm2014.TypeBinding;
public class TypeDefParser implements TypeDef.Handler, TypeBinding.Handler {
......
package se.lth.control.labcomm;
package se.lth.control.labcomm2014;
import java.io.IOException;
......
package se.lth.control.labcomm;
package se.lth.control.labcomm2014;
import java.io.OutputStream;
import java.io.IOException;
......
......@@ -31,9 +31,9 @@ if __name__ == '__main__':
|import java.io.FileInputStream;
|import java.io.FileOutputStream;
|import java.io.IOException;
|import se.lth.control.labcomm.DecoderChannel;
|import se.lth.control.labcomm.EncoderChannel;
|import se.lth.control.labcomm.Sample;
|import se.lth.control.labcomm2014.DecoderChannel;
|import se.lth.control.labcomm2014.EncoderChannel;
|import se.lth.control.labcomm2014.Sample;
|
|public class java_relay implements
"""))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment