Skip to content

Commit 4633fda

Browse files
dcodeIOdcodeIO
committed
Update binary expression inference, see AssemblyScript#35; Update dependencies
1 parent 02dce5a commit 4633fda

26 files changed

+6417
-3132
lines changed

‎dist/asc.js

Lines changed: 2 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/asc.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/assemblyscript.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/assemblyscript.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/game-of-life/assembly/game-of-life.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@ export function step(): void {
2727
load<u8>(yp1 * w + xm1) + load<u8>(yp1 * w + x) + load<u8>(yp1 * w + xp1)
2828
);
2929
if (load<u8>(y * w + x)) {
30-
if (n < 2 || n > 3)
30+
if (n < 2 || n > 3) {
3131
store<u8>(s + y * w + x, 0);
32-
} else if (n == 3)
32+
}
33+
} else if (n == 3) {
3334
store<u8>(s + y * w + x, 1);
35+
}
3436
}
3537
}
3638
}

‎examples/game-of-life/game-of-life.optimized.wat

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -320,31 +320,31 @@
320320
(i32.const 0)
321321
)
322322
)
323-
;;@ assembly/game-of-life.ts:32:13
323+
;;@ assembly/game-of-life.ts:33:13
324324
(if
325-
;;@ assembly/game-of-life.ts:32:17
325+
;;@ assembly/game-of-life.ts:33:17
326326
(i32.eq
327327
(get_local $2)
328-
;;@ assembly/game-of-life.ts:32:22
328+
;;@ assembly/game-of-life.ts:33:22
329329
(i32.const 3)
330330
)
331-
;;@ assembly/game-of-life.ts:33:8
331+
;;@ assembly/game-of-life.ts:34:8
332332
(i32.store8
333-
;;@ assembly/game-of-life.ts:33:18
333+
;;@ assembly/game-of-life.ts:34:18
334334
(i32.add
335335
(i32.add
336336
(get_global $assembly/game-of-life/s)
337-
;;@ assembly/game-of-life.ts:33:22
337+
;;@ assembly/game-of-life.ts:34:22
338338
(i32.mul
339339
(get_local $0)
340-
;;@ assembly/game-of-life.ts:33:26
340+
;;@ assembly/game-of-life.ts:34:26
341341
(get_global $assembly/game-of-life/w)
342342
)
343343
)
344-
;;@ assembly/game-of-life.ts:33:30
344+
;;@ assembly/game-of-life.ts:34:30
345345
(get_local $1)
346346
)
347-
;;@ assembly/game-of-life.ts:33:33
347+
;;@ assembly/game-of-life.ts:34:33
348348
(i32.const 1)
349349
)
350350
)

‎examples/game-of-life/game-of-life.untouched.wat

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -316,15 +316,12 @@
316316
;;@ assembly/game-of-life.ts:30:12
317317
(i32.and
318318
(if (result i32)
319-
(i32.ne
320-
(tee_local $9
321-
(i32.lt_s
322-
(get_local $8)
323-
;;@ assembly/game-of-life.ts:30:16
324-
(i32.const 2)
325-
)
319+
(tee_local $9
320+
(i32.lt_s
321+
(get_local $8)
322+
;;@ assembly/game-of-life.ts:30:16
323+
(i32.const 2)
326324
)
327-
(i32.const 0)
328325
)
329326
(get_local $9)
330327
;;@ assembly/game-of-life.ts:30:21
@@ -356,31 +353,31 @@
356353
(i32.const 0)
357354
)
358355
)
359-
;;@ assembly/game-of-life.ts:32:13
356+
;;@ assembly/game-of-life.ts:33:13
360357
(if
361-
;;@ assembly/game-of-life.ts:32:17
358+
;;@ assembly/game-of-life.ts:33:17
362359
(i32.eq
363360
(get_local $8)
364-
;;@ assembly/game-of-life.ts:32:22
361+
;;@ assembly/game-of-life.ts:33:22
365362
(i32.const 3)
366363
)
367-
;;@ assembly/game-of-life.ts:33:8
364+
;;@ assembly/game-of-life.ts:34:8
368365
(i32.store8
369-
;;@ assembly/game-of-life.ts:33:18
366+
;;@ assembly/game-of-life.ts:34:18
370367
(i32.add
371368
(i32.add
372369
(get_global $assembly/game-of-life/s)
373-
;;@ assembly/game-of-life.ts:33:22
370+
;;@ assembly/game-of-life.ts:34:22
374371
(i32.mul
375372
(get_local $2)
376-
;;@ assembly/game-of-life.ts:33:26
373+
;;@ assembly/game-of-life.ts:34:26
377374
(get_global $assembly/game-of-life/w)
378375
)
379376
)
380-
;;@ assembly/game-of-life.ts:33:30
377+
;;@ assembly/game-of-life.ts:34:30
381378
(get_local $5)
382379
)
383-
;;@ assembly/game-of-life.ts:33:33
380+
;;@ assembly/game-of-life.ts:34:33
384381
(i32.const 1)
385382
)
386383
)

‎examples/pson/assembly/pson.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@ var offset: usize = 0;
4040

4141
export function decode(length: usize): void {
4242
offset = 0;
43-
while (offset < length)
43+
while (offset < length) {
4444
decodeValue();
45+
}
4546
assert(offset == length);
4647
}
4748

@@ -85,8 +86,9 @@ function decodeValue(): void {
8586

8687
case Token.ARRAY:
8788
pson.onArray(size = readVarint32());
88-
while (size--)
89+
while (size--) {
8990
decodeValue();
91+
}
9092
break;
9193

9294
case Token.INTEGER:
@@ -126,8 +128,9 @@ function decodeValue(): void {
126128
break;
127129

128130
default: // small integer?
129-
if (token > Token.MAX)
131+
if (token > <u32>Token.MAX) {
130132
throw new Error("unexpected token");
133+
}
131134
pson.onInteger((token >> 1) ^ -(token & 1));
132135
break;
133136
}

0 commit comments

Comments
 (0)