Fixes for changed RandomValue interface

Author: PaulKlint

src/org/rascalmpl/library/Prelude.java

@@ -164,8 +164,7 @@ public Prelude(IValueFactory values, IRascalValueFactory rascalValues, PrintWrit
 
     private IValue createRandomValue(Type t, int depth, int width) {
         return t.randomValue(
-			random, 
-			RandomTypesConfig.defaultConfig(random).withoutRandomAbstractDatatypes(), 
+			random,  
 			values, 
 			new TypeStore(), 
 			Collections.emptyMap(), 
@@ -3942,7 +3941,7 @@ public IValue randomValue(IValue type, IInteger seed, IInteger depth, IInteger w
 		// don't change the set of types dynamically. the test functions that use this function
 		// have already been type-checked in their static source context.
 		RandomTypesConfig typesConfig = RandomTypesConfig.defaultConfig(random).withoutRandomAbstractDatatypes();
-	    return start.randomValue(random, typesConfig, values, store, Collections.emptyMap(), depth.intValue(), width.intValue());
+	    return start.randomValue(random, values, store, Collections.emptyMap(), depth.intValue(), width.intValue());
 	}
 
 	// Utilities used by Graph

src/org/rascalmpl/runtime/$RascalModule.java

@@ -122,7 +122,7 @@ public abstract class $RascalModule {
     protected final RascalExecutionContext $rex;
 
     //protected final IValueFactory $RVF;
-    protected final TypeFactory $TF;
+    public final TypeFactory $TF;
     protected final RascalTypeFactory $RTF;
     public final TypeStore $TS;
 	protected final Traverse $TRAVERSE;

src/org/rascalmpl/runtime/utils/GenerateActuals.java

@@ -77,7 +77,7 @@ public Stream<IValue[]> generateActuals(Type[] formals, TypeStore $TS) {
 							continue;
 						}
 
-						values[n] = types[n].randomValue(random, typesConfig, $VF, $TS, tpbindings, maxDepth, maxWidth);
+						values[n] = types[n].randomValue(random, $VF, $TS, tpbindings, maxDepth, maxWidth);
 					}
 
 					return values;

src/org/rascalmpl/test/infrastructure/QuickCheck.java

@@ -80,7 +80,7 @@ public TestResult test(String functionName, Type formals, String expectedExcepti
                 // TODO: here we could reuse a previous parameter (once in a while) if it
                 // has a comparable actual type, to cover more cases in the test code
                 // where it is necessary that two parameter values match or are equal.
-                values[n] = types[n].randomValue(random, typesConfig, vf, store, tpbindings, maxDepth, maxWidth);
+                values[n] = types[n].randomValue(random, vf, store, tpbindings, maxDepth, maxWidth);
             }
 
             for (int n = 0; n < formals.getArity(); n++) {
@@ -102,7 +102,7 @@ public TestResult test(String functionName, Type formals, String expectedExcepti
                     for (int width = 1; width < maxWidth && !smallerFound; width++) {
                         for (int j = 0; j < tries && !smallerFound; j++) {
                             for (int n = 0; n < values.length; n++) {
-                                smallerValues[n] = types[n].randomValue(random, RandomTypesConfig.defaultConfig(random).withoutRandomAbstractDatatypes(), vf, store, tpbindings, maxDepth, maxWidth);
+                                smallerValues[n] = types[n].randomValue(random, vf, store, tpbindings, maxDepth, maxWidth);
                             }
 
                             for (int n = 0; n < formals.getArity(); n++) {

src/org/rascalmpl/types/NonTerminalType.java

@@ -522,7 +522,7 @@ public String toString() {
 	}
 
 	@Override
-	public IValue randomValue(Random random, RandomTypesConfig typesConfig, IValueFactory vf, TypeStore store, Map<Type, Type> typeParameters,
+	public IValue randomValue(Random random, IValueFactory vf, TypeStore store, Map<Type, Type> typeParameters,
 	    int maxDepth, int maxBreadth) {
 	    // TODO this should be made more carefully (use the grammar to generate a true random instance of the 
 	    // given non-terminal

src/org/rascalmpl/types/ReifiedType.java

@@ -247,7 +247,7 @@ public int hashCode() {
 	}
 
 	@Override
-	public IValue randomValue(Random random, RandomTypesConfig typesConfig, IValueFactory vf, TypeStore store, Map<Type, Type> typeParameters,
+	public IValue randomValue(Random random, IValueFactory vf, TypeStore store, Map<Type, Type> typeParameters,
 	    int maxDepth, int maxBreadth) {
 
 	    if (store instanceof TypeStoreWithSyntax) {