Skip to content

Commit 4617c37

Browse files
committed
Prefix new variables to avoid clashes with user code
1 parent d7af5a1 commit 4617c37

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

glean_parser/templates/kotlin.jinja2

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,19 +125,19 @@ data class {{ obj.name|Camelize }}{{ suffix }}(
125125
{% endfor %}
126126
): ObjectSerialize {
127127
override fun intoSerializedObject(): String {
128-
var data: MutableList<String> = mutableListOf()
128+
var __obj: MutableList<String> = mutableListOf()
129129
{% for itemname, val in struct.properties.items() %}
130130
this.{{itemname|camelize}}?.let { {{itemname|camelize}} ->
131-
val elem = buildString {
131+
val __elem = buildString {
132132
append("\"{{itemname}}\":")
133133
append({{itemname|camelize}}.intoSerializedObject())
134134
}
135-
data.add(elem)
135+
__obj.add(__elem)
136136
}
137137
{% endfor %}
138138
return buildString {
139139
append("{")
140-
append(data.joinToString(","))
140+
append(__obj.joinToString(","))
141141
append("}")
142142
}
143143
}

glean_parser/templates/swift.jinja2

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ struct {{ obj.name|Camelize }}{{ suffix }}: EventExtras {
8282
{% endfor %}
8383

8484
func intoSerializedObject() -> String {
85-
var data = [String]()
85+
var __obj = [String]()
8686
{% for itemname, val in struct.properties.items() %}
8787
{%- set varname = itemname|camelize|variable_name -%}
8888
{% if val.type == "array" %}
@@ -91,15 +91,15 @@ struct {{ obj.name|Camelize }}{{ suffix }}: EventExtras {
9191
{% else %}
9292
if let {{varname}} = self.{{varname}} {
9393
{% endif %}
94-
var elem = "\"{{itemname}}\":"
95-
elem.append({{varname}}.intoSerializedObject())
96-
data.append(elem)
94+
var __elem = "\"{{itemname}}\":"
95+
__elem.append({{varname}}.intoSerializedObject())
96+
__obj.append(__elem)
9797
}
9898
{% endfor %}
99-
var json = "{"
100-
json.append(data.joined(separator: ","))
101-
json.append("}")
102-
return json
99+
var __json = "{"
100+
__json.append(__obj.joined(separator: ","))
101+
__json.append("}")
102+
return __json
103103
}
104104
}
105105

0 commit comments

Comments
 (0)