Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 24 additions & 48 deletions internal/vm/builtins.go
Original file line number Diff line number Diff line change
Expand Up @@ -1423,17 +1423,17 @@ func (vm *VM) bootstrap() {
vm.cSymbol.define("empty?", func(_ *VM, self object.Value, _ []object.Value, _ *Proc) object.Value {
return object.Bool(symStr(self) == "")
})
vm.cSymbol.define("upcase", func(_ *VM, self object.Value, _ []object.Value, _ *Proc) object.Value {
return object.Symbol(strings.ToUpper(symStr(self)))
vm.cSymbol.define("upcase", func(_ *VM, self object.Value, args []object.Value, _ *Proc) object.Value {
return object.Symbol(caseMapUTF8(symStr(self), caseUpcase, parseCaseOptions(caseUpcase, args)))
})
vm.cSymbol.define("downcase", func(_ *VM, self object.Value, _ []object.Value, _ *Proc) object.Value {
return object.Symbol(strings.ToLower(symStr(self)))
vm.cSymbol.define("downcase", func(_ *VM, self object.Value, args []object.Value, _ *Proc) object.Value {
return object.Symbol(caseMapUTF8(symStr(self), caseDowncase, parseCaseOptions(caseDowncase, args)))
})
vm.cSymbol.define("capitalize", func(_ *VM, self object.Value, _ []object.Value, _ *Proc) object.Value {
return object.Symbol(capitalizeStr(symStr(self)))
vm.cSymbol.define("capitalize", func(_ *VM, self object.Value, args []object.Value, _ *Proc) object.Value {
return object.Symbol(caseMapUTF8(symStr(self), caseCapitalize, parseCaseOptions(caseCapitalize, args)))
})
vm.cSymbol.define("swapcase", func(_ *VM, self object.Value, _ []object.Value, _ *Proc) object.Value {
return object.Symbol(swapcaseStr(symStr(self)))
vm.cSymbol.define("swapcase", func(_ *VM, self object.Value, args []object.Value, _ *Proc) object.Value {
return object.Symbol(caseMapUTF8(symStr(self), caseSwapcase, parseCaseOptions(caseSwapcase, args)))
})
symSucc := func(_ *VM, self object.Value, _ []object.Value, _ *Proc) object.Value {
return object.Symbol(succString(symStr(self)))
Expand Down Expand Up @@ -1544,11 +1544,11 @@ func (vm *VM) bootstrap() {
vm.cString.define("undump", func(vm *VM, self object.Value, _ []object.Value, _ *Proc) object.Value {
return vm.stringUndump(self.(*object.String))
})
vm.cString.define("upcase", func(_ *VM, self object.Value, _ []object.Value, _ *Proc) object.Value {
return strEncOf(self, strings.ToUpper(strOf(self)))
vm.cString.define("upcase", func(vm *VM, self object.Value, args []object.Value, _ *Proc) object.Value {
return vm.stringCaseMap(self, caseUpcase, args)
})
vm.cString.define("downcase", func(_ *VM, self object.Value, _ []object.Value, _ *Proc) object.Value {
return strEncOf(self, strings.ToLower(strOf(self)))
vm.cString.define("downcase", func(vm *VM, self object.Value, args []object.Value, _ *Proc) object.Value {
return vm.stringCaseMap(self, caseDowncase, args)
})
vm.cString.define("casecmp", func(_ *VM, self object.Value, args []object.Value, _ *Proc) object.Value {
o, ok := args[0].(*object.String)
Expand All @@ -1564,11 +1564,11 @@ func (vm *VM) bootstrap() {
}
return object.Bool(strings.EqualFold(strOf(self), o.Str()))
})
vm.cString.define("capitalize", func(_ *VM, self object.Value, _ []object.Value, _ *Proc) object.Value {
return strEncOf(self, capitalizeStr(strOf(self)))
vm.cString.define("capitalize", func(vm *VM, self object.Value, args []object.Value, _ *Proc) object.Value {
return vm.stringCaseMap(self, caseCapitalize, args)
})
vm.cString.define("swapcase", func(_ *VM, self object.Value, _ []object.Value, _ *Proc) object.Value {
return strEncOf(self, swapcaseStr(strOf(self)))
vm.cString.define("swapcase", func(vm *VM, self object.Value, args []object.Value, _ *Proc) object.Value {
return vm.stringCaseMap(self, caseSwapcase, args)
})
vm.cString.define("reverse", func(_ *VM, self object.Value, _ []object.Value, _ *Proc) object.Value {
return strEncOf(self, reverseStr(strOf(self)))
Expand Down Expand Up @@ -2123,17 +2123,17 @@ func (vm *VM) bootstrap() {
s.SetBytes(nil)
return s
})
vm.cString.define("upcase!", func(_ *VM, self object.Value, _ []object.Value, _ *Proc) object.Value {
return vm.strBang(self, strings.ToUpper)
vm.cString.define("upcase!", func(vm *VM, self object.Value, args []object.Value, _ *Proc) object.Value {
return vm.stringCaseMapBang(self, caseUpcase, args)
})
vm.cString.define("downcase!", func(_ *VM, self object.Value, _ []object.Value, _ *Proc) object.Value {
return vm.strBang(self, strings.ToLower)
vm.cString.define("downcase!", func(vm *VM, self object.Value, args []object.Value, _ *Proc) object.Value {
return vm.stringCaseMapBang(self, caseDowncase, args)
})
vm.cString.define("capitalize!", func(_ *VM, self object.Value, _ []object.Value, _ *Proc) object.Value {
return vm.strBang(self, capitalizeStr)
vm.cString.define("capitalize!", func(vm *VM, self object.Value, args []object.Value, _ *Proc) object.Value {
return vm.stringCaseMapBang(self, caseCapitalize, args)
})
vm.cString.define("swapcase!", func(_ *VM, self object.Value, _ []object.Value, _ *Proc) object.Value {
return vm.strBang(self, swapcaseStr)
vm.cString.define("swapcase!", func(vm *VM, self object.Value, args []object.Value, _ *Proc) object.Value {
return vm.stringCaseMapBang(self, caseSwapcase, args)
})
vm.cString.define("reverse!", func(_ *VM, self object.Value, _ []object.Value, _ *Proc) object.Value {
s := self.(*object.String)
Expand Down Expand Up @@ -5503,30 +5503,6 @@ func nativeP(vm *VM, _ object.Value, args []object.Value, _ *Proc) object.Value
// Ruby (space, tab, newline, carriage return, form feed, vertical tab, NUL).
const wsCutset = " \t\n\r\f\v\x00"

func capitalizeStr(s string) string {
if s == "" {
return ""
}
r := []rune(strings.ToLower(s))
r[0] = unicode.ToUpper(r[0])
return string(r)
}

func swapcaseStr(s string) string {
out := make([]rune, 0, len(s))
for _, r := range s {
switch {
case unicode.IsUpper(r):
out = append(out, unicode.ToLower(r))
case unicode.IsLower(r):
out = append(out, unicode.ToUpper(r))
default:
out = append(out, r)
}
}
return string(out)
}

func reverseStr(s string) string {
r := []rune(s)
for i, j := 0, len(r)-1; i < j; i, j = i+1, j-1 {
Expand Down
134 changes: 134 additions & 0 deletions internal/vm/string_case_conformance_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
package vm_test

import (
"strings"
"testing"
)

// TestStringCaseMapping locks in MRI 4.0.x String#upcase/#downcase/#swapcase/
// #capitalize behaviour, including full (multi-character) Unicode case mapping
// and the :ascii, :fold, :turkic and :lithuanian options. Every expected value
// below was verified byte-for-byte against MRI.
func TestStringCaseMapping(t *testing.T) {
tests := []struct {
name, src, want string
}{
// Full Unicode case mapping producing multi-character sequences.
{"upcase_sharp_s", `p "aßet".upcase`, "\"ASSET\"\n"},
{"upcase_umlauts", `p "äöü".upcase`, "\"ÄÖÜ\"\n"},
{"upcase_dotted_I_unchanged", `p "İ".upcase`, "\"İ\"\n"},
{"downcase_sharp_s_stays", `p "ß".downcase`, "\"ß\"\n"},
{"downcase_dotted_I_full", `p "İS".downcase`, "\"i̇s\"\n"},
{"swapcase_sharp_s", `p "Aßet".swapcase`, "\"aSSET\"\n"},
{"swapcase_mixed", `p "cYbEr_PuNk11".swapcase`, "\"CyBeR_pUnK11\"\n"},
{"capitalize_sharp_s", `p "ß".capitalize`, "\"Ss\"\n"},
{"capitalize_sharp_s_tail", `p "ßeT".capitalize`, "\"Sset\"\n"},
{"capitalize_empty", `p "".capitalize`, "\"\"\n"},
{"capitalize_digit_first", `p "1a".capitalize`, "\"1a\"\n"},

// :ascii option — only ASCII letters are mapped.
{"upcase_ascii", `p "aßet".upcase(:ascii)`, "\"AßET\"\n"},
{"downcase_ascii", `p "CÅR".downcase(:ascii)`, "\"cÅr\"\n"},
{"swapcase_ascii", `p "aßet".swapcase(:ascii)`, "\"AßET\"\n"},
{"swapcase_ascii_upper", `p "AbC".swapcase(:ascii)`, "\"aBc\"\n"},
{"capitalize_ascii_nonascii_first", `p "ßet".capitalize(:ascii)`, "\"ßet\"\n"},
{"capitalize_ascii_substr", `p "garçon"[1...-1].capitalize(:ascii)`, "\"Arço\"\n"},

// :turkic option — dotted/dotless I semantics.
{"upcase_turkic_i", `p "i".upcase(:turkic)`, "\"İ\"\n"},
{"upcase_turkic_dotless", `p "ı".upcase(:turkic)`, "\"I\"\n"},
{"downcase_turkic_dotted", `p "İ".downcase(:turkic)`, "\"i\"\n"},
{"downcase_turkic_I", `p "I".downcase(:turkic)`, "\"ı\"\n"},
{"swapcase_turkic", `p "aiS".swapcase(:turkic)`, "\"Aİs\"\n"},
{"capitalize_turkic", `p "iSa".capitalize(:turkic)`, "\"İsa\"\n"},
{"capitalize_turkic_dotless", `p "ısa".capitalize(:turkic)`, "\"Isa\"\n"},

// :lithuanian option — currently the same as full mapping, unless it is
// combined with :turkic (in which case Turkic semantics apply).
{"upcase_lithuanian", `p "iß".upcase(:lithuanian)`, "\"ISS\"\n"},
{"upcase_lithuanian_turkic", `p "iß".upcase(:lithuanian, :turkic)`, "\"İSS\"\n"},
{"downcase_lithuanian", `p "İS".downcase(:lithuanian)`, "\"i̇s\"\n"},
{"downcase_lithuanian_turkic", `p "İS".downcase(:lithuanian, :turkic)`, "\"is\"\n"},
{"swapcase_lithuanian", `p "Iß".swapcase(:lithuanian)`, "\"iSS\"\n"},
{"swapcase_lithuanian_turkic", `p "iS".swapcase(:lithuanian, :turkic)`, "\"İs\"\n"},
{"capitalize_lithuanian", `p "iß".capitalize(:lithuanian)`, "\"Iß\"\n"},
{"capitalize_lithuanian_turkic", `p "iß".capitalize(:lithuanian, :turkic)`, "\"İß\"\n"},
{"upcase_turkic_lithuanian", `p "i".upcase(:turkic, :lithuanian)`, "\"İ\"\n"},

// :fold option — full case folding, downcase only.
{"downcase_fold_sharp_s", `p "ß".downcase(:fold)`, "\"ss\"\n"},

// Non-ASCII-compatible encodings are transcoded through UTF-8.
{"upcase_utf16le", `p "äöü".encode("utf-16le").upcase.bytes`, "[196, 0, 214, 0, 220, 0]\n"},
{"swapcase_utf16le", `p "äÖü".encode("utf-16le").swapcase.bytes`, "[196, 0, 246, 0, 220, 0]\n"},

// Invalid bytes in a binary string pass through untouched.
{"upcase_invalid_byte", `p "A\xFFb".b.upcase.bytes`, "[65, 255, 66]\n"},

// Bang variants: in place, nil when unchanged, otherwise the receiver.
{"upcase_bang_changed", `p "abc".dup.upcase!`, "\"ABC\"\n"},
{"upcase_bang_unchanged", `p "HELLO".dup.upcase!`, "nil\n"},
{"downcase_bang_fold", `s = "ß".dup; s.downcase!(:fold); p s`, "\"ss\"\n"},
{"capitalize_bang_multi", `s = "ß".dup; s.capitalize!; p s`, "\"Ss\"\n"},
{"swapcase_bang_turkic", `s = "aiS".dup; s.swapcase!(:turkic); p s`, "\"Aİs\"\n"},

// Metadata after a multi-character expansion.
{"upcase_metadata_size", `p "aßet".upcase.size`, "5\n"},
{"upcase_metadata_ascii_only", `p "aßet".upcase.ascii_only?`, "true\n"},

// Symbol case methods share the same full-mapping engine.
{"symbol_upcase", `p :aßet.upcase`, ":ASSET\n"},
{"symbol_capitalize", `p :ßet.capitalize`, ":Sset\n"},
{"symbol_swapcase", `p :Aßet.swapcase`, ":aSSET\n"},
{"symbol_downcase", `p :ÄÖÜ.downcase.to_s`, "\"äöü\"\n"},
}
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
if got := eval(t, tc.src); got != tc.want {
t.Errorf("src=%q\n got=%q\nwant=%q", tc.src, got, tc.want)
}
})
}
}

// TestStringCaseMappingErrors locks in the ArgumentError/FrozenError paths of
// the case-mapping option parser and the bang methods.
func TestStringCaseMappingErrors(t *testing.T) {
tests := []struct {
name, src, want string
}{
// :fold is only valid for downcasing.
{"upcase_fold", `"abc".upcase(:fold)`, "ArgumentError"},
{"swapcase_fold", `"abc".swapcase(:fold)`, "ArgumentError"},
{"capitalize_fold", `"abc".capitalize(:fold)`, "ArgumentError"},
{"upcase_bang_fold", `"abc".dup.upcase!(:fold)`, "ArgumentError"},

// Unknown / invalid options.
{"invalid_option", `"abc".upcase(:invalid_option)`, "ArgumentError"},
{"non_symbol_option", `"abc".upcase(5)`, "ArgumentError"},

// :ascii cannot be combined with another option.
{"ascii_plus_turkic", `"abc".upcase(:ascii, :turkic)`, "ArgumentError"},

// Only :turkic+:lithuanian may be combined; the second must match.
{"turkic_bad_second", `"abc".upcase(:turkic, :ascii)`, "ArgumentError"},
{"turkic_nonsym_second", `"abc".upcase(:turkic, 5)`, "ArgumentError"},
{"lithuanian_bad_second", `"abc".upcase(:lithuanian, :ascii)`, "ArgumentError"},
{"lithuanian_nonsym_second", `"abc".upcase(:lithuanian, 5)`, "ArgumentError"},

// More than two options.
{"too_many_options", `"abc".upcase(:turkic, :lithuanian, :ascii)`, "ArgumentError"},

// Frozen receiver raises even when no change would be made.
{"frozen_mixed", `"HeLlo".freeze.upcase!`, "FrozenError"},
{"frozen_no_change", `"HELLO".freeze.upcase!`, "FrozenError"},
}
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
err := runErr(t, tc.src)
if err == nil || !strings.Contains(err.Error(), tc.want) {
t.Errorf("src=%q: got err=%v, want containing %q", tc.src, err, tc.want)
}
})
}
}
Loading