Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • anders.blomdell
  • compiler-refactoring
  • labcomm2006
  • labcomm2013
  • labcomm2014
  • master
  • pragma
  • python_sig_hash
  • typedefs
  • typeref
  • v2006.0
  • v2013.0
  • v2014.0
  • v2014.1
  • v2014.2
  • v2014.3
  • v2014.4
  • v2014.5
  • v2014.6
  • v2015.0
20 results

Target

Select target project
No results found
Select Git revision
Loading items
Show changes

Commits on Source 449

349 additional commits have been omitted to prevent performance issues.
337 files
+ 25772
− 3792
Compare changes
  • Side-by-side
  • Inline

Files

.bzrignore

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
AST

AST/*

LabComm.class

labComm.jar

lib/java/se/lth/control/labcomm/LabComm.class

lib/java/se/lth/control/labcomm/LabCommDecoderChannel.class

lib/java/se/lth/control/labcomm/LabCommDecoder.class

lib/java/se/lth/control/labcomm/LabCommDecoderRegistry.class

lib/java/se/lth/control/labcomm/LabCommDecoderRegistry$Entry.class

lib/java/se/lth/control/labcomm/LabCommDispatcher.class

lib/java/se/lth/control/labcomm/LabCommEncoderChannel.class

lib/java/se/lth/control/labcomm/LabCommEncoder.class

lib/java/se/lth/control/labcomm/LabCommEncoderRegistry.class

lib/java/se/lth/control/labcomm/LabCommEncoderRegistry$Entry.class

lib/java/se/lth/control/labcomm/LabCommHandler.class

lib/java/se/lth/control/labcomm/LabCommReader.class

lib/java/se/lth/control/labcomm/LabCommSample.class

lib/java/se/lth/control/labcomm/LabCommType.class

lib/java/se/lth/control/labcomm/LabCommWriter.class

gen

labcomm.dll

labcomm.jar

example.c

example.h

example.py

examples/wiki_example/example.encoded

example.encoded

examples/simple/*.class

examples/simple/encoded_data

examples/simple/example_decoder

examples/simple/example_encoder

lib/c/test/test_labcomm_basic_type_encoding

lib/c/test/test_labcomm_generated_encoding

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

lib/c/liblabcomm.so.1

.gitignore

0 → 100644
+5 −0
Original line number Diff line number Diff line 
*~

*.class

*.o

*.pyc

examples/dynamic/gen

LICENSE.rationale

0 → 100644
+73 −0
Original line number Diff line number Diff line 
Rationale for the licensing choosen for LabComm

===============================================



Primary goal:   the owners of systems with LabComm communication in it, 

                should have the liberty to replace the LabComm parts with 

                any software they see fit.



Secondary goal: it should be possible to release propreitary software

                with LabComm.





Wanted software architecture

^^^^^^^^^^^^^^^^^^^^^^^^^^^^



+------------------------------------------------------------+

| Propreitary software (any license)                         |

+------------------------------------------------------------+

| Labcomm glue (LGPL)                                        |

+--------------+-----+--------------+                        |

|  Generated   |     |  Generated   |                        |

|   encoder/   |     |   encoder/   |                        |

|   decoder    | * * |   decoder    |                        |

| (  GPLv3 +   |     | (  GPLv3 +   |        +---------------+

|  permission) |     |  permission) |        |  Non-system   |

+--------------+-----+--------------+--+     |    library    |

| LabComm library (GPLv3 + permission) |     | (any license) | 

+--------------------------------------+-----+----------+----+

| System library (any license)                          |    |

+-------------------------------------------------------+    |

| OS (any license)                                           |

+------------------------------------------------------------+



License considerations

^^^^^^^^^^^^^^^^^^^^^^



We need to allow linking to the LabComm library from the LGPL glue

(see http://www.gnu.org/licenses/gpl-faq.html#GPLIncompatibleLibs).



We can not set a license on generated code

(http://www.gnu.org/licenses/gpl-faq.html#GPLOutput), 

but when used with the LabComm library we can force it 

to be licensed under GPLv3.





Suggested license for all library files

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^



Copyright 2013 Anders Blomdell <anders.blomdell@control.lth.se>



This file is part of LabComm.



LabComm is free software: you can redistribute it and/or modify

it under the terms of the GNU General Public License as published by

the Free Software Foundation, either version 3 of the License, or

(at your option) any later version.



LabComm is distributed in the hope that it will be useful,

but WITHOUT ANY WARRANTY; without even the implied warranty of

MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

GNU General Public License for more details.



You should have received a copy of the GNU General Public License

along with this program.  If not, see <http://www.gnu.org/licenses/>.



Additional permission under GNU GPL version 3 section 7



If you modify this Program, or any covered work, by directly linking 

any functionality of it, with the the exception of calls denoting the 

boundary of encoded samples and calls encoding primitive datatypes,

with any software licensed under the GNU Lesser General Public License, 

the licensors of this Program grant you additional permission to convey 

the resulting work.

Makefile

+25 −24
Original line number Diff line number Diff line 
SUBDIRS=compiler lib test examples

export LABCOMM_JAR=$(shell pwd)/compiler/labComm.jar

SUBDIRS=compiler lib test examples packaging

export LABCOMM_JAR=$(shell pwd)/compiler/labcomm2014_compiler.jar

export LABCOMM=java -jar $(LABCOMM_JAR) 

export VALGRIND=valgrind --leak-check=full --error-exitcode=1



all: $(SUBDIRS:%=make-%)

UNAME_S=$(shell uname -s)



.PHONY: make-compiler

make-compiler:

	cd compiler ; ant jar

.PHONY: all

all: $(SUBDIRS:%=all-%)



.PHONY: make-%

make-%:

	LD_LIBRARY_PATH=`pwd`/lib/c $(MAKE) -C $* -e 

.PHONY: all-%

all-%:

ifeq ($(UNAME_S),Darwin)

	DYLD_LIBRARY_PATH=`pwd`/lib/c $(MAKE) -C $*

else

	LD_LIBRARY_PATH=`pwd`/lib/c $(MAKE) -C $*

endif



.PHONY: test

test: $(SUBDIRS:%=test-%)



.PHONY: test-compiler

test-compiler:



.PHONY: test-%

test-%:

	LD_LIBRARY_PATH=`pwd`/lib/c $(MAKE) -C $* -e test

ifeq ($(UNAME_S),Darwin)

	DYLD_LIBRARY_PATH=`pwd`/lib/c $(MAKE) -C $* test

else

	LD_LIBRARY_PATH=`pwd`/lib/c $(MAKE) -C $* test

endif



.PHONY: clean

clean: $(SUBDIRS:%=clean-%)



.PHONY: clean-compiler

clean-compiler:

	cd compiler ; ant clean



.PHONY: clean-%

clean-%:

	$(MAKE) -C $* -e clean

	$(MAKE) -C $* clean



.PHONY: distclean

distclean: $(SUBDIRS:%=distclean-%)



.PHONY: distclean-compiler

distclean-compiler:

	cd compiler ; ant clean

distclean: clean $(SUBDIRS:%=distclean-%)



.PHONY: distclean-%

distclean-%:

	$(MAKE) -C $* -e distclean
 
	$(MAKE) -C $* distclean



.PHONY: srpm

srpm:

	make -C packaging $@

compiler/.gitignore

0 → 100644
+4 −0
Original line number Diff line number Diff line 
gen

labcomm2006_compiler.jar

labcomm2014_compiler.jar

labcomm2014_compiler.jar

compiler/2014/Annotations.jrag

0 → 100644
+130 −0
Original line number Diff line number Diff line 
aspect Annotations {

    syn boolean TypeInstance.hasAnnotations() = getAnnotations().getNumAnnotation()>0;

    syn boolean TypeInstance.hasIntentions() = ! intentionSet().isEmpty();



    syn String Annotations.getName() = new String(lookup(""));



    syn byte[] Annotations.lookup(String key) {

        for(Annotation a: getAnnotations()) {

            byte[] res = a.lookup(key);

            if(res != null) return res;

        }

        return null;

    }



    syn byte[] Annotation.lookup(String key) = (getKey().equals(key) ? getValue() : null);



    syn boolean Annotation.isIntention() = false;

    eq Intention.isIntention() = true;



    inh TypeInstance Annotation.parentInstance();

    eq TypeInstance.getAnnotations().parentInstance() = this;



    coll Set<Intention> TypeInstance.intentionSet() [new HashSet<Intention>()] with add;

    Intention contributes this

        to TypeInstance.intentionSet()

        for parentInstance();



}



aspect SigAnnotations {



   inh Decl TypeInstance.parentDecl();



   coll Set Decl.allAnnotations() [new HashSet()] with add;

   TypeInstance contributes getAnnotationString()

           to Decl.allAnnotations()

           for parentDecl();



   // Helper attribute to get the "outermost" intentions for Decls



   syn byte[] TypeInstance.intentionBytes() = getIntentionBytes(sortedIntentions());

   syn byte[] Decl.getIntentionBytes() = getTypeInstance().intentionBytes();



    static Comparator TypeInstance.intentionComp =

        new Comparator<Intention>() {

            public int compare(Intention i1, Intention i2) {

                    return i1.getKey().compareTo(i2.getKey());

            }

    };



    syn int Decl.getNumIntentions() = getTypeInstance().sortedIntentions().getNumChild();



   syn List<Intention> TypeInstance.sortedIntentions() {

       List<Intention> res = new List<Intention>();



       //TODO: refactor out creation of sorted list of intentions



       java.util.ArrayList<Intention> sorted = new ArrayList(intentionSet());

       java.util.Collections.sort(sorted, intentionComp);

       for(Intention i : sorted) {

           res.add(i);

       }

       return res;

   }





   public DocString.DocString(byte[] bs) {

           super("DOCSTRING", bs);

   }



   public DocString.DocString(String s) {

           super("DOCSTRING", s.getBytes());

   }



   public String Intention.toString() {

       return "("+getKey() + ":"+new String(getValue())+")";

   }

   public String  DocString.toString() {

           return "\""+new String(getValue())+"\"";

   }



    /// TESTING

    syn String Decl.getAnnotationString()  {

            StringBuilder sb = new StringBuilder();

            Iterator<String> iti = allAnnotations().iterator();

            while(iti.hasNext()) {

                    //Annotation i = iti.next();

                    //sb.append("("+i.getKey()+" : "+i.getValue()+") ");

                    String i = iti.next();

                    sb.append(i);

            }

            return sb.toString();

    }





    syn int TypeInstance.fooHash() {

            List<Annotation> ints = getAnnotations().getAnnotationList();

            int result=0;

            for(Annotation i : ints) {

                    if(i.isIntention()) {

                        result += i.toString().hashCode();

                    }

            }

            return result;

    }



    syn String TypeInstance.getAnnotationString() {

            StringBuilder sb = new StringBuilder();

            List<Annotation> ints = getAnnotations().getAnnotationList();

            for(Annotation i : ints) {

                    sb.append(i.toString());

            }

            return sb.toString();

    }



    public void Decl.debugAnnotations() {

            getTypeInstance().debugAnnotations(getName());

    }



    public void TypeInstance.debugAnnotations(String context) {

            if(hasAnnotations()){

                System.out.println(context+".annotations: " + fooHash() + " : " + getAnnotationString());

            } else {

                //System.out.println(context + " : " + fooHash() + " : " + ": NO ANNOTATIONS ");

            }

    }

    //  TESTING END



}

compiler/ArrayTypeRewrite.jrag→compiler/2014/ArrayTypeRewrite.jrag

+8 −8
Original line number Diff line number Diff line
@@ -13,29 +13,29 @@ aspect ArrayRewrite { 
    when (! getDim(0).isVariable()) 

    to FixedArrayType  { 

      if (getNumDim() == 1) {

        return new FixedArrayType(getType(), 

				  getDim(0).getExpList());

        return new FixedArrayType(getDataType(), 

				  getDim(0));

      } 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());

        return new FixedArrayType(new ParseArrayType(getDataType(), l), 

				  getDim(0));

      }

    }

    when (getDim(0).isVariable()) 

    to VariableArrayType  { 

      if (getNumDim() == 1) {

        return new VariableArrayType(getType(), 

				     getDim(0).getExpList());

        return new VariableArrayType(getDataType(), 

				     getDim(0));

      } 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());

        return new VariableArrayType(new ParseArrayType(getDataType(), l), 

				     getDim(0));

      }

    }

  }

compiler/2014/DeclNames.jrag

0 → 100644
+14 −0
Original line number Diff line number Diff line 
aspect DeclNames {

	inh String DataType.declName();

	eq Decl.getTypeInstance().declName() = getName();



	inh String Field.declName();

	eq StructType.getField(int i).declName() = declName();



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



    inh Decl DataType.parentDecl();

    inh Decl Field.parentDecl();

    eq Decl.getTypeInstance().parentDecl() = this;

    eq StructType.getField(int i).parentDecl() = parentDecl();

}

compiler/2014/ErrorCheck.jrag

0 → 100644
+30 −0
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/Signature.jrag→compiler/2014/FlatSignature.jrag

+139 −0
Original line number Diff line number Diff line 
import java.util.*;



aspect Signature {  



  public class SignatureLine {

  

    private int indent;

    private byte[] data;

    private String comment;



    public SignatureLine(int indent, byte[] data, String comment) {

      this.indent = indent;

      this.data = data;

      this.comment = comment;

    }



    public int getIndent() {

      return indent;

    }



    public byte[] getData() {

      return data;

    }



    public String getComment() {

      return comment;

    }



aspect NoIntentionForTypeOrSampledefs {

    inh boolean TypeInstance.addIntentions();

    eq Decl.getTypeInstance().addIntentions() = false;

    eq StructType.getField(int i).addIntentions() = true;

}



  public class SignatureList {



    private int indent;

    private ArrayList list = new ArrayList();

    

    public void add(byte[] data, String comment) {

      list.add(new SignatureLine(indent, data, comment));

    }



    public void addInt(int value, String comment) {

	byte[] tmp = new byte[5];

 	long v = value & 0xffffffff;

        int i, j;



        for (i = 0 ; i == 0 || v != 0 ; i++, v = (v >> 7)) {

          tmp[i] = (byte)(v & 0x7f);

        }

 	byte[] packed = new byte[i];

        for (i = i - 1, j = 0 ; i >= 0 ; i--, j++) {

	  packed[j] = (byte)(tmp[i] | (i!=0?0x80:0x00));

        }

	add(packed, comment);

    }



    public void addString(String value, String comment) {

      addInt(value.length(), comment);

      byte[] data = new byte[value.length()];

      for (int i = 0 ; i < value.length() ; i++) {

        data[i] = (byte)(value.charAt(i) & 0xff);

      }

      add(data, null);

    }

aspect FlatSignature {



    public int size() {

      return list.size();

    }



    public String getIndent(int i) {

      StringBuffer result = new StringBuffer();

      int indent = ((SignatureLine)list.get(i)).getIndent();

      for (i = 0 ; i < indent ; i++) {

        result.append("  ");

      }

      return result.toString();

    }



    public byte[] getData(int i) {

      return ((SignatureLine)list.get(i)).getData();

    }



    public String getComment(int i) {

      return ((SignatureLine)list.get(i)).getComment();

    }



    public void indent() {

      indent++;

    }



    public void unindent() {

      indent--;

    }



  }



  public SignatureList Decl.signature() {

    SignatureList result = new SignatureList();

    flatSignature(result);

  public SignatureList Decl.flatSignature(int version) {

    SignatureList result = getSignature().getFlatSignatureList();

    return result;

  }
@@ -105,11 +20,23 @@ aspect Signature { 
  }



  public void TypeDecl.flatSignature(SignatureList list) {

    getType().flatSignature(list);

    getTypeInstance().flatSignature(list);

  }



  public void SampleDecl.flatSignature(SignatureList list) {

    getType().flatSignature(list);

    getTypeInstance().flatSignature(list);

  }



//  public void SampleRefType.flatSignature(SignatureList list) {

//    list.addInt(LABCOMM_SAMPLE_REF, "sample");

//  }



  public void TypeInstance.flatSignature(SignatureList list) {

    if(addIntentions()) {

      debugAnnotations(this.getName()+".TypeInstance.flatSignature");

      list.addIntentions(intentions(), "intentions: "+getIntentionString());

    }

    getDataType().flatSignature(list);

  }



  public void VoidType.flatSignature(SignatureList list) {
@@ -132,7 +59,7 @@ aspect Signature { 
    for (int i = 0 ; i < getNumExp() ; i++) {

      getExp(i).flatSignature(list);

    }

    getType().flatSignature(list);

    getDataType().flatSignature(list);

    list.unindent();

    list.add(null, "}");

  }
@@ -149,8 +76,10 @@ aspect Signature { 
  }



  public void Field.flatSignature(SignatureList list) {

    list.addString(getName(), signatureComment());

    getType().flatSignature(list);

    debugAnnotations(this.getName()+".Field.flatSignature");

    list.addIntentions(intentions(), "Field: "+getIntentionString());

//    list.addString(getName(), signatureComment());

    getDataType().flatSignature(list);

  }



  public void IntegerLiteral.flatSignature(SignatureList list) {
@@ -180,9 +109,13 @@ aspect Signature { 
  }



  public String Field.signatureComment() {

    return getType().signatureComment() + " '" + getName() +"'";

    return getDataType().signatureComment() + " '" + getName() +"'";

  }



//  public String SampleRefType.signatureComment() {

//    return "sample";

//  }



  public String PrimType.signatureComment() {

    return getName();

  }

compiler/2014/GenerateTypedefs.jrag

0 → 100644
+36 −0
Original line number Diff line number Diff line 
aspect TypeDefGen {



    public void Specification.generateTypedefs(PrintStream out, int ver) {

        for(Decl d : getDecls()) {

            d.generateTypedefs(out);

        }

    }



    public void Decl.generateTypedefs(PrintStream out) {

    }





    public void Decl.generateDepTypedefs(PrintStream out){

        Iterator<Decl> it = type_dependencies().iterator();

        while(it.hasNext()) {

            Decl d = it.next();

            d.generateDepTypedefs(out);

        }

        pp(out);

    }



    public void SampleDecl.generateTypedefs(PrintStream out){



        if(hasDependencies()) {

            out.println("sample "+getName()+"_def {");

            out.println("    sample sample;");

            out.println("    string typedef = <<EOL");

            for(Decl d : type_dependencies()) {

                d.generateDepTypedefs(out);

            }

            pp(out);

            out.println("EOL;");

        }

    }



}

compiler/2014/LabComm.ast

0 → 100644
+46 −0
Original line number Diff line number Diff line 
Specification ::= Decl*;



abstract Decl ::= TypeInstance /Signature/;



TypeInstance ::= DataType Annotations;



Annotations ::= Annotation*;

Annotation ::= <Key:String> <Value:byte[]>;



Intention : Annotation;

DocString : Annotation;



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>;

IntentionSignatureLine     : DataSignatureLine ::= Intention* ;

TypeRefSignatureLine       : SignatureLine     ::= Decl;



Field : TypeInstance;



abstract DataType;

VoidType           : DataType;

//SampleRefType      : DataType;

PrimType           : DataType ::= <Name:String> <Token:int>;

UserType           : DataType ::= <Name:String>;

StructType         : DataType ::= Field*;

ParseArrayType     : DataType ::= DataType Dim*;

abstract ArrayType : DataType ::= DataType Dim;

VariableArrayType  : ArrayType;

FixedArrayType     : ArrayType;



Dim ::= Exp*;



abstract Exp;

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

VariableSize   : Exp;

compiler/2014/LabComm.java

0 → 100644
+425 −0
Original line number Diff line number Diff line 
package se.lth.control.labcomm2014.compiler;



import java.io.*;

import java.util.*;



public class LabComm {



  private static void println(String s) {

    System.out.println(s);

  }



  private static void print_help() {

    println("\n Usage: java -jar labcom.jar [options*] FILE");

    println("");

    println(" --help                  Shows this help text");

    println(" -v                      Be verbose");

    println(" --ver=VERSION           Generate code for labcomm VERSION (=2006 or 2014)");

    println("[ C options ]");

    println(" -C                      Generates C/H code in FILE.[ch]");

    println(" --cprefix=PREFIX        Prefixes C types with PREFIX");

    println(" --cinclude=FILE         Include FILE in generated .c");

    println(" --c=CFILE               Generates C code in CFILE");

    println(" --h=HFILE               Generates H code in HFILE");

    println("[ C# options]");

    println(" --cs                    Generates C# code in FILE.cs");

    println(" --cs=CSFILE             Generates C# code in CSFILE");

    println(" --csnamespace=NAMESPACE Place C# classes in NAMESPACE");

    println("[ Java options ]");

    println(" --java=JDIR             Generates Java files in JDIR");

    println(" --javapackage=PACKAGE   Place Java classes in PACKAGE");

    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");

    println(" --typedefs=TIFILE       Generates typedefs in TIFILE");

  }



  /** To be cleaned up.

   */

  private static void checkVersion(int v) {

     if(! (v == 2006 || v == 2014) ) {

	System.err.println(" Unknown version: " + v);

	System.err.println(" Supported versions: 2006, 2014 ");

	System.exit(2);

     }

  }



  private static void genH(Specification p, String hName,

			   Vector cIncludes, String coreName, String prefix, int ver) {

    try {

      FileOutputStream f;

      PrintStream out;



      f = new FileOutputStream(hName);

      out = new PrintStream(f);

      p.C_genH(out, cIncludes, coreName, prefix, ver);

      out.close();

    } catch (IOException e) {

      System.err.println("IOException: " + hName + " " + e);

    }

  }



  private static void genC(Specification p, String cName,

			   Vector cIncludes, String coreName, String prefix, int ver) {

    try {

      FileOutputStream f;

      PrintStream out;



      f = new FileOutputStream(cName);

      out = new PrintStream(f);

      p.C_genC(out, cIncludes, coreName, prefix, ver);

      out.close();

    } catch (IOException e) {

      System.err.println("IOException: " + cName + " " + e);

    }

  }



  private static void genCS(Specification p, String csName, String csNamespace, int ver) {

//      throw new Error("C# generation currently disabled");

    try {

      p.CS_gen(csName, csNamespace, ver);

    } catch (IOException e) {

      System.err.println("IOException: " + csName + " " +

			 csNamespace + " " + e);

    }

  }



  private static void genJava(Specification p,  String dirName, String packageName, int ver) {

    try {

      p.J_gen(dirName, packageName, ver);

    } catch (IOException e) {

      System.err.println("IOException: " + dirName + " " +

			 packageName + " " + e);

    }

  }



  private static void genPython(Specification p, String filename, String prefix, int ver) {

    try {

      FileOutputStream f;

      PrintStream out;



      f = new FileOutputStream(filename);

      out = new PrintStream(f);

      p.Python_gen(out, prefix, ver);

      out.close();

    } catch (IOException e) {

      System.err.println("IOException: " + filename + " " + e);

    }

  }



  private static void genRAPID(Specification 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

   **/

  private static class Opts {

    final String[] args;

    String coreName = null;

    String prefix = null;

    boolean verbose = false;

    int ver = 2014; //Version 2014 as default

    String cFile = null;

    String hFile = null;

    Vector cIncludes = new Vector();

    String cPrefix; // gets default value (prefix) in processFilename

    String csFile = null;

    String csNamespace = null;

    String javaDir = null;

    String javaPackage = "";

    String pythonFile = null;

    String prettyFile = null;

    String typeinfoFile = null;

    String typedefsFile = null;

    String rapidFile = null;

    String fileName = null;



   Opts(String[] args) {

     this.args = args;

   }



    private static String getCoreName(String s) {

      int i = s.lastIndexOf('.');

      return s.substring(0, i > 0 ? i : s.length());

    }



    private static String getFileName(String s) {

      return s.substring(s.lastIndexOf('/') + 1, s.length());

    }



    private static String getBaseName(String s) {

      s = getFileName(s);

      int i = s.lastIndexOf('.');

      return s.substring(0, i > 0 ? i : s.length());

    }



    private static String getPrefix(String s) {

      return s.substring(s.lastIndexOf('/') + 1, s.length());

    }



    boolean processFilename(){

      // Scan for first non-option

      for (int i = 0 ; i < args.length ; i++) {

        if (! args[i].startsWith("-")) {

  	fileName = args[i];

  	break;

        }

      }

      if (fileName != null) {

        coreName = getBaseName(fileName);

        prefix = getPrefix(coreName);

       cPrefix = prefix;

      }

      return fileName != null;

    }



    void processArgs(){

      for (int i = 0 ; i < args.length ; i++) {

        if (fileName == null ||

            args[i].equals("-help") ||

            args[i].equals("-h") ||

            args[i].equals("--help")) {

          print_help();

          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";

        } else if (args[i].startsWith("--cinclude=")) {

          cIncludes.add(args[i].substring(11));

        } else if (args[i].startsWith("--cprefix=")) {

          cPrefix = args[i].substring(10);

        } else if (args[i].startsWith("--c=")) {

          cFile = args[i].substring(4);

        } else if (args[i].startsWith("--h=")) {

          hFile = args[i].substring(4);

        } else if (args[i].equals("--cs")) {

          csFile = coreName + ".cs";

        } else if (args[i].startsWith("--cs=")) {

          csFile = args[i].substring(5);

        } else if (args[i].startsWith("--csnamespace=")) {

          csNamespace = args[i].substring(14);

        } else if (args[i].startsWith("--java=")) {

          javaDir = args[i].substring(7);

        } else if (args[i].startsWith("--javapackage=")) {

          javaPackage = args[i].substring(14);

        } else if (args[i].equals("-P")) {

          pythonFile = coreName + ".py";

        } else if (args[i].startsWith("--python=")) {

          pythonFile = args[i].substring(9);

        } else if (args[i].startsWith("--pretty=")) {

          prettyFile = args[i].substring(9);

        } else if (args[i].startsWith("--typeinfo=")) {

          typeinfoFile = args[i].substring(11);

        } else if (args[i].startsWith("--typedefs=")) {

          typedefsFile = args[i].substring(11);

        } else if (args[i].equals("--rapid")) {

          rapidFile = coreName + ".sys";

        } else if (i == args.length - 1) {

          fileName = args[i];

        } else {

          System.err.println(" Unknown argument " + args[i]);

          print_help();

          System.exit(2);

        }

      }

     if(prefix==null){

  	System.err.println("   WARNING! prefix==null");

        prefix="";

     }

   }



   Specification parseFile(){

     Specification ast = null;

     try {

       // Check for errors

       LabCommScanner scanner = new LabCommScanner(

                                  new FileReader(fileName));

       LabCommParser parser = new LabCommParser();

       Specification p = (Specification)parser.parse(scanner);

       Collection errors = new LinkedList();

       p.errorCheck(errors);



       if (errors.isEmpty()) {

         ast = p;

       } else {

         for (Iterator iter = errors.iterator(); iter.hasNext(); ) {

           String s = (String)iter.next();

           System.out.println(s);

         }

       }

     } catch (FileNotFoundException e) {

       System.err.println("Could not find file: " + fileName);

     } catch (IOException e) {

       System.err.println("IOException: " + fileName + " " + e);

     } catch (beaver.Parser.Exception e) {

       System.err.println(e.getMessage());

     }

     return ast;

   }



   boolean generateC(Specification ast) {

     boolean wroteFile = false;

     Vector hIncludes = new Vector(cIncludes);

     if (hFile != null) {

       cIncludes.add(hFile);

     }

     if (cFile != null) {

       printStatus("C: " , cFile);

       genC(ast, cFile, cIncludes, coreName, cPrefix, ver);

       wroteFile = true;

     }

     if (hFile != null) {

       printStatus("H: " , hFile);

       genH(ast, hFile, hIncludes, coreName, cPrefix, ver);

       wroteFile = true;

     }

     return wroteFile;

   }



   boolean generateCS(Specification ast) {

     boolean wroteFile = false;

     if (csFile != null) {

       printStatus("C#: " , csFile);

       genCS(ast, csFile, csNamespace, ver);

       wroteFile = true;

     }

     return wroteFile;

   }



   boolean generateJava(Specification ast) {

     boolean wroteFile = false;

     if (javaDir != null) {

       printStatus("Java: " , javaDir);

       genJava(ast, javaDir, javaPackage, ver);

       wroteFile = true;

     }

     return wroteFile;

   }



   boolean generatePython(Specification ast) {

     boolean wroteFile = false;

     if (pythonFile != null) {

       printStatus("Python: " , pythonFile);

       genPython(ast, pythonFile, prefix, ver);

       wroteFile = true;

     }

     return wroteFile;

   }



   boolean generateRAPID(Specification ast) {

     boolean wroteFile = false;

     if (rapidFile != null) {

       printStatus("RAPID: " , rapidFile);

       genRAPID(ast, rapidFile, coreName, ver);

       wroteFile = true;

     }

     return wroteFile;

   }

   boolean generatePrettyPrint(Specification ast) {

     boolean wroteFile = false;

     if (prettyFile != null) {

       printStatus("Pretty: " , prettyFile);

       try {

         FileOutputStream f = new FileOutputStream(prettyFile);

         PrintStream out = new PrintStream(f);

         ast.pp(out);

         out.close();

         wroteFile = true;

       } catch (IOException e) {

         System.err.println("IOException: " + prettyFile + " " + e);

       }

     }

     return wroteFile;

   }



   boolean generateTypeinfo(Specification ast) {

     boolean wroteFile = false;

     if (typeinfoFile != null) {

       printStatus("TypeInfo: " , typeinfoFile);

       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);

         wroteFile = true;

       } catch (IOException e) {

         System.err.println("IOException: " + typeinfoFile + " " + e);

       }

     }

     return wroteFile;

    }



   boolean generateTypedefs(Specification ast) {

     boolean wroteFile = false;

     if (typedefsFile != null) {

       printStatus("Typedefs: " , typedefsFile);

       try {

         FileOutputStream f = new FileOutputStream(typedefsFile);

         PrintStream out = new PrintStream(f);

         ast.generateTypedefs(out, ver);

         wroteFile = true;

       } catch (IOException e) {

         System.err.println("IOException: " + typedefsFile + " " + e);

       }

     }

     return wroteFile;

    }



    private void printStatus(String kind, String filename){

       if (verbose) {

         System.err.println("Generating "+kind+": " + filename);

       }

    }

  }





  public static void main(String[] args) {

    Opts opts = new Opts(args);

    if(!opts.processFilename()) {

      print_help();

      System.exit(1);

    } else {

      opts.processArgs();

      Specification ast =  opts.parseFile();



      if (ast != null) {



	boolean fileWritten = false;



        fileWritten |= opts.generateC(ast);

        fileWritten |= opts.generateCS(ast);

        fileWritten |= opts.generateJava(ast);

        fileWritten |= opts.generatePython(ast);

        fileWritten |= opts.generateRAPID(ast);

        fileWritten |= opts.generatePrettyPrint(ast);

        fileWritten |= opts.generateTypeinfo(ast);

        fileWritten |= opts.generateTypedefs(ast);



        // if no output to files, prettyprint on stdout

	if (!fileWritten) {

	  ast.pp(System.out);

	}

      } else {

          // Catch-all for compilation errors

          System.err.println("Error in specification");

          System.exit(3);

      }

    }

  }

}

