gccrs: Fix ffi and enum conventions

gcc/rust/ChangeLog:

	* ast/rust-fmt.h (enum ParseMode):
	Drop typedef in Cpp

libgrust/ChangeLog:

	* libformat_parser/generic_format_parser/src/lib.rs:
	Remove repr(C)
	* libformat_parser/src/bin.rs: Use ffi
	* libformat_parser/src/lib.rs: pub ffi, create ParseMode and match
	rustc's parse mode

diff --git a/gcc/rust/ast/rust-fmt.h b/gcc/rust/ast/rust-fmt.h
index 1db391bafe7a7875b898fac8a8af6417e47b942f..a54faec6381a818ffe0daa26b0d03952159ad1af 100644 (file)
--- a/gcc/rust/ast/rust-fmt.h
+++ b/gcc/rust/ast/rust-fmt.h
@@ -258,11 +258,11 @@ struct FormatArgsHandle
   RustString rust_string;
 };
 
-typedef enum
+enum ParseMode
 {
-  Format,
+  Format = 0,
   InlineAsm,
-} ParseMode;
+};
 
 extern "C" {
 

diff --git a/libgrust/libformat_parser/generic_format_parser/src/lib.rs b/libgrust/libformat_parser/generic_format_parser/src/lib.rs
index ad4d3d9a546bd0dbd0bd0d6ebec88b030d584491..25f6b0ead170d81ae8cf3f5678a5dd2279597ee4 100644 (file)
--- a/libgrust/libformat_parser/generic_format_parser/src/lib.rs
+++ b/libgrust/libformat_parser/generic_format_parser/src/lib.rs
@@ -78,7 +78,6 @@ enum InputStringKind {
 }
 
 /// The type of format string that we are parsing.
-#[repr(C)]
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
 pub enum ParseMode {
     /// A normal format string as per `format_args!`.

diff --git a/libgrust/libformat_parser/src/bin.rs b/libgrust/libformat_parser/src/bin.rs
index a7947afb11c0ea88b8eb04b72e8ec78d15928953..a48d0066bf2afba6763658c96ad387e78e577b04 100644 (file)
--- a/libgrust/libformat_parser/src/bin.rs
+++ b/libgrust/libformat_parser/src/bin.rs
@@ -6,6 +6,6 @@ fn main() {
         None,
         None,
         false,
-        generic_format_parser::ParseMode::Format
+        libformat_parser::ffi::ParseMode::Format,
     ));
 }

diff --git a/libgrust/libformat_parser/src/lib.rs b/libgrust/libformat_parser/src/lib.rs
index 42ad62892bdf0332a45d3f079eb8d49c2e6a113e..d920cfaa63deec53b04262d0017abf840aeedce0 100644 (file)
--- a/libgrust/libformat_parser/src/lib.rs
+++ b/libgrust/libformat_parser/src/lib.rs
@@ -24,7 +24,7 @@ where
 // FIXME: Make an ffi module in a separate file
 // FIXME: Remember to leak the boxed type somehow
 // FIXME: How to encode the Option type? As a pointer? Option<T> -> Option<&T> -> *const T could work maybe?
-mod ffi {
+pub mod ffi {
     use super::IntoFFI;
 
     // FIXME: We need to ensure we deal with memory properly - whether it's owned by the C++ side or the Rust side
@@ -79,14 +79,14 @@ mod ffi {
 
     // TODO: Not needed for now?
     // /// The type of format string that we are parsing.
-    // #[derive(Copy, Clone, Debug, Eq, PartialEq)]
-    // #[repr(C)]
-    // pub enum ParseMode {
-    //     /// A normal format string as per `format_args!`.
-    //     Format,
-    //     /// An inline assembly template string for `asm!`.
-    //     InlineAsm,
-    // }
+    #[derive(Copy, Clone, Debug, Eq, PartialEq)]
+    #[repr(C)]
+    pub enum ParseMode {
+        /// A normal format string as per `format_args!`.
+        Format = 0,
+        /// An inline assembly template string for `asm!`.
+        InlineAsm,
+    }
 
     /// A piece is a portion of the format string which represents the next part
     /// to emit. These are emitted as a stream by the `Parser` class.
@@ -327,17 +327,20 @@ mod ffi {
 
 // FIXME: Rename?
 pub mod rust {
-    use generic_format_parser::{ParseMode, Parser, Piece};
-
+    use crate::ffi::ParseMode;
+    use generic_format_parser::{Parser, Piece};
     pub fn collect_pieces(
         input: &str,
         style: Option<usize>,
         snippet: Option<String>,
         append_newline: bool,
-        parse_mode: ParseMode
+        parse_mode: ParseMode,
     ) -> Vec<Piece<'_>> {
-        let parser = Parser::new(input, style, snippet, append_newline, parse_mode);
-
+        let converted_parse_mode = match parse_mode {
+            ParseMode::Format => generic_format_parser::ParseMode::Format,
+            ParseMode::InlineAsm => generic_format_parser::ParseMode::InlineAsm,
+        };
+        let parser = Parser::new(input, style, snippet, append_newline, converted_parse_mode);
         parser.into_iter().collect()
     }
 }
@@ -361,12 +364,11 @@ pub struct RustString {
 #[repr(C)]
 pub struct FormatArgsHandle(PieceSlice, RustString);
 
-
 #[no_mangle]
 pub extern "C" fn collect_pieces(
     input: *const libc::c_char,
     append_newline: bool,
-    parse_mode : generic_format_parser::ParseMode 
+    parse_mode: crate::ffi::ParseMode,
 ) -> FormatArgsHandle {
     // FIXME: Add comment
     let str = unsafe { CStr::from_ptr(input) };
@@ -379,10 +381,11 @@ pub extern "C" fn collect_pieces(
     let s = unsafe { std::mem::transmute::<&'_ str, &'static str>(s) };
 
     // FIXME: No unwrap
-    let pieces: Vec<ffi::Piece<'_>> = rust::collect_pieces(s, None, None, append_newline, parse_mode)
-        .into_iter()
-        .map(Into::into)
-        .collect();
+    let pieces: Vec<ffi::Piece<'_>> =
+        rust::collect_pieces(s, None, None, append_newline, parse_mode)
+            .into_iter()
+            .map(Into::into)
+            .collect();
 
     let piece_slice = PieceSlice {
         len: pieces.len(),