porffor 0.2.0-fbab1de → 0.2.0-fdf0fc5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (57) hide show
  1. package/CONTRIBUTING.md +256 -0
  2. package/LICENSE +20 -20
  3. package/README.md +147 -89
  4. package/asur/README.md +2 -0
  5. package/asur/index.js +1262 -0
  6. package/byg/index.js +237 -0
  7. package/compiler/2c.js +317 -72
  8. package/compiler/{sections.js → assemble.js} +63 -15
  9. package/compiler/builtins/annexb_string.js +72 -0
  10. package/compiler/builtins/annexb_string.ts +18 -0
  11. package/compiler/builtins/array.ts +149 -0
  12. package/compiler/builtins/base64.ts +76 -0
  13. package/compiler/builtins/boolean.ts +20 -0
  14. package/compiler/builtins/crypto.ts +120 -0
  15. package/compiler/builtins/date.ts +2070 -0
  16. package/compiler/builtins/escape.ts +141 -0
  17. package/compiler/builtins/function.ts +7 -0
  18. package/compiler/builtins/int.ts +147 -0
  19. package/compiler/builtins/number.ts +534 -0
  20. package/compiler/builtins/object.ts +6 -0
  21. package/compiler/builtins/porffor.d.ts +59 -0
  22. package/compiler/builtins/set.ts +5 -0
  23. package/compiler/builtins/string.ts +1080 -0
  24. package/compiler/builtins.js +450 -270
  25. package/compiler/{codeGen.js → codegen.js} +1065 -414
  26. package/compiler/decompile.js +0 -1
  27. package/compiler/embedding.js +22 -22
  28. package/compiler/encoding.js +108 -10
  29. package/compiler/generated_builtins.js +1526 -0
  30. package/compiler/index.js +36 -34
  31. package/compiler/log.js +6 -3
  32. package/compiler/opt.js +50 -36
  33. package/compiler/parse.js +33 -23
  34. package/compiler/precompile.js +128 -0
  35. package/compiler/prefs.js +27 -0
  36. package/compiler/prototype.js +27 -42
  37. package/compiler/types.js +38 -0
  38. package/compiler/wasmSpec.js +28 -8
  39. package/compiler/wrap.js +51 -46
  40. package/package.json +9 -5
  41. package/porf +4 -0
  42. package/rhemyn/compile.js +46 -27
  43. package/rhemyn/parse.js +322 -320
  44. package/rhemyn/test/parse.js +58 -58
  45. package/runner/compare.js +34 -34
  46. package/runner/debug.js +122 -0
  47. package/runner/index.js +91 -11
  48. package/runner/profiler.js +102 -0
  49. package/runner/repl.js +42 -9
  50. package/runner/sizes.js +37 -37
  51. package/compiler/builtins/base64.js +0 -92
  52. package/r.js +0 -9
  53. package/runner/info.js +0 -89
  54. package/runner/profile.js +0 -46
  55. package/runner/results.json +0 -1
  56. package/runner/transform.js +0 -15
  57. package/util/enum.js +0 -20
