remove the need to read raw game event before transforming into game event

codegen/src/gameevent.rs

@@ -225,8 +225,10 @@ pub fn generate_game_events(demo: Demo) -> TokenStream {
     let span = Span::call_site();
 
     let imports = quote!(
-        use super::gamevent::{FromGameEventValue, FromRawGameEvent, GameEventValue, RawGameEvent};
+        use super::gamevent::{FromGameEventValue, GameEventDefinition, GameEventEntry, RawGameEvent};
-        use crate::Result;
+        use crate::demo::Stream;
+        use crate::{ParseError, Result};
+        use bitbuffer::{BitRead, LittleEndian};
     );
 
     let event_definitions = events.iter().map(|event| {
@@ -239,42 +241,37 @@ pub fn generate_game_events(demo: Demo) -> TokenStream {
 
         let name = Ident::new(&format!("{}Event", get_event_name(&event.name)), span);
 
-        let entry_constructors = event.entries.iter().map(|entry| {
+        let entry_readers = event.entries.iter().map(|entry| {
             let name_str = get_entry_name(&entry.name);
             let name = Ident::new(&name_str, span);
             let ty = Ident::new(get_type_name(entry.kind), span);
 
             quote!(
-                #name: #ty::from_value(iter.next(), #name_str)?,
+                #name: read_value::<#ty>(stream, iter.next(), #name_str)?,
             )
         });
 
-        let iter = if event.entries.len() > 0 {
+        let definition_iter = if event.entries.len() > 0 {
             quote!(
-                let mut iter = values.into_iter();
+                let mut iter = definition.entries.iter();
             )
         } else {
             quote!()
         };
 
-        let param_name = if event.entries.len() > 0 {
-            quote!(values)
-        } else {
-            quote!(_values)
-        };
-
         quote!(
             #[derive(Debug)]
             pub struct #name {
                 #(#fields)*
             }
 
-            impl FromRawGameEvent for #name {
+            impl #name {
-                fn from_raw_event(#param_name: Vec<GameEventValue>) -> Result<Self> {
+                #[allow(unused_variables)]
-                    #iter
+                fn read(stream: &mut Stream, definition: &GameEventDefinition) -> Result<Self> {
+                    #definition_iter
 
                     Ok(#name {
-                        #(#entry_constructors)*
+                        #(#entry_readers)*
                     })
                 }
             }
@@ -315,7 +312,7 @@ pub fn generate_game_events(demo: Demo) -> TokenStream {
         quote!(GameEventType::#variant_name => #name_str,)
     });
 
-    let from_raw_events = events.iter().map(|event| {
+    let read_events = events.iter().map(|event| {
         let name = get_event_name(&event.name);
         let variant_name = Ident::new(&name, span);
         let struct_name = Ident::new(&format!("{}Event", name), span);
@@ -323,13 +320,13 @@ pub fn generate_game_events(demo: Demo) -> TokenStream {
         if should_box_event(&name) {
             quote!(
                 GameEventType::#variant_name => {
-                    GameEvent::#variant_name(<Box<#struct_name>>::from_raw_event(event.values)?)
+                    GameEvent::#variant_name(Box::new(<#struct_name>::read(stream, definition)?))
                 }
             )
         } else {
             quote!(
                 GameEventType::#variant_name => {
-                    GameEvent::#variant_name(#struct_name::from_raw_event(event.values)?)
+                    GameEvent::#variant_name(#struct_name::read(stream, definition)?)
                 }
             )
         }
@@ -347,6 +344,27 @@ pub fn generate_game_events(demo: Demo) -> TokenStream {
     quote!(
         #imports
 
+        fn read_value<'a, T: FromGameEventValue + BitRead<'a, LittleEndian> + Default>(
+            stream: &mut Stream<'a>,
+            entry: Option<&GameEventEntry>,
+            name: &'static str,
+        ) -> Result<T> {
+            let entry = match entry {
+                Some(entry) => entry,
+                None => {
+                    return Ok(T::default());
+                }
+            };
+            if T::value_type() != entry.kind {
+                return Err(ParseError::InvalidGameEvent {
+                    expected_type: T::value_type(),
+                    name,
+                    found_type: entry.kind,
+                });
+            }
+            Ok(T::read(stream)?)
+        }
+
         #(#event_definitions)*
 
         #[derive(Debug)]
@@ -377,10 +395,10 @@ pub fn generate_game_events(demo: Demo) -> TokenStream {
         }
 
         impl GameEvent {
-            pub fn from_raw_event(event: RawGameEvent) -> Result<Self> {
+            pub fn read(stream: &mut Stream, definition: &GameEventDefinition) -> Result<Self> {
-                Ok(match event.event_type {
+                Ok(match definition.event_type {
-                    #(#from_raw_events)*
+                    #(#read_events)*
-                    GameEventType::Unknown => GameEvent::Unknown(event),
+                    GameEventType::Unknown => GameEvent::Unknown(RawGameEvent::read(stream, definition)?),
                 })
             }
         }

src/demo/gamevent.rs

@@ -1,8 +1,9 @@
 use bitbuffer::{BitRead, BitWrite};
 
-use crate::{ParseError, Result};
+use crate::{GameEventError, ParseError, Result, Stream};
 
 pub use super::gameevent_gen::{GameEvent, GameEventType};
+use crate::demo::handle_utf8_error;
 use crate::demo::message::gameevent::GameEventTypeId;
 use parse_display::Display;
 use std::cmp::Ordering;
@@ -65,6 +66,21 @@ pub enum GameEventValue {
     Local,
 }
 
+fn read_event_value(stream: &mut Stream, definition: &GameEventEntry) -> Result<GameEventValue> {
+    Ok(match definition.kind {
+        GameEventValueType::String => {
+            GameEventValue::String(stream.read().or_else(handle_utf8_error)?)
+        }
+        GameEventValueType::Float => GameEventValue::Float(stream.read()?),
+        GameEventValueType::Long => GameEventValue::Long(stream.read()?),
+        GameEventValueType::Short => GameEventValue::Short(stream.read()?),
+        GameEventValueType::Byte => GameEventValue::Byte(stream.read()?),
+        GameEventValueType::Boolean => GameEventValue::Boolean(stream.read()?),
+        GameEventValueType::Local => GameEventValue::Local,
+        GameEventValueType::None => return Err(GameEventError::NoneValue.into()),
+    })
+}
+
 impl GameEventValue {
     pub fn get_type(&self) -> GameEventValueType {
         match self {
@@ -81,6 +97,8 @@ impl GameEventValue {
 
 pub trait FromGameEventValue: Sized {
     fn from_value(value: Option<GameEventValue>, name: &'static str) -> Result<Self>;
+
+    fn value_type() -> GameEventValueType;
 }
 
 impl FromGameEventValue for String {
@@ -95,6 +113,10 @@ impl FromGameEventValue for String {
             }),
         }
     }
+
+    fn value_type() -> GameEventValueType {
+        GameEventValueType::String
+    }
 }
 
 impl FromGameEventValue for f32 {
@@ -109,6 +131,10 @@ impl FromGameEventValue for f32 {
             }),
         }
     }
+
+    fn value_type() -> GameEventValueType {
+        GameEventValueType::Float
+    }
 }
 
 impl FromGameEventValue for u32 {
@@ -125,6 +151,10 @@ impl FromGameEventValue for u32 {
             }),
         }
     }
+
+    fn value_type() -> GameEventValueType {
+        GameEventValueType::Long
+    }
 }
 
 impl FromGameEventValue for u16 {
@@ -141,6 +171,10 @@ impl FromGameEventValue for u16 {
             }),
         }
     }
+
+    fn value_type() -> GameEventValueType {
+        GameEventValueType::Short
+    }
 }
 
 impl FromGameEventValue for u8 {
@@ -157,6 +191,10 @@ impl FromGameEventValue for u8 {
             }),
         }
     }
+
+    fn value_type() -> GameEventValueType {
+        GameEventValueType::Byte
+    }
 }
 
 impl FromGameEventValue for bool {
@@ -171,6 +209,10 @@ impl FromGameEventValue for bool {
             }),
         }
     }
+
+    fn value_type() -> GameEventValueType {
+        GameEventValueType::Boolean
+    }
 }
 
 impl FromGameEventValue for () {
@@ -184,6 +226,10 @@ impl FromGameEventValue for () {
             }),
         }
     }
