projects
/
ldk-java
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
eb8cafb
)
[TS] Correct trait construction with multiple supertraits
author
Matt Corallo
<git@bluematt.me>
Fri, 6 Oct 2023 17:54:22 +0000
(17:54 +0000)
committer
Matt Corallo
<git@bluematt.me>
Sat, 7 Oct 2023 17:23:07 +0000
(17:23 +0000)
typescript_strings.py
patch
|
blob
|
history
diff --git
a/typescript_strings.py
b/typescript_strings.py
index 3dd8d53b3b56d6741ba3545b7e1f9bd2503fafd0..b66181f37ddb5a840098680eefbaf27cf015b22b 100644
(file)
--- a/
typescript_strings.py
+++ b/
typescript_strings.py
@@
-962,7
+962,6
@@
export enum {struct_name} {{
for var in flattened_field_var_conversions:
if isinstance(var, ConvInfo):
impl_constructor_arguments += f", {var.arg_name}: {var.java_hu_ty}"
for var in flattened_field_var_conversions:
if isinstance(var, ConvInfo):
impl_constructor_arguments += f", {var.arg_name}: {var.java_hu_ty}"
- super_instantiator += first_to_lower(var.arg_name) + ", "
if var.from_hu_conv is not None:
bindings_instantiator += ", " + var.from_hu_conv[0]
if var.from_hu_conv[1] != "":
if var.from_hu_conv is not None:
bindings_instantiator += ", " + var.from_hu_conv[0]
if var.from_hu_conv[1] != "":
@@
-971,7
+970,6
@@
export enum {struct_name} {{
bindings_instantiator += ", " + first_to_lower(var.arg_name)
else:
bindings_instantiator += ", " + first_to_lower(var[1]) + ".instance_idx!"
bindings_instantiator += ", " + first_to_lower(var.arg_name)
else:
bindings_instantiator += ", " + first_to_lower(var[1]) + ".instance_idx!"
- super_instantiator += first_to_lower(var[1]) + "_impl, "
pointer_to_adder += "\t\timpl_holder.held.ptrs_to.push(" + first_to_lower(var[1]) + ");\n"
impl_constructor_arguments += f", {first_to_lower(var[1])}_impl: {var[0].replace('LDK', '')}Interface"
pointer_to_adder += "\t\timpl_holder.held.ptrs_to.push(" + first_to_lower(var[1]) + ");\n"
impl_constructor_arguments += f", {first_to_lower(var[1])}_impl: {var[0].replace('LDK', '')}Interface"
@@
-981,7
+979,14
@@
export enum {struct_name} {{
if isinstance(var, ConvInfo):
trait_constructor_arguments += ", " + var.arg_name
else:
if isinstance(var, ConvInfo):
trait_constructor_arguments += ", " + var.arg_name
else:
- super_constructor_statements += "\t\tconst " + first_to_lower(var[1]) + " = " + var[1] + ".new_impl(" + super_instantiator + ");\n"
+ super_constructor_statements += "\t\tconst " + first_to_lower(var[1]) + " = " + var[1] + ".new_impl(" + first_to_lower(var[1]) + "_impl"
+ super_instantiator = ""
+ for suparg in var[2]:
+ if isinstance(suparg, ConvInfo):
+ super_instantiator += ", " + suparg.arg_name
+ else:
+ super_instantiator += ", " + first_to_lower(suparg[1]) + "_impl"
+ super_constructor_statements += super_instantiator + ");\n"
trait_constructor_arguments += ", " + first_to_lower(var[1]) + ".instance_idx!"
for suparg in var[2]:
if isinstance(suparg, ConvInfo):
trait_constructor_arguments += ", " + first_to_lower(var[1]) + ".instance_idx!"
for suparg in var[2]:
if isinstance(suparg, ConvInfo):