porffor 0.2.0-08a272e → 0.2.0-09999e8

package/README.md

@@ -1,5 +1,5 @@
 # Porffor &nbsp;<sup><sub>/ˈpɔrfɔr/ &nbsp;*(poor-for)*</sup></sub>
-A from-scratch experimental **AOT** optimizing JS/TS -> Wasm/C engine/compiler/runtime in JS. Not serious/intended for (real) use. (this is a straight forward, honest readme)<br>
+A from-scratch experimental **AOT** optimizing JS -> Wasm/C engine/compiler/runtime in JS. Not serious/intended for (real) use. (this is a straight forward, honest readme)<br>
 Age: ~6 months (very on and off)
 
 ## Design
@@ -118,7 +118,7 @@ No particular order and no guarentees, just what could happen soon™
 - Objects
   - Basic object expressions (eg `{}`, `{ a: 0 }`)
 - Wasm
-  - *Basic* Wasm engine (interpreter) in JS
+  - *Basic* Wasm engine (interpreter) in js
 - More math operators (`**`, etc)
 - `do { ... } while (...)`
 - Rewrite `console.log` to work with strings/arrays
@@ -188,7 +188,7 @@ Porffor can run Test262 via some hacks/transforms which remove unsupported featu
   - `wasmSpec.js`: "enums"/info from wasm spec
   - `wrap.js`: wrapper for compiler which instantiates and produces nice exports
 
-- `runner`: contains utils for running JS with the compiler
+- `runner`: contains utils for running js with the compiler
   - `index.js`: the main file, you probably want to use this
   - `info.js`: runs with extra info printed
   - `repl.js`: basic repl (uses `node:repl`)
@@ -220,14 +220,11 @@ You can also use Deno (`deno run -A ...` instead of `node ...`), or Bun (`bun ..
 - `-target=native` only:
   - `-compiler=clang` to set compiler binary (path/name) to use to compile
   - `-cO=O3` to set compiler opt argument
-- `-parser=acorn|@babel/parser|meriyah|hermes-parser` (default: `acorn`) to set which parser to use
-- `-parse-types` to enable parsing type annotations/typescript. if `-parser` is unset, changes default to `@babel/parser`. does not type check
-- `-opt-types` to perform optimizations using type annotations as compiler hints. does not type check
 - `-valtype=i32|i64|f64` (default: `f64`) to set valtype
 - `-O0` to disable opt
 - `-O1` (default) to enable basic opt (simplify insts, treeshake wasm imports)
-- `-O2` to enable advanced opt (inlining). unstable
-- `-O3` to enable advanceder opt (precompute const math). unstable
+- `-O2` to enable advanced opt (inlining)
+- `-O3` to enable advanceder opt (precompute const math)
 - `-no-run` to not run wasm output, just compile
 - `-opt-log` to log some opts
 - `-code-log` to log some codegen (you probably want `-funcs`)
@@ -241,20 +238,20 @@ You can also use Deno (`deno run -A ...` instead of `node ...`), or Bun (`bun ..
 - `-compile-hints` to enable V8 compilation hints (experimental + doesn't seem to do much?)
 
 ## VSCode extension
-There is a vscode extension in `porffor-for-vscode` which tweaks JS syntax highlighting to be nicer with porffor features (eg highlighting wasm inside of inline asm).
+There is a vscode extension in `porffor-for-vscode` which tweaks js syntax highlighting to be nicer with porffor features (eg highlighting wasm inside of inline asm).
 
 ## Isn't this the same as AssemblyScript/other Wasm langs?
 No. they are not alike at all internally and have very different goals/ideals:
 - Porffor is made as a generic JS engine, not for Wasm stuff specifically
-- Porffor primarily consumes JS
-- Porffor is written in pure JS and compiles itself, not using Binaryen/etc
+- Porffor takes in JS, not a different language or typescript
+- Porffor is made in pure JS and compiles itself, not using Binaryen/etc
 - (Also I didn't know it existed when I started this, lol)
 
 ## FAQ
 
 ### 1. Why the name?
 `purple` in Welsh is `porffor`. Why purple?
-- No other JS engine is purple colored
+- No other js engine is purple colored
 - Purple is pretty cool
 - Purple apparently represents "ambition", which is.. one word to describe this project
 - The hard to speak name is also the noise your brain makes in reaction to this idea!

package/compiler/codeGen.js

@@ -1759,12 +1759,11 @@ const extractTypeAnnotation = decl => {
     elementType = extractTypeAnnotation(a.elementType).type;
   }
 
-  const typeName = type;
   type = typeAnnoToPorfType(type);
 
   // if (decl.name) console.log(decl.name, { type, elementType });
 
-  return { type, typeName, elementType };
+  return { type, elementType };
 };
 
 const generateVar = (scope, decl) => {
@@ -1794,11 +1793,6 @@ const generateVar = (scope, decl) => {
     }
 
     let idx = allocVar(scope, name, global);
-
-    if (typedInput && x.id.typeAnnotation) {
-      addVarMetadata(scope, name, global, extractTypeAnnotation(x.id));
-    }
-
     if (x.init) {
       out = out.concat(generate(scope, x.init, global, name));
 
@@ -1808,6 +1802,10 @@ const generateVar = (scope, decl) => {
 
     // hack: this follows spec properly but is mostly unneeded 😅
     // out.push(...setType(scope, name, x.init ? getNodeType(scope, x.init) : TYPES.undefined));
+
+    if (typedInput && x.id.typeAnnotation) {
+      addVarMetadata(scope, name, global, extractTypeAnnotation(x.id));
+    }
   }
 
   return out;
@@ -2582,7 +2580,7 @@ export const generateMember = (scope, decl, _global, _name) => {
 
   // // todo: we should only do this for strings but we don't know at compile-time :(
   // hack: this is naughty and will break things!
-  let newOut = number(0, valtypeBinary), newPointer = -1;
+  let newOut = number(0, Valtype.f64), newPointer = -1;
   if (pages.hasString) {
     0, [ newOut, newPointer ] = makeArray(scope, {
       rawElements: new Array(1)

package/compiler/opt.js

@@ -235,7 +235,7 @@ export default (funcs, globals, pages) => {
         }
 
         // remove setting last type if it is never gotten
-        if (!f.gotLastType && inst[0] === Opcodes.local_set && inst[1] === lastType?.idx) {
+        if (!f.gotLastType && inst[0] === Opcodes.local_set && inst[1] === lastType.idx) {
           // replace this inst with drop
           wasm.splice(i, 1, [ Opcodes.drop ]); // remove this and last inst
           if (i > 0) i--;

package/compiler/sections.js

@@ -150,7 +150,7 @@ export default (funcs, globals, tags, pages, data, flags) => {
 
       if (typeCount !== 0) localDecl.push(encodeLocal(typeCount, lastType));
 
-      return encodeVector([ ...encodeVector(localDecl), ...x.wasm.flat().filter(x => x != null && x <= 0xff), Opcodes.end ]);
+      return encodeVector([ ...encodeVector(localDecl), ...x.wasm.flat().filter(x => x <= 0xff), Opcodes.end ]);
     }))
   );
 

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.2.0-08a272e",
+  "version": "0.2.0-09999e8",
   "author": "CanadaHonk",
   "license": "MIT",
   "dependencies": {