Add interpreter test cases

onflow · Jun 29, 2023 · 12eb1cc · 12eb1cc
1 parent 1ded3d2
commit 12eb1cc
Show file tree

Hide file tree

Showing 4 changed files with 505 additions and 34 deletions.
diff --git a/runtime/interpreter/value_range.go b/runtime/interpreter/value_range.go
@@ -40,9 +40,15 @@ func NewInclusiveRangeValue(
 		panic(errors.NewUnreachableError())
 	}
 
-	step := getValueForIntegerType(1, rangeType.ElementType)
+	step := GetValueForIntegerType(1, rangeType.ElementType)
 	if startComparable.Greater(interpreter, endInclusiveComparable, locationRange) {
-		// TODO: Disallow unsigned integers to have a negative step.
+		elemSemaTy := interpreter.MustConvertStaticToSemaType(rangeType.ElementType)
+		if _, ok := sema.AllUnsignedIntegerTypesSet[elemSemaTy]; ok {
+			panic(InclusiveRangeConstructionError{
+				LocationRange: locationRange,
+				Message:       fmt.Sprintf("step value cannot be negative for unsigned integer type %s", elemSemaTy),
+			})
+		}
 
 		negatedStep, ok := step.Negate(interpreter, locationRange).(IntegerValue)
 		if !ok {
@@ -65,10 +71,8 @@ func NewInclusiveRangeValueWithStep(
 	rangeType InclusiveRangeStaticType,
 ) *CompositeValue {
 
-	// TODO: Validate that if start > end, then the type is signed integer.
-
 	// Validate that the step is non-zero.
-	if step.Equal(interpreter, locationRange, getValueForIntegerType(0, rangeType.ElementType)) {
+	if step.Equal(interpreter, locationRange, GetValueForIntegerType(0, rangeType.ElementType)) {
 		panic(InclusiveRangeConstructionError{
 			LocationRange: locationRange,
 			Message:       "step value cannot be zero",
@@ -79,8 +83,8 @@ func NewInclusiveRangeValueWithStep(
 	// If start < end, step must be > 0
 	// If start > end, step must be < 0
 	// If start == end, step doesn't matter.
-	if (start.Less(interpreter, end, locationRange) && step.Less(interpreter, getValueForIntegerType(0, rangeType.ElementType), locationRange)) ||
-		(start.Greater(interpreter, end, locationRange) && step.Greater(interpreter, getValueForIntegerType(0, rangeType.ElementType), locationRange)) {
+	if (start.Less(interpreter, end, locationRange) && step.Less(interpreter, GetValueForIntegerType(0, rangeType.ElementType), locationRange)) ||
+		(start.Greater(interpreter, end, locationRange) && step.Greater(interpreter, GetValueForIntegerType(0, rangeType.ElementType), locationRange)) {
 
 		panic(InclusiveRangeConstructionError{
 			LocationRange: locationRange,
@@ -173,7 +177,7 @@ func rangeContains(
 				panic(errors.NewUnreachableError())
 			}
 
-			result = diff.Mod(interpreter, step, locationRange).Equal(interpreter, locationRange, getValueForIntegerType(0, rangeType.ElementType))
+			result = diff.Mod(interpreter, step, locationRange).Equal(interpreter, locationRange, GetValueForIntegerType(0, rangeType.ElementType))
 		}
 	}
 
@@ -182,7 +186,7 @@ func rangeContains(
 
 // Get the provided int64 value in the required staticType.
 // Note: Assumes that the provided value fits within the constraints of the staticType.
-func getValueForIntegerType(value int64, staticType StaticType) IntegerValue {
+func GetValueForIntegerType(value int64, staticType StaticType) IntegerValue {
 	switch staticType {
 	case PrimitiveStaticTypeInt:
 		return NewUnmeteredIntValueFromInt64(value)
@@ -242,7 +246,7 @@ func getFieldAsIntegerValue(
 		rangeValue.GetField(
 			interpreter,
 			locationRange,
-			sema.InclusiveRangeTypeStartFieldName,
+			name,
 		),
 	)
 }

diff --git a/runtime/sema/type.go b/runtime/sema/type.go
@@ -3239,6 +3239,8 @@ var AllUnsignedIntegerTypes = []Type{
 	Word256Type,
 }
 
+var AllUnsignedIntegerTypesSet = make(map[Type]struct{})
+
 var AllIntegerTypes = append(
 	append(
 		AllUnsignedIntegerTypes[:],
@@ -3386,6 +3388,11 @@ func init() {
 			)
 		}
 	}
+
+	// Populate AllUnsignedIntegerTypesSet
+	for _, ty := range AllUnsignedIntegerTypes {
+		AllUnsignedIntegerTypesSet[ty] = struct{}{}
+	}
 }
 
 func NumberConversionFunctionType(numberType Type) *FunctionType {

diff --git a/runtime/tests/checker/range_value_test.go b/runtime/tests/checker/range_value_test.go
@@ -277,14 +277,14 @@ func TestInclusiveRangeConstructionValid(t *testing.T) {
 }
 
 func TestInclusiveRangeConstructionInvalid(t *testing.T) {
-	// t.Parallel()
+	t.Parallel()
 
 	baseValueActivation := sema.NewVariableActivation(sema.BaseValueActivation)
 	baseValueActivation.DeclareValue(stdlib.InclusiveRangeConstructorFunction)
 
 	runInvalidCase := func(t *testing.T, label, code string, expectedErrorTypes []interface{}) {
 		t.Run(label, func(t *testing.T) {
-			// t.Parallel()
+			t.Parallel()
 
 			_, err := ParseAndCheckWithOptions(t, code,
 				ParseAndCheckOptions{