diff --git a/scie-scanner/src/scanner/mod.rs b/scie-scanner/src/scanner/mod.rs index 44743823c0c3edbfcd7a61b3dfb3cedad5b3e437..075596c2279c5894af918c67b99d85b57aeae0dc 100644 --- a/scie-scanner/src/scanner/mod.rs +++ b/scie-scanner/src/scanner/mod.rs @@ -1,6 +1,4 @@ -pub mod scie_scanner; -pub mod scie_onig; -pub mod scie_error; +pub mod old; pub mod onig_scanner; pub mod onig_string; diff --git a/scie-scanner/src/scanner/old/mod.rs b/scie-scanner/src/scanner/old/mod.rs new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/scie-scanner/src/scanner/onig_scanner.rs b/scie-scanner/src/scanner/onig_scanner.rs index 1520d659baa48063f9d1f7508f9b453a6dc8e5f1..cdf69a014ff7b01b6a03d74a9baaac290dddc4a4 100644 --- a/scie-scanner/src/scanner/onig_scanner.rs +++ b/scie-scanner/src/scanner/onig_scanner.rs @@ -7,8 +7,8 @@ pub struct OnigScanner { impl OnigScanner { pub fn new(pattens: Vec<&str>) -> Self { - let strPtrsArr: Vec = vec![]; - let strLenArr: Vec = vec![]; + let str_ptrs_arr: Vec = vec![]; + let str_len_arr: Vec = vec![]; for x in pattens { } diff --git a/scie-scanner/src/scanner/onig_string.rs b/scie-scanner/src/scanner/onig_string.rs index 2e9e6ac07054f5119e5ba6f473684bc56520e50a..bc02226cbc11735566c7deb4eeda55ace46f07db 100644 --- a/scie-scanner/src/scanner/onig_string.rs +++ b/scie-scanner/src/scanner/onig_string.rs @@ -1,9 +1,38 @@ pub struct OnigString { + pub utf16length: i32, + pub utf8length: i32, + pub utf16value: String, + pub utf8value: Vec, + pub utf16offset_to_utf8: Option>, + pub utf8offset_to_utf16: Option>, } impl OnigString { - pub fn new() -> Self { - OnigString {} + pub fn new(str: String) -> Self { + let utf16Length = str.len(); + + + OnigString { + utf16length: 0, + utf8length: 0, + utf16value: "".to_string(), + utf8value: vec![], + utf16offset_to_utf8: None, + utf8offset_to_utf16: None + } + } +} + + +#[cfg(test)] +mod tests { + use crate::scanner::onig_scanner::OnigScanner; + use crate::scanner::onig_string::OnigString; + + #[test] + fn it_show_works_works() { + OnigString::new(String::from("")); + assert!(true) } }