Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 0 additions & 54 deletions src/methods.rs
Original file line number Diff line number Diff line change
@@ -1,60 +1,22 @@
use jni::{
JNIEnv,
objects::{GlobalRef, JByteArray, JObject, JValue, JValueGen},
signature::{Primitive, ReturnType},
};

#[derive(Clone, Copy)]
pub enum SignatureComp {
Class(ClassDecl),
Boolean,
Byte,
Char,
Short,
Int,
Long,
Float,
Double,
Void,
ArrayBoolean,
ArrayByte,
ArrayChar,
ArrayShort,
ArrayInt,
ArrayLong,
ArrayFloat,
ArrayDouble,
}
impl From<ClassDecl> for SignatureComp {
fn from(value: ClassDecl) -> Self {
Self::Class(value)
}
}
impl From<SignatureComp> for ReturnType {
fn from(value: SignatureComp) -> Self {
match value {
SignatureComp::Class(class_decl) if class_decl.0.starts_with('[') => ReturnType::Array,
SignatureComp::Class(_) => ReturnType::Object,
SignatureComp::Boolean => ReturnType::Primitive(Primitive::Boolean),
SignatureComp::Byte => ReturnType::Primitive(Primitive::Byte),
SignatureComp::Char => ReturnType::Primitive(Primitive::Char),
SignatureComp::Short => ReturnType::Primitive(Primitive::Short),
SignatureComp::Int => ReturnType::Primitive(Primitive::Int),
SignatureComp::Long => ReturnType::Primitive(Primitive::Long),
SignatureComp::Float => ReturnType::Primitive(Primitive::Float),
SignatureComp::Double => ReturnType::Primitive(Primitive::Double),
SignatureComp::Void => ReturnType::Primitive(Primitive::Void),
SignatureComp::ArrayBoolean => ReturnType::Array,
SignatureComp::ArrayByte => ReturnType::Array,
SignatureComp::ArrayChar => ReturnType::Array,
SignatureComp::ArrayShort => ReturnType::Array,
SignatureComp::ArrayInt => ReturnType::Array,
SignatureComp::ArrayLong => ReturnType::Array,
SignatureComp::ArrayFloat => ReturnType::Array,
SignatureComp::ArrayDouble => ReturnType::Array,
}
}
}
impl SignatureComp {
fn for_finding(self) -> &'static str {
match self {
Expand All @@ -67,22 +29,10 @@ impl SignatureComp {
match self {
SignatureComp::Class(ClassDecl(class_decl)) => class_decl,
SignatureComp::Boolean => "Z",
SignatureComp::Byte => "B",
SignatureComp::Char => "C",
SignatureComp::Short => "S",
SignatureComp::Int => "I",
SignatureComp::Long => "J",
SignatureComp::Float => "F",
SignatureComp::Double => "D",
SignatureComp::Void => "V",
SignatureComp::ArrayBoolean => "[Z",
SignatureComp::ArrayByte => "[B",
SignatureComp::ArrayChar => "[C",
SignatureComp::ArrayShort => "[S",
SignatureComp::ArrayInt => "[I",
SignatureComp::ArrayLong => "[J",
SignatureComp::ArrayFloat => "[F",
SignatureComp::ArrayDouble => "[D",
}
}
}
Expand Down Expand Up @@ -372,10 +322,6 @@ impl FromValue for () {
fn from_value(value: JValue) -> JResult<Self> {
value.v()
}

fn from_null() -> JResult<Self> {
Ok(())
}
}
impl FromValue for bool {
fn signature() -> SignatureComp {
Expand Down
Loading