+
+    fn value_type() -> GameEventValueType {
+        GameEventValueType::Local
+    }
 }
 
 #[derive(Debug)]
@@ -192,6 +238,20 @@ pub struct RawGameEvent {
     pub values: Vec<GameEventValue>,
 }
 
+impl RawGameEvent {
+    pub fn read(stream: &mut Stream, definition: &GameEventDefinition) -> Result<Self> {
+        let mut values: Vec<GameEventValue> = Vec::with_capacity(definition.entries.len());
+        for entry in &definition.entries {
+            values.push(read_event_value(stream, &entry)?);
+        }
+
+        Ok(RawGameEvent {
+            event_type: definition.event_type,
+            values,
+        })
+    }
+}
+
 pub trait FromRawGameEvent: Sized {
     fn from_raw_event(values: Vec<GameEventValue>) -> Result<Self>;
 }

src/demo/message/gameevent.rs

@@ -1,30 +1,13 @@
-use bitbuffer::{BitRead, LittleEndian};
+use bitbuffer::{BitRead, BitWrite, BitWriteStream, LittleEndian};
 use parse_display::Display;
 
 use crate::demo::gameevent_gen::GameEventType;
 use crate::demo::gamevent::{
-    GameEvent, GameEventDefinition, GameEventEntry, GameEventValue, GameEventValueType,
+    GameEvent, GameEventDefinition, GameEventEntry, GameEventValueType, RawGameEvent,
-    RawGameEvent,
 };
