-
Notifications
You must be signed in to change notification settings - Fork 65
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add CString implementation #372
Open
Sytten
wants to merge
1
commit into
DelSkayn:master
Choose a base branch
from
caido:cstring
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
use crate::{qjs, Ctx, Error, Result, StdString, Value}; | ||
use std::{mem, slice, str}; | ||
use std::{ffi::c_char, mem, slice, str}; | ||
|
||
/// Rust representation of a JavaScript string. | ||
#[derive(Debug, Clone, PartialEq, Hash)] | ||
|
@@ -25,6 +25,11 @@ impl<'js> String<'js> { | |
Ok(result?) | ||
} | ||
|
||
/// Convert the Javascript string to a Javascript C string. | ||
pub fn to_cstring(self) -> Result<CString<'js>> { | ||
CString::from_string(self) | ||
} | ||
|
||
/// Create a new JavaScript string from an Rust string. | ||
pub fn from_str(ctx: Ctx<'js>, s: &str) -> Result<Self> { | ||
let len = s.as_bytes().len(); | ||
|
@@ -37,6 +42,66 @@ impl<'js> String<'js> { | |
} | ||
} | ||
|
||
/// Rust representation of a JavaScript C string. | ||
#[derive(Debug)] | ||
pub struct CString<'js> { | ||
ptr: *const c_char, | ||
len: usize, | ||
ctx: Ctx<'js>, | ||
} | ||
|
||
#[allow(dead_code)] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why is this attribute here? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Bad copy paste |
||
impl<'js> CString<'js> { | ||
/// Create a new JavaScript C string from a JavaScript string. | ||
pub fn from_string(string: String<'js>) -> Result<Self> { | ||
let mut len = mem::MaybeUninit::uninit(); | ||
// SAFETY: The pointer points to a JSString content which is ref counted | ||
let ptr = unsafe { | ||
qjs::JS_ToCStringLen(string.0.ctx.as_ptr(), len.as_mut_ptr(), string.as_raw()) | ||
}; | ||
if ptr.is_null() { | ||
// Might not ever happen but I am not 100% sure | ||
// so just incase check it. | ||
return Err(Error::Unknown); | ||
} | ||
let len = unsafe { len.assume_init() }; | ||
Ok(Self { | ||
ptr, | ||
len, | ||
ctx: string.0.ctx.clone(), | ||
}) | ||
} | ||
|
||
/// Converts a `CString` to a raw pointer. | ||
pub fn as_ptr(&self) -> *const c_char { | ||
self.ptr | ||
} | ||
|
||
/// Returns the length of this `CString`, in bytes (not chars or graphemes). | ||
pub fn len(&self) -> usize { | ||
self.len | ||
} | ||
|
||
/// Returns `true` if this `CString` has a length of zero, and `false` otherwise. | ||
pub fn is_empty(&self) -> bool { | ||
self.len == 0 | ||
} | ||
|
||
/// Extracts a string slice containing the entire `CString`. | ||
pub fn as_str(&self) -> &str { | ||
// SAFETY: The pointer points to a JSString content which is ref counted | ||
let bytes = unsafe { slice::from_raw_parts(self.ptr as *const u8, self.len) }; | ||
// SAFETY: The bytes are garanteed to be valid utf8 by QuickJS | ||
unsafe { str::from_utf8_unchecked(bytes) } | ||
} | ||
} | ||
|
||
impl<'js> Drop for CString<'js> { | ||
fn drop(&mut self) { | ||
unsafe { qjs::JS_FreeCString(self.ctx.as_ptr(), self.ptr) }; | ||
} | ||
} | ||
|
||
#[cfg(test)] | ||
mod test { | ||
use crate::{prelude::*, *}; | ||
|
@@ -57,4 +122,25 @@ mod test { | |
assert_eq!(text, "foobar".to_string()); | ||
}); | ||
} | ||
|
||
#[test] | ||
fn from_javascript_c() { | ||
test_with(|ctx| { | ||
let s: CString = ctx.eval(" 'foo bar baz' ").unwrap(); | ||
assert_eq!(s.as_str(), "foo bar baz"); | ||
}); | ||
} | ||
|
||
#[test] | ||
fn to_javascript_c() { | ||
test_with(|ctx| { | ||
let string = String::from_str(ctx.clone(), "foo") | ||
.unwrap() | ||
.to_cstring() | ||
.unwrap(); | ||
let func: Function = ctx.eval("x => x + 'bar'").unwrap(); | ||
let text: StdString = (string,).apply(&func).unwrap(); | ||
assert_eq!(text, "foobar".to_string()); | ||
}); | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should probably be a
NonNull
.Feels more correct as this pointer should never be null and might allow for more optimizations within enums.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed