From 37d8a7e6c8784e03385a9dc2dea55c57575601a0 Mon Sep 17 00:00:00 2001 From: mii443 Date: Wed, 16 Apr 2025 03:58:30 +0900 Subject: [PATCH] remove unused comment, fix warning --- src/lib.rs | 110 +---------------------------------------------------- 1 file changed, 1 insertion(+), 109 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 9e46343..88d239b 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2,114 +2,6 @@ use std::os::raw::c_void; use libc::c_int; -/* -@_silgen_name("CreateKanaKanjiConverter") -@MainActor public func create_kana_kanji_converter() -> UnsafeMutablePointer { - let converter = KanaKanjiConverter() - return Unmanaged.passRetained(converter).toOpaque().assumingMemoryBound( - to: KanaKanjiConverter.self) -} -@_silgen_name("DestroyKanaKanjiConverter") -@MainActor public func destroy_kana_kanji_converter( - _ converter: UnsafeMutablePointer -) { - Unmanaged.fromOpaque(converter).release() -} -@_silgen_name("CreateComposingText") -@MainActor public func create_composing_text() -> UnsafeMutablePointer { - let c = ComposingTextWrapper(value: ComposingText()) - return Unmanaged.passRetained(c).toOpaque().assumingMemoryBound(to: ComposingTextWrapper.self) -} -@_silgen_name("DestroyComposingText") -@MainActor public func destroy_composing_text( - _ composingText: UnsafeMutablePointer -) { - Unmanaged.fromOpaque(composingText).release() -} -@_silgen_name("KanaKanjiConverter_RequestCandidates") -@MainActor public func kana_kanji_converter_request_candidates( - _ converter: UnsafeMutablePointer, - _ composingText: UnsafeMutablePointer, - _ context: UnsafePointer -) -> UnsafeMutablePointer> { - let c = Unmanaged.fromOpaque(converter).takeUnretainedValue() - let ct = Unmanaged.fromOpaque(composingText).takeUnretainedValue() - - let options = ConvertRequestOptions.withDefaultDictionary( - requireJapanesePrediction: true, - requireEnglishPrediction: false, - keyboardLanguage: .ja_JP, - learningType: .nothing, - memoryDirectoryURL: URL(filePath: "./"), - sharedContainerURL: URL(filePath: "./"), - zenzaiMode: .on( - weight: URL(filePath: "./ggml-model-Q5_K_M.gguf"), inferenceLimit: 1, - requestRichCandidates: true, personalizationMode: nil, - versionDependentMode: .v3(.init(profile: "", leftSideContext: String(cString: context))) - ), - preloadDictionary: true, - metadata: .init(versionString: "rs-azookey-binding") - ) - - let candidates: ConversionResult = c.requestCandidates(ct.value, options: options) - - var result: [FFICandidate] = [] - - for i in 0..>.allocate(capacity: result.count) - for i in 0...allocate(capacity: 1) - pointer[i].pointee = result[i] - } - return pointer -} -@_silgen_name("KanaKanjiConverter_StopComposition") -@MainActor public func kana_kanji_converter_stop_composition( - _ converter: UnsafeMutablePointer, - _ composingText: UnsafeMutablePointer -) { - let c = Unmanaged.fromOpaque(converter).takeUnretainedValue() - c.stopComposition() -} -@_silgen_name("ComposingText_InsertAtCursorPosition") -@MainActor public func composing_text_insert_at_cursor_position( - _ composingText: UnsafeMutablePointer, - _ text: UnsafePointer, -) { - let ct = Unmanaged.fromOpaque(composingText).takeUnretainedValue() - let str = String(cString: text) - ct.value.insertAtCursorPosition(str, inputStyle: .roman2kana) -} -@_silgen_name("ComposingText_DeleteForwardFromCursorPosition") -@MainActor public func composing_text_delete_forward_from_cursor_position( - _ composingText: UnsafeMutablePointer, - _ count: Int32 -) { - let ct = Unmanaged.fromOpaque(composingText).takeUnretainedValue() - ct.value.deleteForwardFromCursorPosition(count: Int(count)) -} -@_silgen_name("ComposingText_DeleteBackwardFromCursorPosition") -@MainActor public func composing_text_delete_backward_from_cursor_position( - _ composingText: UnsafeMutablePointer, - _ count: Int32 -) { - let ct = Unmanaged.fromOpaque(composingText).takeUnretainedValue() - ct.value.deleteBackwardFromCursorPosition(count: Int(count)) -} - -*/ unsafe extern "C" { pub fn CreateKanaKanjiConverter() -> *mut c_void; pub fn DestroyKanaKanjiConverter(converter: *mut c_void); @@ -138,7 +30,7 @@ unsafe extern "C" { #[derive(Debug, Clone, Copy)] #[repr(C)] -struct FFICandidate { +pub struct FFICandidate { text: *mut libc::c_char, corresponding_count: libc::c_int, }