-use crate::demo::handle_utf8_error;
+use crate::demo::parser::{Encode, ParseBitSkip};
-use crate::demo::parser::ParseBitSkip;
 use crate::{GameEventError, Parse, ParseError, ParserState, ReadResult, Result, Stream};
 
-fn read_event_value(stream: &mut Stream, definition: &GameEventEntry) -> Result<GameEventValue> {
-    Ok(match definition.kind {
-        GameEventValueType::String => {
-            GameEventValue::String(stream.read().or_else(handle_utf8_error)?)
-        }
-        GameEventValueType::Float => GameEventValue::Float(stream.read()?),
-        GameEventValueType::Long => GameEventValue::Long(stream.read()?),
-        GameEventValueType::Short => GameEventValue::Short(stream.read()?),
-        GameEventValueType::Byte => GameEventValue::Byte(stream.read()?),
-        GameEventValueType::Boolean => GameEventValue::Boolean(stream.read()?),
-        GameEventValueType::Local => GameEventValue::Local,
-        GameEventValueType::None => return Err(GameEventError::NoneValue.into()),
-    })
-}
-
 #[derive(Debug)]
 pub struct GameEventMessage {
     pub event: Box<GameEvent>,
@@ -46,31 +29,30 @@ impl Parse<'_> for GameEventMessage {
             });
         }
 
