Skip to content

Commit ba4d354

Browse files
committed
Make reliable default
1 parent 535ab6e commit ba4d354

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

zap/src/config.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,12 @@ pub enum EvType {
250250
Unreliable(bool),
251251
}
252252

253+
impl Default for EvType {
254+
fn default() -> Self {
255+
EvType::Reliable
256+
}
257+
}
258+
253259
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
254260
pub enum EvCall {
255261
SingleSync,

zap/src/parser/convert.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ impl<'src> Converter<'src> {
160160
_ => None,
161161
}) {
162162
let id = match evdecl.from {
163-
EvSource::Server => match evdecl.evty {
163+
EvSource::Server => match evdecl.evty.unwrap_or_default() {
164164
EvType::Reliable => {
165165
let current_id = client_reliable_id;
166166
client_reliable_id += 1;
@@ -172,7 +172,7 @@ impl<'src> Converter<'src> {
172172
current_id
173173
}
174174
},
175-
EvSource::Client => match evdecl.evty {
175+
EvSource::Client => match evdecl.evty.unwrap_or_default() {
176176
EvType::Reliable => {
177177
let current_id = server_reliable_id;
178178
server_reliable_id += 1;
@@ -572,7 +572,7 @@ impl<'src> Converter<'src> {
572572

573573
let name = evdecl.name.name;
574574
let from = evdecl.from;
575-
let evty = evdecl.evty;
575+
let evty = evdecl.evty.unwrap_or_default();
576576
let call = if let Some(call) = evdecl.call {
577577
call
578578
} else if let Some(default) = self.call_default_opt(&self.config.opts.clone()) {

zap/src/parser/grammar.lalrpop

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ FnCall: FnCall = {
6262
EvDecl: SyntaxEvDecl<'input> = {
6363
<start:@L> "event" <name:Identifier> "=" "{"
6464
"from" ":" <from:EvSource>
65-
"," "type" ":" <evty:EvTy>
65+
<evty:("," "type" ":" <EvTy>)?>
6666
<call:("," "call" ":" <EvCall>)?>
6767
<data:("," "data" ":" <Parameters>)?>
6868
","?

zap/src/parser/syntax_tree.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ pub struct SyntaxEvDecl<'src> {
110110
pub start: usize,
111111
pub name: SyntaxIdentifier<'src>,
112112
pub from: EvSource,
113-
pub evty: EvType,
113+
pub evty: Option<EvType>,
114114
pub call: Option<EvCall>,
115115
pub data: Option<SyntaxParameters<'src>>,
116116
pub end: usize,

0 commit comments

Comments
 (0)