compiler/LabCommParser.parser→compiler/2014/LabCommParser.parser

+52 −32
Original line number Diff line number Diff line 
%header {:

 package AST;

  package se.lth.control.labcomm2014.compiler;

  import se.lth.control.labcomm2014.compiler.*;

:};

%embed {:

  public static class SourceError extends Error {
@@ -33,9 +34,9 @@ 
        }

:};



Program goal =

     /* Empty program */               {: return new Program(); :}

  |  decl_list.l                       {: return new Program(l); :}

Specification goal =

     /* Empty program */               {: return new Specification(); :}

  |  decl_list.l                       {: return new Specification(l); :}

  ;



List decl_list =
@@ -53,31 +54,44 @@ List var_decl_list = 
  | var_decl_list.l var_decl.v      {: return l.add(v); :}

  ;



Annotations annotations = 

    /* empty list */  {: return new Annotations(); :}

  |  annotation_list.l {: return new Annotations(l); :}

  ;



List annotation_list =

    annotation.i                      {: return new List().add(i); :}

  | annotation_list.l annotation.i     {: return l.add(i); :}

  ;



String key = IDENTIFIER;

String stringliteral = IDENTIFIER | QUOTEDSTRING;



Annotation annotation = intention.i | docstring.d;

Annotation intention = LPAREN key.k COLON stringliteral.v RPAREN {: return new Intention(k,v.getBytes()); :};