-        let raw_event = match state.event_definitions.get(usize::from(event_type)) {
+        let event = match state.event_definitions.get(usize::from(event_type)) {
-            Some(definition) => {
+            Some(definition) => GameEvent::read(&mut data, definition)?,
-                let mut values: Vec<GameEventValue> = Vec::with_capacity(definition.entries.len());
-                for entry in &definition.entries {
-                    values.push(read_event_value(&mut data, &entry)?);
-                }
-
-                RawGameEvent {
-                    event_type: definition.event_type,
-                    values,
-                }
-            }
             None => {
                 return Err(ParseError::MalformedGameEvent(GameEventError::UnknownType(
                     event_type,
                 )));
             }
         };
-        let event = GameEvent::from_raw_event(raw_event)?;
         Ok(GameEventMessage {
             event: Box::new(event),
         })
     }
 }
 
+impl Encode for GameEventMessage {
+    fn encode(
+        &self,
+        stream: &mut BitWriteStream<LittleEndian>,
+        _state: &ParserState,
+    ) -> Result<()> {
+        Ok(stream.reserve_length(11, |_stream| Ok(()))?)
+    }
+}
+
 impl ParseBitSkip<'_> for GameEventMessage {
     fn parse_skip(stream: &mut Stream) -> Result<()> {
         let length: u16 = stream.read_sized(11)?;
@@ -78,7 +60,7 @@ impl ParseBitSkip<'_> for GameEventMessage {
     }
 }
 
-#[derive(BitRead, Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord, Display)]
+#[derive(BitRead, BitWrite, Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord, Display)]
 pub struct GameEventTypeId(#[size = 9] u16);
 
 impl From<GameEventTypeId> for usize {
@@ -123,6 +105,22 @@ impl BitRead<'_, LittleEndian> for GameEventDefinition {
     }
 }
 
+impl BitWrite<LittleEndian> for GameEventDefinition {
+    fn write(&self, stream: &mut BitWriteStream<LittleEndian>) -> ReadResult<()> {
+        self.id.write(stream)?;
+        self.event_type.as_str().write(stream)?;
+        self.name.write(stream)?;
+
+        for entry in self.entries.iter() {
+            entry.kind.write(stream)?;
+            entry.name.write(stream)?;
+        }
+        GameEventValueType::None.write(stream)?;
+
+        Ok(())
+    }
+}
+
 impl BitRead<'_, LittleEndian> for GameEventListMessage {
     fn read(stream: &mut Stream) -> ReadResult<Self> {
         let count: u16 = stream.read_sized(9)?;
@@ -133,3 +131,17 @@ impl BitRead<'_, LittleEndian> for GameEventListMessage {
         Ok(GameEventListMessage { event_list })
     }
 }
+
+impl BitWrite<LittleEndian> for GameEventListMessage {
+    fn write(&self, stream: &mut BitWriteStream<LittleEndian>) -> ReadResult<()> {
+        (self.event_list.len() as u16).write(stream)?;
+        stream.reserve_length(20, |stream| {
+            for event in self.event_list.iter() {
+                event.write(stream)?;
+            }
+            Ok(())
+        })?;
+
+        Ok(())
+    }
+}

src/demo/parser/mod.rs

@@ -1,4 +1,4 @@
-use bitbuffer::{BitError, BitRead, LittleEndian};
+use bitbuffer::{BitError, BitRead, BitWrite, BitWriteStream, LittleEndian};
 
 pub use self::messagetypeanalyser::MessageTypeAnalyser;
 
@@ -30,6 +30,19 @@ impl<'a, T: BitRead<'a, LittleEndian>> Parse<'a> for T {
         Self::read(stream).map_err(ParseError::from)
     }
 }
+pub trait Encode: Sized {
+    fn encode(&self, stream: &mut BitWriteStream<LittleEndian>, state: &ParserState) -> Result<()>;
+}
+
+impl<T: BitWrite<LittleEndian>> Encode for T {
+    fn encode(
+        &self,
+        stream: &mut BitWriteStream<LittleEndian>,
+        _state: &ParserState,
+    ) -> Result<()> {
+        self.write(stream).map_err(ParseError::from)
+    }
+}
 
 pub trait ParseBitSkip<'a> {
     fn parse_skip(stream: &mut Stream<'a>) -> Result<()>;