porffor 0.36.4 → 0.36.6

package/compiler/codegen.js

@@ -2676,7 +2676,7 @@ const typeSwitch = (scope, type, bc, returns = valtypeBinary, allowFallThrough =
   }
 
   if (Prefs.typeswitchBrtable) {
-    if (allowFallThrough) throw new Error(`Fallthrough is not currently supported with --typeswitch-brtable`)
+    if (allowFallThrough) throw new Error(`Fallthrough is not currently supported with --typeswitch-brtable`);
     return brTable(type, bc, returns);
   }
 
@@ -3288,68 +3288,6 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
           [ Opcodes.local_get, newValueTmp ]
         ],
 
-        [TYPES.object]: [
-          ...objectWasm,
-          Opcodes.i32_to_u,
-          ...(op === '=' ? [] : [ [ Opcodes.local_tee, localTmp(scope, '#objset_object', Valtype.i32) ] ]),
-          ...getNodeType(scope, object),
-
-          ...toPropertyKey(scope, propertyWasm, getNodeType(scope, property), decl.left.computed, op === '='),
-          ...(op === '=' ? [] : [ [ Opcodes.local_set, localTmp(scope, '#objset_property_type', Valtype.i32) ] ]),
-          ...(op === '=' ? [] : [
-            Opcodes.i32_to_u,
-            [ Opcodes.local_tee, localTmp(scope, '#objset_property', Valtype.i32) ]
-          ]),
-          ...(op === '=' ? [] : [ [ Opcodes.local_get, localTmp(scope, '#objset_property_type', Valtype.i32) ] ]),
-
-          ...(op === '=' ? generate(scope, decl.right) : performOp(scope, op, [
-            [ Opcodes.local_get, localTmp(scope, '#objset_object', Valtype.i32) ],
-            ...getNodeType(scope, object),
-
-            [ Opcodes.local_get, localTmp(scope, '#objset_property', Valtype.i32) ],
-            [ Opcodes.local_get, localTmp(scope, '#objset_property_type', Valtype.i32) ],
-
-            [ Opcodes.call, includeBuiltin(scope, '__Porffor_object_get').index ],
-            ...setLastType(scope)
-          ], generate(scope, decl.right), getLastType(scope), getNodeType(scope, decl.right), false, name, true)),
-          ...getNodeType(scope, decl),
-
-          [ Opcodes.call, includeBuiltin(scope, scope.strict ? '__Porffor_object_setStrict' : '__Porffor_object_set').index ],
-          [ Opcodes.drop ],
-          // ...setLastType(scope, getNodeType(scope, decl)),
-        ],
-
-        [TYPES.function]: [
-          ...objectWasm,
-          Opcodes.i32_to_u,
-          ...(op === '=' ? [] : [ [ Opcodes.local_tee, localTmp(scope, '#objset_object', Valtype.i32) ] ]),
-          ...getNodeType(scope, object),
-
-          ...toPropertyKey(scope, propertyWasm, getNodeType(scope, property), decl.left.computed, op === '='),
-          ...(op === '=' ? [] : [ [ Opcodes.local_set, localTmp(scope, '#objset_property_type', Valtype.i32) ] ]),
-          ...(op === '=' ? [] : [
-            Opcodes.i32_to_u,
-            [ Opcodes.local_tee, localTmp(scope, '#objset_property', Valtype.i32) ]
-          ]),
-          ...(op === '=' ? [] : [ [ Opcodes.local_get, localTmp(scope, '#objset_property_type', Valtype.i32) ] ]),
-
-          ...(op === '=' ? generate(scope, decl.right) : performOp(scope, op, [
-            [ Opcodes.local_get, localTmp(scope, '#objset_object', Valtype.i32) ],
-            ...getNodeType(scope, object),
-
-            [ Opcodes.local_get, localTmp(scope, '#objset_property', Valtype.i32) ],
-            [ Opcodes.local_get, localTmp(scope, '#objset_property_type', Valtype.i32) ],
-
-            [ Opcodes.call, includeBuiltin(scope, '__Porffor_object_get').index ],
-            ...setLastType(scope)
-          ], generate(scope, decl.right), getLastType(scope), getNodeType(scope, decl.right), false, name, true)),
-          ...getNodeType(scope, decl),
-
-          [ Opcodes.call, includeBuiltin(scope, scope.strict ? '__Porffor_object_setStrict' : '__Porffor_object_set').index ],
-          [ Opcodes.drop ],
-          // ...setLastType(scope, getNodeType(scope, decl)),
-        ],
-
         ...wrapBC({
           [TYPES.uint8array]: [
             [ Opcodes.i32_add ],
@@ -3511,12 +3449,33 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
         // default: internalThrow(scope, 'TypeError', `Cannot assign member with this type`)
         default: [
           ...objectWasm,
-          [ Opcodes.drop ],
+          Opcodes.i32_to_u,
+          ...(op === '=' ? [] : [ [ Opcodes.local_tee, localTmp(scope, '#objset_object', Valtype.i32) ] ]),
+          ...getNodeType(scope, object),
 
-          ...propertyWasm,
-          [ Opcodes.drop ],
+          ...toPropertyKey(scope, propertyWasm, getNodeType(scope, property), decl.left.computed, op === '='),
+          ...(op === '=' ? [] : [ [ Opcodes.local_set, localTmp(scope, '#objset_property_type', Valtype.i32) ] ]),
+          ...(op === '=' ? [] : [
+            Opcodes.i32_to_u,
+            [ Opcodes.local_tee, localTmp(scope, '#objset_property', Valtype.i32) ]
+          ]),
+          ...(op === '=' ? [] : [ [ Opcodes.local_get, localTmp(scope, '#objset_property_type', Valtype.i32) ] ]),
+
+          ...(op === '=' ? generate(scope, decl.right) : performOp(scope, op, [
+            [ Opcodes.local_get, localTmp(scope, '#objset_object', Valtype.i32) ],
+            ...getNodeType(scope, object),
+
+            [ Opcodes.local_get, localTmp(scope, '#objset_property', Valtype.i32) ],
+            [ Opcodes.local_get, localTmp(scope, '#objset_property_type', Valtype.i32) ],
 
-          ...generate(scope, decl.right)
+            [ Opcodes.call, includeBuiltin(scope, '__Porffor_object_get').index ],
+            ...setLastType(scope)
+          ], generate(scope, decl.right), getLastType(scope), getNodeType(scope, decl.right), false, name, true)),
+          ...getNodeType(scope, decl),
+
+          [ Opcodes.call, includeBuiltin(scope, scope.strict ? '__Porffor_object_setStrict' : '__Porffor_object_set').index ],
+          [ Opcodes.drop ],
+          // ...setLastType(scope, getNodeType(scope, decl)),
         ]
       }, valtypeBinary)
     ];
