Merge branch 'feature/20-attributes' into develop

Author: DavePearce

src/wyrl/ConsoleRewriter.java

@@ -164,8 +164,8 @@ private void print(AbstractActivation activation, Rewrite.Step step) {
 		if(activation.rule() instanceof InferenceRule) {
 			System.out.print("* ");
 		}
-		if(activation.rule().name() != null) {
-			System.out.print(activation.rule().name());
+		if(activation.rule().annotation("name") != null) {
+			System.out.print(activation.rule().annotation("name"));
 		}
 		System.out.print(" #" + activation.target());
 		if(step != null) {
@@ -182,7 +182,7 @@ public void printLog() {
 			AbstractActivation activation = rewrite.states().get(before).activation(step.activation());
 			int after = step.after();
 			System.out.print(before + " => " + after);			
-			System.out.println(" (" + activation.target() + ", " + activation.rule().name() + ")");
+			System.out.println(" (" + activation.target() + ", " + activation.rule().annotation("name") + ")");
 		}
 	}		
 
@@ -233,9 +233,9 @@ public void startRewrite(Reader input, RwMode mode) throws Exception {
 	private Rewrite constructRewrite(final Schema schema, final ReductionRule[] reductions,
 			InferenceRule[] inferences, RwMode mode) {
 		if (mode == RwMode.INFER) {
-			return new Inference(schema, AbstractActivation.RANK_COMPARATOR, inferences, reductions);
+			return new Inference(schema, null, inferences, reductions);
 		} else {
-			return new Reduction(schema, AbstractActivation.RANK_COMPARATOR, reductions);
+			return new Reduction(schema, null, reductions);
 		}
 	}
 

src/wyrl/core/SpecFile.java

@@ -56,56 +56,60 @@ public IncludeDecl(SpecFile file, Attribute... attributes) {
 		}
 	}
 
-	public static class TermDecl extends SyntacticElement.Impl implements Decl {
+	public static class AnnotableDecl extends SyntacticElement.Impl implements Decl {
+		public final Map<String,Object> annotations;
+		
+		public AnnotableDecl(Map<String,Object> annotations, Attribute... attributes) {
+			super(attributes);
+			this.annotations = new HashMap<String,Object>(annotations);
+		}
+	}
+	
+	public static class TermDecl extends AnnotableDecl {		
 		public Type.Term type;
 
-		public TermDecl(Type.Term data, Attribute... attributes) {
-			super(attributes);
+		public TermDecl(Type.Term data, Map<String,Object> annotations, Attribute... attributes) {
+			super(annotations,attributes);
 			this.type = data;
 		}
 	}
 
-	public static class TypeDecl extends SyntacticElement.Impl implements Decl {
+	public static class TypeDecl extends AnnotableDecl {
 		public final String name;
 		public final Type type;
 		public final boolean isOpen;
 
-		public TypeDecl(String n, Type type, boolean isOpen, Attribute... attributes) {
-			super(attributes);
+		public TypeDecl(String n, Type type, boolean isOpen, Map<String,Object> annotations, Attribute... attributes) {
+			super(annotations,attributes);
 			this.name = n;
 			this.type = type;
 			this.isOpen = isOpen;
 		}
 	}
 
-	public static abstract class RewriteDecl extends SyntacticElement.Impl implements
-			Decl {
+	public static abstract class RewriteDecl extends AnnotableDecl {
 		public Pattern.Term pattern;
 		public final ArrayList<RuleDecl> rules;
-		public final String name;
-		public final int rank;
 
 		public RewriteDecl(Pattern.Term pattern, Collection<RuleDecl> rules,
-				String name, int rank, Attribute... attributes) {
-			super(attributes);
+				Map<String,Object> annotations, Attribute... attributes) {
+			super(annotations, attributes);
 			this.pattern = pattern;
-			this.rules = new ArrayList<RuleDecl>(rules);
-			this.name = name;
-			this.rank = rank;
+			this.rules = new ArrayList<RuleDecl>(rules);			
 		}
 	}
 
 	public static class ReduceDecl extends RewriteDecl {
 		public ReduceDecl(Pattern.Term pattern, Collection<RuleDecl> rules,
-				String name, int rank, Attribute... attributes) {
-			super(pattern,rules,name,rank,attributes);
+				Map<String,Object> annotations, Attribute... attributes) {
+			super(pattern,rules,annotations,attributes);
 		}
 	}
 
 	public static class InferDecl extends RewriteDecl {
-		public InferDecl(Pattern.Term pattern, Collection<RuleDecl> rules,
-				String name, int rank, Attribute... attributes) {
-			super(pattern,rules,name,rank, attributes);
+		public InferDecl(Pattern.Term pattern, Collection<RuleDecl> rules, Map<String, Object> annotations,
+				Attribute... attributes) {
+			super(pattern,rules,annotations,attributes);
 		}
 	}