Skip to content

Make reliable default #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sasial-dev merged 2 commits into from
Dec 1, 2025
Merged

Make reliable default #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba4d354
Make reliable default
Ezzenix Nov 28, 2025
f2c0b6b
Fix CI
sasial-dev Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion zap/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,8 +244,9 @@ pub enum EvSource {
Client,
}

#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Default)]
pub enum EvType {
#[default]
Reliable,
Unreliable(bool),
}
Expand Down
6 changes: 3 additions & 3 deletions zap/src/parser/convert.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ impl<'src> Converter<'src> {
_ => None,
}) {
let id = match evdecl.from {
EvSource::Server => match evdecl.evty {
EvSource::Server => match evdecl.evty.unwrap_or_default() {
EvType::Reliable => {
let current_id = client_reliable_id;
client_reliable_id += 1;
Expand All @@ -172,7 +172,7 @@ impl<'src> Converter<'src> {
current_id
}
},
EvSource::Client => match evdecl.evty {
EvSource::Client => match evdecl.evty.unwrap_or_default() {
EvType::Reliable => {
let current_id = server_reliable_id;
server_reliable_id += 1;
Expand Down Expand Up @@ -572,7 +572,7 @@ impl<'src> Converter<'src> {

let name = evdecl.name.name;
let from = evdecl.from;
let evty = evdecl.evty;
let evty = evdecl.evty.unwrap_or_default();
let call = if let Some(call) = evdecl.call {
call
} else if let Some(default) = self.call_default_opt(&self.config.opts.clone()) {
Expand Down
2 changes: 1 addition & 1 deletion zap/src/parser/grammar.lalrpop
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ FnCall: FnCall = {
EvDecl: SyntaxEvDecl<'input> = {
<start:@L> "event" <name:Identifier> "=" "{"
"from" ":" <from:EvSource>
"," "type" ":" <evty:EvTy>
<evty:("," "type" ":" <EvTy>)?>
<call:("," "call" ":" <EvCall>)?>
<data:("," "data" ":" <Parameters>)?>
","?
Expand Down
2 changes: 1 addition & 1 deletion zap/src/parser/syntax_tree.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ pub struct SyntaxEvDecl<'src> {
pub start: usize,
pub name: SyntaxIdentifier<'src>,
pub from: EvSource,
pub evty: EvType,
pub evty: Option<EvType>,
pub call: Option<EvCall>,
pub data: Option<SyntaxParameters<'src>>,
pub end: usize,
Expand Down