porffor 0.28.3 → 0.28.5

package/compiler/codegen.js

@@ -2896,7 +2896,7 @@ const generateVar = (scope, decl) => {
   const topLevel = scope.name === 'main';
 
   // global variable if in top scope (main) or if internally wanted
-  const global = topLevel || decl._bare;
+  const global = decl._global ?? (topLevel || decl._bare);
 
   for (const x of decl.declarations) {
     if (x.id.type === 'ArrayPattern') {
@@ -2905,7 +2905,6 @@ const generateVar = (scope, decl) => {
 
       let i = 0;
       const elements = [...x.id.elements];
-      // todo: if elements.length == 0 and Porffor.rawType(tmpName) is not iterable, throw a typeerror
       for (const e of elements) {
         switch (e?.type) {
           case 'RestElement': { // let [ ...foo ] = []
@@ -2958,9 +2957,9 @@ const generateVar = (scope, decl) => {
             break;
           }
 
-          case 'ArrayPattern': // let [ [ foo, bar ] ] = []
+          case 'ArrayPattern': // let [ [ foo, bar ] ] = [ [ 2, 4 ] ]
           case 'Identifier': // let [ foo ] = []
-          case 'ObjectPattern': { // let [ { foo } ] = []
+          case 'ObjectPattern': { // let [ { foo } ] = [ { foo: true } ]
             decls.push({
               type: 'VariableDeclarator',
               id: e,
@@ -2987,8 +2986,27 @@ const generateVar = (scope, decl) => {
             id: { type: 'Identifier', name: tmpName },
             init: x.init
           }],
-          kind: decl.kind
+          kind: decl.kind,
+          _global: false
         }),
+
+        // check tmp is iterable
+        // array or string or bytestring
+        ...typeIsOneOf(getType(scope, tmpName), [ TYPES.array, TYPES.string, TYPES.bytestring ]),
+        // typed array
+        ...getType(scope, tmpName),
+        ...number(TYPES.uint8array, Valtype.i32),
+        [ Opcodes.i32_ge_s ],
+        ...getType(scope, tmpName),
+        ...number(TYPES.float64array, Valtype.i32),
+        [ Opcodes.i32_le_s ],
+        [ Opcodes.i32_and ],
+        [ Opcodes.i32_or ],
+        [ Opcodes.i32_eqz ],
+        [ Opcodes.if, Blocktype.void ],
+          ...internalThrow(scope, 'TypeError', 'Cannot array destructure a non-iterable'),
+        [ Opcodes.end ],
+
         ...generateVar(scope, {
           type: 'VariableDeclaration',
           declarations: decls,
@@ -3004,7 +3022,6 @@ const generateVar = (scope, decl) => {
       const tmpName = '#destructure' + uniqId();
 
       const properties = [...x.id.properties];
-      // todo: if properties.length == 0 and Porffor.rawType(tmpName) != object, throw a typeerror
       for (const prop of properties) {
         if (prop.type == 'Property') { // let { foo } = {}
           if (prop.value.type === 'AssignmentPattern') { // let { foo = defaultValue } = {}
@@ -3048,8 +3065,28 @@ const generateVar = (scope, decl) => {
             id: { type: 'Identifier', name: tmpName },
             init: x.init
           }],
-          kind: decl.kind
+          kind: decl.kind,
+          _global: false
         }),
+
+        // check tmp is valid object
+        // not undefined or empty type
+        ...typeIsOneOf(getType(scope, tmpName), [ TYPES.undefined, TYPES.empty ]),
+
+        // not null
+        ...getType(scope, tmpName),
+        ...number(TYPES.object, Valtype.i32),
+        [ Opcodes.i32_eq ],
+        [ Opcodes.local_get, scope.locals[tmpName].idx ],
+        ...number(0),
+        [ Opcodes.eq ],
+        [ Opcodes.i32_and ],
+
+        [ Opcodes.i32_or ],
+        [ Opcodes.if, Blocktype.void ],
+          ...internalThrow(scope, 'TypeError', 'Cannot object destructure undefined or null'),
+        [ Opcodes.end ],
+
         ...generateVar(scope, {
           type: 'VariableDeclaration',
           declarations: decls,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "porffor",
   "description": "a basic experimental wip aot optimizing js -> wasm engine/compiler/runtime in js",
-  "version": "0.28.3+a17fb257e",
+  "version": "0.28.5+4f843e06e",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {},

package/runner/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import fs from 'node:fs';
-globalThis.version = '0.28.3+a17fb257e';
+globalThis.version = '0.28.5+4f843e06e';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {