Skip to content

Commit

Permalink
Add String.ToLower() and String.ToUpper()
Browse files Browse the repository at this point in the history
  • Loading branch information
@caesay
caesay committed Feb 17, 2024
1 parent 853653d commit 91de3e8
Show file tree
Hide file tree
Showing 14 changed files with 391 additions and 91 deletions.
4 changes: 4 additions & 0 deletions AST.fu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,8 @@ public enum FuId
StringReplace,
StringStartsWith,
StringSubstring,
StringToLower,
StringToUpper,
ArrayBinarySearchAll,
ArrayBinarySearchPart,
ArrayContains,
Expand Down Expand Up @@ -1529,6 +1531,8 @@ public class FuSystem : FuScope
StringClass.AddMethod(StringStorageType, FuId.StringReplace, "Replace", false, FuVar.New(StringPtrType, "oldValue"), FuVar.New(StringPtrType, "newValue"));
StringClass.AddMethod(BoolType, FuId.StringStartsWith, "StartsWith", false, FuVar.New(StringPtrType, "value"));
StringClass.AddMethod(StringStorageType, FuId.StringSubstring, "Substring", false, FuVar.New(IntType, "offset"), FuVar.New(IntType, "length", NewLiteralLong(-1))); // TODO: UIntType
StringClass.AddMethod(StringStorageType, FuId.StringToLower, "ToLower", false);
StringClass.AddMethod(StringStorageType, FuId.StringToUpper, "ToUpper", false);
StringPtrType.Class = StringClass;
Add(StringPtrType);
StringNullablePtrType.Class = StringClass;
Expand Down
10 changes: 10 additions & 0 deletions GenC.fu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2057,6 +2057,16 @@ public class GenC : GenCCpp
case FuId.StringSubstring:
WriteStringSubstring(obj, args, parent);
break;
case FuId.StringToLower:
WriteGlib("g_utf8_strdown(");
WriteTemporaryOrExpr(obj, FuPriority.Argument);
Write(", -1)");
break;
case FuId.StringToUpper:
WriteGlib("g_utf8_strup(");
WriteTemporaryOrExpr(obj, FuPriority.Argument);
Write(", -1)");
break;
case FuId.ArrayBinarySearchAll:
case FuId.ArrayBinarySearchPart:
if (parent > FuPriority.Add)
Expand Down
20 changes: 20 additions & 0 deletions GenCpp.fu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -808,6 +808,26 @@ public class GenCpp : GenCCpp
case FuId.StringSubstring:
WriteStringMethod(obj, "substr", method, args);
break;
case FuId.StringToLower:
Include("algorithm");
Include("cctype");
Write("[&] { std::string data = std::string{");
obj.Accept(this, FuPriority.Argument);
Write("}; ");
Write("std::transform(data.begin(), data.end(), data.begin(), ");
Write("[](unsigned char c) { return std::tolower(c); }); ");
Write("return data; }()");
break;
case FuId.StringToUpper:
Include("algorithm");
Include("cctype");
Write("[&] { std::string data = std::string{");
obj.Accept(this, FuPriority.Argument);
Write("}; ");
Write("std::transform(data.begin(), data.end(), data.begin(), ");
Write("[](unsigned char c) { return std::toupper(c); }); ");
Write("return data; }()");
break;
case FuId.ArrayBinarySearchAll:
case FuId.ArrayBinarySearchPart:
Include("algorithm");
Expand Down
8 changes: 8 additions & 0 deletions GenD.fu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -802,6 +802,14 @@ public class GenD : GenCCppD
case FuId.StringSubstring:
WriteSlice(obj, args[0], args.Count == 2 ? args[1] : null);
break;
case FuId.StringToLower:
Include("std.uni");
WritePostfix(obj, ".toLower()");
break;
case FuId.StringToUpper:
Include("std.uni");
WritePostfix(obj, ".toUpper()");
break;
case FuId.ArrayBinarySearchAll:
case FuId.ArrayBinarySearchPart:
Include("std.range");
Expand Down
6 changes: 6 additions & 0 deletions GenJava.fu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -661,6 +661,12 @@ public class GenJava : GenTyped
}
WriteChar(')');
break;
case FuId.StringToLower:
WritePostfix(obj, ".toLowerCase()");
break;
case FuId.StringToUpper:
WritePostfix(obj, ".toUpperCase()");
break;
case FuId.ArrayBinarySearchAll:
case FuId.ArrayBinarySearchPart:
WriteArrayBinarySearchFill(obj, "binarySearch", args);
Expand Down
6 changes: 6 additions & 0 deletions GenJs.fu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -601,6 +601,12 @@ public class GenJsNoModule : GenBase
}
WriteChar(')');
break;
case FuId.StringToLower:
WritePostfix(obj, ".toLowerCase()");
break;
case FuId.StringToUpper:
WritePostfix(obj, ".toUpperCase()");
break;
case FuId.ArrayFillAll:
case FuId.ArrayFillPart:
WritePostfix(obj, ".fill(");
Expand Down
6 changes: 6 additions & 0 deletions GenPy.fu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -822,6 +822,12 @@ public class GenPy : GenPySwift
obj.Accept(this, FuPriority.Primary);
WriteSlice(args[0], args.Count == 2 ? args[1] : null);
break;
case FuId.StringToLower:
WritePostfix(obj, ".lower()");
break;
case FuId.StringToUpper:
WritePostfix(obj, ".upper()");
break;
case FuId.ArrayBinarySearchAll:
Include("bisect");
WriteCall("bisect.bisect_left", obj, args[0]);
Expand Down
6 changes: 6 additions & 0 deletions GenSwift.fu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,12 @@ public class GenSwift : GenPySwift
WriteChar(')');
}
break;
case FuId.StringToLower:
WritePostfix(obj, ".lowercased()");
break;
case FuId.StringToUpper:
WritePostfix(obj, ".uppercased()");
break;
case FuId.ArrayCopyTo:
case FuId.ListCopyTo:
OpenIndexing(args[1]);
Expand Down
64 changes: 64 additions & 0 deletions libfut.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2462,6 +2462,8 @@ FuSystem::FuSystem()
this->stringClass->addMethod(this->stringStorageType, FuId::stringReplace, "Replace", false, FuVar::new_(this->stringPtrType, "oldValue"), FuVar::new_(this->stringPtrType, "newValue"));
this->stringClass->addMethod(this->boolType, FuId::stringStartsWith, "StartsWith", false, FuVar::new_(this->stringPtrType, "value"));
this->stringClass->addMethod(this->stringStorageType, FuId::stringSubstring, "Substring", false, FuVar::new_(this->intType, "offset"), FuVar::new_(this->intType, "length", newLiteralLong(-1)));
this->stringClass->addMethod(this->stringStorageType, FuId::stringToLower, "ToLower", false);
this->stringClass->addMethod(this->stringStorageType, FuId::stringToUpper, "ToUpper", false);
this->stringPtrType->class_ = this->stringClass.get();
add(this->stringPtrType);
this->stringNullablePtrType->class_ = this->stringClass.get();
Expand Down Expand Up @@ -10928,6 +10930,16 @@ void GenC::writeCallExpr(const FuExpr * obj, const FuMethod * method, const std:
case FuId::stringSubstring:
writeStringSubstring(obj, args, parent);
break;
case FuId::stringToLower:
writeGlib("g_utf8_strdown(");
writeTemporaryOrExpr(obj, FuPriority::argument);
write(", -1)");
break;
case FuId::stringToUpper:
writeGlib("g_utf8_strup(");
writeTemporaryOrExpr(obj, FuPriority::argument);
write(", -1)");
break;
case FuId::arrayBinarySearchAll:
case FuId::arrayBinarySearchPart:
if (parent > FuPriority::add)
Expand Down Expand Up @@ -13696,6 +13708,26 @@ void GenCpp::writeCallExpr(const FuExpr * obj, const FuMethod * method, const st
case FuId::stringSubstring:
writeStringMethod(obj, "substr", method, args);
break;
case FuId::stringToLower:
include("algorithm");
include("cctype");
write("[&] { std::string data = std::string{");
obj->accept(this, FuPriority::argument);
write("}; ");
write("std::transform(data.begin(), data.end(), data.begin(), ");
write("[](unsigned char c) { return std::tolower(c); }); ");
write("return data; }()");
break;
case FuId::stringToUpper:
include("algorithm");
include("cctype");
write("[&] { std::string data = std::string{");
obj->accept(this, FuPriority::argument);
write("}; ");
write("std::transform(data.begin(), data.end(), data.begin(), ");
write("[](unsigned char c) { return std::toupper(c); }); ");
write("return data; }()");
break;
case FuId::arrayBinarySearchAll:
case FuId::arrayBinarySearchPart:
include("algorithm");
Expand Down Expand Up @@ -16378,6 +16410,14 @@ void GenD::writeCallExpr(const FuExpr * obj, const FuMethod * method, const std:
case FuId::stringSubstring:
writeSlice(obj, (*args)[0].get(), std::ssize(*args) == 2 ? (*args)[1].get() : nullptr);
break;
case FuId::stringToLower:
include("std.uni");
writePostfix(obj, ".toLower()");
break;
case FuId::stringToUpper:
include("std.uni");
writePostfix(obj, ".toUpper()");
break;
case FuId::arrayBinarySearchAll:
case FuId::arrayBinarySearchPart:
include("std.range");
Expand Down Expand Up @@ -17709,6 +17749,12 @@ void GenJava::writeCallExpr(const FuExpr * obj, const FuMethod * method, const s
}
writeChar(')');
break;
case FuId::stringToLower:
writePostfix(obj, ".toLowerCase()");
break;
case FuId::stringToUpper:
writePostfix(obj, ".toUpperCase()");
break;
case FuId::arrayBinarySearchAll:
case FuId::arrayBinarySearchPart:
writeArrayBinarySearchFill(obj, "binarySearch", args);
Expand Down Expand Up @@ -19015,6 +19061,12 @@ void GenJsNoModule::writeCallExpr(const FuExpr * obj, const FuMethod * method, c
}
writeChar(')');
break;
case FuId::stringToLower:
writePostfix(obj, ".toLowerCase()");
break;
case FuId::stringToUpper:
writePostfix(obj, ".toUpperCase()");
break;
case FuId::arrayFillAll:
case FuId::arrayFillPart:
writePostfix(obj, ".fill(");
Expand Down Expand Up @@ -20859,6 +20911,12 @@ void GenSwift::writeCallExpr(const FuExpr * obj, const FuMethod * method, const
writeChar(')');
}
break;
case FuId::stringToLower:
writePostfix(obj, ".lowercased()");
break;
case FuId::stringToUpper:
writePostfix(obj, ".uppercased()");
break;
case FuId::arrayCopyTo:
case FuId::listCopyTo:
openIndexing((*args)[1].get());
Expand Down Expand Up @@ -22868,6 +22926,12 @@ void GenPy::writeCallExpr(const FuExpr * obj, const FuMethod * method, const std
obj->accept(this, FuPriority::primary);
writeSlice((*args)[0].get(), std::ssize(*args) == 2 ? (*args)[1].get() : nullptr);
break;
case FuId::stringToLower:
writePostfix(obj, ".lower()");
break;
case FuId::stringToUpper:
writePostfix(obj, ".upper()");
break;
case FuId::arrayBinarySearchAll:
include("bisect");
writeCall("bisect.bisect_left", obj, (*args)[0].get());
Expand Down
66 changes: 66 additions & 0 deletions libfut.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1341,6 +1341,8 @@ public enum FuId
StringReplace,
StringStartsWith,
StringSubstring,
StringToLower,
StringToUpper,
ArrayBinarySearchAll,
ArrayBinarySearchPart,
ArrayContains,
Expand Down Expand Up @@ -3006,6 +3008,8 @@ internal FuSystem()
this.StringClass.AddMethod(this.StringStorageType, FuId.StringReplace, "Replace", false, FuVar.New(this.StringPtrType, "oldValue"), FuVar.New(this.StringPtrType, "newValue"));
this.StringClass.AddMethod(this.BoolType, FuId.StringStartsWith, "StartsWith", false, FuVar.New(this.StringPtrType, "value"));
this.StringClass.AddMethod(this.StringStorageType, FuId.StringSubstring, "Substring", false, FuVar.New(this.IntType, "offset"), FuVar.New(this.IntType, "length", NewLiteralLong(-1)));
this.StringClass.AddMethod(this.StringStorageType, FuId.StringToLower, "ToLower", false);
this.StringClass.AddMethod(this.StringStorageType, FuId.StringToUpper, "ToUpper", false);
this.StringPtrType.Class = this.StringClass;
Add(this.StringPtrType);
this.StringNullablePtrType.Class = this.StringClass;
Expand Down Expand Up @@ -11222,6 +11226,16 @@ protected override void WriteCallExpr(FuExpr obj, FuMethod method, List<FuExpr>
case FuId.StringSubstring:
WriteStringSubstring(obj, args, parent);
break;
case FuId.StringToLower:
WriteGlib("g_utf8_strdown(");
WriteTemporaryOrExpr(obj, FuPriority.Argument);
Write(", -1)");
break;
case FuId.StringToUpper:
WriteGlib("g_utf8_strup(");
WriteTemporaryOrExpr(obj, FuPriority.Argument);
Write(", -1)");
break;
case FuId.ArrayBinarySearchAll:
case FuId.ArrayBinarySearchPart:
if (parent > FuPriority.Add)
Expand Down Expand Up @@ -14070,6 +14084,26 @@ protected override void WriteCallExpr(FuExpr obj, FuMethod method, List<FuExpr>
case FuId.StringSubstring:
WriteStringMethod(obj, "substr", method, args);
break;
case FuId.StringToLower:
Include("algorithm");
Include("cctype");
Write("[&] { std::string data = std::string{");
obj.Accept(this, FuPriority.Argument);
Write("}; ");
Write("std::transform(data.begin(), data.end(), data.begin(), ");
Write("[](unsigned char c) { return std::tolower(c); }); ");
Write("return data; }()");
break;
case FuId.StringToUpper:
Include("algorithm");
Include("cctype");
Write("[&] { std::string data = std::string{");
obj.Accept(this, FuPriority.Argument);
Write("}; ");
Write("std::transform(data.begin(), data.end(), data.begin(), ");
Write("[](unsigned char c) { return std::toupper(c); }); ");
Write("return data; }()");
break;
case FuId.ArrayBinarySearchAll:
case FuId.ArrayBinarySearchPart:
Include("algorithm");
Expand Down Expand Up @@ -16961,6 +16995,14 @@ protected override void WriteCallExpr(FuExpr obj, FuMethod method, List<FuExpr>
case FuId.StringSubstring:
WriteSlice(obj, args[0], args.Count == 2 ? args[1] : null);
break;
case FuId.StringToLower:
Include("std.uni");
WritePostfix(obj, ".toLower()");
break;
case FuId.StringToUpper:
Include("std.uni");
WritePostfix(obj, ".toUpper()");
break;
case FuId.ArrayBinarySearchAll:
case FuId.ArrayBinarySearchPart:
Include("std.range");
Expand Down Expand Up @@ -18355,6 +18397,12 @@ protected override void WriteCallExpr(FuExpr obj, FuMethod method, List<FuExpr>
}
WriteChar(')');
break;
case FuId.StringToLower:
WritePostfix(obj, ".toLowerCase()");
break;
case FuId.StringToUpper:
WritePostfix(obj, ".toUpperCase()");
break;
case FuId.ArrayBinarySearchAll:
case FuId.ArrayBinarySearchPart:
WriteArrayBinarySearchFill(obj, "binarySearch", args);
Expand Down Expand Up @@ -19675,6 +19723,12 @@ protected override void WriteCallExpr(FuExpr obj, FuMethod method, List<FuExpr>
}
WriteChar(')');
break;
case FuId.StringToLower:
WritePostfix(obj, ".toLowerCase()");
break;
case FuId.StringToUpper:
WritePostfix(obj, ".toUpperCase()");
break;
case FuId.ArrayFillAll:
case FuId.ArrayFillPart:
WritePostfix(obj, ".fill(");
Expand Down Expand Up @@ -21653,6 +21707,12 @@ protected override void WriteCallExpr(FuExpr obj, FuMethod method, List<FuExpr>
WriteChar(')');
}
break;
case FuId.StringToLower:
WritePostfix(obj, ".lowercased()");
break;
case FuId.StringToUpper:
WritePostfix(obj, ".uppercased()");
break;
case FuId.ArrayCopyTo:
case FuId.ListCopyTo:
OpenIndexing(args[1]);
Expand Down Expand Up @@ -23748,6 +23808,12 @@ protected override void WriteCallExpr(FuExpr obj, FuMethod method, List<FuExpr>
obj.Accept(this, FuPriority.Primary);
WriteSlice(args[0], args.Count == 2 ? args[1] : null);
break;
case FuId.StringToLower:
WritePostfix(obj, ".lower()");
break;
case FuId.StringToUpper:
WritePostfix(obj, ".upper()");
break;
case FuId.ArrayBinarySearchAll:
Include("bisect");
WriteCall("bisect.bisect_left", obj, args[0]);
Expand Down
2 changes: 2 additions & 0 deletions libfut.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,8 @@ enum class FuId
stringReplace,
stringStartsWith,
stringSubstring,
stringToLower,
stringToUpper,
arrayBinarySearchAll,
arrayBinarySearchPart,
arrayContains,
Expand Down
Loading

0 comments on commit 91de3e8

Please sign in to comment.