More code gen

Author: thehydroimpulse

Cargo.toml

@@ -27,6 +27,3 @@ git = "https://github.com/carllerche/mio"
 
 [dependencies.bytes]
 git = "https://github.com/carllerche/bytes"
-
-[dependencies.thrust_parser]
-path = "./thrust-parser"

src/lib.rs

@@ -21,13 +21,13 @@ use std::string;
 
 mod util;
 mod event_loop;
-mod reactor;
+pub mod reactor;
 pub mod protocol;
 pub mod binary_protocol;
 // mod service;
 mod pipeline;
 mod runner;
-mod dispatcher;
+pub mod dispatcher;
 mod result;
 mod transport;
 

src/protocol.rs

@@ -65,7 +65,7 @@ impl convert::From<i8> for ThriftType {
             13 => ThriftType::Map,
             14 => ThriftType::Set,
             15 => ThriftType::List,
-            _ => panic!("Unexpected value")
+            e => panic!("Unexpected value: {}", e)
         }
     }
 }
@@ -163,7 +163,7 @@ pub struct ThriftMessage {
     pub ty: ThriftMessageType,
     pub seq: i16
 }
-
+#[derive(Debug)]
 pub struct ThriftField {
     pub name: Option<String>,
     pub ty: ThriftType,

thrust-macros-test/src/lib.rs

@@ -4,29 +4,112 @@
 extern crate thrust;
 extern crate tangle;
 
+use thrust::binary_protocol::*;
+use thrust::protocol::*;
+use std::io::{Cursor, Read, Write};
+
 thrust!("
     namespace rust foobar1
 
-    struct Flocker {
-        1: required i64 fo;
+    service FlockDb {
+        map<string, byte> query(1: string voodoo, 2: i32 mission_control);
     }
+");
 
-    enum Foo {
-        HELLO,
-        Foobar
-    }
+#[test]
+fn args_deserialize_gen() {
+    let mut buf = Vec::new();
+
+    {
+        let mut se = BinarySerializer::new(&mut buf);
+        let args = foobar1::FlockDb_query_Args {
+            voodoo: "Hello".to_string(),
+            mission_control: 500
+        };
 
-    struct Message {
-        1: required i32 foobar;
+        args.serialize(&mut se).unwrap();
     }
 
-    service FlockDb {
-        map<string, byte> query(1: string voodoo);
+    let mut rd = Cursor::new(buf);
+    let mut de = BinaryDeserializer::new(rd);
+    let args = foobar1::FlockDb_query_Args::deserialize(&mut de).unwrap();
+    assert_eq!(&*args.voodoo, "Hello");
+    assert_eq!(args.mission_control, 500);
+}
+
+#[test]
+fn manual_args_deserialize() {
+    let mut buf = Vec::new();
+
+    {
+        let mut se = BinarySerializer::new(&mut buf);
+        se.write_struct_begin("FlockDb_query_Args").unwrap();
+
+        se.write_field_begin("voodoo", ThriftType::String, 1).unwrap();
+        "Hello".to_string().serialize(&mut se);
+        se.write_field_stop();
+        se.write_field_end();
+
+        se.write_field_begin("mission_control", ThriftType::I32, 2).unwrap();
+        let i: i32 = 500;
+        i.serialize(&mut se);
+        se.write_field_stop();
+        se.write_field_end();
+
+        se.write_struct_end();
     }
-");
+
+    let mut rd = Cursor::new(buf);
+    let mut de = BinaryDeserializer::new(rd);
+    let msg = de.read_struct_begin().unwrap();
+    let voodoo = de.read_field_begin().unwrap();
+    assert!(voodoo.name.is_none());
+    assert_eq!(voodoo.seq, 1);
+    assert_eq!(voodoo.ty, ThriftType::String);
+    assert_eq!(&*de.deserialize_str().unwrap(), "Hello");
+    de.read_field_begin().unwrap();
+    let mission = de.read_field_begin().unwrap();
+    assert_eq!(mission.seq, 2);
+    assert_eq!(mission.ty, ThriftType::I32);
+    assert_eq!(de.deserialize_i32().unwrap(), 500);
+}
 
 #[test]
-fn compile() {
-    let m = foobar1::Foo::HELLO;
-    println!("{:?}", m);
+fn serialize() {
+    let mut buf = Vec::new();
+    let mut comp = Vec::new();
+
+    {
+        let mut se = BinarySerializer::new(&mut buf);
+        let args = foobar1::FlockDb_query_Args {
+            voodoo: "Hello".to_string(),
+            mission_control: 500
+        };
+
+        args.serialize(&mut se).unwrap();
+    }
+
+    {
+        let mut se = BinarySerializer::new(&mut comp);
+        se.write_struct_begin("FlockDb_query_Args").unwrap();
+
+        se.write_field_begin("voodoo", ThriftType::String, 1).unwrap();
+        "Hello".to_string().serialize(&mut se);
+        se.write_field_stop();
+        se.write_field_end();
+
+        se.write_field_begin("mission_control", ThriftType::I32, 2).unwrap();
+        let i: i32 = 500;
+        i.serialize(&mut se);
+        se.write_field_stop();
+        se.write_field_end();
+
+        se.write_struct_end();
+    }
+
+    assert_eq!(buf.len(), comp.len());
+
+    for i in 0..buf.len() {
+        assert_eq!(buf[i], comp[i]);
+    }
 }

thrust-macros/src/lib.rs

@@ -92,7 +92,13 @@ impl<'a, 'x> Compiler<'a, 'x> {
 
         Ok(quote_item!(self.cx, pub mod $module {
             #![allow(dead_code, unused_imports)]
-            use thrust::protocol::Error;
+            use thrust::protocol::{Error, ThriftType};
+            use thrust::{ThrustResult, ThrustError};
+            use thrust::dispatcher::{self, Dispatcher};
+            use thrust::reactor::Message;
+            use std::thread::JoinHandle;
+            use std::net::SocketAddr;
+            use std::sync::mpsc::{Sender, Receiver};
             use tangle::{Future, Async};
             use std::collections::{HashMap, HashSet};
             use thrust::protocol::{ThriftDeserializer, ThriftSerializer};

thrust-parser/Cargo.toml

@@ -4,3 +4,6 @@ version = "0.1.0"
 authors = ["Daniel Fagnan <dnfagnan@gmail.com>"]
 
 [dependencies]
+
+[dependencies.thrust]
+path = ".."