this fixes #2048

usethesource · Oct 10, 2024 · 80ccf83 · 80ccf83
1 parent 507e971
commit 80ccf83
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/src/org/rascalmpl/interpreter/result/RelationResult.java b/src/org/rascalmpl/interpreter/result/RelationResult.java
@@ -431,13 +431,16 @@ public Result<IValue> fieldSelect(Field[] selectedFields) {
 					fieldIndices[i] = ((IInteger) f.getFieldIndex()
 							.interpret(this.ctx.getEvaluator()).getValue()).intValue();
 				} else {
-					String fieldName = org.rascalmpl.interpreter.utils.Names
-							.name(f.getFieldName());
+					String fieldName = org.rascalmpl.interpreter.utils.Names.name(f.getFieldName());
+
+					if (!baseType.hasFieldNames()) {
+						throw new UndeclaredField(fieldName, baseType,ctx.getCurrentAST());
+					}
+
 					try {
 						fieldIndices[i] = baseType.getFieldIndex(fieldName);
 					} catch (UndeclaredFieldException e) {
-						throw new UndeclaredField(fieldName, baseType,
-								ctx.getCurrentAST());
+						throw new UndeclaredField(fieldName, baseType, ctx.getCurrentAST());
 					}
 				}
 

diff --git a/src/org/rascalmpl/library/lang/rascal/tests/basic/Relations.rsc b/src/org/rascalmpl/library/lang/rascal/tests/basic/Relations.rsc
@@ -108,3 +108,16 @@ test bool tst_rangeX(rel[int, int] X) {
    XR = rangeX(X, s);
    return isEmpty(XR) || all(<_, b> <- XR, b notin s);
 }
+
+@expected{UndeclaredField}
+@ignoreCompiler{The checker would detect this}
+test bool fieldSelectionNoFields() {
+   x = {};
+   x<name>; // throws UndeclaredField
+   return false;
+}
+
+test bool fieldSelectionEmpty() {
+   rel[int a, int b] x = {};
+   return x<b,a> == {};
+}