Refactor

migrations/legacy_string_value.go

@@ -31,8 +31,8 @@ type LegacyStringValue struct {
 var _ interpreter.Value = &LegacyStringValue{}
 
 func (v *LegacyStringValue) HashInput(_ *interpreter.Interpreter, _ interpreter.LocationRange, scratch []byte) []byte {
-	// Use the un-normalized `v.RawStr` for generating the hash.
-	length := 1 + len(v.RawStr)
+	// Use the un-normalized `v.UnnormalizedStr` for generating the hash.
+	length := 1 + len(v.UnnormalizedStr)
 	var buffer []byte
 	if length <= len(scratch) {
 		buffer = scratch[:length]
@@ -41,6 +41,6 @@ func (v *LegacyStringValue) HashInput(_ *interpreter.Interpreter, _ interpreter.
 	}
 
 	buffer[0] = byte(interpreter.HashInputTypeString)
-	copy(buffer[1:], v.RawStr)
+	copy(buffer[1:], v.UnnormalizedStr)
 	return buffer
 }

migrations/string_normalization/migration_test.go

@@ -61,8 +61,8 @@ func TestStringNormalizingMigration(t *testing.T) {
 
 	newLegacyStringValue := func(s string) *interpreter.StringValue {
 		return &interpreter.StringValue{
-			Str:    s,
-			RawStr: s,
+			Str:             s,
+			UnnormalizedStr: s,
 		}
 	}
 

runtime/interpreter/value.go

@@ -1015,18 +1015,18 @@ type StringValue struct {
 	// graphemes is a grapheme cluster segmentation iterator,
 	// which is initialized lazily and reused/reset in functions
 	// that are based on grapheme clusters
-	graphemes *uniseg.Graphemes
-	Str       string
-	RawStr    string
+	graphemes       *uniseg.Graphemes
+	Str             string
+	UnnormalizedStr string
 	// length is the cached length of the string, based on grapheme clusters.
 	// a negative value indicates the length has not been initialized, see Length()
 	length int
 }
 
 func NewUnmeteredStringValue(str string) *StringValue {
 	return &StringValue{
-		Str:    norm.NFC.String(str),
-		RawStr: str,
+		Str:             norm.NFC.String(str),
+		UnnormalizedStr: str,
 		// a negative value indicates the length has not been initialized, see Length()
 		length: -1,
 	}