Proper error when building a record with duplicated features

* See mozart/mozart2#286.
eregon · Oct 21, 2016 · 869f803 · 869f803
1 parent 83715fd
commit 869f803
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/vm/src/org/mozartoz/truffle/nodes/builtins/RecordBuiltins.java b/vm/src/org/mozartoz/truffle/nodes/builtins/RecordBuiltins.java
@@ -243,6 +243,9 @@ protected Object makeDynamic(Object label, DynamicObject contents) {
 			for (int i = 0; i < size; i++) {
 				Object feature = derefNode.executeDerefIfBound(contents.get((long) i * 2 + 1));
 				Object value = derefNode.executeDerefIfBound(contents.get((long) i * 2 + 2));
+				if (map.containsKey(feature)) {
+					throw kernelError("recordConstruction", label, buildPairs(contents));
+				}
 				map.put(feature, value);
 			}
 
@@ -253,6 +256,17 @@ protected Object makeDynamic(Object label, DynamicObject contents) {
 			}
 		}
 
+		private Object buildPairs(DynamicObject contents) {
+			int size = OzRecord.getArity(contents).getWidth() / 2;
+			Object list = "nil";
+			for (int i = size - 1; i >= 0; i--) {
+				Object feature = derefNode.executeDerefIfBound(contents.get((long) i * 2 + 1));
+				Object value = derefNode.executeDerefIfBound(contents.get((long) i * 2 + 2));
+				list = new OzCons(Arity.PAIR_FACTORY.newRecord(feature, value), list);
+			}
+			return list;
+		}
+
 	}
 
 	@GenerateNodeFactory

diff --git a/vm/src/org/mozartoz/truffle/runtime/Arity.java b/vm/src/org/mozartoz/truffle/runtime/Arity.java
@@ -32,6 +32,7 @@ public class Arity {
 	static final Shape CONS_SHAPE = CONS_ARITY.getShape();
 
 	public static final Arity PAIR_ARITY = Arity.build("#", 1L, 2L);
+	public static final RecordFactory PAIR_FACTORY = PAIR_ARITY.createFactory();
 
 	private final Object label;
 	private final Shape shape;
@@ -148,6 +149,7 @@ public static Arity build(Object label, Object... features) {
 		Shape shape = Arity.BASE;
 		for (Object feature : features) {
 			assert OzGuards.isFeature(feature);
+			assert !shape.hasProperty(feature) : "duplicated feature " + feature;
 			shape = shape.defineProperty(feature, SOME_OBJECT, 0);
 		}
 		return new Arity(label, shape);