Skip to content

Commit d9c0301

Browse files
kateinoigakukunkateinoigakukun
committed
BridgeJS: Rename stack manipulation imports
- `swift_js_pop_param_int32` -> `swift_js_pop_i32` - `swift_js_pop_param_f32` -> `swift_js_pop_f32` - `swift_js_pop_param_f64` -> `swift_js_pop_f64`
1 parent 8004473 commit d9c0301

File tree

65 files changed

+634
-634
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+634
-634
lines changed

‎Benchmarks/Sources/Generated/BridgeJS.swift‎

Lines changed: 66 additions & 66 deletions
Large diffs are not rendered by default.

‎Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -799,41 +799,41 @@ struct StackCodegen {
799799
func liftExpression(for type: BridgeType) -> ExprSyntax {
800800
switch type {
801801
case .string:
802-
return "String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())"
802+
return "String.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())"
803803
case .int, .uint:
804-
return "Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())"
804+
return "Int.bridgeJSLiftParameter(_swift_js_pop_i32())"
805805
case .bool:
806-
return "Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32())"
806+
return "Bool.bridgeJSLiftParameter(_swift_js_pop_i32())"
807807
case .float:
808-
return "Float.bridgeJSLiftParameter(_swift_js_pop_param_f32())"
808+
return "Float.bridgeJSLiftParameter(_swift_js_pop_f32())"
809809
case .double:
810-
return "Double.bridgeJSLiftParameter(_swift_js_pop_param_f64())"
810+
return "Double.bridgeJSLiftParameter(_swift_js_pop_f64())"
811811
case .jsObject:
812-
return "JSObject.bridgeJSLiftParameter(_swift_js_pop_param_int32())"
812+
return "JSObject.bridgeJSLiftParameter(_swift_js_pop_i32())"
813813
case .swiftHeapObject(let className):
814-
return "\(raw: className).bridgeJSLiftParameter(_swift_js_pop_param_pointer())"
814+
return "\(raw: className).bridgeJSLiftParameter(_swift_js_pop_pointer())"
815815
case .unsafePointer:
816-
return "\(raw: type.swiftType).bridgeJSLiftParameter(_swift_js_pop_param_pointer())"
816+
return "\(raw: type.swiftType).bridgeJSLiftParameter(_swift_js_pop_pointer())"
817817
case .swiftProtocol(let protocolName):
818818
// Protocols use their Any wrapper type for lifting
819819
let wrapperName = "Any\(protocolName)"
820-
return "\(raw: wrapperName).bridgeJSLiftParameter(_swift_js_pop_param_int32())"
820+
return "\(raw: wrapperName).bridgeJSLiftParameter(_swift_js_pop_i32())"
821821
case .caseEnum(let enumName):
822-
return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_int32())"
822+
return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_i32())"
823823
case .rawValueEnum(let enumName, let rawType):
824824
switch rawType {
825825
case .string:
826826
return
827-
"\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())"
827+
"\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())"
828828
case .float:
829-
return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_f32())"
829+
return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_f32())"
830830
case .double:
831-
return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_f64())"
831+
return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_f64())"
832832
case .bool, .int, .int32, .int64, .uint, .uint32, .uint64:
833-
return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_int32())"
833+
return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_i32())"
834834
}
835835
case .associatedValueEnum(let enumName):
836-
return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_param_int32())"
836+
return "\(raw: enumName).bridgeJSLiftParameter(_swift_js_pop_i32())"
837837
case .swiftStruct(let structName):
838838
return "\(raw: structName).bridgeJSLiftParameter()"
839839
case .optional(let wrappedType):
@@ -845,7 +845,7 @@ struct StackCodegen {
845845
// Namespace enums are not passed as values
846846
return "()"
847847
case .closure:
848-
return "JSObject.bridgeJSLiftParameter(_swift_js_pop_param_int32())"
848+
return "JSObject.bridgeJSLiftParameter(_swift_js_pop_i32())"
849849
case .array(let elementType):
850850
return liftArrayExpression(elementType: elementType)
851851
}
@@ -856,7 +856,7 @@ struct StackCodegen {
856856
let swiftTypeName = elementType.swiftType
857857
return """
858858
{
859-
let __count = Int(_swift_js_pop_param_array_length())
859+
let __count = Int(_swift_js_pop_array_length())
860860
var __result: [\(raw: swiftTypeName)] = []
861861
__result.reserveCapacity(__count)
862862
for _ in 0..<__count {
@@ -872,49 +872,49 @@ struct StackCodegen {
872872
switch wrappedType {
873873
case .string:
874874
return
875-
"Optional<String>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32())"
875+
"Optional<String>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32(), _swift_js_pop_i32())"
876876
case .int, .uint:
877-
return "Optional<Int>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())"
877+
return "Optional<Int>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())"
878878
case .bool:
879-
return "Optional<Bool>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())"
879+
return "Optional<Bool>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())"
880880
case .float:
881-
return "Optional<Float>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_f32())"
881+
return "Optional<Float>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_f32())"
882882
case .double:
883-
return "Optional<Double>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_f64())"
883+
return "Optional<Double>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_f64())"
884884
case .caseEnum(let enumName):
885885
return
886-
"Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())"
886+
"Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())"
887887
case .rawValueEnum(let enumName, let rawType):
888888
switch rawType {
889889
case .string:
890890
return
891-
"Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32(), _swift_js_pop_param_int32())"
891+
"Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32(), _swift_js_pop_i32())"
892892
case .float:
893893
return
894-
"Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_f32())"
894+
"Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_f32())"
895895
case .double:
896896
return
897-
"Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_f64())"
897+
"Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_f64())"
898898
case .bool, .int, .int32, .int64, .uint, .uint32, .uint64:
899899
return
900-
"Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())"
900+
"Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())"
901901
}
902902
case .swiftStruct(let nestedName):
903-
return "Optional<\(raw: nestedName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32())"
903+
return "Optional<\(raw: nestedName)>.bridgeJSLiftParameter(_swift_js_pop_i32())"
904904
case .swiftHeapObject(let className):
905905
return
906-
"Optional<\(raw: className)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_pointer())"
906+
"Optional<\(raw: className)>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_pointer())"
907907
case .associatedValueEnum(let enumName):
908908
return
909-
"Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())"
909+
"Optional<\(raw: enumName)>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())"
910910
case .jsObject:
911-
return "Optional<JSObject>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())"
911+
return "Optional<JSObject>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())"
912912
case .array(let elementType):
913913
let arrayLift = liftArrayExpression(elementType: elementType)
914914
let swiftTypeName = elementType.swiftType
915915
return """
916916
{
917-
let __isSome = _swift_js_pop_param_int32()
917+
let __isSome = _swift_js_pop_i32()
918918
if __isSome == 0 {
919919
return Optional<[\(raw: swiftTypeName)]>.none
920920
} else {
@@ -924,7 +924,7 @@ struct StackCodegen {
924924
"""
925925
default:
926926
// Fallback for other optional types
927-
return "Optional<Int>.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())"
927+
return "Optional<Int>.bridgeJSLiftParameter(_swift_js_pop_i32(), _swift_js_pop_i32())"
928928
}
929929
}
930930

‎Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -416,17 +416,17 @@ public struct BridgeJSLink {
416416
printer.write("\(JSGlueVariableScope.reservedTmpRetStrings).push(value);")
417417
}
418418
printer.write("}")
419-
printer.write("bjs[\"swift_js_pop_param_int32\"] = function() {")
419+
printer.write("bjs[\"swift_js_pop_i32\"] = function() {")
420420
printer.indent {
421421
printer.write("return \(JSGlueVariableScope.reservedTmpParamInts).pop();")
422422
}
423423
printer.write("}")
424-
printer.write("bjs[\"swift_js_pop_param_f32\"] = function() {")
424+
printer.write("bjs[\"swift_js_pop_f32\"] = function() {")
425425
printer.indent {
426426
printer.write("return \(JSGlueVariableScope.reservedTmpParamF32s).pop();")
427427
}
428428
printer.write("}")
429-
printer.write("bjs[\"swift_js_pop_param_f64\"] = function() {")
429+
printer.write("bjs[\"swift_js_pop_f64\"] = function() {")
430430
printer.indent {
431431
printer.write("return \(JSGlueVariableScope.reservedTmpParamF64s).pop();")
432432
}
@@ -436,7 +436,7 @@ public struct BridgeJSLink {
436436
printer.write("\(JSGlueVariableScope.reservedTmpRetPointers).push(pointer);")
437437
}
438438
printer.write("}")
439-
printer.write("bjs[\"swift_js_pop_param_pointer\"] = function() {")
439+
printer.write("bjs[\"swift_js_pop_pointer\"] = function() {")
440440
printer.indent {
441441
printer.write("return \(JSGlueVariableScope.reservedTmpParamPointers).pop();")
442442
}
@@ -446,7 +446,7 @@ public struct BridgeJSLink {
446446
printer.write("\(JSGlueVariableScope.reservedTmpRetArrayLengths).push(len | 0);")
447447
}
448448
printer.write("}")
449-
printer.write("bjs[\"swift_js_pop_param_array_length\"] = function() {")
449+
printer.write("bjs[\"swift_js_pop_array_length\"] = function() {")
450450
printer.indent {
451451
printer.write("return \(JSGlueVariableScope.reservedTmpParamArrayLengths).pop();")
452452
}

‎Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayParameter.Import.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,25 +89,25 @@ export async function createInstantiator(options, swift) {
8989
const value = textDecoder.decode(bytes);
9090
tmpRetStrings.push(value);
9191
}
92-
bjs["swift_js_pop_param_int32"] = function() {
92+
bjs["swift_js_pop_i32"] = function() {
9393
return tmpParamInts.pop();
9494
}
95-
bjs["swift_js_pop_param_f32"] = function() {
95+
bjs["swift_js_pop_f32"] = function() {
9696
return tmpParamF32s.pop();
9797
}
98-
bjs["swift_js_pop_param_f64"] = function() {
98+
bjs["swift_js_pop_f64"] = function() {
9999
return tmpParamF64s.pop();
100100
}
101101
bjs["swift_js_push_pointer"] = function(pointer) {
102102
tmpRetPointers.push(pointer);
103103
}
104-
bjs["swift_js_pop_param_pointer"] = function() {
104+
bjs["swift_js_pop_pointer"] = function() {
105105
return tmpParamPointers.pop();
106106
}
107107
bjs["swift_js_push_array_length"] = function(len) {
108108
tmpRetArrayLengths.push(len | 0);
109109
}
110-
bjs["swift_js_pop_param_array_length"] = function() {
110+
bjs["swift_js_pop_array_length"] = function() {
111111
return tmpParamArrayLengths.pop();
112112
}
113113
bjs["swift_js_struct_cleanup"] = function(cleanupId) {

‎Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/ArrayTypes.Export.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,25 +115,25 @@ export async function createInstantiator(options, swift) {
115115
const value = textDecoder.decode(bytes);
116116
tmpRetStrings.push(value);
117117
}
118-
bjs["swift_js_pop_param_int32"] = function() {
118+
bjs["swift_js_pop_i32"] = function() {
119119
return tmpParamInts.pop();
120120
}
121-
bjs["swift_js_pop_param_f32"] = function() {
121+
bjs["swift_js_pop_f32"] = function() {
122122
return tmpParamF32s.pop();
123123
}
124-
bjs["swift_js_pop_param_f64"] = function() {
124+
bjs["swift_js_pop_f64"] = function() {
125125
return tmpParamF64s.pop();
126126
}
127127
bjs["swift_js_push_pointer"] = function(pointer) {
128128
tmpRetPointers.push(pointer);
129129
}
130-
bjs["swift_js_pop_param_pointer"] = function() {
130+
bjs["swift_js_pop_pointer"] = function() {
131131
return tmpParamPointers.pop();
132132
}
133133
bjs["swift_js_push_array_length"] = function(len) {
134134
tmpRetArrayLengths.push(len | 0);
135135
}
136-
bjs["swift_js_pop_param_array_length"] = function() {
136+
bjs["swift_js_pop_array_length"] = function() {
137137
return tmpParamArrayLengths.pop();
138138
}
139139
bjs["swift_js_struct_cleanup"] = function(cleanupId) {

‎Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Export.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,25 +88,25 @@ export async function createInstantiator(options, swift) {
8888
const value = textDecoder.decode(bytes);
8989
tmpRetStrings.push(value);
9090
}
91-
bjs["swift_js_pop_param_int32"] = function() {
91+
bjs["swift_js_pop_i32"] = function() {
9292
return tmpParamInts.pop();
9393
}
94-
bjs["swift_js_pop_param_f32"] = function() {
94+
bjs["swift_js_pop_f32"] = function() {
9595
return tmpParamF32s.pop();
9696
}
97-
bjs["swift_js_pop_param_f64"] = function() {
97+
bjs["swift_js_pop_f64"] = function() {
9898
return tmpParamF64s.pop();
9999
}
100100
bjs["swift_js_push_pointer"] = function(pointer) {
101101
tmpRetPointers.push(pointer);
102102
}
103-
bjs["swift_js_pop_param_pointer"] = function() {
103+
bjs["swift_js_pop_pointer"] = function() {
104104
return tmpParamPointers.pop();
105105
}
106106
bjs["swift_js_push_array_length"] = function(len) {
107107
tmpRetArrayLengths.push(len | 0);
108108
}
109-
bjs["swift_js_pop_param_array_length"] = function() {
109+
bjs["swift_js_pop_array_length"] = function() {
110110
return tmpParamArrayLengths.pop();
111111
}
112112
bjs["swift_js_struct_cleanup"] = function(cleanupId) {

‎Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Async.Import.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,25 +89,25 @@ export async function createInstantiator(options, swift) {
8989
const value = textDecoder.decode(bytes);
9090
tmpRetStrings.push(value);
9191
}
92-
bjs["swift_js_pop_param_int32"] = function() {
92+
bjs["swift_js_pop_i32"] = function() {
9393
return tmpParamInts.pop();
9494
}
95-
bjs["swift_js_pop_param_f32"] = function() {
95+
bjs["swift_js_pop_f32"] = function() {
9696
return tmpParamF32s.pop();
9797
}
98-
bjs["swift_js_pop_param_f64"] = function() {
98+
bjs["swift_js_pop_f64"] = function() {
9999
return tmpParamF64s.pop();
100100
}
101101
bjs["swift_js_push_pointer"] = function(pointer) {
102102
tmpRetPointers.push(pointer);
103103
}
104-
bjs["swift_js_pop_param_pointer"] = function() {
104+
bjs["swift_js_pop_pointer"] = function() {
105105
return tmpParamPointers.pop();
106106
}
107107
bjs["swift_js_push_array_length"] = function(len) {
108108
tmpRetArrayLengths.push(len | 0);
109109
}
110-
bjs["swift_js_pop_param_array_length"] = function() {
110+
bjs["swift_js_pop_array_length"] = function() {
111111
return tmpParamArrayLengths.pop();
112112
}
113113
bjs["swift_js_struct_cleanup"] = function(cleanupId) {

‎Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/DefaultParameters.Export.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,25 +141,25 @@ export async function createInstantiator(options, swift) {
141141
const value = textDecoder.decode(bytes);
142142
tmpRetStrings.push(value);
143143
}
144-
bjs["swift_js_pop_param_int32"] = function() {
144+
bjs["swift_js_pop_i32"] = function() {
145145
return tmpParamInts.pop();
146146
}
147-
bjs["swift_js_pop_param_f32"] = function() {
147+
bjs["swift_js_pop_f32"] = function() {
148148
return tmpParamF32s.pop();
149149
}
150-
bjs["swift_js_pop_param_f64"] = function() {
150+
bjs["swift_js_pop_f64"] = function() {
151151
return tmpParamF64s.pop();
152152
}
153153
bjs["swift_js_push_pointer"] = function(pointer) {
154154
tmpRetPointers.push(pointer);
155155
}
156-
bjs["swift_js_pop_param_pointer"] = function() {
156+
bjs["swift_js_pop_pointer"] = function() {
157157
return tmpParamPointers.pop();
158158
}
159159
bjs["swift_js_push_array_length"] = function(len) {
160160
tmpRetArrayLengths.push(len | 0);
161161
}
162-
bjs["swift_js_pop_param_array_length"] = function() {
162+
bjs["swift_js_pop_array_length"] = function() {
163163
return tmpParamArrayLengths.pop();
164164
}
165165
bjs["swift_js_struct_cleanup"] = function(cleanupId) {

‎Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumAssociatedValue.Export.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -563,25 +563,25 @@ export async function createInstantiator(options, swift) {
563563
const value = textDecoder.decode(bytes);
564564
tmpRetStrings.push(value);
565565
}
566-
bjs["swift_js_pop_param_int32"] = function() {
566+
bjs["swift_js_pop_i32"] = function() {
567567
return tmpParamInts.pop();
568568
}
569-
bjs["swift_js_pop_param_f32"] = function() {
569+
bjs["swift_js_pop_f32"] = function() {
570570
return tmpParamF32s.pop();
571571
}
572-
bjs["swift_js_pop_param_f64"] = function() {
572+
bjs["swift_js_pop_f64"] = function() {
573573
return tmpParamF64s.pop();
574574
}
575575
bjs["swift_js_push_pointer"] = function(pointer) {
576576
tmpRetPointers.push(pointer);
577577
}
578-
bjs["swift_js_pop_param_pointer"] = function() {
578+
bjs["swift_js_pop_pointer"] = function() {
579579
return tmpParamPointers.pop();
580580
}
581581
bjs["swift_js_push_array_length"] = function(len) {
582582
tmpRetArrayLengths.push(len | 0);
583583
}
584-
bjs["swift_js_pop_param_array_length"] = function() {
584+
bjs["swift_js_pop_array_length"] = function() {
585585
return tmpParamArrayLengths.pop();
586586
}
587587
bjs["swift_js_struct_cleanup"] = function(cleanupId) {

0 commit comments

Comments
 (0)