@@ -7,6 +7,8 @@ import { number, i32x4, enforceOneByte, enforceTwoBytes, enforceFourBytes, enfor
7
7
  import { log } from "./log.js";
8
8
  import parse from "./parse.js";
9
9
  import * as Rhemyn from "../rhemyn/compile.js";
10
+ import Prefs from './prefs.js';
11
+ import { TYPES, TYPE_NAMES } from './types.js';
10
12
 
11
13
  let globals = {};
12
14
  let globalInd = 0;
@@ -23,38 +25,44 @@ const debug = str => {
23
25
  const logChar = n => {
24
26
  code.push(...number(n));
25
27
 
26
- code.push(Opcodes.call);
27
- code.push(...unsignedLEB128(0));
28
+ code.push([ Opcodes.call, 0 ]);
28
29
  };
29
30
 
30
31
  for (let i = 0; i < str.length; i++) {
31
32
  logChar(str.charCodeAt(i));
32
33
  }
33
34
 
34
- logChar('\n'.charCodeAt(0));
35
+ logChar(10); // new line
35
36
 
36
37
  return code;
37
38
  };
38
39
 
39
- const todo = msg => {
40
- class TodoError extends Error {
41
- constructor(message) {
42
- super(message);
43
- this.name = 'TodoError';
44
- }
40
+ class TodoError extends Error {
41
+ constructor(message) {
42
+ super(message);
43
+ this.name = 'TodoError';
45
44
  }
45
+ }
46
+ const todo = (scope, msg, expectsValue = undefined) => {
47
+ switch (Prefs.todoTime ?? 'runtime') {
48
+ case 'compile':
49
+ throw new TodoError(msg);
46
50
 
47
- throw new TodoError(`todo: ${msg}`);
48
-
49
- const code = [];
50
-
51
- code.push(...debug(`todo! ` + msg));
52
- code.push(Opcodes.unreachable);
51
+ case 'runtime':
52
+ return internalThrow(scope, 'TodoError', msg, expectsValue);
53
53
 
54
- return code;
54
+ // return [
55
+ // ...debug(`todo! ${msg}`),
56
+ // [ Opcodes.unreachable ]
57
+ // ];
58
+ }
55
59
  };
56
60
 
57
61
  const isFuncType = type => type === 'FunctionDeclaration' || type === 'FunctionExpression' || type === 'ArrowFunctionExpression';
62
+ const hasFuncWithName = name => {
63
+ const func = funcs.find(x => x.name === name);
64
+ return !!(func || builtinFuncs[name] || importedFuncs[name] || internalConstrs[name]);
65
+ };
58
66
  const generate = (scope, decl, global = false, name = undefined, valueUnused = false) => {
59
67
  switch (decl.type) {
60
68
  case 'BinaryExpression':
@@ -104,7 +112,7 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
104
112
  return generateUnary(scope, decl);
105
113
 
106
114
  case 'UpdateExpression':
107
- return generateUpdate(scope, decl);
115
+ return generateUpdate(scope, decl, global, name, valueUnused);
108
116
 
109
117
  case 'IfStatement':
110
118
  return generateIf(scope, decl);
@@ -115,6 +123,9 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
115
123
  case 'WhileStatement':
116
124
  return generateWhile(scope, decl);
117
125
 
126
+ case 'DoWhileStatement':
127
+ return generateDoWhile(scope, decl);
128
+
118
129
  case 'ForOfStatement':
119
130
  return generateForOf(scope, decl);
120
131
 
@@ -124,6 +135,9 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
124
135
  case 'ContinueStatement':
125
136
  return generateContinue(scope, decl);
126
137
 
138
+ case 'LabeledStatement':
139
+ return generateLabel(scope, decl);
140
+
127
141
  case 'EmptyStatement':
128
142
  return generateEmpty(scope, decl);
129
143
 
@@ -137,7 +151,7 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
137
151
  return generateTry(scope, decl);
138
152
 
139
153
  case 'DebuggerStatement':
140
- // todo: add fancy terminal debugger?
154
+ // todo: hook into terminal debugger
141
155
  return [];
142
156
 
143
157
  case 'ArrayExpression':
@@ -151,16 +165,22 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
151
165
  const funcsBefore = funcs.length;
152
166
  generate(scope, decl.declaration);
153
167
 
154
- if (funcsBefore === funcs.length) throw new Error('no new func added in export');
168
+ if (funcsBefore !== funcs.length) {
169
+ // new func added
170
+ const newFunc = funcs[funcs.length - 1];
171
+ newFunc.export = true;
172
+ }
173
+
174
+ // if (funcsBefore === funcs.length) throw new Error('no new func added in export');
155
175
 
156
- const newFunc = funcs[funcs.length - 1];
157
- newFunc.export = true;
176
+ // const newFunc = funcs[funcs.length - 1];
177
+ // newFunc.export = true;
158
178
 
159
179
  return [];
160
180
 
161
181
  case 'TaggedTemplateExpression': {
162
182
  const funcs = {
163
- asm: str => {
183
+ __Porffor_wasm: str => {
164
184
  let out = [];
165
185
 
166
186
  for (const line of str.split('\n')) {
@@ -168,8 +188,8 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
168
188
  if (asm[0] === '') continue; // blank
169
189
 
170
190
  if (asm[0] === 'local') {
171
- const [ name, idx, type ] = asm.slice(1);
172
- scope.locals[name] = { idx: parseInt(idx), type: Valtype[type] };
191
+ const [ name, type ] = asm.slice(1);
192
+ scope.locals[name] = { idx: scope.localInd++, type: Valtype[type] };
173
193
  continue;
174
194
  }
175
195
 
@@ -179,52 +199,74 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
179
199
  }
180
200
 
181
201
  if (asm[0] === 'memory') {
182
- allocPage('asm instrinsic');
202
+ allocPage(scope, 'asm instrinsic');
183
203
  // todo: add to store/load offset insts
184
204
  continue;
185
205
  }
186
206
 
187
207
  let inst = Opcodes[asm[0].replace('.', '_')];
188
- if (!inst) throw new Error(`inline asm: inst ${asm[0]} not found`);
208
+ if (inst == null) throw new Error(`inline asm: inst ${asm[0]} not found`);
189
209
 
190
210
  if (!Array.isArray(inst)) inst = [ inst ];
191
- const immediates = asm.slice(1).map(x => parseInt(x));
211
+ const immediates = asm.slice(1).map(x => {
212
+ const int = parseInt(x);
213
+ if (Number.isNaN(int)) return scope.locals[x]?.idx;
214
+ return int;
215
+ });
192
216
 
193
- out.push([ ...inst, ...immediates ]);
217
+ out.push([ ...inst, ...immediates.flatMap(x => signedLEB128(x)) ]);
194
218
  }
195
219
 
196
220
  return out;
197
221
  },
198
222
 
199
- __internal_print_type: str => {
200
- const type = getType(scope, str) - TYPES.number;
223
+ __Porffor_bs: str => [
224
+ ...makeString(scope, str, global, name, true),
201
225
 
202
- return [
203
- ...number(type),
204
- [ Opcodes.call, importedFuncs.print ],
226
+ ...(name ? setType(scope, name, TYPES.bytestring) : [
227
+ ...number(TYPES.bytestring, Valtype.i32),
228
+ ...setLastType(scope)
229
+ ])
230
+ ],
231
+ __Porffor_s: str => [
232
+ ...makeString(scope, str, global, name, false),
205
233
 
206
- // newline
207
- ...number(10),
208
- [ Opcodes.call, importedFuncs.printChar ]
209
- ];
210
- }
211
- }
234
+ ...(name ? setType(scope, name, TYPES.string) : [
235
+ ...number(TYPES.string, Valtype.i32),
236
+ ...setLastType(scope)
237
+ ])
238
+ ],
239
+ };
212
240
 
213
- const name = decl.tag.name;
241
+ const func = decl.tag.name;
214
242
  // hack for inline asm
215
- if (!funcs[name]) return todo('tagged template expressions not implemented');
243
+ if (!funcs[func]) return todo(scope, 'tagged template expressions not implemented', true);
244
+
245
+ const { quasis, expressions } = decl.quasi;
246
+ let str = quasis[0].value.raw;
216
247
 
217
- const str = decl.quasi.quasis[0].value.raw;
218
- return funcs[name](str);
248
+ for (let i = 0; i < expressions.length; i++) {
249
+ const e = expressions[i];
250
+ if (!e.name) {
251
+ if (e.type === 'BinaryExpression' && e.operator === '+' && e.left.type === 'Identifier' && e.right.type === 'Literal') {
252
+ str += lookupName(scope, e.left.name)[0].idx + e.right.value;
253
+ } else todo(scope, 'unsupported expression in intrinsic');
254
+ } else str += lookupName(scope, e.name)[0].idx;
255
+
256
+ str += quasis[i + 1].value.raw;
257
+ }
258
+
259
+ return funcs[func](str);
219
260
  }
220
261
 
221
262
  default:
222
- if (decl.type.startsWith('TS')) {
223
- // ignore typescript nodes
263
+ // ignore typescript nodes
264
+ if (decl.type.startsWith('TS') ||
265
+ decl.type === 'ImportDeclaration' && decl.importKind === 'type') {
224
266
  return [];
225
267
  }
226
268
 
227
- return todo(`no generation for ${decl.type}!`);
269
+ return todo(scope, `no generation for ${decl.type}!`);
228
270
  }
229
271
  };
230
272
 
@@ -252,7 +294,7 @@ const lookupName = (scope, _name) => {
252
294
  return [ undefined, undefined ];
253
295
  };
254
296
 
255
- const internalThrow = (scope, constructor, message, expectsValue = false) => [
297
+ const internalThrow = (scope, constructor, message, expectsValue = Prefs.alwaysValueInternalThrows) => [
256
298
  ...generateThrow(scope, {
257
299
  argument: {
258
300
  type: 'NewExpression',
@@ -274,25 +316,33 @@ const generateIdent = (scope, decl) => {
274
316
  const name = mapName(rawName);
275
317
  let local = scope.locals[rawName];
276
318
 
277
- if (builtinVars[name]) {
319
+ if (Object.hasOwn(builtinVars, name)) {
278
320
  if (builtinVars[name].floatOnly && valtype[0] === 'i') throw new Error(`Cannot use ${unhackName(name)} with integer valtype`);
279
- return builtinVars[name];
321
+
322
+ let wasm = builtinVars[name];
323
+ if (typeof wasm === 'function') wasm = asmFuncToAsm(wasm, { name });
324
+ return wasm.slice();
325
+ }
326
+
327
+ if (Object.hasOwn(builtinFuncs, name) || Object.hasOwn(internalConstrs, name)) {
328
+ // todo: return an actual something
329
+ return number(1);
280
330
  }
281
331
 
282
- if (builtinFuncs[name] || internalConstrs[name]) {
332
+ if (isExistingProtoFunc(name)) {
283
333
  // todo: return an actual something
284
334
  return number(1);
285
335
  }
286
336
 
287
- if (local === undefined) {
337
+ if (local?.idx === undefined) {
288
338
  // no local var with name
289
- if (importedFuncs.hasOwnProperty(name)) return number(importedFuncs[name]);
290
- if (funcIndex[name] !== undefined) return number(funcIndex[name]);
339
+ if (Object.hasOwn(importedFuncs, name)) return number(importedFuncs[name]);
340
+ if (Object.hasOwn(funcIndex, name)) return number(funcIndex[name]);
291
341
 
292
- if (globals[name] !== undefined) return [ [ Opcodes.global_get, globals[name].idx ] ];
342
+ if (Object.hasOwn(globals, name)) return [ [ Opcodes.global_get, globals[name].idx ] ];
293
343
  }
294
344
 
295
- if (local === undefined && rawName.startsWith('__')) {
345
+ if (local?.idx === undefined && rawName.startsWith('__')) {
296
346
  // return undefined if unknown key in already known var
297
347
  let parent = rawName.slice(2).split('_').slice(0, -1).join('_');
298
348
  if (parent.includes('_')) parent = '__' + parent;
@@ -301,7 +351,7 @@ const generateIdent = (scope, decl) => {
301
351
  if (!parentLookup[1]) return number(UNDEFINED);
302
352
  }
303
353
 
304
- if (local === undefined) return internalThrow(scope, 'ReferenceError', `${unhackName(name)} is not defined`, true);
354
+ if (local?.idx === undefined) return internalThrow(scope, 'ReferenceError', `${unhackName(name)} is not defined`, true);
305
355
 
306
356
  return [ [ Opcodes.local_get, local.idx ] ];
307
357
  };
@@ -314,14 +364,18 @@ const generateReturn = (scope, decl) => {
314
364
  // just bare "return"
315
365
  return [
316
366
  ...number(UNDEFINED), // "undefined" if func returns
317
- ...number(TYPES.undefined, Valtype.i32), // type undefined
367
+ ...(scope.returnType != null ? [] : [
368
+ ...number(TYPES.undefined, Valtype.i32) // type undefined
369
+ ]),
318
370
  [ Opcodes.return ]
319
371
  ];
320
372
  }
321
373
 
322
374
  return [
323
375
  ...generate(scope, decl.argument),
324
- ...getNodeType(scope, decl.argument),
376
+ ...(scope.returnType != null ? [] : [
377
+ ...getNodeType(scope, decl.argument)
378
+ ]),
325
379
  [ Opcodes.return ]
326
380
  ];
327
381
  };
@@ -335,7 +389,8 @@ const localTmp = (scope, name, type = valtypeBinary) => {
335
389
  return idx;
336
390
  };
337
391
 
338
- const isIntOp = op => op && (op[0] >= 0xb7 && op[0] <= 0xba);
392
+ const isIntOp = op => op && ((op[0] >= 0x45 && op[0] <= 0x4f) || (op[0] >= 0x67 && op[0] <= 0x78) || op[0] === 0x41);
393
+ const isFloatToIntOp = op => op && (op[0] >= 0xb7 && op[0] <= 0xba);
339
394
 
340
395
  const performLogicOp = (scope, op, left, right, leftType, rightType) => {
341
396
  const checks = {
@@ -344,7 +399,7 @@ const performLogicOp = (scope, op, left, right, leftType, rightType) => {
344
399
  '??': nullish
345
400
  };
346
401
 
347
- if (!checks[op]) return todo(`logic operator ${op} not implemented yet`);
402
+ if (!checks[op]) return todo(scope, `logic operator ${op} not implemented yet`, true);
348
403
 
349
404
  // generic structure for {a} OP {b}
350
405
  // -->
@@ -352,8 +407,8 @@ const performLogicOp = (scope, op, left, right, leftType, rightType) => {
352
407
 
353
408
  // if we can, use int tmp and convert at the end to help prevent unneeded conversions
354
409
  // (like if we are in an if condition - very common)
355
- const leftIsInt = isIntOp(left[left.length - 1]);
356
- const rightIsInt = isIntOp(right[right.length - 1]);
410
+ const leftIsInt = isFloatToIntOp(left[left.length - 1]);
411
+ const rightIsInt = isFloatToIntOp(right[right.length - 1]);
357
412
 
358
413
  const canInt = leftIsInt && rightIsInt;
359
414
 
@@ -370,12 +425,12 @@ const performLogicOp = (scope, op, left, right, leftType, rightType) => {
370
425
  ...right,
371
426
  // note type
372
427
  ...rightType,
373
- setLastType(scope),
428
+ ...setLastType(scope),
374
429
  [ Opcodes.else ],
375
430
  [ Opcodes.local_get, localTmp(scope, 'logictmpi', Valtype.i32) ],
376
431
  // note type
377
432
  ...leftType,
378
- setLastType(scope),
433
+ ...setLastType(scope),
379
434
  [ Opcodes.end ],
380
435
  Opcodes.i32_from
381
436
  ];
@@ -389,17 +444,17 @@ const performLogicOp = (scope, op, left, right, leftType, rightType) => {
389
444
  ...right,
390
445
  // note type
391
446
  ...rightType,
392
- setLastType(scope),
447
+ ...setLastType(scope),
393
448
  [ Opcodes.else ],
394
449
  [ Opcodes.local_get, localTmp(scope, 'logictmp') ],
395
450
  // note type
396
451
  ...leftType,
397
- setLastType(scope),
452
+ ...setLastType(scope),
398
453
  [ Opcodes.end ]
399
454
  ];
400
455
  };
401
456
 
402
- const concatStrings = (scope, left, right, global, name, assign) => {
457
+ const concatStrings = (scope, left, right, global, name, assign = false, bytestrings = false) => {
403
458
  // todo: this should be rewritten into a built-in/func: String.prototype.concat
404
459
  // todo: convert left and right to strings if not
405
460
  // todo: optimize by looking up names in arrays and using that if exists?
@@ -409,11 +464,8 @@ const concatStrings = (scope, left, right, global, name, assign) => {
409
464
  const rightLength = localTmp(scope, 'concat_right_length', Valtype.i32);
410
465
  const leftLength = localTmp(scope, 'concat_left_length', Valtype.i32);
411
466
 
412
- const aotWFA = process.argv.includes('-aot-well-formed-string-approximation');
413
- if (aotWFA) addVarMeta(name, { wellFormed: undefined });
414
-
415
- if (assign) {
416
- const pointer = arrays.get(name ?? '$undeclared');
467
+ if (assign && Prefs.aotPointerOpt) {
468
+ const pointer = scope.arrays?.get(name ?? '$undeclared');
417
469
 
418
470
  return [
419
471
  // setup right
@@ -438,11 +490,11 @@ const concatStrings = (scope, left, right, global, name, assign) => {
438
490
  [ Opcodes.i32_store, Math.log2(ValtypeSize.i32) - 1, ...unsignedLEB128(pointer) ],
439
491
 
440
492
  // copy right
441
- // dst = out pointer + length size + current length * i16 size
493
+ // dst = out pointer + length size + current length * sizeof valtype
442
494
  ...number(pointer + ValtypeSize.i32, Valtype.i32),
443
495
 
444
496
  [ Opcodes.local_get, leftLength ],
445
- ...number(ValtypeSize.i16, Valtype.i32),
497
+ ...number(bytestrings ? ValtypeSize.i8 : ValtypeSize.i16, Valtype.i32),
446
498
  [ Opcodes.i32_mul ],
447
499
  [ Opcodes.i32_add ],
448
500
 
@@ -451,9 +503,9 @@ const concatStrings = (scope, left, right, global, name, assign) => {
451
503
  ...number(ValtypeSize.i32, Valtype.i32),
452
504
  [ Opcodes.i32_add ],
453
505
 
454
- // size = right length * i16 size
506
+ // size = right length * sizeof valtype
455
507
  [ Opcodes.local_get, rightLength ],
456
- ...number(ValtypeSize.i16, Valtype.i32),
508
+ ...number(bytestrings ? ValtypeSize.i8 : ValtypeSize.i16, Valtype.i32),
457
509
  [ Opcodes.i32_mul ],
458
510
 
459
511
  [ ...Opcodes.memory_copy, 0x00, 0x00 ],
@@ -511,11 +563,11 @@ const concatStrings = (scope, left, right, global, name, assign) => {
511
563
  [ ...Opcodes.memory_copy, 0x00, 0x00 ],
512
564
 
513
565
  // copy right
514
- // dst = out pointer + length size + left length * i16 size
566
+ // dst = out pointer + length size + left length * sizeof valtype
515
567
  ...number(pointer + ValtypeSize.i32, Valtype.i32),
516
568
 
517
569
  [ Opcodes.local_get, leftLength ],
518
- ...number(ValtypeSize.i16, Valtype.i32),
570
+ ...number(bytestrings ? ValtypeSize.i8 : ValtypeSize.i16, Valtype.i32),
519
571
  [ Opcodes.i32_mul ],
520
572
  [ Opcodes.i32_add ],
521
573
 
@@ -524,9 +576,9 @@ const concatStrings = (scope, left, right, global, name, assign) => {
524
576
  ...number(ValtypeSize.i32, Valtype.i32),
525
577
  [ Opcodes.i32_add ],
526
578
 
527
- // size = right length * i16 size
579
+ // size = right length * sizeof valtype
528
580
  [ Opcodes.local_get, rightLength ],
529
- ...number(ValtypeSize.i16, Valtype.i32),
581
+ ...number(bytestrings ? ValtypeSize.i8 : ValtypeSize.i16, Valtype.i32),
530
582
  [ Opcodes.i32_mul ],
531
583
 
532
584
  [ ...Opcodes.memory_copy, 0x00, 0x00 ],
@@ -536,7 +588,7 @@ const concatStrings = (scope, left, right, global, name, assign) => {
536
588
  ];
537
589
  };
538
590
 
539
- const compareStrings = (scope, left, right) => {
591
+ const compareStrings = (scope, left, right, bytestrings = false) => {
540
592
  // todo: this should be rewritten into a func
541
593
  // todo: convert left and right to strings if not
542
594
  // todo: optimize by looking up names in arrays and using that if exists?
@@ -545,7 +597,6 @@ const compareStrings = (scope, left, right) => {
545
597
  const leftPointer = localTmp(scope, 'compare_left_pointer', Valtype.i32);
546
598
  const leftLength = localTmp(scope, 'compare_left_length', Valtype.i32);
547
599
  const rightPointer = localTmp(scope, 'compare_right_pointer', Valtype.i32);
548
- const rightLength = localTmp(scope, 'compare_right_length', Valtype.i32);
549
600
 
550
601
  const index = localTmp(scope, 'compare_index', Valtype.i32);
551
602
  const indexEnd = localTmp(scope, 'compare_index_end', Valtype.i32);
@@ -573,7 +624,6 @@ const compareStrings = (scope, left, right) => {
573
624
 
574
625
  [ Opcodes.local_get, rightPointer ],
575
626
  [ Opcodes.i32_load, Math.log2(ValtypeSize[valtype]) - 1, ...unsignedLEB128(0) ],
576
- [ Opcodes.local_tee, rightLength ],
577
627
 
578
628
  // fast path: check leftLength != rightLength
579
629
  [ Opcodes.i32_ne ],
@@ -588,11 +638,13 @@ const compareStrings = (scope, left, right) => {
588
638
  ...number(0, Valtype.i32),
589
639
  [ Opcodes.local_set, index ],
590
640
 
591
- // setup index end as length * sizeof i16 (2)
641
+ // setup index end as length * sizeof valtype (1 for bytestring, 2 for string)
592
642
  // we do this instead of having to do mul/div each iter for perf™
593
643
  [ Opcodes.local_get, leftLength ],
594
- ...number(ValtypeSize.i16, Valtype.i32),
595
- [ Opcodes.i32_mul ],
644
+ ...(bytestrings ? [] : [
645
+ ...number(ValtypeSize.i16, Valtype.i32),
646
+ [ Opcodes.i32_mul ],
647
+ ]),
596
648
  [ Opcodes.local_set, indexEnd ],
597
649
 
598
650
  // iterate over each char and check if eq
@@ -602,13 +654,17 @@ const compareStrings = (scope, left, right) => {
602
654
  [ Opcodes.local_get, index ],
603
655
  [ Opcodes.local_get, leftPointer ],
604
656
  [ Opcodes.i32_add ],
605
- [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ...unsignedLEB128(ValtypeSize.i32) ],
657
+ bytestrings ?
658
+ [ Opcodes.i32_load8_u, 0, ValtypeSize.i32 ] :
659
+ [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 ],
606
660
 
607
661
  // fetch right
608
662
  [ Opcodes.local_get, index ],
609
663
  [ Opcodes.local_get, rightPointer ],
610
664
  [ Opcodes.i32_add ],
611
- [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ...unsignedLEB128(ValtypeSize.i32) ],
665
+ bytestrings ?
666
+ [ Opcodes.i32_load8_u, 0, ValtypeSize.i32 ] :
667
+ [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 ],
612
668
 
613
669
  // not equal, "return" false
614
670
  [ Opcodes.i32_ne ],
@@ -617,13 +673,13 @@ const compareStrings = (scope, left, right) => {
617
673
  [ Opcodes.br, 2 ],
618
674
  [ Opcodes.end ],
619
675
 
620
- // index += sizeof i16 (2)
676
+ // index += sizeof valtype (1 for bytestring, 2 for string)
621
677
  [ Opcodes.local_get, index ],
622
- ...number(ValtypeSize.i16, Valtype.i32),
678
+ ...number(bytestrings ? ValtypeSize.i8 : ValtypeSize.i16, Valtype.i32),
623
679
  [ Opcodes.i32_add ],
624
680
  [ Opcodes.local_tee, index ],
625
681
 
626
- // if index != index end (length * sizeof 16), loop
682
+ // if index != index end (length * sizeof valtype), loop
627
683
  [ Opcodes.local_get, indexEnd ],
628
684
  [ Opcodes.i32_ne ],
629
685
  [ Opcodes.br_if, 0 ],
@@ -644,16 +700,18 @@ const compareStrings = (scope, left, right) => {
644
700
  };
645
701
 
646
702
  const truthy = (scope, wasm, type, intIn = false, intOut = false) => {
647
- if (isIntOp(wasm[wasm.length - 1])) return [
703
+ if (isFloatToIntOp(wasm[wasm.length - 1])) return [
648
704
  ...wasm,
649
705
  ...(!intIn && intOut ? [ Opcodes.i32_to_u ] : [])
650
706
  ];
707
+ // if (isIntOp(wasm[wasm.length - 1])) return [ ...wasm ];
651
708
 
652
- const tmp = localTmp(scope, `$logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
709
+ const useTmp = knownType(scope, type) == null;
710
+ const tmp = useTmp && localTmp(scope, `#logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
653
711
 
654
712
  const def = [
655
713
  // if value != 0
656
- [ Opcodes.local_get, tmp ],
714
+ ...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
657
715
 
658
716
  // ...(intIn ? [ [ Opcodes.i32_eqz ] ] : [ ...Opcodes.eqz ]),
659
717
  ...(!intOut || (intIn && intOut) ? [] : [ Opcodes.i32_to_u ]),
@@ -665,16 +723,16 @@ const truthy = (scope, wasm, type, intIn = false, intOut = false) => {
665
723
 
666
724
  return [
667
725
  ...wasm,
668
- [ Opcodes.local_set, tmp ],
726
+ ...(!useTmp ? [] : [ [ Opcodes.local_set, tmp ] ]),
669
727
 
670
728
  ...typeSwitch(scope, type, {
671
729
  // [TYPES.number]: def,
672
- [TYPES._array]: [
730
+ [TYPES.array]: [
673
731
  // arrays are always truthy
674
732
  ...number(1, intOut ? Valtype.i32 : valtypeBinary)
675
733
  ],
676
734
  [TYPES.string]: [
677
- [ Opcodes.local_get, tmp ],
735
+ ...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
678
736
  ...(intIn ? [] : [ Opcodes.i32_to_u ]),
679
737
 
680
738
  // get length
@@ -685,8 +743,8 @@ const truthy = (scope, wasm, type, intIn = false, intOut = false) => {
685
743
  [ Opcodes.i32_eqz ], */
686
744
  ...(intOut ? [] : [ Opcodes.i32_from_u ])
687
745
  ],
688
- [TYPES._bytestring]: [ // duplicate of string
689
- [ Opcodes.local_get, tmp ],
746
+ [TYPES.bytestring]: [ // duplicate of string
747
+ ...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
690
748
  ...(intIn ? [] : [ Opcodes.i32_to_u ]),
691
749
 
692
750
  // get length
@@ -700,18 +758,20 @@ const truthy = (scope, wasm, type, intIn = false, intOut = false) => {
700
758
  };
701
759
 
702
760
  const falsy = (scope, wasm, type, intIn = false, intOut = false) => {
703
- const tmp = localTmp(scope, `$logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
761
+ const useTmp = knownType(scope, type) == null;
762
+ const tmp = useTmp && localTmp(scope, `#logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
763
+
704
764
  return [
705
765
  ...wasm,
706
- [ Opcodes.local_set, tmp ],
766
+ ...(!useTmp ? [] : [ [ Opcodes.local_set, tmp ] ]),
707
767
 
708
768
  ...typeSwitch(scope, type, {
709
- [TYPES._array]: [
769
+ [TYPES.array]: [
710
770
  // arrays are always truthy
711
771
  ...number(0, intOut ? Valtype.i32 : valtypeBinary)
712
772
  ],
713
773
  [TYPES.string]: [
714
- [ Opcodes.local_get, tmp ],
774
+ ...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
715
775
  ...(intIn ? [] : [ Opcodes.i32_to_u ]),
716
776
 
717
777
  // get length
@@ -721,8 +781,8 @@ const falsy = (scope, wasm, type, intIn = false, intOut = false) => {
721
781
  [ Opcodes.i32_eqz ],
722
782
  ...(intOut ? [] : [ Opcodes.i32_from_u ])
723
783
  ],
724
- [TYPES._bytestring]: [ // duplicate of string
725
- [ Opcodes.local_get, tmp ],
784
+ [TYPES.bytestring]: [ // duplicate of string
785
+ ...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
726
786
  ...(intIn ? [] : [ Opcodes.i32_to_u ]),
727
787
 
728
788
  // get length
@@ -734,7 +794,7 @@ const falsy = (scope, wasm, type, intIn = false, intOut = false) => {
734
794
  ],
735
795
  default: [
736
796
  // if value == 0
737
- [ Opcodes.local_get, tmp ],
797
+ ...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
738
798
 
739
799
  ...(intIn ? [ [ Opcodes.i32_eqz ] ] : [ ...Opcodes.eqz ]),
740
800
  ...(intOut ? [] : [ Opcodes.i32_from_u ])
@@ -744,10 +804,12 @@ const falsy = (scope, wasm, type, intIn = false, intOut = false) => {
744
804
  };
745
805
 
746
806
  const nullish = (scope, wasm, type, intIn = false, intOut = false) => {
747
- const tmp = localTmp(scope, `$logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
807
+ const useTmp = knownType(scope, type) == null;
808
+ const tmp = useTmp && localTmp(scope, `#logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
809
+
748
810
  return [
749
811
  ...wasm,
750
- [ Opcodes.local_set, tmp ],
812
+ ...(!useTmp ? [] : [ [ Opcodes.local_set, tmp ] ]),
751
813
 
752
814
  ...typeSwitch(scope, type, {
753
815
  [TYPES.undefined]: [
@@ -756,7 +818,7 @@ const nullish = (scope, wasm, type, intIn = false, intOut = false) => {
756
818
  ],
757
819
  [TYPES.object]: [
758
820
  // object, null if == 0
759
- [ Opcodes.local_get, tmp ],
821
+ ...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
760
822
 
761
823
  ...(intIn ? [ [ Opcodes.i32_eqz ] ] : [ ...Opcodes.eqz ]),
762
824
  ...(intOut ? [] : [ Opcodes.i32_from_u ])
@@ -785,11 +847,14 @@ const performOp = (scope, op, left, right, leftType, rightType, _global = false,
785
847
  return performLogicOp(scope, op, left, right, leftType, rightType);
786
848
  }
787
849
 
850
+ const knownLeft = knownType(scope, leftType);
851
+ const knownRight = knownType(scope, rightType);
852
+
788
853
  const eqOp = ['==', '===', '!=', '!==', '>', '>=', '<', '<='].includes(op);
789
854
  const strictOp = op === '===' || op === '!==';
790
855
 
791
856
  const startOut = [], endOut = [];
792
- const finalise = out => startOut.concat(out, endOut);
857
+ const finalize = out => startOut.concat(out, endOut);
793
858
 
794
859
  // if strict (in)equal check types match
795
860
  if (strictOp) {
@@ -834,31 +899,59 @@ const performOp = (scope, op, left, right, leftType, rightType, _global = false,
834
899
  // todo: if equality op and an operand is undefined, return false
835
900
  // todo: niche null hell with 0
836
901
 
837
- // if (leftType === TYPES.string || rightType === TYPES.string) {
838
- // if (op === '+') {
839
- // // string concat (a + b)
840
- // return finalise(concatStrings(scope, left, right, _global, _name, assign));
841
- // }
842
-
843
- // // not an equality op, NaN
844
- // if (!eqOp) return finalise(number(NaN));
845
-
846
- // // else leave bool ops
847
- // // todo: convert string to number if string and number/bool
848
- // // todo: string (>|>=|<|<=) string
849
-
850
- // // string comparison
851
- // if (op === '===' || op === '==') {
852
- // return finalise(compareStrings(scope, left, right));
853
- // }
854
-
855
- // if (op === '!==' || op === '!=') {
856
- // return finalise([
857
- // ...compareStrings(scope, left, right),
858
- // [ Opcodes.i32_eqz ]
859
- // ]);
860
- // }
861
- // }
902
+ if (knownLeft === TYPES.string || knownRight === TYPES.string) {
903
+ if (op === '+') {
904
+ // todo: this should be dynamic too but for now only static
905
+ // string concat (a + b)
906
+ return concatStrings(scope, left, right, _global, _name, assign, false);
907
+ }
908
+
909
+ // not an equality op, NaN
910
+ if (!eqOp) return number(NaN);
911
+
912
+ // else leave bool ops
913
+ // todo: convert string to number if string and number/bool
914
+ // todo: string (>|>=|<|<=) string
915
+
916
+ // string comparison
917
+ if (op === '===' || op === '==') {
918
+ return compareStrings(scope, left, right);
919
+ }
920
+
921
+ if (op === '!==' || op === '!=') {
922
+ return [
923
+ ...compareStrings(scope, left, right),
924
+ [ Opcodes.i32_eqz ]
925
+ ];
926
+ }
927
+ }
928
+
929
+ if (knownLeft === TYPES.bytestring || knownRight === TYPES.bytestring) {
930
+ if (op === '+') {
931
+ // todo: this should be dynamic too but for now only static
932
+ // string concat (a + b)
933
+ return concatStrings(scope, left, right, _global, _name, assign, true);
934
+ }
935
+
936
+ // not an equality op, NaN
937
+ if (!eqOp) return number(NaN);
938
+
939
+ // else leave bool ops
940
+ // todo: convert string to number if string and number/bool
941
+ // todo: string (>|>=|<|<=) string
942
+
943
+ // string comparison
944
+ if (op === '===' || op === '==') {
945
+ return compareStrings(scope, left, right, true);
946
+ }
947
+
948
+ if (op === '!==' || op === '!=') {
949
+ return [
950
+ ...compareStrings(scope, left, right, true),
951
+ [ Opcodes.i32_eqz ]
952
+ ];
953
+ }
954
+ }
862
955
 
863
956
  let ops = operatorOpcode[valtype][op];
864
957
 
@@ -868,33 +961,69 @@ const performOp = (scope, op, left, right, leftType, rightType, _global = false,
868
961
  includeBuiltin(scope, builtinName);
869
962
  const idx = funcIndex[builtinName];
870
963
 
871
- return finalise([
964
+ return finalize([
872
965
  ...left,
873
966
  ...right,
874
967
  [ Opcodes.call, idx ]
875
968
  ]);
876
969
  }
877
970
 
878
- if (!ops) return todo(`operator ${op} not implemented yet`); // throw new Error(`unknown operator ${op}`);
971
+ if (!ops) return todo(scope, `operator ${op} not implemented yet`, true);
879
972
 
880
973
  if (!Array.isArray(ops)) ops = [ ops ];
881
974
  ops = [ ops ];
882
975
 
883
976
  let tmpLeft, tmpRight;
884
977
  // if equal op, check if strings for compareStrings
885
- if (op === '===' || op === '==' || op === '!==' || op === '!=') (() => {
886
- const knownLeft = knownType(scope, leftType);
887
- const knownRight = knownType(scope, rightType);
888
-
889
- // todo: intelligent partial skip later
890
- // if neither known are string, stop this madness
891
- if ((knownLeft != null && knownLeft !== TYPES.string) && (knownRight != null && knownRight !== TYPES.string)) {
892
- return;
893
- }
978
+ // todo: intelligent partial skip later
979
+ // if neither known are string, stop this madness
980
+ // we already do known checks earlier, so don't need to recheck
894
981
 
982
+ if ((op === '===' || op === '==' || op === '!==' || op === '!=') && (knownLeft == null && knownRight == null)) {
895
983
  tmpLeft = localTmp(scope, '__tmpop_left');
896
984
  tmpRight = localTmp(scope, '__tmpop_right');
897
985
 
986
+ // returns false for one string, one not - but more ops/slower
987
+ // ops.unshift(...stringOnly([
988
+ // // if left is string
989
+ // ...leftType,
990
+ // ...number(TYPES.string, Valtype.i32),
991
+ // [ Opcodes.i32_eq ],
992
+
993
+ // // if right is string
994
+ // ...rightType,
995
+ // ...number(TYPES.string, Valtype.i32),
996
+ // [ Opcodes.i32_eq ],
997
+
998
+ // // if either are true
999
+ // [ Opcodes.i32_or ],
1000
+ // [ Opcodes.if, Blocktype.void ],
1001
+
1002
+ // // todo: convert non-strings to strings, for now fail immediately if one is not
1003
+ // // if left is not string
1004
+ // ...leftType,
1005
+ // ...number(TYPES.string, Valtype.i32),
1006
+ // [ Opcodes.i32_ne ],
1007
+
1008
+ // // if right is not string
1009
+ // ...rightType,
1010
+ // ...number(TYPES.string, Valtype.i32),
1011
+ // [ Opcodes.i32_ne ],
1012
+
1013
+ // // if either are true
1014
+ // [ Opcodes.i32_or ],
1015
+ // [ Opcodes.if, Blocktype.void ],
1016
+ // ...number(0, Valtype.i32),
1017
+ // [ Opcodes.br, 2 ],
1018
+ // [ Opcodes.end ],
1019
+
1020
+ // ...compareStrings(scope, [ [ Opcodes.local_get, tmpLeft ] ], [ [ Opcodes.local_get, tmpRight ] ]),
1021
+ // ...(op === '!==' || op === '!=' ? [ [ Opcodes.i32_eqz ] ] : []),
1022
+ // [ Opcodes.br, 1 ],
1023
+ // [ Opcodes.end ],
1024
+ // ]));
1025
+
1026
+ // does not handle one string, one not (such cases go past)
898
1027
  ops.unshift(...stringOnly([
899
1028
  // if left is string
900
1029
  ...leftType,
@@ -906,30 +1035,28 @@ const performOp = (scope, op, left, right, leftType, rightType, _global = false,
906
1035
  ...number(TYPES.string, Valtype.i32),
907
1036
  [ Opcodes.i32_eq ],
908
1037
 
909
- // if either are true
910
- [ Opcodes.i32_or ],
1038
+ // if both are true
1039
+ [ Opcodes.i32_and ],
911
1040
  [ Opcodes.if, Blocktype.void ],
1041
+ ...compareStrings(scope, [ [ Opcodes.local_get, tmpLeft ] ], [ [ Opcodes.local_get, tmpRight ] ]),
1042
+ ...(op === '!==' || op === '!=' ? [ [ Opcodes.i32_eqz ] ] : []),
1043
+ [ Opcodes.br, 1 ],
1044
+ [ Opcodes.end ],
912
1045
 
913
- // todo: convert non-strings to strings, for now fail immediately if one is not
914
- // if left is not string
1046
+ // if left is bytestring
915
1047
  ...leftType,
916
- ...number(TYPES.string, Valtype.i32),
917
- [ Opcodes.i32_ne ],
1048
+ ...number(TYPES.bytestring, Valtype.i32),
1049
+ [ Opcodes.i32_eq ],
918
1050
 
919
- // if right is not string
1051
+ // if right is bytestring
920
1052
  ...rightType,
921
- ...number(TYPES.string, Valtype.i32),
922
- [ Opcodes.i32_ne ],
1053
+ ...number(TYPES.bytestring, Valtype.i32),
1054
+ [ Opcodes.i32_eq ],
923
1055
 
924
- // if either are true
925
- [ Opcodes.i32_or ],
1056
+ // if both are true
1057
+ [ Opcodes.i32_and ],
926
1058
  [ Opcodes.if, Blocktype.void ],
927
- ...number(0, Valtype.i32),
928
- [ Opcodes.br, 1 ],
929
- [ Opcodes.end ],
930
-
931
- ...compareStrings(scope, [ [ Opcodes.local_get, tmpLeft ] ], [ [ Opcodes.local_get, tmpRight ] ]),
932
- // ...compareStrings(scope, [ [ Opcodes.local_get, tmpLeft ] ], [ [ Opcodes.local_get, tmpRight ] ]),
1059
+ ...compareStrings(scope, [ [ Opcodes.local_get, tmpLeft ] ], [ [ Opcodes.local_get, tmpRight ] ], true),
933
1060
  ...(op === '!==' || op === '!=' ? [ [ Opcodes.i32_eqz ] ] : []),
934
1061
  [ Opcodes.br, 1 ],
935
1062
  [ Opcodes.end ],
@@ -941,9 +1068,9 @@ const performOp = (scope, op, left, right, leftType, rightType, _global = false,
941
1068
  // endOut.push(stringOnly([ Opcodes.end ]));
942
1069
  endOut.unshift(stringOnly([ Opcodes.end ]));
943
1070
  // }
944
- })();
1071
+ }
945
1072
 
946
- return finalise([
1073
+ return finalize([
947
1074
  ...left,
948
1075
  ...(tmpLeft != null ? stringOnly([ [ Opcodes.local_tee, tmpLeft ] ]) : []),
949
1076
  ...right,
@@ -960,7 +1087,22 @@ const generateBinaryExp = (scope, decl, _global, _name) => {
960
1087
  return out;
961
1088
  };
962
1089
 
963
- const asmFunc = (name, { wasm, params, locals: localTypes, globals: globalTypes = [], globalInits, returns, returnType, localNames = [], globalNames = [] }) => {
1090
+ const asmFuncToAsm = (func, { name = '#unknown_asm_func', params = [], locals = [], returns = [], localInd = 0 }) => {
1091
+ return func({ name, params, locals, returns, localInd }, {
1092
+ TYPES, TYPE_NAMES, typeSwitch, makeArray, makeString, allocPage,
1093
+ builtin: name => {
1094
+ let idx = funcIndex[name] ?? importedFuncs[name];
1095
+ if (idx === undefined && builtinFuncs[name]) {
1096
+ includeBuiltin(null, name);
1097
+ idx = funcIndex[name];
1098
+ }
1099
+
1100
+ return idx;
1101
+ }
1102
+ });
1103
+ };
1104
+
1105
+ const asmFunc = (name, { wasm, params, locals: localTypes, globals: globalTypes = [], globalInits, returns, returnType, localNames = [], globalNames = [], data: _data = [] }) => {
964
1106
  const existing = funcs.find(x => x.name === name);
965
1107
  if (existing) return existing;
966
1108
 
@@ -972,18 +1114,14 @@ const asmFunc = (name, { wasm, params, locals: localTypes, globals: globalTypes
972
1114
  locals[nameParam(i)] = { idx: i, type: allLocals[i] };
973
1115
  }
974
1116
 
975
- if (typeof wasm === 'function') {
976
- const scope = {
977
- name,
978
- params,
979
- locals,
980
- returns,
981
- localInd: allLocals.length,
982
- };
983
-
984
- wasm = wasm(scope, { TYPES, typeSwitch, makeArray });
1117
+ for (const x of _data) {
1118
+ const copy = { ...x };
1119
+ copy.offset += pages.size * pageSize;
1120
+ data.push(copy);
985
1121
  }
986
1122
 
1123
+ if (typeof wasm === 'function') wasm = asmFuncToAsm(wasm, { name, params, locals, returns, localInd: allLocals.length });
1124
+
987
1125
  let baseGlobalIdx, i = 0;
988
1126
  for (const type of globalTypes) {
989
1127
  if (baseGlobalIdx === undefined) baseGlobalIdx = globalInd;
@@ -1006,7 +1144,7 @@ const asmFunc = (name, { wasm, params, locals: localTypes, globals: globalTypes
1006
1144
  params,
1007
1145
  locals,
1008
1146
  returns,
1009
- returnType: TYPES[returnType ?? 'number'],
1147
+ returnType: returnType ?? TYPES.number,
1010
1148
  wasm,
1011
1149
  internal: true,
1012
1150
  index: currentFuncIndex++
@@ -1029,6 +1167,7 @@ const generateLogicExp = (scope, decl) => {
1029
1167
  return performLogicOp(scope, decl.operator, generate(scope, decl.left), generate(scope, decl.right), getNodeType(scope, decl.left), getNodeType(scope, decl.right));
1030
1168
  };
1031
1169
 
1170
+ // potential future ideas for nan boxing (unused):
1032
1171
  // T = JS type, V = value/pointer
1033
1172
  // 0bTTT
1034
1173
  // qNAN: 0 11111111111 1000000000000000000000000000000000000000000000000001
@@ -1042,7 +1181,6 @@ const generateLogicExp = (scope, decl) => {
1042
1181
  // js type: 4 bits
1043
1182
  // internal type: ? bits
1044
1183
  // pointer: 32 bits
1045
-
1046
1184
  // generic
1047
1185
  // 1 23 4 5
1048
1186
  // 0 11111111111 11TTTTIIII??????????PPPPPPPPPPPPPPPPPPPPPPPPPPPPPPPP
@@ -1052,49 +1190,29 @@ const generateLogicExp = (scope, decl) => {
1052
1190
  // 4: internal type
1053
1191
  // 5: pointer
1054
1192
 
1055
- const TYPES = {
1056
- number: 0x00,
1057
- boolean: 0x01,
1058
- string: 0x02,
1059
- undefined: 0x03,
1060
- object: 0x04,
1061
- function: 0x05,
1062
- symbol: 0x06,
1063
- bigint: 0x07,
1064
-
1065
- // these are not "typeof" types but tracked internally
1066
- _array: 0x10,
1067
- _regexp: 0x11,
1068
- _bytestring: 0x12
1069
- };
1070
-
1071
- const TYPE_NAMES = {
1072
- [TYPES.number]: 'Number',
1073
- [TYPES.boolean]: 'Boolean',
1074
- [TYPES.string]: 'String',
1075
- [TYPES.undefined]: 'undefined',
1076
- [TYPES.object]: 'Object',
1077
- [TYPES.function]: 'Function',
1078
- [TYPES.symbol]: 'Symbol',
1079
- [TYPES.bigint]: 'BigInt',
1080
-
1081
- [TYPES._array]: 'Array',
1082
- [TYPES._regexp]: 'RegExp',
1083
- [TYPES._bytestring]: 'ByteString'
1193
+ const isExistingProtoFunc = name => {
1194
+ if (name.startsWith('__Array_prototype')) return !!prototypeFuncs[TYPES.array][name.slice(18)];
1195
+ if (name.startsWith('__String_prototype_')) return !!prototypeFuncs[TYPES.string][name.slice(19)];
1196
+
1197
+ return false;
1084
1198
  };
1085
1199
 
1086
1200
  const getType = (scope, _name) => {
1087
1201
  const name = mapName(_name);
1088
1202
 
1203
+ // if (scope.locals[name] && !scope.locals[name + '#type']) console.log(name);
1204
+
1205
+ if (typedInput && scope.locals[name]?.metadata?.type != null) return number(scope.locals[name].metadata.type, Valtype.i32);
1089
1206
  if (scope.locals[name]) return [ [ Opcodes.local_get, scope.locals[name + '#type'].idx ] ];
1207
+
1208
+ if (typedInput && globals[name]?.metadata?.type != null) return number(globals[name].metadata.type, Valtype.i32);
1090
1209
  if (globals[name]) return [ [ Opcodes.global_get, globals[name + '#type'].idx ] ];
1091
1210
 
1092
1211
  let type = TYPES.undefined;
1093
- if (builtinVars[name]) type = TYPES[builtinVars[name].type ?? 'number'];
1212
+ if (builtinVars[name]) type = builtinVars[name].type ?? TYPES.number;
1094
1213
  if (builtinFuncs[name] !== undefined || importedFuncs[name] !== undefined || funcIndex[name] !== undefined || internalConstrs[name] !== undefined) type = TYPES.function;
1095
1214
 
1096
- if (name.startsWith('__Array_prototype_') && prototypeFuncs[TYPES._array][name.slice(18)] ||
1097
- name.startsWith('__String_prototype_') && prototypeFuncs[TYPES.string][name.slice(19)]) type = TYPES.function;
1215
+ if (isExistingProtoFunc(name)) type = TYPES.function;
1098
1216
 
1099
1217
  return number(type, Valtype.i32);
1100
1218
  };
@@ -1117,23 +1235,24 @@ const setType = (scope, _name, type) => {
1117
1235
  ];
1118
1236
 
1119
1237
  // throw new Error('could not find var');
1238
+ return [];
1120
1239
  };
1121
1240
 
1122
1241
  const getLastType = scope => {
1123
1242
  scope.gotLastType = true;
1124
- return [ Opcodes.local_get, localTmp(scope, '#last_type', Valtype.i32) ];
1243
+ return [ [ Opcodes.local_get, localTmp(scope, '#last_type', Valtype.i32) ] ];
1125
1244
  };
1126
1245
 
1127
1246
  const setLastType = scope => {
1128
- return [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ];
1247
+ return [ [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ] ];
1129
1248
  };
1130
1249
 
1131
1250
  const getNodeType = (scope, node) => {
1132
1251
  const inner = () => {
1133
1252
  if (node.type === 'Literal') {
1134
- if (node.regex) return TYPES._regexp;
1253
+ if (node.regex) return TYPES.regexp;
1135
1254
 
1136
- if (typeof node.value === 'string' && byteStringable(node.value)) return TYPES._bytestring;
1255
+ if (typeof node.value === 'string' && byteStringable(node.value)) return TYPES.bytestring;
1137
1256
 
1138
1257
  return TYPES[typeof node.value];
1139
1258
  }
@@ -1150,13 +1269,25 @@ const getNodeType = (scope, node) => {
1150
1269
  const name = node.callee.name;
1151
1270
  if (!name) {
1152
1271
  // iife
1153
- if (scope.locals['#last_type']) return [ getLastType(scope) ];
1272
+ if (scope.locals['#last_type']) return getLastType(scope);
1154
1273
 
1155
1274
  // presume
1156
1275
  // todo: warn here?
1157
1276
  return TYPES.number;
1158
1277
  }
1159
1278
 
1279
+ if (node.type === 'NewExpression' && builtinFuncs[name + '$constructor']) {
1280
+ if (builtinFuncs[name + '$constructor'].typedReturns) {
1281
+ if (scope.locals['#last_type']) return getLastType(scope);
1282
+
1283
+ // presume
1284
+ // todo: warn here?
1285
+ return TYPES.number;
1286
+ }
1287
+
1288
+ return builtinFuncs[name + '$constructor'].returnType ?? TYPES.number;
1289
+ }
1290
+
1160
1291
  const func = funcs.find(x => x.name === name);
1161
1292
 
1162
1293
  if (func) {
@@ -1164,7 +1295,7 @@ const getNodeType = (scope, node) => {
1164
1295
  if (func.returnType) return func.returnType;
1165
1296
  }
1166
1297
 
1167
- if (builtinFuncs[name]) return TYPES[builtinFuncs[name].returnType ?? 'number'];
1298
+ if (builtinFuncs[name] && !builtinFuncs[name].typedReturns) return builtinFuncs[name].returnType ?? TYPES.number;
1168
1299
  if (internalConstrs[name]) return internalConstrs[name].type;
1169
1300
 
1170
1301
  // check if this is a prototype function
@@ -1175,11 +1306,16 @@ const getNodeType = (scope, node) => {
1175
1306
  const spl = name.slice(2).split('_');
1176
1307
 
1177
1308
  const func = spl[spl.length - 1];
1178
- const protoFuncs = Object.keys(prototypeFuncs).filter(x => x != TYPES._bytestring && prototypeFuncs[x][func] != null);
1309
+ const protoFuncs = Object.keys(prototypeFuncs).filter(x => x != TYPES.bytestring && prototypeFuncs[x][func] != null);
1179
1310
  if (protoFuncs.length === 1) return protoFuncs[0].returnType ?? TYPES.number;
1180
1311
  }
1181
1312
 
1182
- if (scope.locals['#last_type']) return [ getLastType(scope) ];
1313
+ if (name.startsWith('__Porffor_wasm_')) {
1314
+ // todo: return undefined for non-returning ops
1315
+ return TYPES.number;
1316
+ }
1317
+
1318
+ if (scope.locals['#last_type']) return getLastType(scope);
1183
1319
 
1184
1320
  // presume
1185
1321
  // todo: warn here?
@@ -1222,11 +1358,20 @@ const getNodeType = (scope, node) => {
1222
1358
  }
1223
1359
 
1224
1360
  if (node.type === 'ArrayExpression') {
1225
- return TYPES._array;
1361
+ return TYPES.array;
1226
1362
  }
1227
1363
 
1228
1364
  if (node.type === 'BinaryExpression') {
1229
1365
  if (['==', '===', '!=', '!==', '>', '>=', '<', '<='].includes(node.operator)) return TYPES.boolean;
1366
+ if (node.operator !== '+') return TYPES.number;
1367
+
1368
+ const knownLeft = knownType(scope, getNodeType(scope, node.left));
1369
+ const knownRight = knownType(scope, getNodeType(scope, node.right));
1370
+
1371
+ // todo: this should be dynamic but for now only static
1372
+ if (knownLeft === TYPES.string || knownRight === TYPES.string) return TYPES.string;
1373
+ if (knownLeft === TYPES.bytestring || knownRight === TYPES.bytestring) return TYPES.bytestring;
1374
+
1230
1375
  return TYPES.number;
1231
1376
 
1232
1377
  // todo: string concat types
@@ -1251,26 +1396,41 @@ const getNodeType = (scope, node) => {
1251
1396
  if (node.operator === '!') return TYPES.boolean;
1252
1397
  if (node.operator === 'void') return TYPES.undefined;
1253
1398
  if (node.operator === 'delete') return TYPES.boolean;
1254
- if (node.operator === 'typeof') return process.argv.includes('-bytestring') ? TYPES._bytestring : TYPES.string;
1399
+ if (node.operator === 'typeof') return Prefs.bytestring ? TYPES.bytestring : TYPES.string;
1255
1400
 
1256
1401
  return TYPES.number;
1257
1402
  }
1258
1403
 
1259
1404
  if (node.type === 'MemberExpression') {
1405
+ // hack: if something.name, string type
1406
+ if (node.property.name === 'name') {
1407
+ if (hasFuncWithName(node.object.name)) {
1408
+ return TYPES.bytestring;
1409
+ } else {
1410
+ return TYPES.undefined;
1411
+ }
1412
+ }
1413
+
1260
1414
  // hack: if something.length, number type
1261
1415
  if (node.property.name === 'length') return TYPES.number;
1262
1416
 
1263
1417
  // ts hack
1264
1418
  if (scope.locals[node.object.name]?.metadata?.type === TYPES.string) return TYPES.string;
1265
- if (scope.locals[node.object.name]?.metadata?.type === TYPES._array) return TYPES.number;
1419
+ if (scope.locals[node.object.name]?.metadata?.type === TYPES.bytestring) return TYPES.bytestring;
1420
+ if (scope.locals[node.object.name]?.metadata?.type === TYPES.array) return TYPES.number;
1266
1421
 
1267
- if (scope.locals['#last_type']) return [ getLastType(scope) ];
1422
+ if (scope.locals['#last_type']) return getLastType(scope);
1268
1423
 
1269
1424
  // presume
1270
1425
  return TYPES.number;
1271
1426
  }
1272
1427
 
1273
- if (scope.locals['#last_type']) return [ getLastType(scope) ];
1428
+ if (node.type === 'TaggedTemplateExpression') {
1429
+ // hack
1430
+ if (node.tag.name.startsWith('__Porffor_')) return TYPES.number;
1431
+ }
1432
+
1433
+ if (scope.locals['#last_type']) return getLastType(scope);
1274
1434
 
1275
1435
  // presume
1276
1436
  // todo: warn here?
@@ -1286,8 +1446,8 @@ const getNodeType = (scope, node) => {
1286
1446
  const generateLiteral = (scope, decl, global, name) => {
1287
1447
  if (decl.value === null) return number(NULL);
1288
1448
 
1449
+ // hack: just return 1 for regex literals
1289
1450
  if (decl.regex) {
1290
- scope.regex[name] = decl.regex;
1291
1451
  return number(1);
1292
1452
  }
1293
1453
 
@@ -1303,7 +1463,7 @@ const generateLiteral = (scope, decl, global, name) => {
1303
1463
  return makeString(scope, decl.value, global, name);
1304
1464
 
1305
1465
  default:
1306
- return todo(`cannot generate literal of type ${typeof decl.value}`);
1466
+ return todo(scope, `cannot generate literal of type ${typeof decl.value}`, true);
1307
1467
  }
1308
1468
  };
1309
1469
 
@@ -1312,6 +1472,8 @@ const countLeftover = wasm => {
1312
1472
 
1313
1473
  for (let i = 0; i < wasm.length; i++) {
1314
1474
  const inst = wasm[i];
1475
+ if (inst[0] == null) continue;
1476
+
1315
1477
  if (depth === 0 && (inst[0] === Opcodes.if || inst[0] === Opcodes.block || inst[0] === Opcodes.loop)) {
1316
1478
  if (inst[0] === Opcodes.if) count--;
1317
1479
  if (inst[1] !== Blocktype.void) count++;
@@ -1320,18 +1482,25 @@ const countLeftover = wasm => {
1320
1482
  if (inst[0] === Opcodes.end) depth--;
1321
1483
 
1322
1484
  if (depth === 0)
1323
- if ([Opcodes.throw,Opcodes.drop, Opcodes.local_set, Opcodes.global_set].includes(inst[0])) count--;
1485
+ if ([Opcodes.throw, Opcodes.drop, Opcodes.local_set, Opcodes.global_set].includes(inst[0])) count--;
1324
1486
  else if ([null, Opcodes.i32_eqz, Opcodes.i64_eqz, Opcodes.f64_ceil, Opcodes.f64_floor, Opcodes.f64_trunc, Opcodes.f64_nearest, Opcodes.f64_sqrt, Opcodes.local_tee, Opcodes.i32_wrap_i64, Opcodes.i64_extend_i32_s, Opcodes.i64_extend_i32_u, Opcodes.f32_demote_f64, Opcodes.f64_promote_f32, Opcodes.f64_convert_i32_s, Opcodes.f64_convert_i32_u, Opcodes.i32_clz, Opcodes.i32_ctz, Opcodes.i32_popcnt, Opcodes.f64_neg, Opcodes.end, Opcodes.i32_trunc_sat_f64_s[0], Opcodes.i32x4_extract_lane, Opcodes.i16x8_extract_lane, Opcodes.i32_load, Opcodes.i64_load, Opcodes.f64_load, Opcodes.v128_load, Opcodes.i32_load16_u, Opcodes.i32_load16_s, Opcodes.i32_load8_u, Opcodes.i32_load8_s, Opcodes.memory_grow].includes(inst[0]) && (inst[0] !== 0xfc || inst[1] < 0x0a)) {}
1325
- else if ([Opcodes.local_get, Opcodes.global_get, Opcodes.f64_const, Opcodes.i32_const, Opcodes.i64_const, Opcodes.v128_const].includes(inst[0])) count++;
1487
+ else if ([Opcodes.local_get, Opcodes.global_get, Opcodes.f64_const, Opcodes.i32_const, Opcodes.i64_const, Opcodes.v128_const, Opcodes.memory_size].includes(inst[0])) count++;
1326
1488
  else if ([Opcodes.i32_store, Opcodes.i64_store, Opcodes.f64_store, Opcodes.i32_store16, Opcodes.i32_store8].includes(inst[0])) count -= 2;
1327
1489
  else if (Opcodes.memory_copy[0] === inst[0] && Opcodes.memory_copy[1] === inst[1]) count -= 3;
1328
1490
  else if (inst[0] === Opcodes.return) count = 0;
1329
1491
  else if (inst[0] === Opcodes.call) {
1330
1492
  let func = funcs.find(x => x.index === inst[1]);
1331
- if (func) {
1332
- count -= func.params.length;
1333
- } else count--;
1334
- if (func) count += func.returns.length;
1493
+ if (inst[1] === -1) {
1494
+ // todo: count for calling self
1495
+ } else if (!func && inst[1] < importedFuncs.length) {
1496
+ count -= importedFuncs[inst[1]].params;
1497
+ count += importedFuncs[inst[1]].returns;
1498
+ } else {
1499
+ if (func) {
1500
+ count -= func.params.length;
1501
+ } else count--;
1502
+ if (func) count += func.returns.length;
1503
+ }
1335
1504
  } else count--;
1336
1505
 
1337
1506
  // console.log(count, decompile([ inst ]).slice(0, -1));
@@ -1423,10 +1592,21 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
1423
1592
  name = func.name;
1424
1593
  }
1425
1594
 
1426
- if (name === 'eval' && decl.arguments[0].type === 'Literal') {
1595
+ if (name === 'eval' && decl.arguments[0]?.type === 'Literal') {
1427
1596
  // literal eval hack
1428
- const code = decl.arguments[0].value;
1429
- const parsed = parse(code, []);
1597
+ const code = decl.arguments[0]?.value ?? '';
1598
+
1599
+ let parsed;
1600
+ try {
1601
+ parsed = parse(code, []);
1602
+ } catch (e) {
1603
+ if (e.name === 'SyntaxError') {
1604
+ // throw syntax errors of evals at runtime instead
1605
+ return internalThrow(scope, 'SyntaxError', e.message, true);
1606
+ }
1607
+
1608
+ throw e;
1609
+ }
1430
1610
 
1431
1611
  const out = generate(scope, {
1432
1612
  type: 'BlockStatement',
@@ -1440,13 +1620,13 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
1440
1620
  const finalStatement = parsed.body[parsed.body.length - 1];
1441
1621
  out.push(
1442
1622
  ...getNodeType(scope, finalStatement),
1443
- setLastType(scope)
1623
+ ...setLastType(scope)
1444
1624
  );
1445
1625
  } else if (countLeftover(out) === 0) {
1446
1626
  out.push(...number(UNDEFINED));
1447
1627
  out.push(
1448
1628
  ...number(TYPES.undefined, Valtype.i32),
1449
- setLastType(scope)
1629
+ ...setLastType(scope)
1450
1630
  );
1451
1631
  }
1452
1632
 
@@ -1468,6 +1648,9 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
1468
1648
 
1469
1649
  target = { ...decl.callee };
1470
1650
  target.name = spl.slice(0, -1).join('_');
1651
+
1652
+ // failed to lookup name, abort
1653
+ if (!lookupName(scope, target.name)[0]) protoName = null;
1471
1654
  }
1472
1655
 
1473
1656
  // literal.func()
@@ -1475,22 +1658,29 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
1475
1658
  // megahack for /regex/.func()
1476
1659
  const funcName = decl.callee.property.name;
1477
1660
  if (decl.callee.object.regex && Object.hasOwn(Rhemyn, funcName)) {
1478
- const func = Rhemyn[funcName](decl.callee.object.regex.pattern, currentFuncIndex++);
1661
+ const regex = decl.callee.object.regex.pattern;
1662
+ const rhemynName = `regex_${funcName}_${regex}`;
1663
+
1664
+ if (!funcIndex[rhemynName]) {
1665
+ const func = Rhemyn[funcName](regex, currentFuncIndex++, rhemynName);
1479
1666
 
1480
- funcIndex[func.name] = func.index;
1481
- funcs.push(func);
1667
+ funcIndex[func.name] = func.index;
1668
+ funcs.push(func);
1669
+ }
1482
1670
 
1671
+ const idx = funcIndex[rhemynName];
1483
1672
  return [
1484
1673
  // make string arg
1485
1674
  ...generate(scope, decl.arguments[0]),
1675
+ Opcodes.i32_to_u,
1676
+ ...getNodeType(scope, decl.arguments[0]),
1486
1677
 
1487
1678
  // call regex func
1488
- Opcodes.i32_to_u,
1489
- [ Opcodes.call, func.index ],
1679
+ [ Opcodes.call, idx ],
1490
1680
  Opcodes.i32_from_u,
1491
1681
 
1492
1682
  ...number(TYPES.boolean, Valtype.i32),
1493
- setLastType(scope)
1683
+ ...setLastType(scope)
1494
1684
  ];
1495
1685
  }
1496
1686
 
@@ -1515,12 +1705,31 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
1515
1705
  // }
1516
1706
 
1517
1707
  if (protoName) {
1708
+ const protoBC = {};
1709
+
1710
+ const builtinProtoCands = Object.keys(builtinFuncs).filter(x => x.startsWith('__') && x.endsWith('_prototype_' + protoName));
1711
+
1712
+ if (!decl._protoInternalCall && builtinProtoCands.length > 0) {
1713
+ for (const x of builtinProtoCands) {
1714
+ const type = TYPES[x.split('_prototype_')[0].slice(2).toLowerCase()];
1715
+ if (type == null) continue;
1716
+
1717
+ protoBC[type] = generateCall(scope, {
1718
+ callee: {
1719
+ type: 'Identifier',
1720
+ name: x
1721
+ },
1722
+ arguments: [ target, ...decl.arguments ],
1723
+ _protoInternalCall: true
1724
+ });
1725
+ }
1726
+ }
1727
+
1518
1728
  const protoCands = Object.keys(prototypeFuncs).reduce((acc, x) => {
1519
1729
  if (Object.hasOwn(prototypeFuncs[x], protoName)) acc[x] = prototypeFuncs[x][protoName];
1520
1730
  return acc;
1521
1731
  }, {});
1522
1732
 
1523
- // no prototype function candidates, ignore
1524
1733
  if (Object.keys(protoCands).length > 0) {
1525
1734
  // use local for cached i32 length as commonly used
1526
1735
  const lengthLocal = localTmp(scope, '__proto_length_cache', Valtype.i32);
@@ -1538,7 +1747,6 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
1538
1747
 
1539
1748
  let allOptUnused = true;
1540
1749
  let lengthI32CacheUsed = false;
1541
- const protoBC = {};
1542
1750
  for (const x in protoCands) {
1543
1751
  const protoFunc = protoCands[x];
1544
1752
  if (protoFunc.noArgRetLength && decl.arguments.length === 0) {
@@ -1546,7 +1754,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
1546
1754
  ...RTArrayUtil.getLength(getPointer),
1547
1755
 
1548
1756
  ...number(TYPES.number, Valtype.i32),
1549
- setLastType(scope)
1757
+ ...setLastType(scope)
1550
1758
  ];
1551
1759
  continue;
1552
1760
  }
@@ -1583,7 +1791,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
1583
1791
  ...protoOut,
1584
1792
 
1585
1793
  ...number(protoFunc.returnType ?? TYPES.number, Valtype.i32),
1586
- setLastType(scope),
1794
+ ...setLastType(scope),
1587
1795
  [ Opcodes.end ]
1588
1796
  ];
1589
1797
  }
@@ -1609,10 +1817,19 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
1609
1817
  }, allOptUnused && unusedValue ? Blocktype.void : valtypeBinary),
1610
1818
  ];
1611
1819
  }
1820
+
1821
+ if (Object.keys(protoBC).length > 0) {
1822
+ return typeSwitch(scope, getNodeType(scope, target), {
1823
+ ...protoBC,
1824
+
1825
+ // TODO: error better
1826
+ default: internalThrow(scope, 'TypeError', `'${protoName}' proto func tried to be called on a type without an impl`)
1827
+ }, valtypeBinary);
1828
+ }
1612
1829
  }
1613
1830
 
1614
1831
  // TODO: only allows callee as literal
1615
- if (!name) return todo(`only literal callees (got ${decl.callee.type})`);
1832
+ if (!name) return todo(scope, `only literal callees (got ${decl.callee.type})`);
1616
1833
 
1617
1834
  let idx = funcIndex[name] ?? importedFuncs[name];
1618
1835
  if (idx === undefined && builtinFuncs[name]) {
@@ -1622,20 +1839,20 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
1622
1839
  idx = funcIndex[name];
1623
1840
 
1624
1841
  // infer arguments types from builtins params
1625
- const func = funcs.find(x => x.name === name);
1626
- for (let i = 0; i < decl.arguments.length; i++) {
1627
- const arg = decl.arguments[i];
1628
- if (!arg.name) continue;
1629
-
1630
- const local = scope.locals[arg.name];
1631
- if (!local) continue;
1632
-
1633
- local.type = func.params[i];
1634
- if (local.type === Valtype.v128) {
1635
- // specify vec subtype inferred from last vec type in function name
1636
- local.vecType = name.split('_').reverse().find(x => x.includes('x'));
1637
- }
1638
- }
1842
+ // const func = funcs.find(x => x.name === name);
1843
+ // for (let i = 0; i < decl.arguments.length; i++) {
1844
+ // const arg = decl.arguments[i];
1845
+ // if (!arg.name) continue;
1846
+
1847
+ // const local = scope.locals[arg.name];
1848
+ // if (!local) continue;
1849
+
1850
+ // local.type = func.params[i];
1851
+ // if (local.type === Valtype.v128) {
1852
+ // // specify vec subtype inferred from last vec type in function name
1853
+ // local.vecType = name.split('_').reverse().find(x => x.includes('x'));
1854
+ // }
1855
+ // }
1639
1856
  }
1640
1857
 
1641
1858
  if (idx === undefined && internalConstrs[name]) return internalConstrs[name].generate(scope, decl, _global, _name);
@@ -1645,16 +1862,62 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
1645
1862
  idx = -1;
1646
1863
  }
1647
1864
 
1865
+ if (idx === undefined && name.startsWith('__Porffor_wasm_')) {
1866
+ const wasmOps = {
1867
+ // pointer, align, offset
1868
+ i32_load: { imms: 2, args: [ true ], returns: 1 },
1869
+ // pointer, value, align, offset
1870
+ i32_store: { imms: 2, args: [ true, true ], returns: 0 },
1871
+ // pointer, align, offset
1872
+ i32_load8_u: { imms: 2, args: [ true ], returns: 1 },
1873
+ // pointer, value, align, offset
1874
+ i32_store8: { imms: 2, args: [ true, true ], returns: 0 },
1875
+ // pointer, align, offset
1876
+ i32_load16_u: { imms: 2, args: [ true ], returns: 1 },
1877
+ // pointer, value, align, offset
1878
+ i32_store16: { imms: 2, args: [ true, true ], returns: 0 },
1879
+
1880
+ // pointer, align, offset
1881
+ f64_load: { imms: 2, args: [ true ], returns: 0 }, // 0 due to not i32
1882
+ // pointer, value, align, offset
1883
+ f64_store: { imms: 2, args: [ true, false ], returns: 0 },
1884
+
1885
+ // value
1886
+ i32_const: { imms: 1, args: [], returns: 1 },
1887
+ };
1888
+
1889
+ const opName = name.slice('__Porffor_wasm_'.length);
1890
+
1891
+ if (wasmOps[opName]) {
1892
+ const op = wasmOps[opName];
1893
+
1894
+ const argOut = [];
1895
+ for (let i = 0; i < op.args.length; i++) argOut.push(
1896
+ ...generate(scope, decl.arguments[i]),
1897
+ ...(op.args[i] ? [ Opcodes.i32_to ] : [])
1898
+ );
1899
+
1900
+ // literals only
1901
+ const imms = decl.arguments.slice(op.args.length).map(x => x.value);
1902
+
1903
+ return [
1904
+ ...argOut,
1905
+ [ Opcodes[opName], ...imms ],
1906
+ ...(new Array(op.returns).fill(Opcodes.i32_from))
1907
+ ];
1908
+ }
1909
+ }
1910
+
1648
1911
  if (idx === undefined) {
1649
- if (scope.locals[name] !== undefined || globals[name] !== undefined || builtinVars[name] !== undefined) return internalThrow(scope, 'TypeError', `${unhackName(name)} is not a function`);
1650
- return internalThrow(scope, 'ReferenceError', `${unhackName(name)} is not defined`);
1912
+ if (scope.locals[name] !== undefined || globals[name] !== undefined || builtinVars[name] !== undefined) return internalThrow(scope, 'TypeError', `${unhackName(name)} is not a function`, true);
1913
+ return internalThrow(scope, 'ReferenceError', `${unhackName(name)} is not defined`, true);
1651
1914
  }
1652
1915
 
1653
1916
  const func = funcs.find(x => x.index === idx);
1654
1917
 
1655
1918
  const userFunc = (funcIndex[name] && !importedFuncs[name] && !builtinFuncs[name] && !internalConstrs[name]) || idx === -1;
1656
1919
  const typedParams = userFunc || builtinFuncs[name]?.typedParams;
1657
- const typedReturn = userFunc || builtinFuncs[name]?.typedReturn;
1920
+ const typedReturns = (func ? func.returnType == null : userFunc) || builtinFuncs[name]?.typedReturns;
1658
1921
  const paramCount = func && (typedParams ? func.params.length / 2 : func.params.length);
1659
1922
 
1660
1923
  let args = decl.arguments;
@@ -1671,14 +1934,24 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
1671
1934
  if (func && func.throws) scope.throws = true;
1672
1935
 
1673
1936
  let out = [];
1674
- for (const arg of args) {
1937
+ for (let i = 0; i < args.length; i++) {
1938
+ const arg = args[i];
1675
1939
  out = out.concat(generate(scope, arg));
1940
+
1941
+ if (builtinFuncs[name] && builtinFuncs[name].params[i * (typedParams ? 2 : 1)] === Valtype.i32 && valtypeBinary !== Valtype.i32) {
1942
+ out.push(Opcodes.i32_to);
1943
+ }
1944
+
1945
+ if (importedFuncs[name] && name.startsWith('profile')) {
1946
+ out.push(Opcodes.i32_to);
1947
+ }
1948
+
1676
1949
  if (typedParams) out = out.concat(getNodeType(scope, arg));
1677
1950
  }
1678
1951
 
1679
1952
  out.push([ Opcodes.call, idx ]);
1680
1953
 
1681
- if (!typedReturn) {
1954
+ if (!typedReturns) {
1682
1955
  // let type;
1683
1956
  // if (builtinFuncs[name]) type = TYPES[builtinFuncs[name].returnType ?? 'number'];
1684
1957
  // if (internalConstrs[name]) type = internalConstrs[name].type;
@@ -1688,7 +1961,11 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
1688
1961
  // ...number(type, Valtype.i32),
1689
1962
  // [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
1690
1963
  // );
1691
- } else out.push(setLastType(scope));
1964
+ } else out.push(...setLastType(scope));
1965
+
1966
+ if (builtinFuncs[name] && builtinFuncs[name].returns?.[0] === Valtype.i32 && valtypeBinary !== Valtype.i32) {
1967
+ out.push(Opcodes.i32_from);
1968
+ }
1692
1969
 
1693
1970
  return out;
1694
1971
  };
@@ -1696,8 +1973,21 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
1696
1973
  const generateNew = (scope, decl, _global, _name) => {
1697
1974
  // hack: basically treat this as a normal call for builtins for now
1698
1975
  const name = mapName(decl.callee.name);
1976
+
1699
1977
  if (internalConstrs[name] && !internalConstrs[name].notConstr) return internalConstrs[name].generate(scope, decl, _global, _name);
1700
- if (!builtinFuncs[name]) return todo(`new statement is not supported yet`); // return todo(`new statement is not supported yet (new ${unhackName(name)})`);
1978
+
1979
+ if (builtinFuncs[name + '$constructor']) {
1980
+ // custom ...$constructor override builtin func
1981
+ return generateCall(scope, {
1982
+ ...decl,
1983
+ callee: {
1984
+ type: 'Identifier',
1985
+ name: name + '$constructor'
1986
+ }
1987
+ }, _global, _name);
1988
+ }
1989
+
1990
+ if (!builtinFuncs[name]) return todo(scope, `new statement is not supported yet`); // return todo(scope, `new statement is not supported yet (new ${unhackName(name)})`);
1701
1991
 
1702
1992
  return generateCall(scope, decl, _global, _name);
1703
1993
  };
@@ -1814,14 +2104,14 @@ const brTable = (input, bc, returns) => {
1814
2104
  };
1815
2105
 
1816
2106
  const typeSwitch = (scope, type, bc, returns = valtypeBinary) => {
1817
- if (!process.argv.includes('-bytestring')) delete bc[TYPES._bytestring];
2107
+ if (!Prefs.bytestring) delete bc[TYPES.bytestring];
1818
2108
 
1819
2109
  const known = knownType(scope, type);
1820
2110
  if (known != null) {
1821
2111
  return bc[known] ?? bc.default;
1822
2112
  }
1823
2113
 
1824
- if (process.argv.includes('-typeswitch-use-brtable'))
2114
+ if (Prefs.typeswitchUseBrtable)
1825
2115
  return brTable(type, bc, returns);
1826
2116
 
1827
2117
  const tmp = localTmp(scope, '#typeswitch_tmp', Valtype.i32);
@@ -1831,8 +2121,6 @@ const typeSwitch = (scope, type, bc, returns = valtypeBinary) => {
1831
2121
  [ Opcodes.block, returns ]
1832
2122
  ];
1833
2123
 
1834
- // todo: use br_table?
1835
-
1836
2124
  for (const x in bc) {
1837
2125
  if (x === 'default') continue;
1838
2126
 
@@ -1856,7 +2144,7 @@ const typeSwitch = (scope, type, bc, returns = valtypeBinary) => {
1856
2144
  return out;
1857
2145
  };
1858
2146
 
1859
- const allocVar = (scope, name, global = false) => {
2147
+ const allocVar = (scope, name, global = false, type = true) => {
1860
2148
  const target = global ? globals : scope.locals;
1861
2149
 
1862
2150
  // already declared
@@ -1870,8 +2158,10 @@ const allocVar = (scope, name, global = false) => {
1870
2158
  let idx = global ? globalInd++ : scope.localInd++;
1871
2159
  target[name] = { idx, type: valtypeBinary };
1872
2160
 
1873
- let typeIdx = global ? globalInd++ : scope.localInd++;
1874
- target[name + '#type'] = { idx: typeIdx, type: Valtype.i32 };
2161
+ if (type) {
2162
+ let typeIdx = global ? globalInd++ : scope.localInd++;
2163
+ target[name + '#type'] = { idx: typeIdx, type: Valtype.i32 };
2164
+ }
1875
2165
 
1876
2166
  return idx;
1877
2167
  };
@@ -1886,11 +2176,14 @@ const addVarMetadata = (scope, name, global = false, metadata = {}) => {
1886
2176
  };
1887
2177
 
1888
2178
  const typeAnnoToPorfType = x => {
1889
- if (TYPES[x]) return TYPES[x];
1890
- if (TYPES['_' + x]) return TYPES['_' + x];
2179
+ if (!x) return null;
2180
+ if (TYPES[x.toLowerCase()] != null) return TYPES[x.toLowerCase()];
2181
+ if (TYPES['_' + x.toLowerCase()] != null) return TYPES['_' + x.toLowerCase()];
1891
2182
 
1892
2183
  switch (x) {
1893
2184
  case 'i32':
2185
+ case 'i64':
2186
+ case 'f64':
1894
2187
  return TYPES.number;
1895
2188
  }
1896
2189
 
@@ -1901,7 +2194,7 @@ const extractTypeAnnotation = decl => {
1901
2194
  let a = decl;
1902
2195
  while (a.typeAnnotation) a = a.typeAnnotation;
1903
2196
 
1904
- let type, elementType;
2197
+ let type = null, elementType = null;
1905
2198
  if (a.typeName) {
1906
2199
  type = a.typeName.name;
1907
2200
  } else if (a.type.endsWith('Keyword')) {
@@ -1914,7 +2207,7 @@ const extractTypeAnnotation = decl => {
1914
2207
  const typeName = type;
1915
2208
  type = typeAnnoToPorfType(type);
1916
2209
 
1917
- if (type === TYPES._bytestring && !process.argv.includes('-bytestring')) type = TYPES.string;
2210
+ if (type === TYPES.bytestring && !Prefs.bytestring) type = TYPES.string;
1918
2211
 
1919
2212
  // if (decl.name) console.log(decl.name, { type, elementType });
1920
2213
 
@@ -1928,10 +2221,13 @@ const generateVar = (scope, decl) => {
1928
2221
 
1929
2222
  // global variable if in top scope (main) and var ..., or if wanted
1930
2223
  const global = topLevel || decl._bare; // decl.kind === 'var';
2224
+ const target = global ? globals : scope.locals;
1931
2225
 
1932
2226
  for (const x of decl.declarations) {
1933
2227
  const name = mapName(x.id.name);
1934
2228
 
2229
+ if (!name) return todo(scope, 'destructuring is not supported yet');
2230
+
1935
2231
  if (x.init && isFuncType(x.init.type)) {
1936
2232
  // hack for let a = function () { ... }
1937
2233
  x.init.id = { name };
@@ -1947,16 +2243,29 @@ const generateVar = (scope, decl) => {
1947
2243
  continue; // always ignore
1948
2244
  }
1949
2245
 
1950
- let idx = allocVar(scope, name, global);
2246
+ // // generate init before allocating var
2247
+ // let generated;
2248
+ // if (x.init) generated = generate(scope, x.init, global, name);
2249
+
2250
+ const typed = typedInput && x.id.typeAnnotation;
2251
+ let idx = allocVar(scope, name, global, !(typed && extractTypeAnnotation(x.id).type != null));
1951
2252
 
1952
- if (typedInput && x.id.typeAnnotation) {
2253
+ if (typed) {
1953
2254
  addVarMetadata(scope, name, global, extractTypeAnnotation(x.id));
1954
2255
  }
1955
2256
 
1956
2257
  if (x.init) {
1957
- out = out.concat(generate(scope, x.init, global, name));
1958
-
1959
- out.push([ global ? Opcodes.global_set : Opcodes.local_set, idx ]);
2258
+ const generated = generate(scope, x.init, global, name);
2259
+ if (scope.arrays?.get(name) != null) {
2260
+ // hack to set local as pointer before
2261
+ out.push(...number(scope.arrays.get(name)), [ global ? Opcodes.global_set : Opcodes.local_set, idx ]);
2262
+ if (generated.at(-1) == Opcodes.i32_from_u) generated.pop();
2263
+ generated.pop();
2264
+ out = out.concat(generated);
2265
+ } else {
2266
+ out = out.concat(generated);
2267
+ out.push([ global ? Opcodes.global_set : Opcodes.local_set, idx ]);
2268
+ }
1960
2269
  out.push(...setType(scope, name, getNodeType(scope, x.init)));
1961
2270
  }
1962
2271
 
@@ -1967,7 +2276,8 @@ const generateVar = (scope, decl) => {
1967
2276
  return out;
1968
2277
  };
1969
2278
 
1970
- const generateAssign = (scope, decl) => {
2279
+ // todo: optimize this func for valueUnused
2280
+ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
1971
2281
  const { type, name } = decl.left;
1972
2282
 
1973
2283
  if (type === 'ObjectPattern') {
@@ -1982,22 +2292,30 @@ const generateAssign = (scope, decl) => {
1982
2292
  return [];
1983
2293
  }
1984
2294
 
2295
+ const op = decl.operator.slice(0, -1) || '=';
2296
+
1985
2297
  // hack: .length setter
1986
2298
  if (decl.left.type === 'MemberExpression' && decl.left.property.name === 'length') {
1987
2299
  const name = decl.left.object.name;
1988
- const pointer = arrays.get(name);
2300
+ const pointer = scope.arrays?.get(name);
1989
2301
 
1990
- const aotPointer = pointer != null;
2302
+ const aotPointer = Prefs.aotPointerOpt && pointer != null;
1991
2303
 
1992
2304
  const newValueTmp = localTmp(scope, '__length_setter_tmp');
2305
+ const pointerTmp = op === '=' ? null : localTmp(scope, '__member_setter_ptr_tmp', Valtype.i32);
1993
2306
 
1994
2307
  return [
1995
2308
  ...(aotPointer ? number(0, Valtype.i32) : [
1996
2309
  ...generate(scope, decl.left.object),
1997
2310
  Opcodes.i32_to_u
1998
2311
  ]),
2312
+ ...(!pointerTmp ? [] : [ [ Opcodes.local_tee, pointerTmp ] ]),
1999
2313
 
2000
- ...generate(scope, decl.right),
2314
+ ...(op === '=' ? generate(scope, decl.right) : performOp(scope, op, [
2315
+ [ Opcodes.local_get, pointerTmp ],
2316
+ [ Opcodes.i32_load, Math.log2(ValtypeSize.i32) - 1, 0 ],
2317
+ Opcodes.i32_from_u
2318
+ ], generate(scope, decl.right), number(TYPES.number, Valtype.i32), getNodeType(scope, decl.right))),
2001
2319
  [ Opcodes.local_tee, newValueTmp ],
2002
2320
 
2003
2321
  Opcodes.i32_to_u,
@@ -2007,21 +2325,19 @@ const generateAssign = (scope, decl) => {
2007
2325
  ];
2008
2326
  }
2009
2327
 
2010
- const op = decl.operator.slice(0, -1) || '=';
2011
-
2012
2328
  // arr[i]
2013
2329
  if (decl.left.type === 'MemberExpression' && decl.left.computed) {
2014
2330
  const name = decl.left.object.name;
2015
- const pointer = arrays.get(name);
2331
+ const pointer = scope.arrays?.get(name);
2016
2332
 
2017
- const aotPointer = pointer != null;
2333
+ const aotPointer = Prefs.aotPointerOpt && pointer != null;
2018
2334
 
2019
2335
  const newValueTmp = localTmp(scope, '__member_setter_val_tmp');
2020
2336
  const pointerTmp = op === '=' ? -1 : localTmp(scope, '__member_setter_ptr_tmp', Valtype.i32);
2021
2337
 
2022
2338
  return [
2023
2339
  ...typeSwitch(scope, getNodeType(scope, decl.left.object), {
2024
- [TYPES._array]: [
2340
+ [TYPES.array]: [
2025
2341
  ...(aotPointer ? [] : [
2026
2342
  ...generate(scope, decl.left.object),
2027
2343
  Opcodes.i32_to_u
@@ -2070,6 +2386,8 @@ const generateAssign = (scope, decl) => {
2070
2386
  ];
2071
2387
  }
2072
2388
 
2389
+ if (!name) return todo(scope, 'destructuring is not supported yet', true);
2390
+
2073
2391
  const [ local, isGlobal ] = lookupName(scope, name);
2074
2392
 
2075
2393
  if (local === undefined) {
@@ -2116,9 +2434,7 @@ const generateAssign = (scope, decl) => {
2116
2434
  ], getType(scope, name), getNodeType(scope, decl.right), isGlobal, name, true),
2117
2435
  [ isGlobal ? Opcodes.global_get : Opcodes.local_get, local.idx ],
2118
2436
 
2119
- getLastType(scope),
2120
- // hack: type is idx+1
2121
- [ isGlobal ? Opcodes.global_set : Opcodes.local_set, local.idx + 1 ],
2437
+ ...setType(scope, name, getLastType(scope))
2122
2438
  ];
2123
2439
  }
2124
2440
 
@@ -2129,9 +2445,7 @@ const generateAssign = (scope, decl) => {
2129
2445
 
2130
2446
  // todo: string concat types
2131
2447
 
2132
- // hack: type is idx+1
2133
- ...number(TYPES.number, Valtype.i32),
2134
- [ isGlobal ? Opcodes.global_set : Opcodes.local_set, local.idx + 1 ],
2448
+ ...setType(scope, name, TYPES.number)
2135
2449
  ];
2136
2450
  };
2137
2451
 
@@ -2177,7 +2491,7 @@ const generateUnary = (scope, decl) => {
2177
2491
  return out;
2178
2492
  }
2179
2493
 
2180
- case 'delete':
2494
+ case 'delete': {
2181
2495
  let toReturn = true, toGenerate = true;
2182
2496
 
2183
2497
  if (decl.argument.type === 'Identifier') {
@@ -2199,40 +2513,60 @@ const generateUnary = (scope, decl) => {
2199
2513
 
2200
2514
  out.push(...number(toReturn ? 1 : 0));
2201
2515
  return out;
2516
+ }
2517
+
2518
+ case 'typeof': {
2519
+ let overrideType, toGenerate = true;
2520
+
2521
+ if (decl.argument.type === 'Identifier') {
2522
+ const out = generateIdent(scope, decl.argument);
2523
+
2524
+ // if ReferenceError (undeclared var), ignore and return undefined
2525
+ if (out[1]) {
2526
+ // does not exist (2 ops from throw)
2527
+ overrideType = number(TYPES.undefined, Valtype.i32);
2528
+ toGenerate = false;
2529
+ }
2530
+ }
2202
2531
 
2203
- case 'typeof':
2204
- return typeSwitch(scope, getNodeType(scope, decl.argument), {
2532
+ const out = toGenerate ? generate(scope, decl.argument) : [];
2533
+ disposeLeftover(out);
2534
+
2535
+ out.push(...typeSwitch(scope, overrideType ?? getNodeType(scope, decl.argument), {
2205
2536
  [TYPES.number]: makeString(scope, 'number', false, '#typeof_result'),
2206
2537
  [TYPES.boolean]: makeString(scope, 'boolean', false, '#typeof_result'),
2207
2538
  [TYPES.string]: makeString(scope, 'string', false, '#typeof_result'),
2208
2539
  [TYPES.undefined]: makeString(scope, 'undefined', false, '#typeof_result'),
2209
2540
  [TYPES.function]: makeString(scope, 'function', false, '#typeof_result'),
2210
2541
 
2211
- [TYPES._bytestring]: makeString(scope, 'string', false, '#typeof_result'),
2542
+ [TYPES.bytestring]: makeString(scope, 'string', false, '#typeof_result'),
2212
2543
 
2213
2544
  // object and internal types
2214
2545
  default: makeString(scope, 'object', false, '#typeof_result'),
2215
- });
2546
+ }));
2547
+
2548
+ return out;
2549
+ }
2216
2550
 
2217
2551
  default:
2218
- return todo(`unary operator ${decl.operator} not implemented yet`);
2552
+ return todo(scope, `unary operator ${decl.operator} not implemented yet`, true);
2219
2553
  }
2220
2554
  };
2221
2555
 
2222
- const generateUpdate = (scope, decl) => {
2556
+ const generateUpdate = (scope, decl, _global, _name, valueUnused = false) => {
2223
2557
  const { name } = decl.argument;
2224
2558
 
2225
2559
  const [ local, isGlobal ] = lookupName(scope, name);
2226
2560
 
2227
2561
  if (local === undefined) {
2228
- return todo(`update expression with undefined variable`);
2562
+ return todo(scope, `update expression with undefined variable`, true);
2229
2563
  }
2230
2564
 
2231
2565
  const idx = local.idx;
2232
2566
  const out = [];
2233
2567
 
2234
2568
  out.push([ isGlobal ? Opcodes.global_get : Opcodes.local_get, idx ]);
2235
- if (!decl.prefix) out.push([ isGlobal ? Opcodes.global_get : Opcodes.local_get, idx ]);
2569
+ if (!decl.prefix && !valueUnused) out.push([ isGlobal ? Opcodes.global_get : Opcodes.local_get, idx ]);
2236
2570
 
2237
2571
  switch (decl.operator) {
2238
2572
  case '++':
@@ -2245,7 +2579,7 @@ const generateUpdate = (scope, decl) => {
2245
2579
  }
2246
2580
 
2247
2581
  out.push([ isGlobal ? Opcodes.global_set : Opcodes.local_set, idx ]);
2248
- if (decl.prefix) out.push([ isGlobal ? Opcodes.global_get : Opcodes.local_get, idx ]);
2582
+ if (decl.prefix && !valueUnused) out.push([ isGlobal ? Opcodes.global_get : Opcodes.local_get, idx ]);
2249
2583
 
2250
2584
  return out;
2251
2585
  };
@@ -2285,7 +2619,7 @@ const generateConditional = (scope, decl) => {
2285
2619
  // note type
2286
2620
  out.push(
2287
2621
  ...getNodeType(scope, decl.consequent),
2288
- setLastType(scope)
2622
+ ...setLastType(scope)
2289
2623
  );
2290
2624
 
2291
2625
  out.push([ Opcodes.else ]);
@@ -2294,7 +2628,7 @@ const generateConditional = (scope, decl) => {
2294
2628
  // note type
2295
2629
  out.push(
2296
2630
  ...getNodeType(scope, decl.alternate),
2297
- setLastType(scope)
2631
+ ...setLastType(scope)
2298
2632
  );
2299
2633
 
2300
2634
  out.push([ Opcodes.end ]);
@@ -2308,7 +2642,7 @@ const generateFor = (scope, decl) => {
2308
2642
  const out = [];
2309
2643
 
2310
2644
  if (decl.init) {
2311
- out.push(...generate(scope, decl.init));
2645
+ out.push(...generate(scope, decl.init, false, undefined, true));
2312
2646
  disposeLeftover(out);
2313
2647
  }
2314
2648
 
@@ -2326,7 +2660,7 @@ const generateFor = (scope, decl) => {
2326
2660
  out.push(...generate(scope, decl.body));
2327
2661
  out.push([ Opcodes.end ]);
2328
2662
 
2329
- if (decl.update) out.push(...generate(scope, decl.update));
2663
+ if (decl.update) out.push(...generate(scope, decl.update, false, undefined, true));
2330
2664
 
2331
2665
  out.push([ Opcodes.br, 1 ]);
2332
2666
  out.push([ Opcodes.end ], [ Opcodes.end ]);
@@ -2354,6 +2688,36 @@ const generateWhile = (scope, decl) => {
2354
2688
  return out;
2355
2689
  };
2356
2690
 
2691
+ const generateDoWhile = (scope, decl) => {
2692
+ const out = [];
2693
+
2694
+ out.push([ Opcodes.loop, Blocktype.void ]);
2695
+ depth.push('dowhile');
2696
+
2697
+ // block for break (includes all)
2698
+ out.push([ Opcodes.block, Blocktype.void ]);
2699
+ depth.push('block');
2700
+
2701
+ // block for continue
2702
+ // includes body but not test+loop so we can exit body at anytime
2703
+ // and still test+loop after
2704
+ out.push([ Opcodes.block, Blocktype.void ]);
2705
+ depth.push('block');
2706
+
2707
+ out.push(...generate(scope, decl.body));
2708
+
2709
+ out.push([ Opcodes.end ]);
2710
+ depth.pop();
2711
+
2712
+ out.push(...generate(scope, decl.test), Opcodes.i32_to);
2713
+ out.push([ Opcodes.br_if, 1 ]);
2714
+
2715
+ out.push([ Opcodes.end ], [ Opcodes.end ]);
2716
+ depth.pop(); depth.pop();
2717
+
2718
+ return out;
2719
+ };
2720
+
2357
2721
  const generateForOf = (scope, decl) => {
2358
2722
  const out = [];
2359
2723
 
@@ -2383,8 +2747,17 @@ const generateForOf = (scope, decl) => {
2383
2747
  // setup local for left
2384
2748
  generate(scope, decl.left);
2385
2749
 
2386
- const leftName = decl.left.declarations[0].id.name;
2750
+ let leftName = decl.left.declarations?.[0]?.id?.name;
2751
+ if (!leftName && decl.left.name) {
2752
+ leftName = decl.left.name;
2753
+
2754
+ generateVar(scope, { kind: 'var', _bare: true, declarations: [ { id: { name: leftName } } ] })
2755
+ }
2756
+
2757
+ // if (!leftName) console.log(decl.left?.declarations?.[0]?.id ?? decl.left);
2758
+
2387
2759
  const [ local, isGlobal ] = lookupName(scope, leftName);
2760
+ if (!local) return todo(scope, 'for of failed to get left local (probably destructure)');
2388
2761
 
2389
2762
  depth.push('block');
2390
2763
  depth.push('block');
@@ -2393,6 +2766,7 @@ const generateForOf = (scope, decl) => {
2393
2766
  // hack: this is naughty and will break things!
2394
2767
  let newOut = number(0, Valtype.f64), newPointer = -1;
2395
2768
  if (pages.hasAnyString) {
2769
+ // todo: we use i16 even for bytestrings which should not make a bad thing happen, just be confusing for debugging?
2396
2770
  0, [ newOut, newPointer ] = makeArray(scope, {
2397
2771
  rawElements: new Array(1)
2398
2772
  }, isGlobal, leftName, true, 'i16');
@@ -2401,7 +2775,7 @@ const generateForOf = (scope, decl) => {
2401
2775
  // set type for local
2402
2776
  // todo: optimize away counter and use end pointer
2403
2777
  out.push(...typeSwitch(scope, getNodeType(scope, decl.right), {
2404
- [TYPES._array]: [
2778
+ [TYPES.array]: [
2405
2779
  ...setType(scope, leftName, TYPES.number),
2406
2780
 
2407
2781
  [ Opcodes.loop, Blocktype.void ],
@@ -2484,6 +2858,56 @@ const generateForOf = (scope, decl) => {
2484
2858
  [ Opcodes.end ],
2485
2859
  [ Opcodes.end ]
2486
2860
  ],
2861
+ [TYPES.bytestring]: [
2862
+ ...setType(scope, leftName, TYPES.bytestring),
2863
+
2864
+ [ Opcodes.loop, Blocktype.void ],
2865
+
2866
+ // setup new/out array
2867
+ ...newOut,
2868
+ [ Opcodes.drop ],
2869
+
2870
+ ...number(0, Valtype.i32), // base 0 for store after
2871
+
2872
+ // load current string ind {arg}
2873
+ [ Opcodes.local_get, pointer ],
2874
+ [ Opcodes.local_get, counter ],
2875
+ [ Opcodes.i32_add ],
2876
+ [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(ValtypeSize.i32) ],
2877
+
2878
+ // store to new string ind 0
2879
+ [ Opcodes.i32_store8, 0, ...unsignedLEB128(newPointer + ValtypeSize.i32) ],
2880
+
2881
+ // return new string (page)
2882
+ ...number(newPointer),
2883
+
2884
+ [ isGlobal ? Opcodes.global_set : Opcodes.local_set, local.idx ],
2885
+
2886
+ [ Opcodes.block, Blocktype.void ],
2887
+ [ Opcodes.block, Blocktype.void ],
2888
+ ...generate(scope, decl.body),
2889
+ [ Opcodes.end ],
2890
+
2891
+ // increment iter pointer
2892
+ // [ Opcodes.local_get, pointer ],
2893
+ // ...number(1, Valtype.i32),
2894
+ // [ Opcodes.i32_add ],
2895
+ // [ Opcodes.local_set, pointer ],
2896
+
2897
+ // increment counter by 1
2898
+ [ Opcodes.local_get, counter ],
2899
+ ...number(1, Valtype.i32),
2900
+ [ Opcodes.i32_add ],
2901
+ [ Opcodes.local_tee, counter ],
2902
+
2903
+ // loop if counter != length
2904
+ [ Opcodes.local_get, length ],
2905
+ [ Opcodes.i32_ne ],
2906
+ [ Opcodes.br_if, 1 ],
2907
+
2908
+ [ Opcodes.end ],
2909
+ [ Opcodes.end ]
2910
+ ],
2487
2911
  default: internalThrow(scope, 'TypeError', `Tried for..of on non-iterable type`)
2488
2912
  }, Blocktype.void));
2489
2913
 
@@ -2494,28 +2918,65 @@ const generateForOf = (scope, decl) => {
2494
2918
  return out;
2495
2919
  };
2496
2920
 
2921
+ // find the nearest loop in depth map by type
2497
2922
  const getNearestLoop = () => {
2498
2923
  for (let i = depth.length - 1; i >= 0; i--) {
2499
- if (depth[i] === 'while' || depth[i] === 'for' || depth[i] === 'forof') return i;
2924
+ if (['while', 'dowhile', 'for', 'forof'].includes(depth[i])) return i;
2500
2925
  }
2501
2926
 
2502
2927
  return -1;
2503
2928
  };
2504
2929
 
2505
2930
  const generateBreak = (scope, decl) => {
2506
- const nearestLoop = depth.length - getNearestLoop();
2931
+ const target = decl.label ? scope.labels.get(decl.label.name) : getNearestLoop();
2932
+ const type = depth[target];
2933
+
2934
+ // different loop types have different branch offsets
2935
+ // as they have different wasm block/loop/if structures
2936
+ // we need to use the right offset by type to branch to the one we want
2937
+ // for a break: exit the loop without executing anything else inside it
2938
+ const offset = ({
2939
+ for: 2, // loop > if (wanted branch) > block (we are here)
2940
+ while: 2, // loop > if (wanted branch) (we are here)
2941
+ dowhile: 2, // loop > block (wanted branch) > block (we are here)
2942
+ forof: 2, // loop > block (wanted branch) > block (we are here)
2943
+ if: 1 // break inside if, branch 0 to skip the rest of the if
2944
+ })[type];
2945
+
2507
2946
  return [
2508
- [ Opcodes.br, ...signedLEB128(nearestLoop - 2) ]
2947
+ [ Opcodes.br, ...signedLEB128(depth.length - target - offset) ]
2509
2948
  ];
2510
2949
  };
2511
2950
 
2512
2951
  const generateContinue = (scope, decl) => {
2513
- const nearestLoop = depth.length - getNearestLoop();
2952
+ const target = decl.label ? scope.labels.get(decl.label.name) : getNearestLoop();
2953
+ const type = depth[target];
2954
+
2955
+ // different loop types have different branch offsets
2956
+ // as they have different wasm block/loop/if structures
2957
+ // we need to use the right offset by type to branch to the one we want
2958
+ // for a continue: do test for the loop, and then loop depending on that success
2959
+ const offset = ({
2960
+ for: 3, // loop (wanted branch) > if > block (we are here)
2961
+ while: 1, // loop (wanted branch) > if (we are here)
2962
+ dowhile: 3, // loop > block > block (wanted branch) (we are here)
2963
+ forof: 3 // loop > block > block (wanted branch) (we are here)
2964
+ })[type];
2965
+
2514
2966
  return [
2515
- [ Opcodes.br, ...signedLEB128(nearestLoop - 3) ]
2967
+ [ Opcodes.br, ...signedLEB128(depth.length - target - offset) ]
2516
2968
  ];
2517
2969
  };
2518
2970
 
2971
+ const generateLabel = (scope, decl) => {
2972
+ scope.labels ??= new Map();
2973
+
2974
+ const name = decl.label.name;
2975
+ scope.labels.set(name, depth.length);
2976
+
2977
+ return generate(scope, decl.body);
2978
+ };
2979
+
2519
2980
  const generateThrow = (scope, decl) => {
2520
2981
  scope.throws = true;
2521
2982
 
@@ -2536,6 +2997,9 @@ const generateThrow = (scope, decl) => {
2536
2997
  let exceptId = exceptions.push({ constructor, message }) - 1;
2537
2998
  let tagIdx = tags[0].idx;
2538
2999
 
3000
+ scope.exceptions ??= [];
3001
+ scope.exceptions.push(exceptId);
3002
+
2539
3003
  // todo: write a description of how this works lol
2540
3004
 
2541
3005
  return [
@@ -2545,7 +3009,7 @@ const generateThrow = (scope, decl) => {
2545
3009
  };
2546
3010
 
2547
3011
  const generateTry = (scope, decl) => {
2548
- if (decl.finalizer) return todo('try finally not implemented yet');
3012
+ if (decl.finalizer) return todo(scope, 'try finally not implemented yet');
2549
3013
 
2550
3014
  const out = [];
2551
3015
 
@@ -2576,11 +3040,11 @@ const generateAssignPat = (scope, decl) => {
2576
3040
  // TODO
2577
3041
  // if identifier declared, use that
2578
3042
  // else, use default (right)
2579
- return todo('assignment pattern (optional arg)');
3043
+ return todo(scope, 'assignment pattern (optional arg)');
2580
3044
  };
2581
3045
 
2582
3046
  let pages = new Map();
2583
- const allocPage = (reason, type) => {
3047
+ const allocPage = (scope, reason, type) => {
2584
3048
  if (pages.has(reason)) return pages.get(reason).ind;
2585
3049
 
2586
3050
  if (reason.startsWith('array:')) pages.hasArray = true;
@@ -2591,16 +3055,20 @@ const allocPage = (reason, type) => {
2591
3055
  const ind = pages.size;
2592
3056
  pages.set(reason, { ind, type });
2593
3057
 
2594
- if (allocLog) log('alloc', `allocated new page of memory (${ind}) | ${reason} (type: ${type})`);
3058
+ scope.pages ??= new Map();
3059
+ scope.pages.set(reason, { ind, type });
3060
+
3061
+ if (Prefs.allocLog) log('alloc', `allocated new page of memory (${ind}) | ${reason} (type: ${type})`);
2595
3062
 
2596
3063
  return ind;
2597
3064
  };
2598
3065
 
3066
+ // todo: add scope.pages
2599
3067
  const freePage = reason => {
2600
3068
  const { ind } = pages.get(reason);
2601
3069
  pages.delete(reason);
2602
3070
 
2603
- if (allocLog) log('alloc', `freed page of memory (${ind}) | ${reason}`);
3071
+ if (Prefs.allocLog) log('alloc', `freed page of memory (${ind}) | ${reason}`);
2604
3072
 
2605
3073
  return ind;
2606
3074
  };
@@ -2626,15 +3094,14 @@ const StoreOps = {
2626
3094
 
2627
3095
  let data = [];
2628
3096
 
2629
- const compileBytes = (val, itemType, signed = true) => {
3097
+ const compileBytes = (val, itemType) => {
2630
3098
  // todo: this is a mess and needs confirming / ????
2631
3099
  switch (itemType) {
2632
3100
  case 'i8': return [ val % 256 ];
2633
- case 'i16': return [ val % 256, Math.floor(val / 256) ];
2634
-
2635
- case 'i32':
2636
- case 'i64':
2637
- return enforceFourBytes(signedLEB128(val));
3101
+ case 'i16': return [ val % 256, (val / 256 | 0) % 256 ];
3102
+ case 'i16': return [ val % 256, (val / 256 | 0) % 256 ];
3103
+ case 'i32': return [...new Uint8Array(new Int32Array([ val ]).buffer)];
3104
+ // todo: i64
2638
3105
 
2639
3106
  case 'f64': return ieee754_binary64(val);
2640
3107
  }
@@ -2652,16 +3119,22 @@ const getAllocType = itemType => {
2652
3119
  const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty = false, itemType = valtype) => {
2653
3120
  const out = [];
2654
3121
 
3122
+ scope.arrays ??= new Map();
3123
+
2655
3124
  let firstAssign = false;
2656
- if (!arrays.has(name) || name === '$undeclared') {
3125
+ if (!scope.arrays.has(name) || name === '$undeclared') {
2657
3126
  firstAssign = true;
2658
3127
 
2659
3128
  // todo: can we just have 1 undeclared array? probably not? but this is not really memory efficient
2660
3129
  const uniqueName = name === '$undeclared' ? name + Math.random().toString().slice(2) : name;
2661
- arrays.set(name, allocPage(`${getAllocType(itemType)}: ${uniqueName}`, itemType) * pageSize);
3130
+
3131
+ if (Prefs.scopedPageNames) scope.arrays.set(name, allocPage(scope, `${getAllocType(itemType)}: ${scope.name}/${uniqueName}`, itemType) * pageSize);
3132
+ else scope.arrays.set(name, allocPage(scope, `${getAllocType(itemType)}: ${uniqueName}`, itemType) * pageSize);
2662
3133
  }
2663
3134
 
2664
- const pointer = arrays.get(name);
3135
+ const pointer = scope.arrays.get(name);
3136
+
3137
+ const local = global ? globals[name] : scope.locals[name];
2665
3138
 
2666
3139
  const useRawElements = !!decl.rawElements;
2667
3140
  const elements = useRawElements ? decl.rawElements : decl.elements;
@@ -2669,19 +3142,25 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
2669
3142
  const valtype = itemTypeToValtype[itemType];
2670
3143
  const length = elements.length;
2671
3144
 
2672
- if (firstAssign && useRawElements) {
2673
- let bytes = compileBytes(length, 'i32');
3145
+ if (firstAssign && useRawElements && !Prefs.noData) {
3146
+ // if length is 0 memory/data will just be 0000... anyway
3147
+ if (length !== 0) {
3148
+ let bytes = compileBytes(length, 'i32');
2674
3149
 
2675
- if (!initEmpty) for (let i = 0; i < length; i++) {
2676
- if (elements[i] == null) continue;
3150
+ if (!initEmpty) for (let i = 0; i < length; i++) {
3151
+ if (elements[i] == null) continue;
2677
3152
 
2678
- bytes.push(...compileBytes(elements[i], itemType));
2679
- }
3153
+ bytes.push(...compileBytes(elements[i], itemType));
3154
+ }
2680
3155
 
2681
- data.push({
2682
- offset: pointer,
2683
- bytes
2684
- });
3156
+ const ind = data.push({
3157
+ offset: pointer,
3158
+ bytes
3159
+ }) - 1;
3160
+
3161
+ scope.data ??= [];
3162
+ scope.data.push(ind);
3163
+ }
2685
3164
 
2686
3165
  // local value as pointer
2687
3166
  out.push(...number(pointer));
@@ -2689,11 +3168,22 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
2689
3168
  return [ out, pointer ];
2690
3169
  }
2691
3170
 
3171
+ const pointerTmp = local != null ? localTmp(scope, '#makearray_pointer_tmp', Valtype.i32) : null;
3172
+ if (pointerTmp != null) {
3173
+ out.push(
3174
+ [ global ? Opcodes.global_get : Opcodes.local_get, local.idx ],
3175
+ Opcodes.i32_to_u,
3176
+ [ Opcodes.local_set, pointerTmp ]
3177
+ );
3178
+ }
3179
+
3180
+ const pointerWasm = pointerTmp != null ? [ [ Opcodes.local_get, pointerTmp ] ] : number(pointer, Valtype.i32);
3181
+
2692
3182
  // store length as 0th array
2693
3183
  out.push(
2694
- ...number(0, Valtype.i32),
3184
+ ...pointerWasm,
2695
3185
  ...number(length, Valtype.i32),
2696
- [ Opcodes.i32_store, Math.log2(ValtypeSize.i32) - 1, ...unsignedLEB128(pointer) ]
3186
+ [ Opcodes.i32_store, Math.log2(ValtypeSize.i32) - 1, 0 ]
2697
3187
  );
2698
3188
 
2699
3189
  const storeOp = StoreOps[itemType];
@@ -2702,20 +3192,20 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
2702
3192
  if (elements[i] == null) continue;
2703
3193
 
2704
3194
  out.push(
2705
- ...number(0, Valtype.i32),
3195
+ ...pointerWasm,
2706
3196
  ...(useRawElements ? number(elements[i], Valtype[valtype]) : generate(scope, elements[i])),
2707
- [ storeOp, (Math.log2(ValtypeSize[itemType]) || 1) - 1, ...unsignedLEB128(pointer + ValtypeSize.i32 + i * ValtypeSize[itemType]) ]
3197
+ [ storeOp, (Math.log2(ValtypeSize[itemType]) || 1) - 1, ...unsignedLEB128(ValtypeSize.i32 + i * ValtypeSize[itemType]) ]
2708
3198
  );
2709
3199
  }
2710
3200
 
2711
3201
  // local value as pointer
2712
- out.push(...number(pointer));
3202
+ out.push(...pointerWasm, Opcodes.i32_from_u);
2713
3203
 
2714
3204
  return [ out, pointer ];
2715
3205
  };
2716
3206
 
2717
3207
  const byteStringable = str => {
2718
- if (!process.argv.includes('-bytestring')) return false;
3208
+ if (!Prefs.bytestring) return false;
2719
3209
 
2720
3210
  for (let i = 0; i < str.length; i++) {
2721
3211
  if (str.charCodeAt(i) > 0xFF) return false;
@@ -2724,9 +3214,9 @@ const byteStringable = str => {
2724
3214
  return true;
2725
3215
  };
2726
3216
 
2727
- const makeString = (scope, str, global = false, name = '$undeclared') => {
3217
+ const makeString = (scope, str, global = false, name = '$undeclared', forceBytestring = undefined) => {
2728
3218
  const rawElements = new Array(str.length);
2729
- let byteStringable = process.argv.includes('-bytestring');
3219
+ let byteStringable = Prefs.bytestring;
2730
3220
  for (let i = 0; i < str.length; i++) {
2731
3221
  const c = str.charCodeAt(i);
2732
3222
  rawElements[i] = c;
@@ -2734,25 +3224,60 @@ const makeString = (scope, str, global = false, name = '$undeclared') => {
2734
3224
  if (byteStringable && c > 0xFF) byteStringable = false;
2735
3225
  }
2736
3226
 
3227
+ if (byteStringable && forceBytestring === false) byteStringable = false;
3228
+
2737
3229
  return makeArray(scope, {
2738
3230
  rawElements
2739
3231
  }, global, name, false, byteStringable ? 'i8' : 'i16')[0];
2740
3232
  };
2741
3233
 
2742
- let arrays = new Map();
2743
3234
  const generateArray = (scope, decl, global = false, name = '$undeclared', initEmpty = false) => {
2744
3235
  return makeArray(scope, decl, global, name, initEmpty, valtype)[0];
2745
3236
  };
2746
3237
 
2747
3238
  export const generateMember = (scope, decl, _global, _name) => {
2748
3239
  const name = decl.object.name;
2749
- const pointer = arrays.get(name);
3240
+ const pointer = scope.arrays?.get(name);
3241
+
3242
+ const aotPointer = Prefs.aotPointerOpt && pointer != null;
3243
+
3244
+ // hack: .name
3245
+ if (decl.property.name === 'name') {
3246
+ if (hasFuncWithName(name)) {
3247
+ let nameProp = name;
2750
3248
 
2751
- const aotPointer = pointer != null;
3249
+ // eg: __String_prototype_toLowerCase -> toLowerCase
3250
+ if (nameProp.startsWith('__')) nameProp = nameProp.split('_').pop();
3251
+
3252
+ return makeString(scope, nameProp, _global, _name, true);
3253
+ } else {
3254
+ return generate(scope, DEFAULT_VALUE);
3255
+ }
3256
+ }
2752
3257
 
2753
3258
  // hack: .length
2754
3259
  if (decl.property.name === 'length') {
2755
- // if (![TYPES._array, TYPES.string].includes(type)) return number(UNDEFINED);
3260
+ const func = funcs.find(x => x.name === name);
3261
+ if (func) {
3262
+ const userFunc = funcIndex[name] && !importedFuncs[name] && !builtinFuncs[name] && !internalConstrs[name];
3263
+ const typedParams = userFunc || builtinFuncs[name]?.typedParams;
3264
+ return number(typedParams ? func.params.length / 2 : func.params.length);
3265
+ }
3266
+
3267
+ if (builtinFuncs[name + '$constructor']) {
3268
+ const regularFunc = builtinFuncs[name];
3269
+ const regularParams = regularFunc.typedParams ? (regularFunc.params.length / 2) : regularFunc.params.length;
3270
+
3271
+ const constructorFunc = builtinFuncs[name + '$constructor'];
3272
+ const constructorParams = constructorFunc.typedParams ? (constructorFunc.params.length / 2) : constructorFunc.params.length;
3273
+
3274
+ return number(Math.max(regularParams, constructorParams));
3275
+ }
3276
+
3277
+ if (builtinFuncs[name]) return number(builtinFuncs[name].typedParams ? (builtinFuncs[name].params.length / 2) : builtinFuncs[name].params.length);
3278
+ if (importedFuncs[name]) return number(importedFuncs[name].params);
3279
+ if (internalConstrs[name]) return number(internalConstrs[name].length ?? 0);
3280
+
2756
3281
  return [
2757
3282
  ...(aotPointer ? number(0, Valtype.i32) : [
2758
3283
  ...generate(scope, decl.object),
@@ -2777,7 +3302,7 @@ export const generateMember = (scope, decl, _global, _name) => {
2777
3302
  }
2778
3303
 
2779
3304
  return typeSwitch(scope, getNodeType(scope, decl.object), {
2780
- [TYPES._array]: [
3305
+ [TYPES.array]: [
2781
3306
  // get index as valtype
2782
3307
  ...property,
2783
3308
 
@@ -2796,7 +3321,7 @@ export const generateMember = (scope, decl, _global, _name) => {
2796
3321
  [ Opcodes.load, Math.log2(ValtypeSize[valtype]) - 1, ...unsignedLEB128((aotPointer ? pointer : 0) + ValtypeSize.i32) ],
2797
3322
 
2798
3323
  ...number(TYPES.number, Valtype.i32),
2799
- setLastType(scope)
3324
+ ...setLastType(scope)
2800
3325
  ],
2801
3326
 
2802
3327
  [TYPES.string]: [
@@ -2828,9 +3353,9 @@ export const generateMember = (scope, decl, _global, _name) => {
2828
3353
  ...number(newPointer),
2829
3354
 
2830
3355
  ...number(TYPES.string, Valtype.i32),
2831
- setLastType(scope)
3356
+ ...setLastType(scope)
2832
3357
  ],
2833
- [TYPES._bytestring]: [
3358
+ [TYPES.bytestring]: [
2834
3359
  // setup new/out array
2835
3360
  ...newOut,
2836
3361
  [ Opcodes.drop ],
@@ -2847,19 +3372,19 @@ export const generateMember = (scope, decl, _global, _name) => {
2847
3372
  ]),
2848
3373
 
2849
3374
  // load current string ind {arg}
2850
- [ Opcodes.i32_load8_u, Math.log2(ValtypeSize.i16) - 1, ...unsignedLEB128((aotPointer ? pointer : 0) + ValtypeSize.i32) ],
3375
+ [ Opcodes.i32_load8_u, 0, ...unsignedLEB128((aotPointer ? pointer : 0) + ValtypeSize.i32) ],
2851
3376
 
2852
3377
  // store to new string ind 0
2853
- [ Opcodes.i32_store8, Math.log2(ValtypeSize.i16) - 1, ...unsignedLEB128(newPointer + ValtypeSize.i32) ],
3378
+ [ Opcodes.i32_store8, 0, ...unsignedLEB128(newPointer + ValtypeSize.i32) ],
2854
3379
 
2855
3380
  // return new string (page)
2856
3381
  ...number(newPointer),
2857
3382
 
2858
- ...number(TYPES._bytestring, Valtype.i32),
2859
- setLastType(scope)
3383
+ ...number(TYPES.bytestring, Valtype.i32),
3384
+ ...setLastType(scope)
2860
3385
  ],
2861
3386
 
2862
- default: [ [ Opcodes.unreachable ] ]
3387
+ default: internalThrow(scope, 'TypeError', 'Member expression is not supported for non-string non-array yet', true)
2863
3388
  });
2864
3389
  };
2865
3390
 
@@ -2869,28 +3394,36 @@ const objectHack = node => {
2869
3394
  if (!node) return node;
2870
3395
 
2871
3396
  if (node.type === 'MemberExpression') {
2872
- if (node.computed || node.optional) return node;
3397
+ const out = (() => {
3398
+ if (node.computed || node.optional) return;
3399
+
3400
+ let objectName = node.object.name;
2873
3401
 
2874
- let objectName = node.object.name;
3402
+ // if object is not identifier or another member exp, give up
3403
+ if (node.object.type !== 'Identifier' && node.object.type !== 'MemberExpression') return;
3404
+ if (objectName && ['undefined', 'null', 'NaN', 'Infinity'].includes(objectName)) return;
2875
3405
 
2876
- // if object is not identifier or another member exp, give up
2877
- if (node.object.type !== 'Identifier' && node.object.type !== 'MemberExpression') return node;
3406
+ if (!objectName) objectName = objectHack(node.object)?.name?.slice?.(2);
2878
3407
 
2879
- if (!objectName) objectName = objectHack(node.object)?.name?.slice?.(2);
3408
+ // if .name or .length, give up (hack within a hack!)
3409
+ if (['name', 'length'].includes(node.property.name)) {
3410
+ node.object = objectHack(node.object);
3411
+ return;
3412
+ }
2880
3413
 
2881
- // if .length, give up (hack within a hack!)
2882
- if (node.property.name === 'length') return node;
3414
+ // no object name, give up
3415
+ if (!objectName) return;
2883
3416
 
2884
- // no object name, give up
2885
- if (!objectName) return node;
3417
+ const name = '__' + objectName + '_' + node.property.name;
3418
+ if (Prefs.codeLog) log('codegen', `object hack! ${node.object.name}.${node.property.name} -> ${name}`);
2886
3419
 
2887
- const name = '__' + objectName + '_' + node.property.name;
2888
- if (codeLog) log('codegen', `object hack! ${node.object.name}.${node.property.name} -> ${name}`);
3420
+ return {
3421
+ type: 'Identifier',
3422
+ name
3423
+ };
3424
+ })();
2889
3425
 
2890
- return {
2891
- type: 'Identifier',
2892
- name
2893
- };
3426
+ if (out) return out;
2894
3427
  }
2895
3428
 
2896
3429
  for (const x in node) {
@@ -2904,8 +3437,8 @@ const objectHack = node => {
2904
3437
  };
2905
3438
 
2906
3439
  const generateFunc = (scope, decl) => {
2907
- if (decl.async) return todo('async functions are not supported');
2908
- if (decl.generator) return todo('generator functions are not supported');
3440
+ if (decl.async) return todo(scope, 'async functions are not supported');
3441
+ if (decl.generator) return todo(scope, 'generator functions are not supported');
2909
3442
 
2910
3443
  const name = decl.id ? decl.id.name : `anonymous_${randId()}`;
2911
3444
  const params = decl.params ?? [];
@@ -2921,6 +3454,11 @@ const generateFunc = (scope, decl) => {
2921
3454
  name
2922
3455
  };
2923
3456
 
3457
+ if (typedInput && decl.returnType) {
3458
+ innerScope.returnType = extractTypeAnnotation(decl.returnType).type;
3459
+ innerScope.returns = [ valtypeBinary ];
3460
+ }
3461
+
2924
3462
  for (let i = 0; i < params.length; i++) {
2925
3463
  allocVar(innerScope, params[i].name, false);
2926
3464
 
@@ -2947,6 +3485,8 @@ const generateFunc = (scope, decl) => {
2947
3485
  };
2948
3486
  funcIndex[name] = func.index;
2949
3487
 
3488
+ if (name === 'main') func.gotLastType = true;
3489
+
2950
3490
  // quick hack fixes
2951
3491
  for (const inst of wasm) {
2952
3492
  if (inst[0] === Opcodes.call && inst[1] === -1) {
@@ -2998,7 +3538,7 @@ const internalConstrs = {
2998
3538
 
2999
3539
  // todo: check in wasm instead of here
3000
3540
  const literalValue = arg.value ?? 0;
3001
- if (literalValue < 0 || !Number.isFinite(literalValue) || literalValue > 4294967295) return internalThrow(scope, 'RangeThrow', 'Invalid array length');
3541
+ if (literalValue < 0 || !Number.isFinite(literalValue) || literalValue > 4294967295) return internalThrow(scope, 'RangeThrow', 'Invalid array length', true);
3002
3542
 
3003
3543
  return [
3004
3544
  ...number(0, Valtype.i32),
@@ -3009,7 +3549,8 @@ const internalConstrs = {
3009
3549
  ...number(pointer)
3010
3550
  ];
3011
3551
  },
3012
- type: TYPES._array
3552
+ type: TYPES.array,
3553
+ length: 1
3013
3554
  },
3014
3555
 
3015
3556
  __Array_of: {
@@ -3020,27 +3561,134 @@ const internalConstrs = {
3020
3561
  elements: decl.arguments
3021
3562
  }, global, name);
3022
3563
  },
3023
- type: TYPES._array,
3564
+ type: TYPES.array,
3565
+ notConstr: true,
3566
+ length: 0
3567
+ },
3568
+
3569
+ __Porffor_fastOr: {
3570
+ generate: (scope, decl) => {
3571
+ const out = [];
3572
+
3573
+ for (let i = 0; i < decl.arguments.length; i++) {
3574
+ out.push(
3575
+ ...generate(scope, decl.arguments[i]),
3576
+ Opcodes.i32_to_u,
3577
+ ...(i > 0 ? [ [ Opcodes.i32_or ] ] : [])
3578
+ );
3579
+ }
3580
+
3581
+ out.push(Opcodes.i32_from_u);
3582
+
3583
+ return out;
3584
+ },
3585
+ type: TYPES.boolean,
3024
3586
  notConstr: true
3025
- }
3026
- };
3587
+ },
3588
+
3589
+ __Porffor_fastAnd: {
3590
+ generate: (scope, decl) => {
3591
+ const out = [];
3592
+
3593
+ for (let i = 0; i < decl.arguments.length; i++) {
3594
+ out.push(
3595
+ ...generate(scope, decl.arguments[i]),
3596
+ Opcodes.i32_to_u,
3597
+ ...(i > 0 ? [ [ Opcodes.i32_and ] ] : [])
3598
+ );
3599
+ }
3600
+
3601
+ out.push(Opcodes.i32_from_u);
3602
+
3603
+ return out;
3604
+ },
3605
+ type: TYPES.boolean,
3606
+ notConstr: true
3607
+ },
3027
3608
 
3028
- // const _ = Array.prototype.push;
3029
- // Array.prototype.push = function (a) {
3030
- // const check = arr => {
3031
- // for (const x of arr) {
3032
- // if (x === undefined) {
3033
- // console.trace(arr);
3034
- // process.exit();
3035
- // }
3036
- // if (Array.isArray(x)) check(x);
3037
- // }
3038
- // };
3039
- // if (Array.isArray(a) && !new Error().stack.includes('node:')) check(a);
3040
- // // if (Array.isArray(a)) check(a);
3609
+ Boolean: {
3610
+ generate: (scope, decl) => {
3611
+ // todo: boolean object when used as constructor
3612
+ const arg = decl.arguments[0] ?? DEFAULT_VALUE;
3613
+ return truthy(scope, generate(scope, arg), getNodeType(scope, arg));
3614
+ },
3615
+ type: TYPES.boolean,
3616
+ length: 1
3617
+ },
3618
+
3619
+ __Math_max: {
3620
+ generate: (scope, decl) => {
3621
+ const out = [
3622
+ ...number(-Infinity)
3623
+ ];
3624
+
3625
+ for (let i = 0; i < decl.arguments.length; i++) {
3626
+ out.push(
3627
+ ...generate(scope, decl.arguments[i]),
3628
+ [ Opcodes.f64_max ]
3629
+ );
3630
+ }
3631
+
3632
+ return out;
3633
+ },
3634
+ type: TYPES.number,
3635
+ notConstr: true,
3636
+ length: 2
3637
+ },
3041
3638
 
3042
- // return _.apply(this, arguments);
3043
- // };
3639
+ __Math_min: {
3640
+ generate: (scope, decl) => {
3641
+ const out = [
3642
+ ...number(Infinity)
3643
+ ];
3644
+
3645
+ for (let i = 0; i < decl.arguments.length; i++) {
3646
+ out.push(
3647
+ ...generate(scope, decl.arguments[i]),
3648
+ [ Opcodes.f64_min ]
3649
+ );
3650
+ }
3651
+
3652
+ return out;
3653
+ },
3654
+ type: TYPES.number,
3655
+ notConstr: true,
3656
+ length: 2
3657
+ },
3658
+
3659
+ __console_log: {
3660
+ generate: (scope, decl) => {
3661
+ const out = [];
3662
+
3663
+ for (let i = 0; i < decl.arguments.length; i++) {
3664
+ out.push(
3665
+ ...generateCall(scope, {
3666
+ callee: {
3667
+ type: 'Identifier',
3668
+ name: '__Porffor_print'
3669
+ },
3670
+ arguments: [ decl.arguments[i] ]
3671
+ }),
3672
+
3673
+ // print space
3674
+ ...number(32),
3675
+ [ Opcodes.call, importedFuncs.printChar ]
3676
+ );
3677
+ }
3678
+
3679
+ // print newline
3680
+ out.push(
3681
+ ...number(10),
3682
+ [ Opcodes.call, importedFuncs.printChar ]
3683
+ );
3684
+
3685
+ return out;
3686
+ },
3687
+ type: TYPES.undefined,
3688
+ notConstr: true,
3689
+ length: 0
3690
+ }
3691
+ };
3044
3692
 
3045
3693
  export default program => {
3046
3694
  globals = {};
@@ -3050,20 +3698,23 @@ export default program => {
3050
3698
  funcs = [];
3051
3699
  funcIndex = {};
3052
3700
  depth = [];
3053
- arrays = new Map();
3054
3701
  pages = new Map();
3055
3702
  data = [];
3056
3703
  currentFuncIndex = importedFuncs.length;
3057
3704
 
3058
3705
  globalThis.valtype = 'f64';
3059
3706
 
3060
- const valtypeOpt = process.argv.find(x => x.startsWith('-valtype='));
3707
+ const valtypeOpt = process.argv.find(x => x.startsWith('--valtype='));
3061
3708
  if (valtypeOpt) valtype = valtypeOpt.split('=')[1];
3062
3709
 
3063
3710
  globalThis.valtypeBinary = Valtype[valtype];
3064
3711
 
3065
3712
  const valtypeInd = ['i32', 'i64', 'f64'].indexOf(valtype);
3066
3713
 
3714
+ globalThis.pageSize = PageSize;
3715
+ const pageSizeOpt = process.argv.find(x => x.startsWith('--page-size='));
3716
+ if (pageSizeOpt) pageSize = parseInt(pageSizeOpt.split('=')[1]) * 1024;
3717
+
3067
3718
  // set generic opcodes for current valtype
3068
3719
  Opcodes.const = [ Opcodes.i32_const, Opcodes.i64_const, Opcodes.f64_const ][valtypeInd];
3069
3720
  Opcodes.eq = [ Opcodes.i32_eq, Opcodes.i64_eq, Opcodes.f64_eq ][valtypeInd];
@@ -3072,10 +3723,10 @@ export default program => {
3072
3723
  Opcodes.add = [ Opcodes.i32_add, Opcodes.i64_add, Opcodes.f64_add ][valtypeInd];
3073
3724
  Opcodes.sub = [ Opcodes.i32_sub, Opcodes.i64_sub, Opcodes.f64_sub ][valtypeInd];
3074
3725
 
3075
- Opcodes.i32_to = [ [ null ], [ Opcodes.i32_wrap_i64 ], Opcodes.i32_trunc_sat_f64_s ][valtypeInd];
3076
- Opcodes.i32_to_u = [ [ null ], [ Opcodes.i32_wrap_i64 ], Opcodes.i32_trunc_sat_f64_u ][valtypeInd];
3077
- Opcodes.i32_from = [ [ null ], [ Opcodes.i64_extend_i32_s ], [ Opcodes.f64_convert_i32_s ] ][valtypeInd];
3078
- Opcodes.i32_from_u = [ [ null ], [ Opcodes.i64_extend_i32_u ], [ Opcodes.f64_convert_i32_u ] ][valtypeInd];
3726
+ Opcodes.i32_to = [ [], [ Opcodes.i32_wrap_i64 ], Opcodes.i32_trunc_sat_f64_s ][valtypeInd];
3727
+ Opcodes.i32_to_u = [ [], [ Opcodes.i32_wrap_i64 ], Opcodes.i32_trunc_sat_f64_u ][valtypeInd];
3728
+ Opcodes.i32_from = [ [], [ Opcodes.i64_extend_i32_s ], [ Opcodes.f64_convert_i32_s ] ][valtypeInd];
3729
+ Opcodes.i32_from_u = [ [], [ Opcodes.i64_extend_i32_u ], [ Opcodes.f64_convert_i32_u ] ][valtypeInd];
3079
3730
 
3080
3731
  Opcodes.load = [ Opcodes.i32_load, Opcodes.i64_load, Opcodes.f64_load ][valtypeInd];
3081
3732
  Opcodes.store = [ Opcodes.i32_store, Opcodes.i64_store, Opcodes.f64_store ][valtypeInd];
@@ -3088,10 +3739,6 @@ export default program => {
3088
3739
 
3089
3740
  program.id = { name: 'main' };
3090
3741
 
3091
- globalThis.pageSize = PageSize;
3092
- const pageSizeOpt = process.argv.find(x => x.startsWith('-page-size='));
3093
- if (pageSizeOpt) pageSize = parseInt(pageSizeOpt.split('=')[1]) * 1024;
3094
-
3095
3742
  const scope = {
3096
3743
  locals: {},
3097
3744
  localInd: 0
@@ -3102,7 +3749,7 @@ export default program => {
3102
3749
  body: program.body
3103
3750
  };
3104
3751
 
3105
- if (process.argv.includes('-ast-log')) console.log(program.body.body);
3752
+ if (Prefs.astLog) console.log(JSON.stringify(program.body.body, null, 2));
3106
3753
 
3107
3754
  generateFunc(scope, program);
3108
3755
 
@@ -3119,7 +3766,11 @@ export default program => {
3119
3766
  }
3120
3767
 
3121
3768
  if (lastInst[0] === Opcodes.end || lastInst[0] === Opcodes.local_set || lastInst[0] === Opcodes.global_set) {
3122
- main.returns = [];
3769
+ if (lastInst[0] === Opcodes.local_set && lastInst[1] === main.locals['#last_type'].idx) {
3770
+ main.wasm.splice(main.wasm.length - 1, 1);
3771
+ } else {
3772
+ main.returns = [];
3773
+ }
3123
3774
  }
3124
3775
 
3125
3776
  if (lastInst[0] === Opcodes.call) {