Skip to content

Commit ee68ffa

Browse files
TheBlueMattTheBlueMatt
authored
Merge pull request #801 from TheBlueMatt/2021-02-789-bindings
Bindings updates for 789
2 parents 041d7aa + 68811da commit ee68ffa

20 files changed

+2307
-1170
lines changed

‎c-bindings-gen/src/main.rs

Lines changed: 66 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,6 +1076,17 @@ fn writeln_enum<'a, 'b, W: std::io::Write>(w: &mut W, e: &'a syn::ItemEnum, type
10761076
writeln!(w, ",").unwrap();
10771077
}
10781078
write!(w, "\t}}").unwrap();
1079+
} else if let syn::Fields::Unnamed(fields) = &var.fields {
1080+
needs_free = true;
1081+
write!(w, "(").unwrap();
1082+
for (idx, field) in fields.unnamed.iter().enumerate() {
1083+
if export_status(&field.attrs) == ExportStatus::TestOnly { continue; }
1084+
types.write_c_type(w, &field.ty, None, false);
1085+
if idx != fields.unnamed.len() - 1 {
1086+
write!(w, ",").unwrap();
1087+
}
1088+
}
1089+
write!(w, ")").unwrap();
10791090
}
10801091
if var.discriminant.is_some() { unimplemented!(); }
10811092
writeln!(w, ",").unwrap();
@@ -1094,60 +1105,94 @@ fn writeln_enum<'a, 'b, W: std::io::Write>(w: &mut W, e: &'a syn::ItemEnum, type
10941105
write!(w, "{}{}, ", if $ref { "ref " } else { "mut " }, field.ident.as_ref().unwrap()).unwrap();
10951106
}
10961107
write!(w, "}} ").unwrap();
1108+
} else if let syn::Fields::Unnamed(fields) = &var.fields {
1109+
write!(w, "(").unwrap();
1110+
for (idx, field) in fields.unnamed.iter().enumerate() {
1111+
if export_status(&field.attrs) == ExportStatus::TestOnly { continue; }
1112+
write!(w, "{}{}, ", if $ref { "ref " } else { "mut " }, ('a' as u8 + idx as u8) as char).unwrap();
1113+
}
1114+
write!(w, ") ").unwrap();
10971115
}
10981116
write!(w, "=>").unwrap();
1099-
if let syn::Fields::Named(fields) = &var.fields {
1100-
write!(w, " {{\n\t\t\t\t").unwrap();
1101-
for field in fields.named.iter() {
1102-
if export_status(&field.attrs) == ExportStatus::TestOnly { continue; }
1117+
1118+
macro_rules! handle_field_a {
1119+
($field: expr, $field_ident: expr) => { {
1120+
if export_status(&$field.attrs) == ExportStatus::TestOnly { continue; }
11031121
let mut sink = ::std::io::sink();
11041122
let mut out: &mut dyn std::io::Write = if $ref { &mut sink } else { w };
11051123
let new_var = if $to_c {
1106-
types.write_to_c_conversion_new_var(&mut out, field.ident.as_ref().unwrap(), &field.ty, None, false)
1124+
types.write_to_c_conversion_new_var(&mut out, $field_ident, &$field.ty, None, false)
11071125
} else {
1108-
types.write_from_c_conversion_new_var(&mut out, field.ident.as_ref().unwrap(), &field.ty, None)
1126+
types.write_from_c_conversion_new_var(&mut out, $field_ident, &$field.ty, None)
11091127
};
11101128
if $ref || new_var {
11111129
if $ref {
1112-
write!(w, "let mut {}_nonref = (*{}).clone();\n\t\t\t\t", field.ident.as_ref().unwrap(), field.ident.as_ref().unwrap()).unwrap();
1130+
write!(w, "let mut {}_nonref = (*{}).clone();\n\t\t\t\t", $field_ident, $field_ident).unwrap();
11131131
if new_var {
1114-
let nonref_ident = syn::Ident::new(&format!("{}_nonref", field.ident.as_ref().unwrap()), Span::call_site());
1132+
let nonref_ident = syn::Ident::new(&format!("{}_nonref", $field_ident), Span::call_site());
11151133
if $to_c {
1116-
types.write_to_c_conversion_new_var(w, &nonref_ident, &field.ty, None, false);
1134+
types.write_to_c_conversion_new_var(w, &nonref_ident, &$field.ty, None, false);
11171135
} else {
1118-
types.write_from_c_conversion_new_var(w, &nonref_ident, &field.ty, None);
1136+
types.write_from_c_conversion_new_var(w, &nonref_ident, &$field.ty, None);
11191137
}
11201138
write!(w, "\n\t\t\t\t").unwrap();
11211139
}
11221140
} else {
11231141
write!(w, "\n\t\t\t\t").unwrap();
11241142
}
11251143
}
1144+
} }
1145+
}
1146+
if let syn::Fields::Named(fields) = &var.fields {
1147+
write!(w, " {{\n\t\t\t\t").unwrap();
1148+
for field in fields.named.iter() {
1149+
handle_field_a!(field, field.ident.as_ref().unwrap());
1150+
}
1151+
} else if let syn::Fields::Unnamed(fields) = &var.fields {
1152+
write!(w, " {{\n\t\t\t\t").unwrap();
1153+
for (idx, field) in fields.unnamed.iter().enumerate() {
1154+
handle_field_a!(field, &syn::Ident::new(&(('a' as u8 + idx as u8) as char).to_string(), Span::call_site()));
11261155
}
11271156
} else { write!(w, " ").unwrap(); }
1157+
11281158
write!(w, "{}{}::{}", if $to_c { "" } else { "native" }, e.ident, var.ident).unwrap();
1129-
if let syn::Fields::Named(fields) = &var.fields {
1130-
write!(w, " {{").unwrap();
1131-
for field in fields.named.iter() {
1132-
if export_status(&field.attrs) == ExportStatus::TestOnly { continue; }
1133-
write!(w, "\n\t\t\t\t\t{}: ", field.ident.as_ref().unwrap()).unwrap();
1159+
1160+
macro_rules! handle_field_b {
1161+
($field: expr, $field_ident: expr) => { {
1162+
if export_status(&$field.attrs) == ExportStatus::TestOnly { continue; }
11341163
if $to_c {
1135-
types.write_to_c_conversion_inline_prefix(w, &field.ty, None, false);
1164+
types.write_to_c_conversion_inline_prefix(w, &$field.ty, None, false);
11361165
} else {
1137-
types.write_from_c_conversion_prefix(w, &field.ty, None);
1166+
types.write_from_c_conversion_prefix(w, &$field.ty, None);
11381167
}
1139-
write!(w, "{}{}",
1140-
field.ident.as_ref().unwrap(),
1168+
write!(w, "{}{}", $field_ident,
11411169
if $ref { "_nonref" } else { "" }).unwrap();
11421170
if $to_c {
1143-
types.write_to_c_conversion_inline_suffix(w, &field.ty, None, false);
1171+
types.write_to_c_conversion_inline_suffix(w, &$field.ty, None, false);
11441172
} else {
1145-
types.write_from_c_conversion_suffix(w, &field.ty, None);
1173+
types.write_from_c_conversion_suffix(w, &$field.ty, None);
11461174
}
11471175
write!(w, ",").unwrap();
1176+
} }
1177+
}
1178+
1179+
if let syn::Fields::Named(fields) = &var.fields {
1180+
write!(w, " {{").unwrap();
1181+
for field in fields.named.iter() {
1182+
if export_status(&field.attrs) == ExportStatus::TestOnly { continue; }
1183+
write!(w, "\n\t\t\t\t\t{}: ", field.ident.as_ref().unwrap()).unwrap();
1184+
handle_field_b!(field, field.ident.as_ref().unwrap());
11481185
}
11491186
writeln!(w, "\n\t\t\t\t}}").unwrap();
11501187
write!(w, "\t\t\t}}").unwrap();
1188+
} else if let syn::Fields::Unnamed(fields) = &var.fields {
1189+
write!(w, " (").unwrap();
1190+
for (idx, field) in fields.unnamed.iter().enumerate() {
1191+
write!(w, "\n\t\t\t\t\t").unwrap();
1192+
handle_field_b!(field, &syn::Ident::new(&(('a' as u8 + idx as u8) as char).to_string(), Span::call_site()));
1193+
}
1194+
writeln!(w, "\n\t\t\t\t)").unwrap();
1195+
write!(w, "\t\t\t}}").unwrap();
11511196
}
11521197
writeln!(w, ",").unwrap();
11531198
}

‎c-bindings-gen/src/types.rs

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -114,16 +114,20 @@ pub fn assert_simple_bound(bound: &syn::TraitBound) {
114114
/// type), otherwise it is mapped into a transparent, C-compatible version of itself.
115115
pub fn is_enum_opaque(e: &syn::ItemEnum) -> bool {
116116
for var in e.variants.iter() {
117-
if let syn::Fields::Unit = var.fields {
118-
} else if let syn::Fields::Named(fields) = &var.fields {
117+
if let syn::Fields::Named(fields) = &var.fields {
119118
for field in fields.named.iter() {
120119
match export_status(&field.attrs) {
121120
ExportStatus::Export|ExportStatus::TestOnly => {},
122121
ExportStatus::NoExport => return true,
123122
}
124123
}
125-
} else {
126-
return true;
124+
} else if let syn::Fields::Unnamed(fields) = &var.fields {
125+
for field in fields.unnamed.iter() {
126+
match export_status(&field.attrs) {
127+
ExportStatus::Export|ExportStatus::TestOnly => {},
128+
ExportStatus::NoExport => return true,
129+
}
130+
}
127131
}
128132
}
129133
false
@@ -963,7 +967,7 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
963967
").into() }"))
964968
},
965969
"Vec" if !is_ref => {
966-
Some(("Vec::new(); for item in ", vec![(format!(".drain(..) {{ local_{}.push(", var_name), "item".to_string())], "); }"))
970+
Some(("Vec::new(); for mut item in ", vec![(format!(".drain(..) {{ local_{}.push(", var_name), "item".to_string())], "); }"))
967971
},
968972
"Slice" => {
969973
Some(("Vec::new(); for item in ", vec![(format!(".iter() {{ local_{}.push(", var_name), "**item".to_string())], "); }"))
@@ -1004,8 +1008,8 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
10041008
match full_path {
10051009
"Result" if !is_ref => {
10061010
Some(("match ",
1007-
vec![(".result_ok { true => Ok(".to_string(), format!("(*unsafe {{ Box::from_raw(<*mut _>::take_ptr(&mut {}.contents.result)) }})", var_name)),
1008-
("), false => Err(".to_string(), format!("(*unsafe {{ Box::from_raw(<*mut _>::take_ptr(&mut {}.contents.err)) }})", var_name))],
1011+
vec![(".result_ok { true => Ok(".to_string(), format!("(*unsafe {{ Box::from_raw(<*mut _>::take_ptr(&mut {}.contents.result)) }})", var_access)),
1012+
("), false => Err(".to_string(), format!("(*unsafe {{ Box::from_raw(<*mut _>::take_ptr(&mut {}.contents.err)) }})", var_access))],
10091013
")}"))
10101014
},
10111015
"Vec"|"Slice" if !is_ref => {
@@ -1018,9 +1022,9 @@ impl<'a, 'c: 'a> TypeResolver<'a, 'c> {
10181022
if let Some(syn::Type::Path(p)) = single_contained {
10191023
if self.c_type_has_inner_from_path(&self.resolve_path(&p.path, generics)) {
10201024
if is_ref {
1021-
return Some(("if ", vec![(".inner.is_null() { None } else { Some((*".to_string(), format!("{}", var_name))], ").clone()) }"))
1025+
return Some(("if ", vec![(".inner.is_null() { None } else { Some((*".to_string(), format!("{}", var_access))], ").clone()) }"))
10221026
} else {
1023-
return Some(("if ", vec![(".inner.is_null() { None } else { Some(".to_string(), format!("{}", var_name))], ") }"));
1027+
return Some(("if ", vec![(".inner.is_null() { None } else { Some(".to_string(), format!("{}", var_access))], ") }"));
10241028
}
10251029
}
10261030
}

‎lightning-c-bindings/demo.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ int main() {
6868
.free = NULL,
6969
};
7070

71-
LDKKeysManager keys = KeysManager_new(&node_seed, net, 0, 0);
71+
LDKKeysManager keys = KeysManager_new(&node_seed, 0, 0);
7272
LDKKeysInterface keys_source = KeysManager_as_KeysInterface(&keys);
7373

7474
LDKUserConfig config = UserConfig_default();

‎lightning-c-bindings/demo.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ int main() {
348348
// Instantiate classes for node 1:
349349
uint8_t node_seed[32];
350350
memset(&node_seed, 0, 32);
351-
LDK::KeysManager keys1 = KeysManager_new(&node_seed, network, 0, 0);
351+
LDK::KeysManager keys1 = KeysManager_new(&node_seed, 0, 0);
352352
LDK::KeysInterface keys_source1 = KeysManager_as_KeysInterface(&keys1);
353353
node_secret1 = keys_source1->get_node_secret(keys_source1->this_arg);
354354

@@ -370,7 +370,7 @@ int main() {
370370

371371
// Instantiate classes for node 2:
372372
memset(&node_seed, 1, 32);
373-
LDK::KeysManager keys2 = KeysManager_new(&node_seed, network, 0, 0);
373+
LDK::KeysManager keys2 = KeysManager_new(&node_seed, 0, 0);
374374
LDK::KeysInterface keys_source2 = KeysManager_as_KeysInterface(&keys2);
375375
node_secret2 = keys_source2->get_node_secret(keys_source2->this_arg);
376376

@@ -567,7 +567,7 @@ int main() {
567567
mons_list1->data[0].is_owned = false; // XXX: God this sucks
568568
uint8_t node_seed[32];
569569
memset(&node_seed, 0, 32);
570-
LDK::KeysManager keys1 = KeysManager_new(&node_seed, network, 1, 0);
570+
LDK::KeysManager keys1 = KeysManager_new(&node_seed, 1, 0);
571571
LDK::KeysInterface keys_source1 = KeysManager_as_KeysInterface(&keys1);
572572

573573
LDK::ChannelManagerReadArgs cm1_args = ChannelManagerReadArgs_new(KeysManager_as_KeysInterface(&keys1), fee_est, mon1, broadcast, logger1, UserConfig_default(), std::move(mons_list1));
@@ -581,7 +581,7 @@ int main() {
581581
mons_list2->data[0] = *& std::get<1>(mons2.mons[0]); // Note that we need a reference, thus need a raw clone here, which *& does.
582582
mons_list2->data[0].is_owned = false; // XXX: God this sucks
583583
memset(&node_seed, 1, 32);
584-
LDK::KeysManager keys2 = KeysManager_new(&node_seed, network, 1, 0);
584+
LDK::KeysManager keys2 = KeysManager_new(&node_seed, 1, 0);
585585

586586
LDK::ChannelManagerReadArgs cm2_args = ChannelManagerReadArgs_new(KeysManager_as_KeysInterface(&keys2), fee_est, mon2, broadcast, logger2, UserConfig_default(), std::move(mons_list2));
587587
LDK::CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ cm2_read =

0 commit comments

Comments
 (0)