@@ -5406,28 +5365,6 @@ const generateMember = (scope, decl, _global, _name, _objectWasm = undefined) =>
       ...setLastType(scope, TYPES.bytestring)
     ],
 
-    [TYPES.object]: [
-      ...objectWasm,
-      Opcodes.i32_to_u,
-      ...getNodeType(scope, object),
-
-      ...toPropertyKey(scope, propertyWasm, getNodeType(scope, property), decl.computed, true),
-
-      [ Opcodes.call, includeBuiltin(scope, '__Porffor_object_get').index ],
-      ...setLastType(scope)
-    ],
-
-    [TYPES.function]: [
-      ...objectWasm,
-      Opcodes.i32_to_u,
-      ...getNodeType(scope, object),
-
-      ...toPropertyKey(scope, propertyWasm, getNodeType(scope, property), decl.computed, true),
-
-      [ Opcodes.call, includeBuiltin(scope, '__Porffor_object_get').index ],
-      ...setLastType(scope)
-    ],
-
     ...wrapBC({
       [TYPES.uint8array]: [
         [ Opcodes.i32_add ],
@@ -5510,8 +5447,14 @@ const generateMember = (scope, decl, _global, _name, _objectWasm = undefined) =>
 
     // default: internalThrow(scope, 'TypeError', 'Unsupported member expression object', true)
     default: [
-      ...number(0),
-      ...setLastType(scope, TYPES.undefined)
+      ...objectWasm,
+      Opcodes.i32_to_u,
+      ...getNodeType(scope, object),
+
+      ...toPropertyKey(scope, propertyWasm, getNodeType(scope, property), decl.computed, true),
+
+      [ Opcodes.call, includeBuiltin(scope, '__Porffor_object_get').index ],
+      ...setLastType(scope)
     ],
 
     ...extraBC
@@ -5603,7 +5546,7 @@ const generateClass = (scope, decl) => {
     optional: false
   };
 
-  const constr = {
+  const [ func, out ] = generateFunc(scope, {
     ...(body.find(x => x.kind === 'constructor')?.value ?? {
       type: 'FunctionExpression',
       params: [],
@@ -5612,12 +5555,9 @@ const generateClass = (scope, decl) => {
         body: []
       }
     }),
-    id: root
-  };
-
-  const [ func, out ] = generateFunc(scope, {
-    ...constr,
+    id: root,
     _onlyConstr: true,
+    strict: true,
     type: expr ? 'FunctionExpression' : 'FunctionDeclaration'
   });
 
@@ -5663,7 +5603,7 @@ const generateClass = (scope, decl) => {
       outScope = func;
     }
 
-    if (isFuncType(value.type) && type === 'MethodDefinition') {
+    if (isFuncType(value.type)) {
       let id = value.id;
 
       // todo: support computed names properly
@@ -5675,6 +5615,7 @@ const generateClass = (scope, decl) => {
       value = {
         ...value,
         id,
+        strict: true,
         _onlyThisMethod: true
       };
     }
@@ -5837,7 +5778,7 @@ const generateFunc = (scope, decl, outUnused = false) => {
       // not async or generator
       !decl.async && !decl.generator,
     _onlyConstr: decl._onlyConstr, _onlyThisMethod: decl._onlyThisMethod,
-    strict: scope.strict,
+    strict: scope.strict || decl.strict,
 
     generate() {
       if (func.wasm) return func.wasm;

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.36.4+2bd354932",
+  "version": "0.36.6+732d836d7",
   "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.36.4+2bd354932';
+globalThis.version = '0.36.6+732d836d7';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {