master to labcomm2006 · Sven Gestegård Robertz / LabComm

Some changes are not shown.

For a faster browsing experience, only 18 of 182 files are shown. Download one of the files below to see all changes.

Makefile

+1 −1

Original line number	Diff line number	Diff line
		SUBDIRS=compiler lib test examples packaging
		export LABCOMM_JAR=$(shell pwd)/compiler/labcomm_compiler.jar
		export LABCOMM_JAR=$(shell pwd)/compiler/labcomm2006_compiler.jar
		export LABCOMM=java -jar $(LABCOMM_JAR)

		.PHONY: all

compiler/.gitignore

+0 −2

Original line number	Diff line number	Diff line
		gen
		labcomm2006_compiler.jar
		labcomm2014_compiler.jar
		labcomm_compiler.jar

compiler/2006/CS_CodeGen.jrag

+52 −115

Original line number	Diff line number	Diff line
		@@ -8,8 +8,6 @@ aspect CS_CodeGenEnv {

		public class CS_env {

		public final int version;
		public final String verStr;
		private int indent;
		private int depth;
		private CS_printer printer;
		@@ -77,19 +75,17 @@ aspect CS_CodeGenEnv {
		}
		}

		private CS_env(int indent, CS_printer printer, int version) {
		this.version = version;
		private CS_env(int indent, CS_printer printer) {
		this.indent = indent;
		this.printer = printer;
		this.verStr = LabCommVersion.versionString(version);
		}

		public CS_env(File f, int version) {
		this(0, new CS_printer(f), version);
		public CS_env(File f) {
		this(0, new CS_printer(f));
		}

		public CS_env(PrintStream out, int version) {
		this(0, new CS_printer(out), version);
		public CS_env(PrintStream out) {
		this(0, new CS_printer(out));
		}

		public void close() throws IOException {
		@@ -202,15 +198,15 @@ aspect CS_Void {
		aspect CS_CodeGen {

		public void Program.CS_gen(String file,
		String namespace, int version) throws IOException {
		String namespace) throws IOException {
		// Registration class
		CS_env env = new CS_env(new File(file), version);
		CS_env env = new CS_env(new File(file));
		if (namespace != null && namespace.length() > 0) {
		env.println("namespace " + namespace + "{");
		env.indent();
		}
		env.println("using System;");
		env.println("using se.lth.control.labcomm;");
		env.println("using se.lth.control.labcomm2006;");
		for (int i = 0; i < getNumDecl(); i++) {
		Decl d = getDecl(i);
		try {
		@@ -244,7 +240,6 @@ aspect CS_Register {
		}

		public void TypeDecl.CS_emitTypeRegister(CS_env env) {
		// TODO
		}

		}
		@@ -260,43 +255,7 @@ aspect CS_Class {
		public void Decl.CS_emitDeclPP(CS_env env){
		env.println("/* ");
		pp(env.getPrintStream());

		CS_emitUserTypeDeps(env,null,false);
		CS_emitUserTypeRefs(env,null,false);
		env.println("*/");

		}

		public void Decl.CS_emitUserTypeDeps(CS_env env, String via, boolean outputCode){
		Iterator<Decl> it = type_dependencies().iterator();
		while(it.hasNext()) {
		Decl t = it.next();

		t.CS_emitUserTypeDeps(env, t.getName(), outputCode);
		if( outputCode && t.getType().isUserType() ) {
		env.println(t.getName()+".register(e);");
		} else { // Just output a comment
		String refpath = (via == null) ? "directly" : "indirectly via "+via;
		env.println(" //Depends ("+refpath+") on "+t.getName() );
		}
		}
		}

		public void Decl.CS_emitUserTypeRefs(CS_env env, String via, boolean outputCode){
		if( isReferenced() ) {
		Iterator<Decl> it = type_references().iterator();
		while(it.hasNext()) {
		Decl t = it.next();

		t.CS_emitUserTypeRefs(env, t.getName(), outputCode);
		if(outputCode) {
		env.println(t.getName()+".register(e);");
		} else { // Just output a comment
		String refpath = (via == null) ? "directly" : "indirectly via "+via;
		env.println(" //Is referenced ("+refpath+") by "+t.getName() );
		}
		}
		}
		}

		public void Decl.CS_emitRegisterEncoder(CS_env env) {
		@@ -305,11 +264,6 @@ aspect CS_Class {
		env.println("e.register(dispatcher);");
		env.unindent();
		env.println("}");
		env.println("public static void registerSampleRef(Encoder e) {");
		env.indent();
		env.println("e.registerSampleRef(dispatcher);");
		env.unindent();
		env.println("}");
		env.println();
		}

		@@ -320,12 +274,6 @@ aspect CS_Class {
		env.unindent();
		env.println("}");
		env.println();
		env.println("public static void registerSampleRef(Decoder d) {");
		env.indent();
		env.println("d.registerSampleRef(dispatcher);");
		env.unindent();
		env.println("}");
		env.println();
		}

		public void TypeDecl.CS_emitClass(CS_env env) {
		@@ -339,11 +287,6 @@ aspect CS_Class {
		env.println();
		env.indent();
		getType().CS_emitInstance(env);
		if( isReferenced()) {
		CS_emitRegisterEncoder(env);
		CS_emitDispatcher(env,false);
		}
		CS_emitSignature(env);
		CS_emitEncoder(env);
		CS_emitDecoder(env);
		env.unindent();
		@@ -381,22 +324,18 @@ aspect CS_Class {

		public void Decl.CS_emitSignature(CS_env env) {
		CS_emitFlatSignature(env);
		// if(isReferenced() \|\| isSampleDecl()){
		// Signature signature = getSignature();
		// signature.CS_emitSignature(env, !isSampleDecl());
		// }
		}

		public void Decl.CS_emitFlatSignature(CS_env env){
		env.println("private static byte[] signature = new byte[] {");
		env.indent();
		SignatureList signature = flatSignature(env.version);
		SignatureList signature = flatSignature(2006);
		for (int i = 0 ; i < signature.size() ; i++) {
		String comment = signature.getComment(i);
		if (comment != null) {
		env.println(signature.getIndent(i) + "// " + comment);
		}
		byte[] data = signature.getData(i, env.version);
		byte[] data = signature.getData(i, 2006);
		if (data != null) {
		env.print(signature.getIndent(i));
		for (int j = 0 ; j < data.length ; j++) {
		@@ -413,7 +352,7 @@ aspect CS_Class {

		//XXX TODO: refactor: split into a static class ("TypeDefSingleton"?)and a (smaller) dispatcher
		public void Decl.CS_emitDispatcher(CS_env env, boolean isSample) {
		String genericStr = ""; //env.versionHasMetaData()?"<"+getName()+">":"";
		String genericStr = "";
		env.println("private static Dispatcher dispatcher = new Dispatcher();");
		env.println();
		env.println("public SampleDispatcher getDispatcher() {");
		@@ -467,8 +406,8 @@ aspect CS_Class {
		// env.println();
		// env.println("public void encodeSignatureMetadata(Encoder e, int index){");
		// env.indent();
		// env.println("e.encodePacked32(Constant.TYPE_DEF);");
		// env.println("e.encodePacked32(index);");
		// env.println("e.encodeInt(Constant.TYPE_DEF);");
		// env.println("e.encodeInt(index);");
		// env.println("e.encodeString(getName());");
		// env.println("emitSignature(e);");
		// env.unindent();
		@@ -553,7 +492,6 @@ aspect CS_Class {
		case LABCOMM_FLOAT: { env.print("e.encodeFloat"); } break;
		case LABCOMM_DOUBLE: { env.print("e.encodeDouble"); } break;
		case LABCOMM_STRING: { env.print("e.encodeString"); } break;
		case LABCOMM_SAMPLE: { env.print("e.encodeSampleRef"); } break;
		}
		env.println("(" + name + ");");
		}
		@@ -593,7 +531,7 @@ aspect CS_Class {
		}

		public String VariableSize.CS_emitEncoder(CS_env env, String name) {
		env.println("e.encodePacked32(" + name + ");");
		env.println("e.encodeInt(" + name + ");");
		return name;
		}

		@@ -648,7 +586,6 @@ aspect CS_Class {
		case LABCOMM_FLOAT: { env.println("d.decodeFloat();"); } break;
		case LABCOMM_DOUBLE: { env.println("d.decodeDouble();"); } break;
		case LABCOMM_STRING: { env.println("d.decodeString();"); } break;
		case LABCOMM_SAMPLE: { env.println("d.decodeSampleRef();"); } break;
		default: {
		throw new Error("PrimType.CS_emitDecoder(CS_env env, String name)" +
		" unknown token type");
		@@ -706,7 +643,7 @@ aspect CS_Class {
		}

		public void VariableSize.CS_emitDecoder(CS_env env) {
		env.print("d.decodePacked32()");
		env.print("d.decodeInt()");
		}

		public void StructType.CS_emitDecoder(CS_env env, String name) {
		@@ -892,8 +829,8 @@ aspect CS_Class {
		}

		aspect CS_Signature {
		public void Signature.CS_emitSignature(CS_env env, boolean decl){

		public void Signature.CS_emitSignature(CS_env env, boolean decl) {
		SignatureList sl = getSignatureList();
		sl.CS_emitSignature(env, decl);
		}
		@@ -902,20 +839,20 @@ aspect CS_Signature {

		public void TypeRefSignatureLine.CS_emitSignature(CS_env env, boolean isDecl) {
		env.print(getIndentString());
		env.println("e.encodePacked32(e.getTypeId( typeof("+decl.getName()+")));");
		env.println("e.encodeInt(e.getTypeId( typeof("+decl.getName()+")));");
		}

		public void DataSignatureLine.CS_emitSignature(CS_env env, boolean decl) {
		byte[] data = getData(env.version);
		byte[] data = getData(2006);
		if (data != null) {
		env.print(getIndentString());
		for (int j = 0 ; j < data.length ; j++) {
		//env.print("e.encodeByte((byte)"+data[j]+");");
		env.print("e.encodeByte((byte)"+ String.format("0x%02X ", data[j]) +"); ");
		}
		env.println();
		}
		}

		public void SignatureList.CS_emitSignature(CS_env env, boolean decl) {
		env.println("private static void emitSignature(Encoder e){");
		env.indent();
		@@ -935,8 +872,8 @@ aspect CS_Signature {

		aspect CS_Info {

		public void Program.CS_info(PrintStream out, String namespace, int version) {
		CS_env env = new CS_env(out, version);
		public void Program.CS_info(PrintStream out, String namespace) {
		CS_env env = new CS_env(out);
		if (namespace == null) {
		namespace = "";
		} else {

compiler/2006/C_CodeGen.jrag

+79 −202

File changed.

Preview size limit exceeded, changes collapsed.

compiler/2006/Java_CodeGen.jrag

+39 −102

Original line number	Diff line number	Diff line
		@@ -8,8 +8,6 @@ aspect Java_CodeGenEnv {

		public class Java_env {

		public final int version; //labcomm version to generate code for
		public final String verStr;
		private int indent;
		private int depth;
		private Java_printer printer;
		@@ -77,24 +75,22 @@ aspect Java_CodeGenEnv {
		}
		}

		private Java_env(int version, int indent) {
		this.version = version;
		this.verStr = LabCommVersion.versionString(version);
		private Java_env(int indent) {
		this.indent = indent;
		}

		private Java_env(int version, Java_printer printer) {
		this(version, 0);
		private Java_env(Java_printer printer) {
		this(0);
		this.printer = printer;
		}

		public Java_env(int version, File f) {
		this(version, 0);
		public Java_env(File f) {
		this(0);
		this.printer = new Java_printer(f);
		}

		public Java_env(int version, PrintStream out) {
		this(version, 0);
		public Java_env(PrintStream out) {
		this(0);
		this.printer = new Java_printer(out);
		}

		@@ -204,9 +200,9 @@ aspect Java_Void {

		aspect Java_CodeGen {

		public void Program.J_gen(PrintStream ps, String pack, int version) throws IOException {
		public void Program.J_gen(PrintStream ps, String pack) throws IOException {
		Java_env env;
		env = new Java_env(version, ps);
		env = new Java_env(ps);
		for (int i = 0; i < getNumDecl(); i++) {
		Decl d = getDecl(i);
		try {
		@@ -219,12 +215,12 @@ aspect Java_CodeGen {
		env.close();
		}

		public void Program.J_gen(String dir, String pack, int version) throws IOException {
		public void Program.J_gen(String dir, String pack) throws IOException {
		Java_env env;
		for (int i = 0; i < getNumDecl(); i++) {
		Decl d = getDecl(i);
		try {
		env = new Java_env(version, new File(dir, d.getName() + ".java"));
		env = new Java_env(new File(dir, d.getName() + ".java"));
		d.Java_emitClass(env, pack);
		env.close();
		} catch (Error e) {
		@@ -236,14 +232,14 @@ aspect Java_CodeGen {

		/** Experimental method for generating code to a map <classname, source>
		*/
		public void Program.J_gen(Map<String,String> src, String pack, int version) throws IOException {
		public void Program.J_gen(Map<String,String> src, String pack) throws IOException {
		Java_env env;
		for (int i = 0; i < getNumDecl(); i++) {
		Decl d = getDecl(i);
		try {
		ByteArrayOutputStream bs = new ByteArrayOutputStream();
		PrintStream out = new PrintStream(bs);
		env = new Java_env(version, out);
		env = new Java_env(out);
		d.Java_emitClass(env, pack);
		env.close();
		src.put(d.getName(), bs.toString());
		@@ -276,20 +272,6 @@ aspect Java_Class {
		}

		public void Decl.Java_emitUserTypeDeps(Java_env env, String via, boolean outputCode) {
		// XXX TODO will generate unnecessary recursion for types. fix this per commented out code
		// XXX but ensure that types with references actually register themselves.. (i.e., add "nested" argument)
		//public abstract void Decl.Java_emitUserTypeDeps(Java_env env, String via, boolean outputCode);

		//public void TypeDecl.Java_emitUserTypeDeps(Java_env env, String via, boolean outputCode) {
		// // do nothing for type decls; sampledecl iterates over all dependencies and outputs
		// // all type decls
		//}
		//public void SampleDecl.Java_emitUserTypeDeps(Java_env env, String via, boolean outputCode) {
		// if(env.versionHasMetaData() && hasDependencies() \|\| isReferenced() ) {
		// if(env.versionHasMetaData() && isSampleDecl() && outputCode) {
		// env.println("if(sendMetaData){");
		// env.indent();
		// }
		Iterator<Decl> it = type_dependencies().iterator();
		while(it.hasNext()) {
		Decl t = it.next();
		@@ -302,12 +284,8 @@ aspect Java_Class {
		env.println(" //Depends ("+refpath+") on "+t.getName() );
		}
		}
		// if(env.versionHasMetaData() && isSampleDecl() && outputCode) {
		// env.unindent();
		// env.println("}");
		// }
		// }
		}

		public void Decl.Java_emitUserTypeRefs(Java_env env, String via, boolean outputCode) {
		if( isReferenced() ) {
		Iterator<Decl> it = type_references().iterator();
		@@ -348,19 +326,15 @@ aspect Java_Class {
		env.println("package " + pack + ";");
		}

		env.println("import se.lth.control.labcomm"+env.verStr+".Constant;");
		env.println("import se.lth.control.labcomm"+env.verStr+".SampleType;");
		env.println("import se.lth.control.labcomm2006.Constant;");
		env.println("import se.lth.control.labcomm2006.SampleType;");

		if (getType().Java_needInstance() \|\| hasDependencies() \|\| isReferenced()) {
		env.println("import se.lth.control.labcomm"+env.verStr+".Encoder;");
		env.println("import se.lth.control.labcomm"+env.verStr+".SampleDispatcher;");
		env.println("import se.lth.control.labcomm"+env.verStr+".SampleHandler;");
		// env.println();
		// }
		//
		// if (getType().Java_needInstance()) {
		env.println("import se.lth.control.labcomm2006.Encoder;");
		env.println("import se.lth.control.labcomm2006.SampleDispatcher;");
		env.println("import se.lth.control.labcomm2006.SampleHandler;");
		env.println("import java.io.IOException;");
		env.println("import se.lth.control.labcomm"+env.verStr+".Decoder;");
		env.println("import se.lth.control.labcomm2006.Decoder;");
		}
		// For types without type_dependencies and not needing an instance,
		// currently just an empty class is generated
		@@ -397,21 +371,14 @@ aspect Java_Class {
		}

		env.println("import java.io.IOException;");
		env.println("import se.lth.control.labcomm"+env.verStr+".Constant;");
		env.println("import se.lth.control.labcomm"+env.verStr+".Decoder;");
		env.println("import se.lth.control.labcomm"+env.verStr+".SampleDispatcher;");
		env.println("import se.lth.control.labcomm"+env.verStr+".Encoder;");
		env.println("import se.lth.control.labcomm"+env.verStr+".SampleHandler;");
		env.println("import se.lth.control.labcomm"+env.verStr+".Sample;");
		env.println("import se.lth.control.labcomm2006.Constant;");
		env.println("import se.lth.control.labcomm2006.Decoder;");
		env.println("import se.lth.control.labcomm2006.SampleDispatcher;");
		env.println("import se.lth.control.labcomm2006.Encoder;");
		env.println("import se.lth.control.labcomm2006.SampleHandler;");
		env.println("import se.lth.control.labcomm2006.Sample;");
		env.println();
		env.print("public class " + getName());
		// TODO: ?
		// Code for making samples of user types extend their type
		// currently commented out. Is this a good idea or not?
		//
		// if(getType().isUserType()) {
		// env.print(" extends "+getType().getTypeName());
		// }
		env.println(" implements Sample {");
		env.println();
		env.indent();
		@@ -464,13 +431,13 @@ aspect Java_Class {
		public void Decl.Java_emitFlatSignature(Java_env env){
		env.println("private static byte[] signature = new byte[] {");
		env.indent();
		SignatureList signature = flatSignature(env.version);
		SignatureList signature = flatSignature(2006);
		for (int i = 0 ; i < signature.size() ; i++) {
		String comment = signature.getComment(i);
		if (comment != null) {
		env.println(signature.getIndent(i) + "// " + comment);
		}
		byte[] data = signature.getData(i, env.version);
		byte[] data = signature.getData(i, 2006);
		if (data != null) {
		env.print(signature.getIndent(i));
		for (int j = 0 ; j < data.length ; j++) {
		@@ -487,7 +454,7 @@ aspect Java_Class {

		//XXX TODO: refactor: split into a static class ("TypeDefSingleton"?)and a (smaller) dispatcher
		public void Decl.Java_emitDispatcher(Java_env env, boolean isSample) {
		String genericStr = ""; //env.versionHasMetaData()?"<"+getName()+">":"";
		String genericStr = "";
		env.println("private static Dispatcher dispatcher = new Dispatcher();");
		env.println();
		env.println("public SampleDispatcher getDispatcher() {");
		@@ -513,19 +480,11 @@ aspect Java_Class {
		env.println();
		env.println("public byte getTypeDeclTag() {");
		env.indent();
		if(env.version == 2006) {
		if(isSample) {
		env.println("return Constant.SAMPLE;");
		} else {
		env.println("return Constant.TYPEDEF;");
		}
		} else {
		if(isSample) {
		env.println("return Constant.SAMPLE_DEF;");
		} else {
		env.println("return Constant.TYPE_DEF;");
		}
		}
		env.unindent();
		env.println("}");
		env.println();
		@@ -534,11 +493,6 @@ aspect Java_Class {
		env.println("return "+isSample+";");
		env.unindent();
		env.println("}");
		// env.println("public boolean hasStaticSignature() {");
		// env.indent();
		// env.println("return "+!hasDependencies()+";");
		// env.unindent();
		// env.println("}");
		env.println();
		env.println("/** return the flat signature. */");
		env.println("public byte[] getSignature() {");
		@@ -547,21 +501,6 @@ aspect Java_Class {
		env.unindent();
		env.println("}");
		env.println();
		// env.println("public void encodeSignature(Encoder e) throws IOException{");
		// env.indent();
		// env.println("emitSignature(e);");
		// env.unindent();
		// env.println("}");
		// env.println();
		// env.println("public void encodeSignatureMetadata(Encoder e, int index) throws IOException{");
		// env.indent();
		// env.println("e.encodePacked32(Constant.TYPE_DEF);");
		// env.println("e.encodePacked32(index);");
		// env.println("e.encodeString(getName());");
		// env.println("emitSignature(e);");
		// env.unindent();
		// env.println("}");
		// env.println();
		env.println("public boolean canDecodeAndHandle() {");
		env.indent();
		env.println("return "+isSample+";");
		@@ -677,7 +616,7 @@ aspect Java_Class {
		}

		public String VariableSize.Java_emitEncoder(Java_env env, String name) {
		env.println("e.encodePacked32(" + name + ".length);");
		env.println("e.encodeInt(" + name + ".length);");
		return name + ".length";
		}

		@@ -770,7 +709,7 @@ aspect Java_Class {
		}

		public void VariableSize.Java_emitDecoder(Java_env env) {
		env.print("d.decodePacked32()");
		env.print("d.decodeInt()");
		}

		public void StructType.Java_emitDecoder(Java_env env, String name) {
		@@ -966,8 +905,6 @@ aspect Java_Class {

		aspect Java_Signature {
		public void Signature.Java_emitSignature(Java_env env, boolean decl){
		// XXX should sendOnlyFlatSignatures be kept somewhere?
		//SignatureList sl = (parentDecl().sendOnlyFlatSignatures(env)) ? getFlatSignatureList() : getSignatureList();
		SignatureList sl = getSignatureList();
		sl.Java_emitSignature(env, decl);
		}
		@@ -981,11 +918,11 @@ aspect Java_Signature {

		public void TypeRefSignatureLine.Java_emitSignature(Java_env env, boolean isDecl){
		env.print(getIndentString());
		env.println("e.encodePacked32(e.getTypeId("+decl.getName()+".class));");
		env.println("e.encodeInt(e.getTypeId("+decl.getName()+".class));");
		}

		public void DataSignatureLine.Java_emitSignature(Java_env env, boolean decl){
		byte[] data = getData(env.version);
		byte[] data = getData(2006);
		if (data != null) {
		env.print(getIndentString());
		for (int j = 0 ; j < data.length ; j++) {
		@@ -1014,8 +951,8 @@ aspect Java_Signature {

		aspect Java_Info {

		public void Program.Java_info(PrintStream out, int version) {
		Java_env env = new Java_env(version, out);
		public void Program.Java_info(PrintStream out) {
		Java_env env = new Java_env(out);
		for (int i = 0; i < getNumDecl(); i++) {
		getDecl(i).Java_info(env);
		}

compiler/2006/LabComm.java

+18 −57

Original line number	Diff line number	Diff line
		@@ -14,7 +14,6 @@ public class LabComm {
		println("");
		println(" --help Shows this help text");
		println(" -v Be verbose");
		println(" --ver=VERSION Generate code for labcomm VERSION (=2006 or 2013)");
		println("[ C options ]");
		println(" -C Generates C/H code in FILE.[ch]");
		println(" --cprefix=PREFIX Prefixes C types with PREFIX");
		@@ -31,32 +30,20 @@ public class LabComm {
		println("[ Python options ]");
		println(" -P Generates Python code in FILE.py");
		println(" --python=PFILE Generates Python code in PFILE");
		println("[ RAPID options ]");
		println(" --rapid Generates RAPID code in FILE.sys");
		println("[ Misc options ]");
		println(" --pretty=PFILE Pretty prints to PFILE");
		println(" --typeinfo=TIFILE Generates typeinfo in TIFILE");
		}

		/** To be cleaned up.
		*/
		private static void checkVersion(int v) {
		if(! (v == 2006 \|\| v == 2013) ) {
		System.err.println(" Unknown version: " + v);
		System.err.println(" Supported versions: 2006, 2013 ");
		System.exit(2);
		}
		}

		private static void genH(Program p, String hName,
		Vector cIncludes, String coreName, String prefix, int ver) {
		Vector cIncludes, String coreName, String prefix) {
		try {
		FileOutputStream f;
		PrintStream out;

		f = new FileOutputStream(hName);
		out = new PrintStream(f);
		p.C_genH(out, cIncludes, coreName, prefix, ver);
		p.C_genH(out, cIncludes, coreName, prefix);
		out.close();
		} catch (IOException e) {
		System.err.println("IOException: " + hName + " " + e);
		@@ -64,61 +51,52 @@ public class LabComm {
		}

		private static void genC(Program p, String cName,
		Vector cIncludes, String coreName, String prefix, int ver) {
		Vector cIncludes, String coreName, String prefix) {
		try {
		FileOutputStream f;
		PrintStream out;

		f = new FileOutputStream(cName);
		out = new PrintStream(f);
		p.C_genC(out, cIncludes, coreName, prefix, ver);
		p.C_genC(out, cIncludes, coreName, prefix);
		out.close();
		} catch (IOException e) {
		System.err.println("IOException: " + cName + " " + e);
		}
		}

		private static void genCS(Program p, String csName, String csNamespace, int ver) {
		// throw new Error("C# generation currently disabled");
		private static void genCS(Program p, String csName, String csNamespace) {
		try {
		p.CS_gen(csName, csNamespace, ver);
		p.CS_gen(csName, csNamespace);
		} catch (IOException e) {
		System.err.println("IOException: " + csName + " " +
		csNamespace + " " + e);
		}
		}

		private static void genJava(Program p, String dirName, String packageName, int ver) {
		private static void genJava(Program p, String dirName, String packageName) {
		try {
		p.J_gen(dirName, packageName, ver);
		p.J_gen(dirName, packageName);
		} catch (IOException e) {
		System.err.println("IOException: " + dirName + " " +
		packageName + " " + e);
		}
		}

		private static void genPython(Program p, String filename, String prefix, int ver) {
		private static void genPython(Program p, String filename, String prefix) {
		try {
		FileOutputStream f;
		PrintStream out;

		f = new FileOutputStream(filename);
		out = new PrintStream(f);
		p.Python_gen(out, prefix, ver);
		p.Python_gen(out, prefix);
		out.close();
		} catch (IOException e) {
		System.err.println("IOException: " + filename + " " + e);
		}
		}

		private static void genRAPID(Program p, String filename, String prefix, int ver) {
		try {
		p.RAPID_gen(filename, prefix, ver);
		} catch (IOException e) {
		System.err.println("IOException: " + filename + " " + e);
		}
		}

		/** Helper class to contain command line options
		and their associated behaviour
		**/
		@@ -127,7 +105,6 @@ public class LabComm {
		String coreName = null;
		String prefix = null;
		boolean verbose = false;
		int ver = 2006; // Version 2006 fixed
		String cFile = null;
		String hFile = null;
		Vector cIncludes = new Vector();
		@@ -139,7 +116,6 @@ public class LabComm {
		String pythonFile = null;
		String prettyFile = null;
		String typeinfoFile = null;
		String rapidFile = null;
		String fileName = null;

		Opts(String[] args) {
		@@ -191,9 +167,6 @@ public class LabComm {
		System.exit(0);
		} else if (args[i].equals("-v")) {
		verbose=true;
		} else if (args[i].startsWith("--ver=")) {
		/* ver = Integer.parseInt(args[i].substring(6));
		checkVersion(ver); */
		} else if (args[i].equals("-C")) {
		cFile = coreName + ".c";
		hFile = coreName + ".h";
		@@ -223,8 +196,6 @@ public class LabComm {
		prettyFile = args[i].substring(9);
		} else if (args[i].startsWith("--typeinfo=")) {
		typeinfoFile = args[i].substring(11);
		} else if (args[i].equals("--rapid")) {
		rapidFile = coreName + ".sys";
		} else if (i == args.length - 1) {
		fileName = args[i];
		} else {
		@@ -276,12 +247,12 @@ public class LabComm {
		}
		if (cFile != null) {
		printStatus("C: " , cFile);
		genC(ast, cFile, cIncludes, coreName, cPrefix, ver);
		genC(ast, cFile, cIncludes, coreName, cPrefix);
		wroteFile = true;
		}
		if (hFile != null) {
		printStatus("H: " , hFile);
		genH(ast, hFile, hIncludes, coreName, cPrefix, ver);
		genH(ast, hFile, hIncludes, coreName, cPrefix);
		wroteFile = true;
		}
		return wroteFile;
		@@ -291,7 +262,7 @@ public class LabComm {
		boolean wroteFile = false;
		if (csFile != null) {
		printStatus("C#: " , csFile);
		genCS(ast, csFile, csNamespace, ver);
		genCS(ast, csFile, csNamespace);
		wroteFile = true;
		}
		return wroteFile;
		@@ -301,7 +272,7 @@ public class LabComm {
		boolean wroteFile = false;
		if (javaDir != null) {
		printStatus("Java: " , javaDir);
		genJava(ast, javaDir, javaPackage, ver);
		genJava(ast, javaDir, javaPackage);
		wroteFile = true;
		}
		return wroteFile;
		@@ -311,21 +282,12 @@ public class LabComm {
		boolean wroteFile = false;
		if (pythonFile != null) {
		printStatus("Python: " , pythonFile);
		genPython(ast, pythonFile, prefix, ver);
		genPython(ast, pythonFile, prefix);
		wroteFile = true;
		}
		return wroteFile;
		}

		boolean generateRAPID(Program ast) {
		boolean wroteFile = false;
		if (rapidFile != null) {
		printStatus("RAPID: " , rapidFile);
		genRAPID(ast, rapidFile, coreName, ver);
		wroteFile = true;
		}
		return wroteFile;
		}
		boolean generatePrettyPrint(Program ast) {
		boolean wroteFile = false;
		if (prettyFile != null) {
		@@ -350,9 +312,9 @@ public class LabComm {
		try {
		FileOutputStream f = new FileOutputStream(typeinfoFile);
		PrintStream out = new PrintStream(f);
		ast.C_info(out, cPrefix, ver);
		ast.Java_info(out, ver);
		ast.CS_info(out, csNamespace, ver);
		ast.C_info(out, cPrefix);
		ast.Java_info(out);
		ast.CS_info(out, csNamespace);
		wroteFile = true;
		} catch (IOException e) {
		System.err.println("IOException: " + typeinfoFile + " " + e);
		@@ -386,7 +348,6 @@ public class LabComm {
		fileWritten \|= opts.generateCS(ast);
		fileWritten \|= opts.generateJava(ast);
		fileWritten \|= opts.generatePython(ast);
		fileWritten \|= opts.generateRAPID(ast);
		fileWritten \|= opts.generatePrettyPrint(ast);
		fileWritten \|= opts.generateTypeinfo(ast);

compiler/2006/Python_CodeGen.jrag

+18 −47

Original line number	Diff line number	Diff line
		@@ -72,32 +72,21 @@ aspect Python_CodeGenEnv {

		aspect Python_CodeGen {

		public void Program.Python_gen(PrintStream out, String baseName, int version) {
		// Remove when Blomdell has verified that it is OK to ignore version
		// when generating python code.
		System.err.println("*** Warning! Python_gen ignores version: "+version);
		public void Program.Python_gen(PrintStream out, String baseName) {
		Python_env env = new Python_env(out);
		env.println("#!/usr/bin/python");
		env.println("# Auto generated " + baseName);
		env.println();
		env.println("import labcomm");
		env.println("import StringIO");
		env.println("import labcomm2006");
		env.println();
		Python_genTypes(env);
		//env.println("typedef = [");
		//env.indent();
		//for (int i = 0 ; i < getNumDecl() ; i++) {
		// getDecl(i).Python_genTypedefListEntry(env);
		//}
		//env.unindent();
		//env.println("]");
		env.println("sample = [");
		env.println("sample = tuple([");
		env.indent();
		for (int i = 0 ; i < getNumDecl() ; i++) {
		getDecl(i).Python_genSampleListEntry(env);
		}
		env.unindent();
		env.println("]");
		env.println("])");
		}

		}
		@@ -117,23 +106,12 @@ aspect PythonTypes {
		}

		public void TypeDecl.Python_genSignature(Python_env env) {
		/*
		env.println("class " + getName() + "(object):");
		env.indent();
		env.println("signature = labcomm.typedef('" + getName() + "',");
		env.indent();
		getType().Python_genSignature(env);
		env.unindent();
		env.println(")");
		env.unindent();
		env.println();
		*/
		}

		public void SampleDecl.Python_genSignature(Python_env env) {
		env.println("class " + getName() + "(object):");
		env.indent();
		env.println("signature = labcomm.sample('" + getName() + "', ");
		env.println("signature = labcomm2006.sample('" + getName() + "', ");
		env.indent();
		getType().Python_genSignature(env);
		env.unindent();
		@@ -154,20 +132,20 @@ aspect PythonTypes {

		public void PrimType.Python_genSignature(Python_env env) {
		switch (getToken()) {
		case LABCOMM_BOOLEAN: { env.print("labcomm.BOOLEAN()"); } break;
		case LABCOMM_BYTE: { env.print("labcomm.BYTE()"); } break;
		case LABCOMM_SHORT: { env.print("labcomm.SHORT()"); } break;
		case LABCOMM_INT: { env.print("labcomm.INTEGER()"); } break;
		case LABCOMM_LONG: { env.print("labcomm.LONG()"); } break;
		case LABCOMM_FLOAT: { env.print("labcomm.FLOAT()"); } break;
		case LABCOMM_DOUBLE: { env.print("labcomm.DOUBLE()"); } break;
		case LABCOMM_STRING: { env.print("labcomm.STRING()"); } break;
		case LABCOMM_SAMPLE: { env.print("labcomm.SAMPLE()"); } break;
		case LABCOMM_BOOLEAN: { env.print("labcomm2006.BOOLEAN()"); } break;
		case LABCOMM_BYTE: { env.print("labcomm2006.BYTE()"); } break;
		case LABCOMM_SHORT: { env.print("labcomm2006.SHORT()"); } break;
		case LABCOMM_INT: { env.print("labcomm2006.INTEGER()"); } break;
		case LABCOMM_LONG: { env.print("labcomm2006.LONG()"); } break;
		case LABCOMM_FLOAT: { env.print("labcomm2006.FLOAT()"); } break;
		case LABCOMM_DOUBLE: { env.print("labcomm2006.DOUBLE()"); } break;
		case LABCOMM_STRING: { env.print("labcomm2006.STRING()"); } break;
		case LABCOMM_SAMPLE: { env.print("labcomm2006.SAMPLE()"); } break;
		}
		}

		public void ArrayType.Python_genSignature(Python_env env) {
		env.print("labcomm.array([");
		env.print("labcomm2006.array([");
		for (int i = 0 ; i < getNumExp() ; i++) {
		if (i > 0) { env.print(", "); }
		env.print(getExp(i).Python_getValue());
		@@ -180,7 +158,7 @@ aspect PythonTypes {
		}

		public void StructType.Python_genSignature(Python_env env) {
		env.println("labcomm.struct([");
		env.println("labcomm2006.struct([");
		env.indent();
		for (int i = 0 ; i < getNumField() ; i++) {
		if (i > 0) { env.println(","); }
		@@ -191,7 +169,7 @@ aspect PythonTypes {
		}

		public void VoidType.Python_genSignature(Python_env env) {
		env.println("labcomm.struct([])");
		env.println("labcomm2006.struct([])");
		}

		public void Field.Python_genSignature(Python_env env) {
		@@ -200,18 +178,11 @@ aspect PythonTypes {
		env.print(")");
		}

		public void Decl.Python_genTypedefListEntry(Python_env env) {
		}

		public void TypeDecl.Python_genTypedefListEntry(Python_env env) {
		env.println("('" + getName() + "', " + getName() + ".signature),");
		}

		public void Decl.Python_genSampleListEntry(Python_env env) {
		}

		public void SampleDecl.Python_genSampleListEntry(Python_env env) {
		env.println("('" + getName() + "', " + getName() + ".signature),");
		env.println(getName() + ",");
		}

		public String Exp.Python_getValue() {

compiler/2006/RAPID_CodeGen.jrag

deleted100644 → 0

+0 −369

Original line number	Diff line number	Diff line

		aspect RAPID_env {
		public class RAPID_env {
		public final int version;
		private String prefix;
		private StringBuilder types;
		private StringBuilder constants;
		private StringBuilder procedures;
		private PrintStream ps;

		public RAPID_env(PrintStream ps, String prefix, int version)
		{
		this.version = version;
		this.types = new StringBuilder();
		this.constants = new StringBuilder();
		this.procedures = new StringBuilder();
		this.prefix = prefix;
		this.ps = ps;
		}

		public String prefix() { return this.prefix; }

		public String addRecord(String name, java.util.List<String> components)
		{
		String recordName = this.prefix + "_" + name;
		types.append("\tRECORD " + recordName);
		types.append("\n");
		for (String c : components) {
		types.append("\t\t" + c + "\n");
		}
		types.append("\tENDRECORD");
		types.append("\n\n");
		return recordName;
		}

		public void addConstant(String type, String name, String value) {
		this.constants.append("\tLOCAL CONST " + type + " " + name +
		" := " + value + ";\n");
		}

		public void addProc(String name, java.util.List<String> params,
		java.util.List<String> stmts)
		{
		this.procedures.append("\tLOCAL PROC " + name + "(");
		for (int i = 0; i < params.size(); i++) {
		this.procedures.append(params.get(i));
		if (i < params.size() - 1) {
		this.procedures.append(", ");
		}
		}
		this.procedures.append(")\n");
		for (String stmt : stmts) {
		this.procedures.append("\t\t" + stmt + "\n");
		}
		this.procedures.append("\tERROR\n\t\tRAISE ;\n\tENDPROC\n\n");
		}

		public void flush()
		{
		ps.println("MODULE " + prefix() + "(SYSMODULE)");
		ps.println();
		ps.print(types.toString());
		ps.println();
		ps.println("\tLOCAL CONST string prefix:=\"" + this.prefix + "\";");
		ps.print(constants.toString());
		ps.println();
		ps.print(procedures.toString());
		ps.println();
		ps.print("ENDMODULE");
		}
		}
		}

		aspect RAPID_CodeGen {

		public void ASTNode.RAPID_gen(RAPID_env env) {
		throw new UnsupportedOperationException();
		}

		public void Program.RAPID_gen(String file, String prefix, int version)
		throws IOException
		{
		PrintStream ps = new PrintStream(new FileOutputStream(new File(file)));
		RAPID_env env = new RAPID_env(ps, prefix, version);
		RAPID_gen(env);
		}

		public void Program.RAPID_gen(RAPID_env env)
		{
		for (int i = 0; i < getNumDecl(); i++) {
		getDecl(i).RAPID_gen(env);
		}
		env.flush();
		}

		public void Decl.RAPID_gen(RAPID_env env) {
		throw new UnsupportedOperationException("RAPID code generation (currently) does not support "+getClass().getSimpleName());
		}

		public void TypeDecl.RAPID_gen(RAPID_env env) {
		System.out.println("***WARNING! TypeDecl.RapidGen(.) a NOP after sig reorganization.");
		System.out.println(" (Tell a developer to) remove this warning when tested");
		}

		public void Decl.RAPID_emitFlatSignature(RAPID_env env, String sig_len_name, String sig_name) {
		System.out.println("***WARNING! Code not tested after reorganization of signatures.");
		System.out.println(" (Tell a developer to) remove this warning when tested");
		SignatureList sig = flatSignature(env.version);
		StringBuilder sb = new StringBuilder();
		sb.append("[");
		byte[] d = null;
		int sig_len = 0;
		for (int i = 0; i < sig.size(); i++) {
		d = sig.getData(i, env.version);
		for (int j = 0; d != null && j < d.length; j++) {
		sb.append(d[j] + ",");
		sig_len++;
		}
		}
		sb.delete(sb.length() - 1, sb.length());
		sb.append("]");
		env.addConstant("num", sig_len_name, "" + sig_len);
		env.addConstant("byte", sig_name + "{" + sig_len_name + "}",
		sb.toString());
		}

		public void SampleDecl.RAPID_gen(RAPID_env env) {
		// Add type declarations
		String fullName = getType().RAPID_AddType(env, getName());
		// Add signature constants
		String sig_len_name = "signature_len_" + getName();
		String sig_name = "signature_" + getName();

		RAPID_emitFlatSignature(env, sig_len_name, sig_name);

		// Add decode procedures
		ArrayList<String> params = new ArrayList<String>();
		ArrayList<String> stmts = new ArrayList<String>();
		params.add("VAR LabComm_Decoder_Sample s");
		params.add("string handler");
		stmts.add("s.prefix := prefix;");
		stmts.add("s.name := \"" + getName() + "\";");
		stmts.add("s.handler := handler;");
		env.addProc("Dec_Reg_" + getName(), params, stmts);

		params.clear();
		stmts.clear();
		params.add("VAR LabComm_Decoder_Sample s");
		params.add("VAR rawbytes sig");
		params.add("num user_id");
		stmts.add("VAR byte tmp_sig{" + sig_len_name + "};");
		stmts.add("IF RawBytesLen(sig)<>" + sig_len_name + " THEN");
		stmts.add("\tRETURN;");
		stmts.add("ENDIF");
		stmts.add("FOR i FROM 1 TO " + sig_len_name + " DO");
		stmts.add("\tUnpackRawBytes sig, i, tmp_sig{i}, \\Hex1;");
		stmts.add("ENDFOR");
		stmts.add("IF tmp_sig<>" + sig_name + " THEN");
		stmts.add("\tRETURN;");
		stmts.add("ENDIF");
		stmts.add("s.user_id := user_id;");
		env.addProc("Reg_If_Signature_Of_" + getName(), params, stmts);

		params.clear();
		stmts.clear();
		params.add("VAR Decoder d");
		params.add("VAR LabComm_Stream st");
		params.add("VAR LabComm_Decoder_Sample s");
		stmts.add("VAR " + fullName + " tmp;");
		getType().RAPID_AddDecodeInstr(env, stmts, "tmp", "st");
		stmts.add("% s.handler % tmp;");
		env.addProc("Decode_And_Handle_" + getName(), params, stmts);

		params.clear();
		stmts.clear();
		params.add("VAR Encoder e");
		params.add("VAR LabComm_Stream st");
		params.add("VAR LabComm_Encoder_Sample s");
		stmts.add("s.prefix := prefix;");
		stmts.add("s.name := \"" + getName() + "\";");
		stmts.add("Encoder_Register_Sample e, st, s;");
		env.addProc("Enc_Reg_" + getName(), params, stmts);

		params.clear();
		stmts.clear();
		params.add("VAR Encoder e");
		params.add("VAR LabComm_Stream s");
		stmts.add("VAR rawbytes buffer;");
		stmts.add("FOR i FROM 1 TO " + sig_len_name + " DO");
		stmts.add("\tPackRawBytes " + sig_name +
		"{i}, buffer, \\Network, i, \\Hex1;");
		stmts.add("ENDFOR");
		stmts.add("SocketSend s.soc, \\RawData:=buffer, \\NoOfBytes:=" +
		sig_len_name + ";");
		env.addProc("Encode_Signature_" + getName(), params, stmts);

		params.clear();
		stmts.clear();
		params.add("VAR Encoder e");
		params.add("VAR LabComm_Stream st");
		params.add("VAR LabComm_Encoder_Sample s");
		params.add("VAR " + fullName + " val");
		stmts.add("Encode_Packed st, s.user_id;");
		getType().RAPID_AddEncodeInstr(env, stmts, "val", "st");
		env.addProc("Encode_" + getName(), params, stmts);
		}

		public String Type.RAPID_AddType(RAPID_env env, String name) {
		throw new UnsupportedOperationException("RAPID code generation does (currently) not support "+getClass().getSimpleName());
		}

		public String StructType.RAPID_AddType(RAPID_env env, String name) {
		ArrayList<String> components = new ArrayList<String>();
		for (int i = 0; i < getNumField(); i++) {
		Field f = getField(i);
		components.add(
		f.getType().RAPID_AddType(env, name + "_" + f.getName()) +
		" " + f.getName() + ";");
		}
		String typeName = env.addRecord(name, components);
		return typeName;
		}

		public String FixedArrayType.RAPID_AddType(RAPID_env env, String name) {
		String typeName = getType().RAPID_AddType(env, name + "_e");
		if (getNumExp() > 1) {
		throw new UnsupportedOperationException("RAPID generation only (currently) supports one-dimensional arrays");
		}
		ArrayList<String> components = new ArrayList<String>();
		for (int i = 1; i <= getExp(0).RAPID_getValue(); i++) {
		components.add(typeName + " e" + i + ";");
		}
		String completeName = env.addRecord("list_" + name, components);
		return completeName;
		}

		public String PrimType.RAPID_AddType(RAPID_env env, String name) {
		if (getToken() == LABCOMM_SHORT \|\|
		getToken() == LABCOMM_FLOAT \|\|
		getToken() == LABCOMM_INT) {
		return "num";
		} else if (getToken() == LABCOMM_LONG) {
		return "dnum";
		} else if (getToken() == LABCOMM_STRING) {
		return "string";
		} else if (getToken() == LABCOMM_BOOLEAN) {
		return "bool";
		} else if (getToken() == LABCOMM_BYTE) {
		return "byte";
		}
		throw new UnsupportedOperationException("RAPID code generation does not (currently) support "+getName());
		}

		public void Type.RAPID_AddDecodeInstr(RAPID_env env,
		java.util.List<String> instrs,
		String var_name, String stream_name) {
		throw new UnsupportedOperationException("RAPID code generation does not (currently) support "+getClass().getSimpleName());
		}

		public void StructType.RAPID_AddDecodeInstr(RAPID_env env,
		java.util.List<String> instrs,
		String var_name, String stream_name) {
		for (int i = 0; i < getNumField(); i++) {
		getField(i).getType().RAPID_AddDecodeInstr(env, instrs,
		var_name + "." + getField(i).getName(), stream_name);
		}
		}

		public void FixedArrayType.RAPID_AddDecodeInstr(RAPID_env env,
		java.util.List<String> instrs,
		String var_name, String stream_name) {
		for (int i = 1; i <= getExp(0).RAPID_getValue(); i++) {
		getType().RAPID_AddDecodeInstr(env, instrs,
		var_name + ".e" + i, stream_name);
		}
		}

		public void PrimType.RAPID_AddDecodeInstr(RAPID_env env,
		java.util.List<String> instrs,
		String var_name, String stream_name) {
		switch(getToken()) {
		case LABCOMM_BYTE:
		instrs.add("Decode_Byte " + stream_name + "," + var_name + ";");
		break;
		case LABCOMM_BOOLEAN:
		instrs.add("Decode_Bool " + stream_name + "," + var_name + ";");
		break;
		case LABCOMM_SHORT:
		instrs.add("Decode_Short " + stream_name + "," + var_name + ";");
		break;
		case LABCOMM_INT:
		instrs.add("Decode_Int " + stream_name + "," + var_name + ";");
		break;
		case LABCOMM_LONG:
		instrs.add("Decode_Long " + stream_name + "," + var_name + ";");
		break;
		case LABCOMM_FLOAT:
		instrs.add("Decode_Float " + stream_name + "," + var_name + ";");
		break;
		case LABCOMM_STRING:
		instrs.add("Decode_String " + stream_name + "," + var_name + ";");
		break;
		default:
		throw new UnsupportedOperationException("RAPID code generation does not (currently) support "+getName());
		}
		}

		public void Type.RAPID_AddEncodeInstr(RAPID_env env,
		java.util.List<String> instrs,
		String var_name, String stream_name) {
		throw new UnsupportedOperationException("RAPID code generation does not (currently) support "+getClass().getSimpleName());
		}

		public void StructType.RAPID_AddEncodeInstr(RAPID_env env,
		java.util.List<String> instrs,
		String var_name, String stream_name) {
		for (int i = 0; i < getNumField(); i++) {
		getField(i).getType().RAPID_AddEncodeInstr(env, instrs,
		var_name + "." + getField(i).getName(), stream_name);
		}
		}

		public void FixedArrayType.RAPID_AddEncodeInstr(RAPID_env env,
		java.util.List<String> instrs,
		String var_name, String stream_name) {
		for (int i = 1; i <= getExp(0).RAPID_getValue(); i++) {
		getType().RAPID_AddEncodeInstr(env, instrs,
		var_name + ".e" + i, stream_name);
		}
		}

		public void PrimType.RAPID_AddEncodeInstr(RAPID_env env,
		java.util.List<String> instrs,
		String var_name, String stream_name) {
		switch(getToken()) {
		case LABCOMM_BYTE:
		instrs.add("Encode_Byte " + stream_name + "," + var_name + ";");
		break;
		case LABCOMM_BOOLEAN:
		instrs.add("Encode_Bool " + stream_name + "," + var_name + ";");
		break;
		case LABCOMM_SHORT:
		instrs.add("Encode_Short " + stream_name + "," + var_name + ";");
		break;
		case LABCOMM_INT:
		instrs.add("Encode_Int " + stream_name + "," + var_name + ";");
		break;
		case LABCOMM_LONG:
		instrs.add("Encode_Long " + stream_name + "," + var_name + ";");
		break;
		case LABCOMM_FLOAT:
		instrs.add("Encode_Float " + stream_name + "," + var_name + ";");
		break;
		case LABCOMM_STRING:
		instrs.add("Encode_String " + stream_name + "," + var_name + ";");
		break;
		default:
		throw new UnsupportedOperationException("RAPID code generation does not (currently) support "+getName());
		}
		}

		public int Exp.RAPID_getValue() {
		throw new UnsupportedOperationException("RAPID code generation does not (currently) support "+getClass().getSimpleName());
		}

		public int IntegerLiteral.RAPID_getValue() {
		return Integer.parseInt(getValue());
		}
		}

compiler/2006/Signature.jrag

+0 −2

Original line number	Diff line number	Diff line
		@@ -6,8 +6,6 @@ aspect Signature {
		eq TypeDecl.isSampleDecl() = false;
		eq SampleDecl.isSampleDecl() = true;

		syn boolean Decl.sendOnlyFlatSignatures(Java_env env) = (env.version==2006);

		eq Decl.getSignature().parentDecl() = this;
		eq Signature.getSignatureList().parentDecl() = parentDecl();

compiler/2014/ArrayTypeRewrite.jrag

deleted100644 → 0

+0 −43

Original line number	Diff line number	Diff line
		aspect ArrayRewrite {

		syn boolean Dim.isVariable() {
		for (int i = 0 ; i < getNumExp() ; i++) {
		if (getExp(i) instanceof VariableSize) {
		return true;
		}
		}
		return false;
		}

		rewrite ParseArrayType {
		when (! getDim(0).isVariable())
		to FixedArrayType {
		if (getNumDim() == 1) {
		return new FixedArrayType(getType(),
		getDim(0).getExpList());
		} else {
		List l = new List();
		for (int i = 1 ; i < getNumDim() ; i++) {
		l.add(getDim(i));
		}
		return new FixedArrayType(new ParseArrayType(getType(), l),
		getDim(0).getExpList());
		}
		}
		when (getDim(0).isVariable())
		to VariableArrayType {
		if (getNumDim() == 1) {
		return new VariableArrayType(getType(),
		getDim(0).getExpList());
		} else {
		List l = new List();
		for (int i = 1 ; i < getNumDim() ; i++) {
		l.add(getDim(i));
		}
		return new VariableArrayType(new ParseArrayType(getType(), l),
		getDim(0).getExpList());
		}
		}
		}

		}

compiler/2014/CS_CodeGen.jrag

deleted100644 → 0

+0 −971

File deleted.

Preview size limit exceeded, changes collapsed.

compiler/2014/C_CodeGen.jrag

deleted100644 → 0

+0 −1755

File deleted.

Preview size limit exceeded, changes collapsed.

compiler/2014/DeclNames.jrag

deleted100644 → 0

+0 −14

Original line number	Diff line number	Diff line
		aspect DeclNames {
		inh String Type.declName();
		eq Decl.getType().declName() = getName();

		inh String Field.declName();
		eq StructType.getField(int i).declName() = declName();

		//TODO: aspect should be renamed to parent-something

		inh Decl Type.parentDecl();
		inh Decl Field.parentDecl();
		eq Decl.getType().parentDecl() = this;
		eq StructType.getField(int i).parentDecl() = parentDecl();
		}

compiler/2014/ErrorCheck.jrag

deleted100644 → 0

+0 −31

Original line number	Diff line number	Diff line
		import java.util.Collection;

		aspect ErrorCheck {

		syn int ASTNode.lineNumber() = getLine(getStart());

		protected String ASTNode.errors = null;

		protected void ASTNode.error(String s) {
		s = "Error at " + lineNumber() + ": " + s;
		if(errors == null) {
		errors = s;
		} else {
		errors = errors + "\n" + s;
		}
		}

		protected boolean ASTNode.hasErrors() {
		return errors != null;
		}
		public void ASTNode.errorCheck(Collection collection) {
		nameCheck();
		typeCheck();
		if(hasErrors())
		collection.add(errors);
		for(int i = 0; i < getNumChild(); i++) {
		getChild(i).errorCheck(collection);
		}
		}

		}

compiler/2014/FlatSignature.jrag

deleted100644 → 0

+0 −123

Original line number	Diff line number	Diff line
		import java.util.*;

		aspect FlatSignature {

		public SignatureList Decl.flatSignature(int version) {
		SignatureList result = getSignature().getFlatSignatureList();
		return result;
		}

		public void ASTNode.flatSignature(SignatureList list) {
		throw new Error(this.getClass().getName() +
		".flatSignature(SignatureList list)" +
		" not declared");
		}

		public void TypeDecl.flatSignature(SignatureList list) {
		getType().flatSignature(list);
		}

		public void SampleDecl.flatSignature(SignatureList list) {
		getType().flatSignature(list);
		}

		// public void SampleRefType.flatSignature(SignatureList list) {
		// list.addInt(LABCOMM_SAMPLE_REF, "sample");
		// }

		public void VoidType.flatSignature(SignatureList list) {
		list.addInt(LABCOMM_STRUCT, "void");
		list.addInt(0, null);
		}

		public void PrimType.flatSignature(SignatureList list) {
		list.addInt(getToken(), null);
		}

		public void UserType.flatSignature(SignatureList list) {
		lookupType(getName()).flatSignature(list);
		}

		public void ArrayType.flatSignature(SignatureList list) {
		list.addInt(LABCOMM_ARRAY, signatureComment());
		list.indent();
		list.addInt(getNumExp(), null);
		for (int i = 0 ; i < getNumExp() ; i++) {
		getExp(i).flatSignature(list);
		}
		getType().flatSignature(list);
		list.unindent();
		list.add(null, "}");
		}

		public void StructType.flatSignature(SignatureList list) {
		list.addInt(LABCOMM_STRUCT, "struct { " + getNumField() + " fields");
		list.indent();
		list.addInt(getNumField(), null);
		for (int i = 0 ; i < getNumField() ; i++) {
		getField(i).flatSignature(list);
		}
		list.unindent();
		list.add(null, "}");
		}

		public void Field.flatSignature(SignatureList list) {
		list.addString(getName(), signatureComment());
		getType().flatSignature(list);
		}

		public void IntegerLiteral.flatSignature(SignatureList list) {
		list.addInt(Integer.parseInt(getValue()), null);
		}

		public void VariableSize.flatSignature(SignatureList list) {
		list.addInt(0, null);
		}

		public String ArrayType.signatureComment() {
		StringBuffer result = new StringBuffer("array [");
		for (int i = 0 ; i < getNumExp() ; i++) {
		if (i > 0) {
		result.append(", ");
		}
		result.append(getExp(i).signatureComment());
		}
		result.append("]");
		return result.toString();
		}

		public String ASTNode.signatureComment() {
		throw new Error(this.getClass().getName() +
		".signatureComment()" +
		" not declared");
		}

		public String Field.signatureComment() {
		return getType().signatureComment() + " '" + getName() +"'";
		}

		// public String SampleRefType.signatureComment() {
		// return "sample";
		// }

		public String PrimType.signatureComment() {
		return getName();
		}

		public String UserType.signatureComment() {
		return getName();
		}

		public String StructType.signatureComment() {
		return "struct";
		}

		public String IntegerLiteral.signatureComment() {
		return getValue();
		}

		public String VariableSize.signatureComment() {
		return "_";
		}

		}

compiler/2014/Java_CodeGen.jrag

deleted100644 → 0

+0 −1062

File deleted.

Preview size limit exceeded, changes collapsed.

compiler/2014/LabComm.ast

deleted100644 → 0

+0 −37

Original line number	Diff line number	Diff line
		Program ::= Decl*;

		abstract Decl ::= Type <Name:String> /Signature/;

		TypeDecl : Decl;
		SampleDecl : Decl;

		//Signatures are in the abstract grammar, so that
		//they can be extended and refined by aspects.

		Signature ::= SignatureList FlatSignatureList:SignatureList;
		SignatureList ::= SignatureLine*;
		abstract SignatureLine ::= <Indent:int> <Comment:String>;
		abstract DataSignatureLine : SignatureLine;
		ByteArraySignatureLine : DataSignatureLine ::= <Data:byte[]>;
		IntSignatureLine : DataSignatureLine ::= <Data:int>;
		StringSignatureLine : DataSignatureLine ::= <Data:String>;
		TypeRefSignatureLine : SignatureLine ::= Decl;

		Field ::= Type <Name:String>;

		abstract Type;
		VoidType : Type;
		//SampleRefType : Type;
		PrimType : Type ::= <Name:String> <Token:int>;
		UserType : Type ::= <Name:String>;
		StructType : Type ::= Field*;
		ParseArrayType : Type ::= Type Dim*;
		abstract ArrayType : Type ::= Type Exp*;
		VariableArrayType : ArrayType;
		FixedArrayType : ArrayType;

		Dim ::= Exp*;

		abstract Exp;
		IntegerLiteral : Exp ::= <Value:String>;
		VariableSize : Exp;

compiler/2014/LabComm.java

deleted100644 → 0

+0 −404

File deleted.

Preview size limit exceeded, changes collapsed.

compiler/2014/LabCommParser.parser

deleted100644 → 0

+0 −133

Original line number	Diff line number	Diff line
		%header {:
		package se.lth.control.labcomm2014.compiler;
		import se.lth.control.labcomm2014.compiler.*;
		:};
		%embed {:
		public static class SourceError extends Error {
		public SourceError(String msg) {
		super(msg);
		}
		}
		class Events extends Parser.Events {
		public void syntaxError(Symbol token) {
		StringBuffer s = new StringBuffer();
		s.append(token.getLine(token.getStart()) + ", " + token.getColumn(token.getStart()) + "\n");
		s.append(" *** Syntactic error: unexpected token " + Terminals.NAMES[token.getId()]);
		throw new SourceError(s.toString());
		//super.syntaxError(token);
		//throw new RuntimeException(token.getLine(token.getStart()) + ", " +
		// token.getColumn(token.getStart()) + ": Syntax Error");
		}
		public void scannerError(Scanner.Exception e) {
		StringBuffer s = new StringBuffer();
		s.append(e.line + ", " + e.column + "\n");
		s.append(" *** Lexical error: " + e.getMessage());
		throw new SourceError(s.toString());
		//super.scannerError(e);
		//throw new RuntimeException("Unexpected token");
		}

		}

		{
		report = new Events(); // Use error handler in parser
		}
		:};

		Program goal =
		/* Empty program */ {: return new Program(); :}
		\| decl_list.l {: return new Program(l); :}
		;

		List decl_list =
		decl.d {: return new List().add(d); :}
		\| decl_list.l decl.d {: return l.add(d); :}
		;

		Decl decl =
		type_decl.t {: return t; :}
		\| sample_decl.s {: return s; :}
		;

		List var_decl_list =
		var_decl.v {: return new List().add(v); :}
		\| var_decl_list.l var_decl.v {: return l.add(v); :}
		;

		Field var_decl =
		type.t IDENTIFIER SEMICOLON {: return new Field(t, IDENTIFIER); :}
		\| type.t IDENTIFIER dim_list.d SEMICOLON
		{: return new Field(new ParseArrayType(t, d), IDENTIFIER); :}
		;

		TypeDecl type_decl =
		TYPEDEF type.t IDENTIFIER SEMICOLON {: return new TypeDecl(t, IDENTIFIER); :}
		\| TYPEDEF type.t IDENTIFIER dim_list.d SEMICOLON
		{: return new TypeDecl(new ParseArrayType(t, d), IDENTIFIER); :}
		;

		SampleDecl sample_decl =
		SAMPLE type.t IDENTIFIER SEMICOLON
		{: return new SampleDecl(t, IDENTIFIER); :}
		\| SAMPLE type.t IDENTIFIER dim_list.d SEMICOLON
		{: return new SampleDecl(new ParseArrayType(t, d), IDENTIFIER); :}
		;

		Type type =
		prim_type.p {: return p; :}
		\| user_type.u {: return u; :}
		\| struct_type.s {: return s; :}
		\| void_type.v {: return v; :}
		;

		PrimType prim_type =
		BOOLEAN
		{: return new PrimType(BOOLEAN, ASTNode.LABCOMM_BOOLEAN); :}
		\| BYTE
		{: return new PrimType(BYTE, ASTNode.LABCOMM_BYTE); :}
		\| SHORT
		{: return new PrimType(SHORT, ASTNode.LABCOMM_SHORT); :}
		\| INT
		{: return new PrimType(INT, ASTNode.LABCOMM_INT); :}
		\| LONG
		{: return new PrimType(LONG, ASTNode.LABCOMM_LONG); :}
		\| FLOAT
		{: return new PrimType(FLOAT, ASTNode.LABCOMM_FLOAT); :}
		\| DOUBLE
		{: return new PrimType(DOUBLE, ASTNode.LABCOMM_DOUBLE); :}
		\| STRING
		{: return new PrimType(STRING, ASTNode.LABCOMM_STRING); :}
		\| SAMPLE
		{: return new PrimType(SAMPLE, ASTNode.LABCOMM_SAMPLE); :}
		;

		UserType user_type =
		IDENTIFIER {: return new UserType(IDENTIFIER); :}
		;

		StructType struct_type =
		STRUCT LBRACE var_decl_list.l RBRACE {: return new StructType(l); :}
		;

		VoidType void_type =
		VOID {: return new VoidType(); :}
		;

		List dim_list =
		dim.d {: return new List().add(d); :}
		\| dim_list.l dim.d {: return l.add(d); :}
		;

		Dim dim =
		LBRACK exp_list.e RBRACK {: return new Dim(e); :}
		;

		List exp_list =
		exp.e {: return new List().add(e); :}
		\| exp_list.l COMMA exp.e {: return l.add(e); :}
		;

		Exp exp =
		INTEGER_LITERAL {: return new IntegerLiteral(INTEGER_LITERAL); :}
		\| UNDERSCORE {: return new VariableSize(); :}
		;

compiler/2014/LabCommScanner.flex

deleted100644 → 0

+0 −87

File deleted.

Preview size limit exceeded, changes collapsed.

compiler/2014/LabCommTokens.jrag

deleted100644 → 0

+0 −22

File deleted.

Preview size limit exceeded, changes collapsed.

compiler/2014/NameAnalysis.jrag

deleted100644 → 0

+0 −67

File deleted.

Preview size limit exceeded, changes collapsed.

compiler/2014/PrettyPrint.jrag

deleted100644 → 0

+0 −117

File deleted.

Preview size limit exceeded, changes collapsed.

compiler/2014/Python_CodeGen.jrag

deleted100644 → 0

+0 −231

File deleted.

Preview size limit exceeded, changes collapsed.

compiler/2014/RAPID_CodeGen.jrag

deleted100644 → 0

+0 −369

File deleted.

Preview size limit exceeded, changes collapsed.

compiler/2014/Signature.jrag

deleted100644 → 0

+0 −229

File deleted.

Preview size limit exceeded, changes collapsed.

compiler/2014/TypeCheck.jrag

deleted100644 → 0

+0 −36

File deleted.

Preview size limit exceeded, changes collapsed.

compiler/2014/TypeReferences.jrag

deleted100644 → 0

+0 −46

File deleted.

Preview size limit exceeded, changes collapsed.

compiler/2014/Version.jrag

deleted100644 → 0

+0 −15

Original line number	Diff line number	Diff line
		aspect Version {

		/* An auxilliary class for handling naming and prefixes connected
		* to the LabComm version
		*/
		class LabCommVersion {
		public static String versionString(int version) {
		return (version == 2006) ? "2006" : "";
		}

		public static boolean versionHasPragma(int version) {
		return version != 2006;
		}
		}
		}

compiler/LabComm.java

deleted100644 → 0

+0 −36

File deleted.

Preview size limit exceeded, changes collapsed.

compiler/Makefile

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

compiler/build.xml

+1 −38

File changed.

Preview size limit exceeded, changes collapsed.

compiler/labcomm

deleted100755 → 0

+0 −2

Original line number	Diff line number	Diff line
		#!/bin/sh
		java -jar /lib/labcomm_compiler.jar "$@"

compiler/labcomm2014

deleted100755 → 0

+0 −2

File deleted.

Preview size limit exceeded, changes collapsed.

doc/tech_report.tex

deleted100644 → 0

+0 −910

File deleted.

Preview size limit exceeded, changes collapsed.

examples/Makefile

+3 −3

File changed.

Preview size limit exceeded, changes collapsed.

examples/duck_typing/Makefile

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

examples/duck_typing/duck_typing.py

+3 −3

File changed.

Preview size limit exceeded, changes collapsed.

examples/dynamic/dynamic.sh

+3 −3

File changed.

Preview size limit exceeded, changes collapsed.

examples/dynamic/static.sh

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

examples/dynamic/test.sh

+2 −2

File changed.

Preview size limit exceeded, changes collapsed.

examples/dynamic/test_type.sh

+2 −2

File changed.

Preview size limit exceeded, changes collapsed.

examples/jgrafchart/Makefile

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

examples/simple/compile.sh

+2 −2

File changed.

Preview size limit exceeded, changes collapsed.

examples/tcp/Makefile

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

examples/twoway/Makefile

+4 −4

File changed.

Preview size limit exceeded, changes collapsed.

examples/twoway/client.c

+39 −39

File changed.

Preview size limit exceeded, changes collapsed.

examples/twoway/decimating.c

+47 −47

File changed.

Preview size limit exceeded, changes collapsed.

examples/twoway/decimating.h

+9 −9

File changed.

Preview size limit exceeded, changes collapsed.

examples/twoway/introspecting.c

+49 −49

File changed.

Preview size limit exceeded, changes collapsed.

examples/twoway/introspecting.h

+11 −11

File changed.

Preview size limit exceeded, changes collapsed.

examples/twoway/server.c

+34 −34

File changed.

Preview size limit exceeded, changes collapsed.

examples/user_types/ExampleDecoder.cs

+87 −87

File changed.

Contains only whitespace changes.

lib/RAPID/LabComm.sys

deleted100644 → 0

+0 −317

File deleted.

Preview size limit exceeded, changes collapsed.

lib/RAPID/README

deleted100644 → 0

+0 −104

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2006/Makefile

+0 −1

File changed.

Preview size limit exceeded, changes collapsed.

lib/c/2006/labcomm2006.c

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

lib/c/2006/labcomm2006_decoder.c

+10 −10

File changed.

Preview size limit exceeded, changes collapsed.

lib/c/2006/labcomm2006_encoder.c

+3 −3

File changed.

Preview size limit exceeded, changes collapsed.

lib/c/2006/labcomm2006_private.h

+7 −7

File changed.

Preview size limit exceeded, changes collapsed.

lib/c/2006/test/test_labcomm_basic_type_encoding.c

+0 −12

File changed.

Preview size limit exceeded, changes collapsed.

lib/c/2014/Makefile

deleted100644 → 0

+0 −171

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/experimental/ThrottleDrv/display.h

deleted100644 → 0

+0 −12

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/experimental/ThrottleDrv/ethernet_drv.c

deleted100644 → 0

+0 −233

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/experimental/ThrottleDrv/ethernet_drv.h

deleted100644 → 0

+0 −14

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/experimental/ThrottleDrv/throttle_drv.c

deleted100644 → 0

+0 −409

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/experimental/ThrottleDrv/throttle_drv.h

deleted100644 → 0

+0 −24

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/experimental/ethaddr.c

deleted100644 → 0

+0 −41

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/experimental/ethaddr.h

deleted100644 → 0

+0 −11

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/experimental/labcomm_sig_parser.c

deleted100644 → 0

+0 −917

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/experimental/labcomm_sig_parser.h

deleted100644 → 0

+0 −135

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/experimental/labcomm_thr_reader_writer.c

deleted100644 → 0

+0 −139

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/experimental/labcomm_thr_reader_writer.h

deleted100644 → 0

+0 −5

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/experimental/labcomm_udp_reader_writer.c

deleted100644 → 0

+0 −105

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/experimental/labcomm_udp_reader_writer.h

deleted100644 → 0

+0 −9

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/experimental/pack.c

deleted100644 → 0

+0 −76

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/experimental/test_sig_parser.c

deleted100644 → 0

+0 −45

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/experimental/throttlenet/throttlenet.lc

deleted100644 → 0

+0 −75

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/experimental/udp_hack.c

deleted100644 → 0

+0 −121

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/experimental/udp_hack.h

deleted100644 → 0

+0 −12

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/labcomm2014.c

deleted100644 → 0

+0 −273

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/labcomm2014.h

deleted100644 → 0

+0 −138

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/labcomm2014_compat_arm_cortexm3.h

deleted100644 → 0

+0 −5

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/labcomm2014_compat_osx.h

deleted100644 → 0

+0 −28

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/labcomm2014_compat_vxworks.h

deleted100644 → 0

+0 −30

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/labcomm2014_decoder.c

deleted100644 → 0

+0 −665

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/labcomm2014_default_error_handler.c

deleted100644 → 0

+0 −24

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/labcomm2014_default_error_handler.h

deleted100644 → 0

+0 −28

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/labcomm2014_default_memory.c

deleted100644 → 0

+0 −49

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/labcomm2014_default_memory.h

deleted100644 → 0

+0 −29

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/labcomm2014_default_scheduler.c

deleted100644 → 0

+0 −109

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/labcomm2014_default_scheduler.h

deleted100644 → 0

+0 −28

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/labcomm2014_dynamic_buffer_writer.c

deleted100644 → 0

+0 −155

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/labcomm2014_dynamic_buffer_writer.h

deleted100644 → 0

+0 −32

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/labcomm2014_encoder.c

deleted100644 → 0

+0 −398

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/labcomm2014_error.c

deleted100644 → 0

+0 −39

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/labcomm2014_error.h

deleted100644 → 0

+0 −70

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/labcomm2014_fd_reader.c

deleted100644 → 0

+0 −129

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/labcomm2014_fd_reader.h

deleted100644 → 0

+0 −31

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/labcomm2014_fd_writer.c

deleted100644 → 0

+0 −142

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/labcomm2014_fd_writer.h

deleted100644 → 0

+0 −31

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/labcomm2014_ioctl.h

deleted100644 → 0

+0 −101

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/labcomm2014_memory.c

deleted100644 → 0

+0 −40

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/labcomm2014_private.h

deleted100644 → 0

+0 −563

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/labcomm2014_pthread_scheduler.c

deleted100644 → 0

+0 −394

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/labcomm2014_pthread_scheduler.h

deleted100644 → 0

+0 −31

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/labcomm2014_scheduler.c

deleted100644 → 0

+0 −85

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/labcomm2014_scheduler.h

deleted100644 → 0

+0 −60

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/labcomm2014_scheduler_private.h

deleted100644 → 0

+0 −60

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/labcomm2014_time.c

deleted100644 → 0

+0 −42

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/labcomm2014_type_signature.c

deleted100644 → 0

+0 −128

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/labcomm2014_type_signature.h

deleted100644 → 0

+0 −139

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/test/.gitignore

deleted100644 → 0

+0 −1

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/test/another_encoding.lc

deleted100644 → 0

+0 −2

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/test/cppmacros.h

deleted100644 → 0

+0 −8

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/test/generated_encoding.lc

deleted100644 → 0

+0 −12

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/test/labcomm_mem_reader.c

deleted100644 → 0

+0 −80

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/test/labcomm_mem_reader.h

deleted100644 → 0

+0 −19

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/test/labcomm_mem_writer.c

deleted100644 → 0

+0 −146

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/test/labcomm_mem_writer.h

deleted100644 → 0

+0 −25

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/test/more_types.lc

deleted100644 → 0

+0 −7

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/test/test_labcomm.c

deleted100644 → 0

+0 −277

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/test/test_labcomm_basic_type_encoding.c

deleted100644 → 0

+0 −143

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/test/test_labcomm_copy.c

deleted100644 → 0

+0 −283

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/test/test_labcomm_errors.c

deleted100644 → 0

+0 −173

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/test/test_labcomm_errors.h

deleted100644 → 0

+0 −6

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/test/test_labcomm_generated_encoding.c

deleted100644 → 0

+0 −280

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/test/test_labcomm_pthread_scheduler.c

deleted100644 → 0

+0 −82

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/test/test_sample.lc

deleted100644 → 0

+0 −1

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/2014/test/test_signature_numbers.c

deleted100644 → 0

+0 −24

File deleted.

Preview size limit exceeded, changes collapsed.

lib/c/Makefile

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

lib/csharp/.gitignore

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

lib/csharp/Makefile

+3 −3

File changed.

Preview size limit exceeded, changes collapsed.

lib/csharp/se/lth/control/labcomm/Constant.cs→lib/csharp/se/lth/control/labcomm2006/Constant.cs

+1 −8

File changed and moved.

Preview size limit exceeded, changes collapsed.

lib/csharp/se/lth/control/labcomm/Decoder.cs→lib/csharp/se/lth/control/labcomm2006/Decoder.cs

+1 −4

File changed and moved.

Preview size limit exceeded, changes collapsed.

lib/csharp/se/lth/control/labcomm/DecoderChannel.cs→lib/csharp/se/lth/control/labcomm2006/DecoderChannel.cs

+48 −62

File changed and moved.

Preview size limit exceeded, changes collapsed.

lib/csharp/se/lth/control/labcomm/DecoderRegistry.cs→lib/csharp/se/lth/control/labcomm2006/DecoderRegistry.cs

+1 −1

File changed and moved.

Preview size limit exceeded, changes collapsed.

lib/csharp/se/lth/control/labcomm/Encoder.cs→lib/csharp/se/lth/control/labcomm2006/Encoder.cs

+1 −4

File changed and moved.

Preview size limit exceeded, changes collapsed.

lib/csharp/se/lth/control/labcomm/EncoderChannel.cs→lib/csharp/se/lth/control/labcomm2006/EncoderChannel.cs

+5 −49

File changed and moved.

Preview size limit exceeded, changes collapsed.

lib/csharp/se/lth/control/labcomm/EncoderRegistry.cs→lib/csharp/se/lth/control/labcomm2006/EncoderRegistry.cs

+1 −1

File changed and moved.

Preview size limit exceeded, changes collapsed.

lib/csharp/se/lth/control/labcomm/Sample.cs→lib/csharp/se/lth/control/labcomm2006/Sample.cs

+1 −1

File changed and moved.

Preview size limit exceeded, changes collapsed.

lib/csharp/se/lth/control/labcomm/SampleDispatcher.cs→lib/csharp/se/lth/control/labcomm2006/SampleDispatcher.cs

+1 −1

File changed and moved.

Preview size limit exceeded, changes collapsed.

lib/csharp/se/lth/control/labcomm/SampleHandler.cs→lib/csharp/se/lth/control/labcomm2006/SampleHandler.cs

+1 −1

File changed and moved.

Preview size limit exceeded, changes collapsed.

lib/csharp/se/lth/control/labcomm/SampleType.cs→lib/csharp/se/lth/control/labcomm2006/SampleType.cs

+0 −0

File moved.

lib/java/Makefile

+4 −15

File changed.

Preview size limit exceeded, changes collapsed.

lib/java/se/lth/control/labcomm/ASTbuilder.java

deleted100644 → 0

+0 −177

File deleted.

Preview size limit exceeded, changes collapsed.

lib/java/se/lth/control/labcomm/BuiltinType.java

deleted100644 → 0

+0 −5

File deleted.

Preview size limit exceeded, changes collapsed.

lib/java/se/lth/control/labcomm/Constant.java

deleted100644 → 0

+0 −46

File deleted.

Preview size limit exceeded, changes collapsed.

lib/java/se/lth/control/labcomm/Decoder.java

deleted100644 → 0

+0 −22

File deleted.

Preview size limit exceeded, changes collapsed.

lib/java/se/lth/control/labcomm/DecoderChannel.java

deleted100644 → 0

+0 −231

File deleted.

Preview size limit exceeded, changes collapsed.

lib/java/se/lth/control/labcomm/DecoderRegistry.java

deleted100644 → 0

+0 −164

File deleted.

Preview size limit exceeded, changes collapsed.

lib/java/se/lth/control/labcomm/Encoder.java

deleted100644 → 0

+0 −26

File deleted.

Preview size limit exceeded, changes collapsed.

lib/java/se/lth/control/labcomm/EncoderChannel.java

deleted100644 → 0

+0 −248

File deleted.

Preview size limit exceeded, changes collapsed.

lib/java/se/lth/control/labcomm/EncoderRegistry.java

deleted100644 → 0

+0 −63

File deleted.

Preview size limit exceeded, changes collapsed.

lib/java/se/lth/control/labcomm/Reader.java

deleted100644 → 0

+0 −7

File deleted.

Preview size limit exceeded, changes collapsed.

lib/java/se/lth/control/labcomm/Sample.java

deleted100644 → 0

+0 −7

File deleted.

Preview size limit exceeded, changes collapsed.

lib/java/se/lth/control/labcomm/SampleDispatcher.java

deleted100644 → 0

+0 −29

File deleted.

Preview size limit exceeded, changes collapsed.

lib/java/se/lth/control/labcomm/SampleHandler.java

deleted100644 → 0

+0 −4

File deleted.

Preview size limit exceeded, changes collapsed.

lib/java/se/lth/control/labcomm/SampleType.java

deleted100644 → 0

+0 −5

File deleted.

Preview size limit exceeded, changes collapsed.

lib/java/se/lth/control/labcomm/TypeBinding.java

deleted100644 → 0

+0 −125

File deleted.

Preview size limit exceeded, changes collapsed.

lib/java/se/lth/control/labcomm/TypeDef.java

deleted100644 → 0

+0 −132

File deleted.

Preview size limit exceeded, changes collapsed.

lib/java/se/lth/control/labcomm/TypeDefParser.java

deleted100644 → 0

+0 −663

File deleted.

Preview size limit exceeded, changes collapsed.

lib/java/se/lth/control/labcomm/Writer.java

deleted100644 → 0

+0 −9

File deleted.

Preview size limit exceeded, changes collapsed.

lib/java/se/lth/control/labcomm/WriterWrapper.java

deleted100644 → 0

+0 −17

File deleted.

Preview size limit exceeded, changes collapsed.

lib/java/se/lth/control/labcomm2006/Decoder.java

+0 −1

File changed.

Preview size limit exceeded, changes collapsed.

lib/java/se/lth/control/labcomm2006/DecoderChannel.java

+10 −17

File changed.

Preview size limit exceeded, changes collapsed.

lib/java/se/lth/control/labcomm2006/Encoder.java

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

lib/java/se/lth/control/labcomm2006/EncoderChannel.java

+4 −4

File changed.

Preview size limit exceeded, changes collapsed.

lib/python/labcomm/init.py

deleted100644 → 0

+0 −35

File deleted.

Preview size limit exceeded, changes collapsed.

lib/python/labcomm/LabComm.py→lib/python/labcomm2006/LabComm.py

+32 −259

File changed and moved.

Preview size limit exceeded, changes collapsed.

lib/python/labcomm/StreamReader.py→lib/python/labcomm2006/StreamReader.py

+0 −2

File changed and moved.

Preview size limit exceeded, changes collapsed.

lib/python/labcomm/StreamWriter.py→lib/python/labcomm2006/StreamWriter.py

+0 −2

File changed and moved.

Preview size limit exceeded, changes collapsed.

lib/python/labcomm2006/init.py

0 → 100644

+27 −0

File added.

Preview size limit exceeded, changes collapsed.

packaging/make_srpm

+8 −17

File changed.

Preview size limit exceeded, changes collapsed.

test/Makefile

+12 −12

File changed.

Preview size limit exceeded, changes collapsed.

test/ref.lc

deleted100644 → 0

+0 −4

File deleted.

Preview size limit exceeded, changes collapsed.

test/relay_gen_c.py

+23 −25

File changed.

Preview size limit exceeded, changes collapsed.

test/relay_gen_cs.py

+1 −7

File changed.

Preview size limit exceeded, changes collapsed.

test/relay_gen_java.py

+3 −9

File changed.

Preview size limit exceeded, changes collapsed.

test/test_encoder_decoder.py

+17 −46

File changed.

Preview size limit exceeded, changes collapsed.

tools/lc2csv.py

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

tools/lc_to_matlab_coder.py

deleted100755 → 0

+0 −108

File deleted.

Preview size limit exceeded, changes collapsed.

Source

Target

Files

Some changes are not shown.