Introduce DiplomatStr16
#368
Conversation
| @@ -391,6 +391,13 @@ pub enum TypeName { | |||
| SelfType(PathType), | |||
| } | |||
|
|
|||
| #[derive(Clone, PartialEq, Eq, Hash, Serialize, Deserialize, Debug, Copy)] | |||
| #[non_exhaustive] | |||
| pub enum StringEncoding { | |||
| const buf = new Uint8Array(wasm.memory.buffer, ptr, len); | ||
| return (new TextDecoder("utf-8")).decode(buf) | ||
| } | ||
|
|
||
| export function readString16(wasm, ptr, len) { | ||
| const buf = new Uint16Array(wasm.memory.buffer, ptr, len); | ||
| return String.fromCharCode(buf) |
There was a problem hiding this comment.
huzzah no decoding
too bad we can't pass it in directly, but whatever.
There was a problem hiding this comment.
I'm no JS guru, maybe there's a better way to make a String from a WASM ptr and length, but this works for now.
There was a problem hiding this comment.
This is close but not quite right. String.fromCharCode takes one or more individual arguments where each argument is a UTF-16 code unit.
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/fromCharCode
console.log(String.fromCharCode(189, 43, 190, 61));
// Expected output: "½+¾="
You need to use .apply() on the function in order to convert the Uint16Array to an argument list and get the behavior you want. There's an example here:
https://developer.chrome.com/blog/how-to-convert-arraybuffer-to-and-from-string/
For example:
u16a = new Uint16Array([189, 43, 190, 61]);
String.fromCharCode.apply(null, u16a); // "½+¾="(I think the code you wrote, without the .apply(), doesn't work at all; did you test it?)
There was a problem hiding this comment.
Thanks, fixed in #371
| const buf = new Uint8Array(wasm.memory.buffer, ptr, len); | ||
| return (new TextDecoder("utf-8")).decode(buf) | ||
| } | ||
|
|
||
| export function readString16(wasm, ptr, len) { | ||
| const buf = new Uint16Array(wasm.memory.buffer, ptr, len); | ||
| return String.fromCharCode(buf) |
There was a problem hiding this comment.
This is close but not quite right. String.fromCharCode takes one or more individual arguments where each argument is a UTF-16 code unit.
https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/fromCharCode
console.log(String.fromCharCode(189, 43, 190, 61));
// Expected output: "½+¾="
You need to use .apply() on the function in order to convert the Uint16Array to an argument list and get the behavior you want. There's an example here:
https://developer.chrome.com/blog/how-to-convert-arraybuffer-to-and-from-string/
For example:
u16a = new Uint16Array([189, 43, 190, 61]);
String.fromCharCode.apply(null, u16a); // "½+¾="(I think the code you wrote, without the .apply(), doesn't work at all; did you test it?)
| static str16 = (wasm, string) => { | ||
| return new DiplomatBuf(wasm, string.length, 2, buf => { | ||
| for (var i; i < string.length; i++) { | ||
| buf[i] = string.codePointAt(i); | ||
| } | ||
| }) | ||
| } |
There was a problem hiding this comment.
I think you want .charCodeAt, not .codePointAt
Why #240 deliberately asked for |
|
That's an oversight. I didn't know that |
#57
This adds the
DiplomatStr16Rust type, and adds FFI bindings in JS (String), Dart (String), C2 (wchar_t), and CPP2 (std::wstring_view).Based on #367