kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use lime.system.Locale instead of a new Language enum

Browse Source
This commit is contained in:
Joshua Granick
2018-10-31 15:12:14 -07:00
parent 0a08a82d0c
commit 344fb75bf8
1 changed files with 25 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/lime/text/UTF8String.hx
View File

@@ -4,6 +4,7 @@ package lime.text;
import haxe.Utf8; import haxe.Utf8;
import lime._internal.unifill.Unifill; import lime._internal.unifill.Unifill;
import lime._internal.unifill.CodePoint; import lime._internal.unifill.CodePoint;
import lime.system.Locale;
abstract UTF8String(String) from String to String { abstract UTF8String(String) from String to String {
@@ -123,7 +124,7 @@ abstract UTF8String(String) from String to String {
If `str` cannot be found, -1 is returned. If `str` cannot be found, -1 is returned.
**/ **/
public function lastIndexOf(str:String, ?startIndex:Int):Int { public function lastIndexOf (str:String, ?startIndex:Int):Int {
return Unifill.uLastIndexOf (this, str, startIndex); return Unifill.uLastIndexOf (this, str, startIndex);
@@ -212,10 +213,8 @@ abstract UTF8String(String) from String to String {
If `language` is specified, language-specific casing rules will be followed. If `language` is specified, language-specific casing rules will be followed.
**/ **/
public function toLowerCase (language:Language=null):String { public function toLowerCase (locale:Locale = null):String {
if(language == null) language = STANDARD;
#if sys #if sys
if (lowercaseMap == null) { if (lowercaseMap == null) {
@@ -229,12 +228,12 @@ abstract UTF8String(String) from String to String {
Utf8.iter (this, function (v) { Utf8.iter (this, function (v) {
if(language != STANDARD) if (language != null)
{ {
var v2 = toLowerCaseLanguageFixes(v,language); var v2 = toLowerCaseLocaleFixes (v, locale);
if(v2 != v) if (v2 != v)
{ {
r.addChar(v2); r.addChar (v2);
return; return;
} }
} }
@@ -252,12 +251,13 @@ abstract UTF8String(String) from String to String {
} }
private static function toLowerCaseLanguageFixes(v:Int,language:Language):Int
private static function toLowerCaseLocaleFixes (v:Int, locale:Locale):Int
{ {
return switch(language) return switch (locale.language)
{ {
case TURKISH: case "tr":
switch(v) switch (v)
{ {
case 0xC4B0: 0x69; //İ-->i (large dotted İ to small i) //probably redundant and can be removed, presented here for logical symmtery for when genuine cases are needed case 0xC4B0: 0x69; //İ-->i (large dotted İ to small i) //probably redundant and can be removed, presented here for logical symmtery for when genuine cases are needed
default: v; default: v;
@@ -266,6 +266,7 @@ abstract UTF8String(String) from String to String {
} }
} }
/** /**
Returns the String itself. Returns the String itself.
**/ **/
@@ -283,10 +284,8 @@ abstract UTF8String(String) from String to String {
If `language` is specified, language-specific casing rules will be followed. If `language` is specified, language-specific casing rules will be followed.
**/ **/
public function toUpperCase (language:Language=null):String { public function toUpperCase (locale:Locale = null):String {
if(language == null) language = STANDARD;
#if sys #if sys
if (uppercaseMap == null) { if (uppercaseMap == null) {
@@ -298,14 +297,14 @@ abstract UTF8String(String) from String to String {
var r = new Utf8 (); var r = new Utf8 ();
Utf8.iter (this, function(v) { Utf8.iter (this, function (v) {
if(language != STANDARD) if (locale != null)
{ {
var v2 = toUpperCaseLanguageFixes(v,language); var v2 = toUpperCaseLocaleFixes (v, locale);
if(v2 != v) if (v2 != v)
{ {
r.addChar(v2); r.addChar (v2);
return; return;
} }
} }
@@ -322,13 +321,14 @@ abstract UTF8String(String) from String to String {
#end #end
} }
private static function toUpperCaseLanguageFixes(v:Int,language:Language):Int
private static function toUpperCaseLocaleFixes (v:Int, locale:Locale):Int
{ {
return switch(language) return switch (locale.language)
{ {
case TURKISH: case "tr":
switch(v) switch (v)
{ {
case 0x69: 0xC4B0; //i-->İ (small i to large dotted İ) case 0x69: 0xC4B0; //i-->İ (small i to large dotted İ)
default: v; default: v;
@@ -802,10 +802,3 @@ for (i in 0...32) map[0x118C0+i] = 0x118A0+i;
for (i in 0...34) map[0x1E922+i] = 0x1E900+i; for (i in 0...34) map[0x1E922+i] = 0x1E900+i;
} }
} }
enum Language
{
STANDARD; //any language that doesn't have surprising results with casing
TURKISH; //turkish
//add more special case languages as necessary
}