Annotation docstring = QUOTEDSTRING.s {: return new DocString(s.substring(1,s.length()-1).getBytes()); :};



TypeInstance type_instance =

    annotations.a type.t IDENTIFIER {: return new TypeInstance(t, IDENTIFIER, a); :}

  | annotations.a type.t IDENTIFIER dim_list.d 

    {: return new TypeInstance(new ParseArrayType(t, d), IDENTIFIER, a); :}

  ;



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); :}

    type_instance.t SEMICOLON     {: return new Field(t); :}

  ;



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); :}

  ;

    TYPEDEF type_instance.t  SEMICOLON {: return new TypeDecl(t); :} ;



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); :}

  | SAMPLE VOID IDENTIFIER SEMICOLON 

      {: return new SampleDecl(new VoidType(), IDENTIFIER); :}

  ;

    SAMPLE type_instance.t SEMICOLON {: return new SampleDecl(t); :} ;



Type type =

DataType type =

    prim_type.p                     {: return p; :}

  | user_type.u                     {: return u; :}

  | struct_type.s                   {: return s; :}

  | void_type.v                     {: return v; :}

  ;



PrimType prim_type =
@@ -97,6 +111,8 @@ PrimType prim_type = 
      {: 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 =
@@ -107,6 +123,10 @@ 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); :}

