Skip to content
This repository was archived by the owner on Jan 18, 2022. It is now read-only.

Commit c8de3e5

Browse files
authored
Bugfix - Code generation with fields called value (#619)
* fix the template * add a test case in schema * regen generated code * changelog
1 parent 93bf24e commit c8de3e5

File tree

13 files changed

+200
-45
lines changed

13 files changed

+200
-45
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
- Improved the method of calculating load and FPS.
1616
- Updated test project Unity version to `2018.2.14f`.
1717

18+
### Fixed
19+
20+
- Fixed a bug where schema components with a field named `value` would generate invalid code.
21+
1822
## `0.1.2` - 2018-11-01
1923

2024
### Added

test-project/Assets/.Schema/improbable/gdk/tests/alternate_schema_syntax.schema

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package improbable.gdk.tests.alternate_schema_syntax;
22

33
type RandomDataType {
4-
4+
int32 value = 1;
55
}
66

77
component Connection

test-project/Assets/Generated/Source/improbable/gdk/tests/ExhaustiveBlittableSingular.cs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public BlittableBool Field1
115115
set
116116
{
117117
MarkDataDirty(0);
118-
field1 = value;
118+
this.field1 = value;
119119
}
120120
}
121121

@@ -127,7 +127,7 @@ public float Field2
127127
set
128128
{
129129
MarkDataDirty(1);
130-
field2 = value;
130+
this.field2 = value;
131131
}
132132
}
133133

@@ -139,7 +139,7 @@ public int Field4
139139
set
140140
{
141141
MarkDataDirty(2);
142-
field4 = value;
142+
this.field4 = value;
143143
}
144144
}
145145

@@ -151,7 +151,7 @@ public long Field5
151151
set
152152
{
153153
MarkDataDirty(3);
154-
field5 = value;
154+
this.field5 = value;
155155
}
156156
}
157157

@@ -163,7 +163,7 @@ public double Field6
163163
set
164164
{
165165
MarkDataDirty(4);
166-
field6 = value;
166+
this.field6 = value;
167167
}
168168
}
169169

@@ -175,7 +175,7 @@ public uint Field8
175175
set
176176
{
177177
MarkDataDirty(5);
178-
field8 = value;
178+
this.field8 = value;
179179
}
180180
}
181181

@@ -187,7 +187,7 @@ public ulong Field9
187187
set
188188
{
189189
MarkDataDirty(6);
190-
field9 = value;
190+
this.field9 = value;
191191
}
192192
}
193193

@@ -199,7 +199,7 @@ public int Field10
199199
set
200200
{
201201
MarkDataDirty(7);
202-
field10 = value;
202+
this.field10 = value;
203203
}
204204
}
205205

@@ -211,7 +211,7 @@ public long Field11
211211
set
212212
{
213213
MarkDataDirty(8);
214-
field11 = value;
214+
this.field11 = value;
215215
}
216216
}
217217

@@ -223,7 +223,7 @@ public uint Field12
223223
set
224224
{
225225
MarkDataDirty(9);
226-
field12 = value;
226+
this.field12 = value;
227227
}
228228
}
229229

@@ -235,7 +235,7 @@ public ulong Field13
235235
set
236236
{
237237
MarkDataDirty(10);
238-
field13 = value;
238+
this.field13 = value;
239239
}
240240
}
241241

@@ -247,7 +247,7 @@ public int Field14
247247
set
248248
{
249249
MarkDataDirty(11);
250-
field14 = value;
250+
this.field14 = value;
251251
}
252252
}
253253

@@ -259,7 +259,7 @@ public long Field15
259259
set
260260
{
261261
MarkDataDirty(12);
262-
field15 = value;
262+
this.field15 = value;
263263
}
264264
}
265265

@@ -271,7 +271,7 @@ public long Field15
271271
set
272272
{
273273
MarkDataDirty(13);
274-
field16 = value;
274+
this.field16 = value;
275275
}
276276
}
277277

@@ -283,7 +283,7 @@ public long Field15
283283
set
284284
{
285285
MarkDataDirty(14);
286-
field17 = value;
286+
this.field17 = value;
287287
}
288288
}
289289

test-project/Assets/Generated/Source/improbable/gdk/tests/ExhaustiveSingular.cs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public BlittableBool Field1
123123
set
124124
{
125125
MarkDataDirty(0);
126-
field1 = value;
126+
this.field1 = value;
127127
}
128128
}
129129

@@ -135,7 +135,7 @@ public float Field2
135135
set
136136
{
137137
MarkDataDirty(1);
138-
field2 = value;
138+
this.field2 = value;
139139
}
140140
}
141141

@@ -159,7 +159,7 @@ public int Field4
159159
set
160160
{
161161
MarkDataDirty(3);
162-
field4 = value;
162+
this.field4 = value;
163163
}
164164
}
165165

@@ -171,7 +171,7 @@ public long Field5
171171
set
172172
{
173173
MarkDataDirty(4);
174-
field5 = value;
174+
this.field5 = value;
175175
}
176176
}
177177

@@ -183,7 +183,7 @@ public double Field6
183183
set
184184
{
185185
MarkDataDirty(5);
186-
field6 = value;
186+
this.field6 = value;
187187
}
188188
}
189189

@@ -207,7 +207,7 @@ public uint Field8
207207
set
208208
{
209209
MarkDataDirty(7);
210-
field8 = value;
210+
this.field8 = value;
211211
}
212212
}
213213

@@ -219,7 +219,7 @@ public ulong Field9
219219
set
220220
{
221221
MarkDataDirty(8);
222-
field9 = value;
222+
this.field9 = value;
223223
}
224224
}
225225

@@ -231,7 +231,7 @@ public int Field10
231231
set
232232
{
233233
MarkDataDirty(9);
234-
field10 = value;
234+
this.field10 = value;
235235
}
236236
}
237237

@@ -243,7 +243,7 @@ public long Field11
243243
set
244244
{
245245
MarkDataDirty(10);
246-
field11 = value;
246+
this.field11 = value;
247247
}
248248
}
249249

@@ -255,7 +255,7 @@ public uint Field12
255255
set
256256
{
257257
MarkDataDirty(11);
258-
field12 = value;
258+
this.field12 = value;
259259
}
260260
}
261261

@@ -267,7 +267,7 @@ public ulong Field13
267267
set
268268
{
269269
MarkDataDirty(12);
270-
field13 = value;
270+
this.field13 = value;
271271
}
272272
}
273273

@@ -279,7 +279,7 @@ public int Field14
279279
set
280280
{
281281
MarkDataDirty(13);
282-
field14 = value;
282+
this.field14 = value;
283283
}
284284
}
285285

@@ -291,7 +291,7 @@ public long Field15
291291
set
292292
{
293293
MarkDataDirty(14);
294-
field15 = value;
294+
this.field15 = value;
295295
}
296296
}
297297

@@ -303,7 +303,7 @@ public long Field15
303303
set
304304
{
305305
MarkDataDirty(15);
306-
field16 = value;
306+
this.field16 = value;
307307
}
308308
}
309309

@@ -315,7 +315,7 @@ public long Field15
315315
set
316316
{
317317
MarkDataDirty(16);
318-
field17 = value;
318+
this.field17 = value;
319319
}
320320
}
321321

test-project/Assets/Generated/Source/improbable/gdk/tests/NestedComponent.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public Snapshot ToComponentSnapshot(global::Unity.Entities.World world)
107107
set
108108
{
109109
MarkDataDirty(0);
110-
nestedType = value;
110+
this.nestedType = value;
111111
}
112112
}
113113

0 commit comments

Comments
 (0)