Update //third_party/dart_lang/trunk, v2 and macos_sdk to 30719b37a9397cc38610e71a804236ec314535ec.
This CL also updates //third_party/dart/tflite_native and
//third_party/dart/intl to fresh ffi API and imports package:ffi to
//third_party/dart/ffi
New changes in trunk:
- 30719b37a9397cc38610e71a804236ec314535ec [analyzer/ffi] Allow "Pointer<NativeType>" in native func... by Martin Kustermann <kustermann@google.com>
- 9f1b0fe102c0ad4599b695974621530f07684290 [cfe] Handle explicit extension operator calls by Johnni Winther <johnniwinther@google.com>
- 9e636b5ab4de850fb19bc262e0686fdf14bfbfc0 Reland "[vm/service] Introduce IsolateGroup entity to vm ... by Alexander Aprelev <aam@google.com>
- 8e7fa2a35b32eab34e6a3fb86a13dbba7bda5812 NNBD i13n: Proper messages for nullable values in collect... by Sam Rawlins <srawlins@google.com>
- c52ac7b1144157a7bc975c30d473321da82fe04e Migration: ensure that the target of cascade expressions ... by Paul Berry <paulberry@google.com>
- 1b044eec083f8332983194704396ceafccad8ed1 Combine nullabilities during substitution. by Konstantin Shcheglov <scheglov@google.com>
- c2489c2f5326000883688d7dbc5290f98f8b10e0 Issue 38811. Fix for reporting MISSING_DEFAULT_VALUE_FOR_... by Konstantin Shcheglov <scheglov@google.com>
- 0b045aea2b0dc40f4770c63dec2ebb99fed06331 [ VM ] Removed tests/standalone along with any references... by Ben Konyi <bkonyi@google.com>
- 6d029cac3b53e70e812ffe9f0dec330352ee11ee [vm] Fixing warnings in newer Clang versions. by Ryan Macnak <rmacnak@google.com>
- a9d0987476c111288a51ca4fd67890d5df344419 Migration: generalize FixBuilder's representation of chan... by Paul Berry <paulberry@google.com>
- 9fe78bc9a816426737827a5b404ff42fbe65dfac Support for 'question' in FieldFormalParameter. by Konstantin Shcheglov <scheglov@google.com>
- 1e3e9ee04c58b38b845c069227b1d308f5b03cd0 Flow analysis: introduce a debug implementation. by Paul Berry <paulberry@google.com>
- 68d398b392fee6a96a9bd4352d93b361c599a2d8 [analyzer] add more diagnostics for ML completion by Devon Carew <devoncarew@google.com>
- 3e992eb8fe10abc709da56f6e29af20f3b19dfda NNBD i13n: Add line numbers to a few messages by Sam Rawlins <srawlins@google.com>
- 558875d4809d41dda5892beeeabf3e057a5d056e [ VM / dart:io ] Added service extension scaffolding for ... by Ben Konyi <bkonyi@google.com>
- dfa50ae87be975d4c74b334a86fd2847c9a3c790 [vm,bytecode] Drop AST by default when generating bytecod... by Alexander Markov <alexmarkov@google.com>
- 8f1913ff1b57d3edb24cbfefb3afbe1fed84fde2 [dart2js] New RTI: Clean up "any" hack in recipe encoder. by Mayank Patke <fishythefish@google.com>
- 0649cb7755f3dd4eae3c5a22375bc159018450c5 Issue 38900. Fix type parameter type NonNull promotion. by Konstantin Shcheglov <scheglov@google.com>
- 41bc899b5657a18b065d4472303a8807e42b8d05 Check for implicit cast using computeVariance(). by Konstantin Shcheglov <scheglov@google.com>
- 3964afdbc59f85982518b973b22e7c0430755c8f [dart2js] New RTI: Stop recognizing "dynamic" as a recipe. by Mayank Patke <fishythefish@google.com>
- c19adc635542004d2c2cdac55b447e7175391bf8 [vm,aot] Fix handling of exported extensions in TFA tree ... by Alexander Markov <alexmarkov@google.com>
- 630100fb16af150e8620287d975734e8a8b653dc Don't allow ML to suggest punctuation by reference by Ari Aye <ariaye@google.com>
- f020ce5d23a50c05b10c372d99a3f7a878420c78 Revert "[vm/service] Introduce IsolateGroup entity to vm ... by Alexander Aprelev <aam@google.com>
- c4a7f1c6bfb8735e392d105ba29eca9dab00d394 Revert "[vm/compiler] Mark more stores as initializing." by Ben Konyi <bkonyi@google.com>
- 01bd0ab62f4cfc5cfaba722d1bf49b33f17027d0 [vm/fuzzer] Always add OOM catch in try-catch-finally by Aart Bik <ajcbik@google.com>
- 2cee751fb97c5af1406bd76c71582c62f9bbeea7 dartfix: Don't sort edits when using --outputDir; fixes #... by Sam Rawlins <srawlins@google.com>
- 7b135fc7a6cdc4567d6d857b73b8953a3e6c3c5c Differentiate between legacy and sound covariance. by Kallen Tu <kallentu@google.com>
- f219e5152d4e447a5a8b09f6bf0fb0dcd263877e [vm/service] Introduce IsolateGroup entity to vm service ... by Alexander Aprelev <aam@google.com>
- 2c94e561587bba2ee01bbf4deee46b1aac6334b1 [vm] Implementation of the null check instruction in the ... by Liam Appelbe <liama@google.com>
- c0a46e7b5a0ce346546286c77e3e9a3e80cf55e5 [vm/compiler] improve redundant store elimination by Aart Bik <ajcbik@google.com>
- f26aa6fff4deb53f8dddacdc1125fb685eea4a93 [vm, bytecode] Put the 'main' sub-component last when gen... by Ryan Macnak <rmacnak@google.com>
- 88e7fbbe68b7679a9c0133410a37ef2b9c56e742 [ dart:developer ] Update documentation for TimelineTask.... by Ben Konyi <bkonyi@google.com>
- 17a5460b4921a4a9c6d8b57cd3ddd45b57ef53e8 [vm] Add --no-bytecode gn option by Alexander Markov <alexmarkov@google.com>
- e47ab49f0c4f09b94ce2889d3931441354ad2cb8 [analyzer] add a diagnostics page for ml completion by Devon Carew <devoncarew@google.com>
- eb87e79e8e0c14c6837e028209450d76835f137f [vm/compiler] Mark more stores as initializing. by Vyacheslav Egorov <vegorov@google.com>
- dee702264b4ab6f6b634b2e346de5ac7ea08b042 [cfe] Handle named arguments on extensions methods correc... by Johnni Winther <johnniwinther@google.com>
- 504c45fe2b0bc62dfba454d87682428eaa5eead3 [CFE] Don't cleanup moved parts in uriToSource by Jens Johansen <jensj@google.com>
- f3294f708361d1226e99df4de1d997434d923cb1 [cfe] Ignore context when de-duplicating error messages by Aske Simon Christensen <askesc@google.com>
- ed1e0e199eceb4ce0b0530acdb231f0c3bc989bc [vm/ffi] Handle IntConverter's similar to LoadUntagged in... by Martin Kustermann <kustermann@google.com>
- 23e8f2bcfa045471e4ed7c7834c04760f2fc6b43 [cfe] Verify that Null is always nullable by Dmitry Stefantsov <dmitryas@google.com>
- 9634e053cb51629c67032cd9a0976b4db050c7e4 [analyzer/ffi] Remove Struct type parameter in analyzer m... by Martin Kustermann <kustermann@google.com>
- f95a1abbeec80ab939dea8d879ae0711184f5c64 [CFE] Recognize >>> in Symbol when triple-shift flag is e... by Aske Simon Christensen <askesc@google.com>
- e00048285267f742438934d15060e25c6c9b5d6c [cfe] Better marker length when pointing to a constructor by Aske Simon Christensen <askesc@google.com>
- dd140495e7c76de8853edf1837cc786ef23b9e57 [cfe] Position on != by Aske Simon Christensen <askesc@google.com>
- ca669032c39bc7d5a3d2ef611e012c757db6459f [vm/aot] Re-enable dwarf_stack_trace_test. by Samir Jindel <sjindel@google.com>
- 2ed7b63abd797dcbdf73596bfa7668b57d259ae4 [cfe] Describe subtype relation in "Nullability in CFE" by Dmitry Stefantsov <dmitryas@google.com>
- dbf63583ff10b8557153bfe664df53e9d3a4acbf [cfe] Add .withNullability to the "Nullability in CFE" doc by Dmitry Stefantsov <dmitryas@google.com>
- c9f6e669f90eacdb2d5c982beffb33b5a0fbf789 [vm/compiler] Reland "Further compress the information...... by Teagan Strickland <sstrickl@google.com>
- bdf02028cd582c3380b616978efe5da564bba8b9 [vm/ffi] Remove deprecated methods by Daco Harkes <dacoharkes@google.com>
- f1657ab934d212be3f37bc0626c4a0a6764694b5 NNBD i13n: Handle returned values in deeper expressions by Sam Rawlins <srawlins@google.com>
- cf9c6134b870fd272803b20e7e1ee89d2bb26abc Move consumerName(Request) from the analysis server gener... by Jaime Wren <jwren@google.com>
- fbc406aec3955440bc12e8a1dcb7164d2a996abe Revert "[vm,aot] Simple unreachable code elimination befo... by Alexander Markov <alexmarkov@google.com>
- 2e6695f6f94c9cf01b666c464d28ec69b4cf5ed6 NNBD i13n: Add line numbers by Sam Rawlins <srawlins@google.com>
- e221f83febb696841d43d5668f9c799c70210981 Set nullability for function typed formal parameters. by Konstantin Shcheglov <scheglov@google.com>
- a73eba98235494b48497c59bba32167a315af5de [dartdevc] Preliminary additions to support NNBD runtime ... by Nicholas Shahan <nshahan@google.com>
- 41b65b27c20ee76cfafe73384d3b6b2e46ec3667 [vm,aot] Simple unreachable code elimination before type-... by Alexander Markov <alexmarkov@google.com>
- 81679a2ab45ac359fb2ef119d1349dbb99c9574e [analyzer] reduce the default number of times we repeat a... by Devon Carew <devoncarew@google.com>
- 2e237765525b1673a42669760a1135dac7223417 [dartdevc] Add new bot configuration for nnbd strong by Nicholas Shahan <nshahan@google.com>
- cfe25c7e95790f5a9dfdc6934a712428b731507b NNBD i13n: Sort navigation links by Sam Rawlins <srawlins@google.com>
- e642af52a5e1c52f2f4c03bfc7355e28e26458fb Fix behavior of ML query construction by Ari Aye <ariaye@google.com>
- 65bf2f0bcdab83e301e7748e9affb9c509b70000 [VM] Fix name demangling in AOT mode. by asiva <asiva@google.com>
- 95bd6a288857e8c14727cecb14c6c295d558e605 Fix --completion-model flag by Ari Aye <ariaye@google.com>
PiperOrigin-RevId: 275245017
diff --git a/test/number_format_compact_icu_test.dart b/test/number_format_compact_icu_test.dart
index 2a0b6f5..db6eacd 100644
--- a/test/number_format_compact_icu_test.dart
+++ b/test/number_format_compact_icu_test.dart
@@ -4,8 +4,8 @@
/// testing the package:intl implementation, they only help verify consistent
/// behaviour across platforms.
@TestOn("!browser")
-import 'dart:convert';
-import 'dart:ffi' as ffi;
+import 'dart:ffi';
+import 'package:ffi/ffi.dart';
import 'package:test/test.dart';
import 'compact_number_test_data.dart' as testdata35;
@@ -105,23 +105,23 @@
/// If [systemIcuVersion] is unspecified, we expect to find all functions in a
/// library with filename [specialIcuLibPath].
bool setupICU({int systemIcuVersion = null, String specialIcuLibPath = null}) {
- ffi.DynamicLibrary libicui18n;
+ DynamicLibrary libicui18n;
String icuVersionSuffix;
if (systemIcuVersion != null) {
icuVersionSuffix = '_$systemIcuVersion';
try {
- ffi.DynamicLibrary libicuuc =
- ffi.DynamicLibrary.open('libicuuc.so.$systemIcuVersion');
+ DynamicLibrary libicuuc =
+ DynamicLibrary.open('libicuuc.so.$systemIcuVersion');
u_errorName = libicuuc.lookupFunction<NativeUErrorNameOp, UErrorNameOp>(
"u_errorName$icuVersionSuffix");
- libicui18n = ffi.DynamicLibrary.open('libicui18n.so.$systemIcuVersion');
+ libicui18n = DynamicLibrary.open('libicui18n.so.$systemIcuVersion');
} on ArgumentError catch (e) {
print('Unable to test against ICU version $systemIcuVersion: $e');
return false;
}
} else {
icuVersionSuffix = '';
- libicui18n = ffi.DynamicLibrary.open(specialIcuLibPath);
+ libicui18n = DynamicLibrary.open(specialIcuLibPath);
u_errorName = libicui18n.lookupFunction<NativeUErrorNameOp, UErrorNameOp>(
"u_errorName$icuVersionSuffix");
}
@@ -157,22 +157,22 @@
// unumf_openForSkeletonAndLocale(u"precision-integer", -1, "en", &ec);
// UFormattedNumber* uresult = unumf_openResult(&ec);
// if (U_FAILURE(ec)) { return; }
- final cLocale = Utf8.allocate(locale);
- final cSkeleton = Utf16.allocate(skeleton);
- final cErrorCode = ffi.Pointer<ffi.Int32>.allocate(count: 1);
- cErrorCode.store(0);
+ final cLocale = Utf8.toUtf8(locale);
+ final cSkeleton = Utf16.toUtf16(skeleton);
+ final cErrorCode = allocate<Int32>(count: 1);
+ cErrorCode.value = 0;
final uformatter =
unumf_openForSkeletonAndLocale(cSkeleton, -1, cLocale, cErrorCode);
- cSkeleton.free();
- cLocale.free();
- var errorCode = cErrorCode.load<int>();
+ free(cSkeleton);
+ free(cLocale);
+ var errorCode = cErrorCode.value;
expect(errorCode, lessThanOrEqualTo(0),
- reason: u_errorName(errorCode).load<Utf8>().toString());
+ reason: u_errorName(errorCode).toString());
final uresult = unumf_openResult(cErrorCode);
- errorCode = cErrorCode.load();
+ errorCode = cErrorCode.value;
// Try to improve this once dart:ffi has extension methods:
expect(errorCode, lessThanOrEqualTo(0),
- reason: u_errorName(errorCode).load<Utf8>().toString());
+ reason: u_errorName(errorCode).toString());
// // Format a double:
// unumf_formatDouble(uformatter, 5142.3, uresult, &ec);
@@ -182,9 +182,9 @@
} else {
unumf_formatInt(uformatter, number, uresult, cErrorCode);
}
- errorCode = cErrorCode.load();
+ errorCode = cErrorCode.value;
expect(errorCode, lessThanOrEqualTo(0),
- reason: u_errorName(errorCode).load<Utf8>().toString());
+ reason: u_errorName(errorCode).toString());
// // Export the string to a malloc'd buffer:
// int32_t len = unumf_resultToString(uresult, NULL, 0, &ec);
@@ -194,19 +194,17 @@
// unumf_resultToString(uresult, buffer, len+1, &ec);
// if (U_FAILURE(ec)) { return; }
// // buffer should equal "5,142"
- final reqLen =
- unumf_resultToString(uresult, ffi.nullptr.cast(), 0, cErrorCode);
- errorCode = cErrorCode.load();
+ final reqLen = unumf_resultToString(uresult, nullptr.cast(), 0, cErrorCode);
+ errorCode = cErrorCode.value;
expect(errorCode, equals(15), // U_BUFFER_OVERFLOW_ERROR
- reason: u_errorName(errorCode).load<Utf8>().toString());
- cErrorCode.store(0);
- final buffer = ffi.Pointer<Utf16>.allocate(count: reqLen + 1);
+ reason: u_errorName(errorCode).toString());
+ cErrorCode.value = 0;
+ final buffer = allocate<Utf16>(count: reqLen + 1);
unumf_resultToString(uresult, buffer, reqLen + 1, cErrorCode);
- errorCode = cErrorCode.load();
+ errorCode = cErrorCode.value;
expect(errorCode, lessThanOrEqualTo(0),
- reason: u_errorName(errorCode).load<Utf8>().toString());
- final bufferContent = buffer.load<Utf16>();
- final result = bufferContent.toString();
+ reason: u_errorName(errorCode).toString());
+ final result = buffer.toString();
// // Cleanup:
// unumf_close(uformatter);
@@ -214,179 +212,103 @@
// free(buffer);
unumf_close(uformatter);
unumf_closeResult(uresult);
- buffer.free();
- cErrorCode.free();
+ free(buffer);
+ free(cErrorCode);
return result;
}
-/// Represents a char* UTF-8 string in C memory.
-class Utf8 extends ffi.Struct<Utf8> {
- @ffi.Uint8()
- int char;
-
- /// Allocate a [CString] and populates it with [dartStr].
- ///
- /// This [CString] is not managed by an [Arena]. Please ensure to [free] the
- /// memory manually!
- static ffi.Pointer<Utf8> allocate(String dartStr) {
- List<int> units = Utf8Encoder().convert(dartStr);
- ffi.Pointer<Utf8> str = ffi.Pointer<Utf8>.allocate(count: units.length + 1);
- for (int i = 0; i < units.length; ++i) {
- str.elementAt(i).load<Utf8>().char = units[i];
- }
- str.elementAt(units.length).load<Utf8>().char = 0;
- return str;
- }
-
- /// Read the string for C memory into Dart.
- String toString() {
- final str = addressOf;
- if (str == ffi.nullptr) return null;
- int len = 0;
- while (str.elementAt(++len).load<Utf8>().char != 0);
- List<int> units = List(len);
- for (int i = 0; i < len; ++i) {
- units[i] = str.elementAt(i).load<Utf8>().char;
- }
- return Utf8Decoder().convert(units);
- }
-}
-
-/// Represents a UChar* in C memory.
-class Utf16 extends ffi.Struct<Utf16> {
- @ffi.Uint16()
- int char;
-
- /// Allocates a Pointer<Utf16> and populates it with [dartStr].
- ///
- /// Please ensure to [free] the memory manually!
- static ffi.Pointer<Utf16> allocate(String dartStr) {
- List<int> units = dartStr.codeUnits;
- ffi.Pointer<Utf16> str =
- ffi.Pointer<Utf16>.allocate(count: (units.length + 1));
- for (int i = 0; i < units.length; ++i) {
- str.elementAt(i).load<Utf16>().char = units[i];
- }
- str.elementAt(units.length).load<Utf16>().char = 0;
- return str;
- }
-
- /// Read the string for C memory into Dart.
- String toString() {
- final str = addressOf;
- if (str == ffi.nullptr) return null;
- int len = 0;
- while (str.elementAt(++len).load<Utf16>().char != 0);
- List<int> units = List(len);
- for (int i = 0; i < len; ++i) {
- units[i] = str.elementAt(i).load<Utf16>().char;
- }
- return String.fromCharCodes(units);
- }
-}
-
/// C signature for
/// [u_errorName()](http://icu-project.org/apiref/icu4c/utypes_8h.html#a89eb455526bb29bf5350ee861d81df92)
-typedef NativeUErrorNameOp = ffi.Pointer<Utf8> Function(ffi.Int32 code);
+typedef NativeUErrorNameOp = Pointer<Utf8> Function(Int32 code);
/// Dart signature for
/// [u_errorName()](http://icu-project.org/apiref/icu4c/utypes_8h.html#a89eb455526bb29bf5350ee861d81df92)
-typedef UErrorNameOp = ffi.Pointer<Utf8> Function(int code);
+typedef UErrorNameOp = Pointer<Utf8> Function(int code);
/// [UNumberFormatter](http://icu-project.org/apiref/icu4c/unumberformatter_8h.html#a7c1238b2dd08f32f1ea245ece41e71bd)
-class UNumberFormatter extends ffi.Struct<UNumberFormatter> {}
+class UNumberFormatter extends Struct {}
/// [UFormattedNumber](http://icu-project.org/apiref/icu4c/unumberformatter_8h.html#a9d4030bdc4dd1ec4de828bf1bcf4b1b6)
-class UFormattedNumber extends ffi.Struct<UFormattedNumber> {}
+class UFormattedNumber extends Struct {}
/// C signature for
/// [unumf_openForSkeletonAndLocale()](http://icu-project.org/apiref/icu4c/unumberformatter_8h.html#a29339e144833880bda36fb7c17032698)
typedef NativeUnumfOpenForSkeletonAndLocaleOp
- = ffi.Pointer<UNumberFormatter> Function(
- ffi.Pointer<Utf16> skeleton,
- ffi.Int32 skeletonLen,
- ffi.Pointer<Utf8> locale,
- ffi.Pointer<ffi.Int32> ec);
+ = Pointer<UNumberFormatter> Function(Pointer<Utf16> skeleton,
+ Int32 skeletonLen, Pointer<Utf8> locale, Pointer<Int32> ec);
/// Dart signature for
/// [unumf_openForSkeletonAndLocale()](http://icu-project.org/apiref/icu4c/unumberformatter_8h.html#a29339e144833880bda36fb7c17032698)
-typedef UnumfOpenForSkeletonAndLocaleOp
- = ffi.Pointer<UNumberFormatter> Function(ffi.Pointer<Utf16> skeleton,
- int skeletonLen, ffi.Pointer<Utf8> locale, ffi.Pointer<ffi.Int32> ec);
+typedef UnumfOpenForSkeletonAndLocaleOp = Pointer<UNumberFormatter> Function(
+ Pointer<Utf16> skeleton,
+ int skeletonLen,
+ Pointer<Utf8> locale,
+ Pointer<Int32> ec);
/// C signature for
/// [unumf_openResult()](http://icu-project.org/apiref/icu4c/unumberformatter_8h.html#a5bd2d297cb2664b4964d25fd41671dad)
-typedef NativeUnumfOpenResultOp = ffi.Pointer<UFormattedNumber> Function(
- ffi.Pointer<ffi.Int32> ec);
+typedef NativeUnumfOpenResultOp = Pointer<UFormattedNumber> Function(
+ Pointer<Int32> ec);
/// Dart signature for
/// [unumf_openResult()](http://icu-project.org/apiref/icu4c/unumberformatter_8h.html#a5bd2d297cb2664b4964d25fd41671dad)
-typedef UnumfOpenResultOp = ffi.Pointer<UFormattedNumber> Function(
- ffi.Pointer<ffi.Int32> ec);
+typedef UnumfOpenResultOp = Pointer<UFormattedNumber> Function(
+ Pointer<Int32> ec);
/// C signature for
/// [unumf_formatDouble()](http://icu-project.org/apiref/icu4c/unumberformatter_8h.html#af5f79e43adc900f07b3ba90b6315944e)
-typedef NativeUnumfFormatDoubleOp = ffi.Void Function(
- ffi.Pointer<UNumberFormatter> uformatter,
- ffi.Double value,
- ffi.Pointer<UFormattedNumber> uresult,
- ffi.Pointer<ffi.Int32> ec);
+typedef NativeUnumfFormatDoubleOp = Void Function(
+ Pointer<UNumberFormatter> uformatter,
+ Double value,
+ Pointer<UFormattedNumber> uresult,
+ Pointer<Int32> ec);
/// Dart signature for
/// [unumf_formatDouble()](http://icu-project.org/apiref/icu4c/unumberformatter_8h.html#af5f79e43adc900f07b3ba90b6315944e)
-typedef UnumfFormatDoubleOp = Function(
- ffi.Pointer<UNumberFormatter> uformatter,
- double value,
- ffi.Pointer<UFormattedNumber> uresult,
- ffi.Pointer<ffi.Int32> ec);
+typedef UnumfFormatDoubleOp = void Function(Pointer<UNumberFormatter> uformatter,
+ double value, Pointer<UFormattedNumber> uresult, Pointer<Int32> ec);
/// C signature for
/// [unumf_formatInt()](http://icu-project.org/apiref/icu4c/unumberformatter_8h.html#a459b9313ed05fc98c9cd125eb9c1a625)
-typedef NativeUnumfFormatIntOp = ffi.Void Function(
- ffi.Pointer<UNumberFormatter> uformatter,
- ffi.Int32 value,
- ffi.Pointer<UFormattedNumber> uresult,
- ffi.Pointer<ffi.Int32> ec);
+typedef NativeUnumfFormatIntOp = Void Function(
+ Pointer<UNumberFormatter> uformatter,
+ Int32 value,
+ Pointer<UFormattedNumber> uresult,
+ Pointer<Int32> ec);
/// Dart signature for
/// [unumf_formatInt()](http://icu-project.org/apiref/icu4c/unumberformatter_8h.html#a459b9313ed05fc98c9cd125eb9c1a625)
-typedef UnumfFormatIntOp = Function(
- ffi.Pointer<UNumberFormatter> uformatter,
- int value,
- ffi.Pointer<UFormattedNumber> uresult,
- ffi.Pointer<ffi.Int32> ec);
+typedef UnumfFormatIntOp = void Function(Pointer<UNumberFormatter> uformatter,
+ int value, Pointer<UFormattedNumber> uresult, Pointer<Int32> ec);
/// C signature for
/// [unumf_resultToString()](http://icu-project.org/apiref/icu4c/unumberformatter_8h.html#a72131183633fda6851c35e37ffd821a1)
-typedef NativeUnumfResultToStringOp = ffi.Int32 Function(
- ffi.Pointer<UFormattedNumber> uresult,
- ffi.Pointer<Utf16> buffer,
- ffi.Int32 bufferCapacity,
- ffi.Pointer<ffi.Int32> ec);
+typedef NativeUnumfResultToStringOp = Int32 Function(
+ Pointer<UFormattedNumber> uresult,
+ Pointer<Utf16> buffer,
+ Int32 bufferCapacity,
+ Pointer<Int32> ec);
/// Dart signature for
/// [unumf_resultToString()](http://icu-project.org/apiref/icu4c/unumberformatter_8h.html#a72131183633fda6851c35e37ffd821a1)
-typedef UnumfResultToStringOp = int Function(
- ffi.Pointer<UFormattedNumber> uresult,
- ffi.Pointer<Utf16> buffer,
- int bufferCapacity,
- ffi.Pointer<ffi.Int32> ec);
+typedef UnumfResultToStringOp = int Function(Pointer<UFormattedNumber> uresult,
+ Pointer<Utf16> buffer, int bufferCapacity, Pointer<Int32> ec);
/// C signature for
/// [unumf_close()](http://icu-project.org/apiref/icu4c/unumberformatter_8h.html#a6f47836ca05077fc912ad24e462312c6)
-typedef NativeUnumfCloseOp = ffi.Void Function(
- ffi.Pointer<UNumberFormatter> uformatter);
+typedef NativeUnumfCloseOp = Void Function(
+ Pointer<UNumberFormatter> uformatter);
/// Dart signature for
/// [unumf_close()](http://icu-project.org/apiref/icu4c/unumberformatter_8h.html#a6f47836ca05077fc912ad24e462312c6)
-typedef UnumfCloseOp = Function(ffi.Pointer<UNumberFormatter> uformatter);
+typedef UnumfCloseOp = void Function(Pointer<UNumberFormatter> uformatter);
/// C signature for
/// [unumf_closeResult()](http://icu-project.org/apiref/icu4c/unumberformatter_8h.html#a78f19cef14a2db1a0eb62a8b724eb123)
-typedef NativeUnumfCloseResultOp = ffi.Void Function(
- ffi.Pointer<UFormattedNumber> uresult);
+typedef NativeUnumfCloseResultOp = Void Function(
+ Pointer<UFormattedNumber> uresult);
/// Dart signature for
/// [unumf_closeResult()](http://icu-project.org/apiref/icu4c/unumberformatter_8h.html#a78f19cef14a2db1a0eb62a8b724eb123)
-typedef UnumfCloseResultOp = Function(ffi.Pointer<UFormattedNumber> uresult);
+typedef UnumfCloseResultOp = void Function(Pointer<UFormattedNumber> uresult);
