Preliminary refactoring: added annotations to *Decl

compiler/2014/Annotations.jrag

@@ -5,8 +5,9 @@ aspect Annotations {
     syn boolean Annotation.isIntention() = false;
     eq Intention.isIntention() = true;
 
-    inh TypeInstance Annotation.parentInstance();
+    inh ASTNode Annotation.parentInstance();
     eq TypeInstance.getAnnotation(int i).parentInstance() = this;
+    eq Decl.getAnnotation(int i).parentInstance() = this;
 
 
     coll Set<Intention> TypeInstance.intentionSet() [new HashSet<Intention>()] with add;

compiler/2014/LabComm.ast

 Specification ::= Decl*;
 
-abstract Decl ::= TypeInstance /Signature/;
+abstract Decl ::= TypeInstance Annotation* /Signature/;
 
 TypeInstance ::= DataType <Name:String> Annotation*;
 

compiler/2014/LabCommParser.parser

@@ -82,10 +82,10 @@ Field var_decl =
   ;
 
 TypeDecl type_decl =
-    TYPEDEF type_instance.t  SEMICOLON {: return new TypeDecl(t); :} ;
+    annotations.a TYPEDEF type_instance.t  SEMICOLON {: return new TypeDecl(t, a); :} ;
 
 SampleDecl sample_decl =
-    SAMPLE type_instance.t SEMICOLON {: return new SampleDecl(t); :} ;
+    annotations.a SAMPLE type_instance.t SEMICOLON {: return new SampleDecl(t, a); :} ;
 
 DataType type =
     prim_type.p                     {: return p; :}

compiler/2014/Refactoring.jrag

@@ -11,4 +11,12 @@ aspect Refactoring {
         this(t, n, new  List<Annotation>());
         System.out.println("WARNING! TypeInstance(DataType, String) ignoring intention list");
     }
+    public TypeDecl.TypeDecl(TypeInstance t) {
+        this(t, new  List<Annotation>());
+        System.out.println("WARNING! TypeDecl(TypeInstance) ignoring intention list");
+    }
+    public SampleDecl.SampleDecl(TypeInstance t) {
+        this(t, new  List<Annotation>());
+        System.out.println("WARNING! SampleDecl(TypeInstance) ignoring intention list");
+    }
 }