compiler/LabCommScanner.flex→compiler/2014/LabCommScanner.flex

+16 −9
Original line number Diff line number Diff line 
package AST;

package se.lth.control.labcomm2014.compiler;



import beaver.Symbol;

import beaver.Scanner;

import AST.LabCommParser.Terminals;

import se.lth.control.labcomm2014.compiler.LabCommParser.Terminals;



%%
@@ -44,13 +44,16 @@ Comment = {TraditionalComment} 
TraditionalComment = "/*" [^*] ~"*/" | "/*" "*"+ "/" | "/*" "*"+ [^/*] ~"*/"

EndOfLineComment = "//" {InputCharacter}* {LineTerminator}?



Identifier = [:jletter:][:jletterdigit:]*

Identifier = [[:letter:]_]([[:letter:]_[:digit:]])*

StringLiteral = [:jletterdigit:]*



DecimalNumeral = 0 | {NonZeroDigit} {Digits}?

Digits = {Digit}+

Digit = 0 | {NonZeroDigit}

NonZeroDigit = [1-9]



QuotedString = "\""~"\""



%%



<YYINITIAL> {
@@ -76,10 +79,14 @@ NonZeroDigit = [1-9] 
  "}"                            { return sym(Terminals.RBRACE); }

  "["                            { return sym(Terminals.LBRACK); }

  "]"                            { return sym(Terminals.RBRACK); }

  "("                            { return sym(Terminals.LPAREN); }

  ")"                            { return sym(Terminals.RPAREN); }

  ";"                            { return sym(Terminals.SEMICOLON); }

  ":"                            { return sym(Terminals.COLON); }

  ","                            { return sym(Terminals.COMMA); }



  {Identifier}                   { return sym(Terminals.IDENTIFIER); }

  {QuotedString}                 { return sym(Terminals.QUOTEDSTRING); }

}



// fall through errors

compiler/ErrorCheck.jrag

deleted100644 → 0
+0 −30

File deleted.

Preview size limit exceeded, changes collapsed.

compiler/LabComm.ast

deleted100644 → 0
+0 −23

File deleted.

Preview size limit exceeded, changes collapsed.

compiler/LabComm.java

deleted100644 → 0
+0 −295

File deleted.

Preview size limit exceeded, changes collapsed.

compiler/Makefile

0 → 100644
+16 −0

File added.

Preview size limit exceeded, changes collapsed.

compiler/build.xml

+190 −68

File changed.

Preview size limit exceeded, changes collapsed.

compiler/cs_codegen.patch

deleted100644 → 0
+0 −34

File deleted.

Preview size limit exceeded, changes collapsed.

compiler/labcomm2014

0 → 100755
+2 −0
Original line number Diff line number Diff line 
#!/bin/sh

java -jar /lib/labcomm2014_compiler.jar "$@"

doc/.gitignore

0 → 100644
+7 −0
Original line number Diff line number Diff line 
tech_report.aux

tech_report.bbl

tech_report.blg

tech_report.fdb_latexmk

tech_report.fls

tech_report.log

tech_report.pdf

doc/refs.bib

0 → 100644
+39 −0

File added.

Preview size limit exceeded, changes collapsed.

doc/tech_report.tex

+655 −150

File changed.

Preview size limit exceeded, changes collapsed.

examples/Makefile

+23 −7

File changed.

Preview size limit exceeded, changes collapsed.

examples/dynamic/README

0 → 100644
+63 −0

File added.

Preview size limit exceeded, changes collapsed.

examples/dynamic/test.sh

0 → 100644
+7 −0

File added.

Preview size limit exceeded, changes collapsed.

examples/robot/Makefile

0 → 100644
+5 −0

File added.

Preview size limit exceeded, changes collapsed.

examples/simple/Makefile

0 → 100644
+10 −0

File added.

Preview size limit exceeded, changes collapsed.

examples/tcp/Makefile

0 → 100644
+58 −0

File added.

Preview size limit exceeded, changes collapsed.

examples/tcp/README.txt

0 → 100644
+14 −0

File added.

Preview size limit exceeded, changes collapsed.

examples/tcp/runpy

0 → 100755
+3 −0

File added.

Preview size limit exceeded, changes collapsed.

examples/tcp/rwsocket.py

0 → 100644
+24 −0

File added.

Preview size limit exceeded, changes collapsed.

examples/tcp/test.lc

0 → 100644
+8 −0

File added.

Preview size limit exceeded, changes collapsed.