porffor 0.41.2 → 0.41.4

package/compiler/builtins/_internal_string.ts

@@ -16,7 +16,6 @@ export const __Porffor_compareStrings = (a: any, b: any): boolean => {
 
     // todo/perf: just use a.toString()?
     a = ecma262.ToString(a);
-    at = Porffor.rawType(a);
   }
 
   if ((bt | 0b10000000) != Porffor.TYPES.bytestring) {
@@ -31,7 +30,6 @@ export const __Porffor_compareStrings = (a: any, b: any): boolean => {
 
     // todo/perf: just use b.toString()?
     b = ecma262.ToString(b);
-    bt = Porffor.rawType(b);
   }
 
   return Porffor.strcmp(a, b);
@@ -45,14 +43,12 @@ export const __Porffor_concatStrings = (a: any, b: any): boolean => {
     // a is not string or bytestring
     // todo/perf: just use a.toString()?
     a = ecma262.ToString(a);
-    at = Porffor.rawType(a);
   }
 
   if ((bt | 0b10000000) != Porffor.TYPES.bytestring) {
     // b is not string or bytestring
     // todo/perf: just use b.toString()?
     b = ecma262.ToString(b);
-    bt = Porffor.rawType(b);
   }
 
   return Porffor.strcat(a, b);

package/compiler/builtins/object.ts

@@ -703,7 +703,8 @@ export const __Object_prototype_toString = (_this: any) => {
     t == Porffor.TYPES.numberobject)) return out = '[object Number]';
   if (Porffor.fastOr(
     t == Porffor.TYPES.string,
-    t == Porffor.TYPES.bytestring)) return out = '[object String]';
+    t == Porffor.TYPES.bytestring,
+    t == Porffor.TYPES.stringobject)) return out = '[object String]';
   if (t == Porffor.TYPES.date) return out = '[object Date]';
   if (t == Porffor.TYPES.regexp) return out = '[object RegExp]';
 

package/compiler/builtins/porffor.d.ts

@@ -4,7 +4,8 @@ export type f64 = number;
 export type bytestring = string;
 
 export type BooleanObject = Boolean;
-export type NumberObject = Boolean;
+export type NumberObject = Number;
+export type StringObject = String;
 
 type PorfforGlobal = {
   wasm: {
@@ -146,5 +147,6 @@ declare global {
   type bytestring = string;
 
   type BooleanObject = Boolean;
-  type NumberObject = Boolean;
+  type NumberObject = Number;
+  type StringObject = String;
 }

package/compiler/builtins/string_f64.ts

@@ -1,10 +1,35 @@
 import type {} from './porffor.d.ts';
 
-// todo: support non-bytestring properly
-// todo: support constructor/string objects properly
-export const String = function (value: any): bytestring {
-  if (!new.target && Porffor.rawType(value) == Porffor.TYPES.symbol) return __Symbol_prototype_toString(value);
-  return ecma262.ToString(value);
+// 22.1.1.1 String (value)
+// https://tc39.es/ecma262/#sec-string-constructor-string-value
+export const String = function (...args: any[]): string|bytestring|StringObject {
+  let s: bytestring|string = '';
+
+  // 1. If value is not present, then
+  // a. Let s be the empty String.
+  // s is already empty
+
+  // 2. Else,
+  if (args.length > 0) {
+    const value: any = args[0];
+
+    // a. If NewTarget is undefined and value is a Symbol, return SymbolDescriptiveString(value).
+    if (!new.target && Porffor.rawType(value) == Porffor.TYPES.symbol) return __Symbol_prototype_toString(value);
+
+    // b. Let s be ? ToString(value).
+    s = ecma262.ToString(value);
+  }
+
+  // 3. If NewTarget is undefined, return s.
+  if (!new.target) return s;
+
+  // 4. Return StringCreate(s, ? GetPrototypeFromConstructor(NewTarget, "%String.prototype%")).
+
+  // force bytestrings to strings
+  if (Porffor.rawType(s) == Porffor.TYPES.bytestring) s = Porffor.bytestringToString(s, s.length);
+
+  const O: StringObject = s;
+  return O;
 };
 
 export const __String_fromCharCode = (...codes: any[]): bytestring|string => {

package/compiler/builtins/z_ecma262.ts

@@ -154,6 +154,12 @@ export const __ecma262_ToString = (argument: unknown): any => {
 
   // 8. If argument is a BigInt, return BigInt::toString(argument, 10).
 
+  // hack: StringObject -> String
+  if (type == Porffor.TYPES.stringobject) {
+    const remap: string = argument;
+    return remap;
+  }
+
   // 9. Assert: argument is an Object.
   // 10. Let primValue be ? ToPrimitive(argument, string).
   const primValue: any = __ecma262_ToPrimitive_String(argument);