@ball-lang/engine 1.3.6 → 1.3.8

package/src/compiled_engine.ts

@@ -677,17 +677,9 @@ function __ball_cascade(target: any, ops: any[]): any {
   Object.defineProperty(sp, 'isNotEmpty', {
     configurable: true, get() { return this.length !== 0; },
   });
-  // Make undefined/null safe for .isEmpty/.isNotEmpty via a global wrapper.
-  // Proto3 JSON omits empty strings, so code like call.module.isEmpty needs
-  // to handle undefined gracefully.
-  const _origObjDefProp = Object.defineProperty;
-  for (const boolProp of ['isEmpty', 'isNotEmpty']) {
-    if (!(undefined as any)?.[boolProp]) {
-      // Can't add properties to undefined/null, but we handle it in the
-      // generated code via ?.isEmpty fallback patterns. The preamble's
-      // protoWrap handles most cases.
-    }
-  }
+  // Note: undefined/null safety for .isEmpty/.isNotEmpty is handled in the
+  // generated code via optional-chaining (?.isEmpty) patterns and protoWrap;
+  // properties cannot be installed on undefined/null directly.
   // Dart String methods not on JS String.
   if (!sp.contains) sp.contains = function (s: any) { return this.includes(s); };
   if (!sp.replaceFirst) sp.replaceFirst = function (from: any, to: any) {
@@ -893,7 +885,6 @@ function __ball_cascade(target: any, ops: any[]): any {
     return Object.keys(this).filter((k: string) => !k.startsWith('__')).length;
   });
 
-  // Number polyfills moved earlier (see "Dart Number polyfills" block above).
   // runtimeType — Dart's Object.runtimeType. Returns the Dart-style
   // type name for any JS value. Used by the compiled engine for type
   // checking and error messages.
@@ -1569,7 +1560,7 @@ export class BallEngine {
         let enumName = enumDesc.name;
         let enumMap = {};
         let enumValueList = enumDesc.value;
-        for (var vi = 0; (vi < enumValueList.length); (vi++)) {
+        for (let vi = 0; (vi < enumValueList.length); (vi++)) {
           let v = __ball_index(enumValueList, vi);
           let entry = { ['__type__']: enumName, ['name']: v.name, ['index']: v.number };
           enumMap[v.name] = entry;
@@ -1887,19 +1878,23 @@ export class BallEngine {
           }
         } else {
           if (!__ball_eq(inputMap, null)) {
-            for (var i = 0; (i < params.length); (i++)) {
+            for (let i = 0; (i < params.length); (i++)) {
               let p = __ball_index(params, i);
               if ((p in inputMap)) {
                 scope.bind(p, __ball_index(inputMap, p));
               } else {
                 if ((('arg' + __ball_to_string(i)) in inputMap)) {
                   scope.bind(p, __ball_index(inputMap, ('arg' + __ball_to_string(i))));
+                } else {
+                  if ((((__ball_eq(i, 0) && __ball_eq(params.length, 1)) && ('value' in inputMap)) && this._isSetter(func))) {
+                    scope.bind(p, __ball_index(inputMap, 'value'));
+                  }
                 }
               }
             }
           } else {
             if (Array.isArray(input)) {
-              for (var i = 0; ((i < params.length) && (i < input.length)); (i++)) {
+              for (let i = 0; ((i < params.length) && (i < input.length)); (i++)) {
                 scope.bind(__ball_index(params, i), __ball_index(input, i));
               }
             }
@@ -2033,7 +2028,7 @@ export class BallEngine {
     let params = (hasMetadata(func) ? this._extractParams(func.metadata) : []);
     let paramsMeta = (hasMetadata(func) ? this._extractParamsMeta(func.metadata) : []);
     let resolvedParams = {};
-    for (var i = 0; (i < params.length); (i++)) {
+    for (let i = 0; (i < params.length); (i++)) {
       let param = __ball_index(params, i);
       let value = __no_init__;
       if ((param in inputMap)) {
@@ -2161,7 +2156,7 @@ export class BallEngine {
     let resolvedParams = {};
     let inputMap = this._asMap(input);
     if (!__ball_eq(inputMap, null)) {
-      for (var i = 0; (i < params.length); (i++)) {
+      for (let i = 0; (i < params.length); (i++)) {
         let p = __ball_index(params, i);
         let isThis = ((i < paramsMeta.length) && __ball_eq(__ball_index(__ball_index(paramsMeta, i), 'is_this'), true));
         let val = __no_init__;
@@ -2239,7 +2234,7 @@ export class BallEngine {
             })() ?? '');
             let argNames = this._parseSuperArgs(argsStr);
             let superInput = {};
-            for (var i = 0; (i < argNames.length); (i++)) {
+            for (let i = 0; (i < argNames.length); (i++)) {
               let token = __ball_index(argNames, i);
               if ((token in resolvedParams)) {
                 superInput[('arg' + __ball_to_string(i))] = __ball_index(resolvedParams, token);
@@ -2273,7 +2268,7 @@ export class BallEngine {
     let superCtorEntry = this._lookupConstructor(superclass);
     if (!__ball_eq(superCtorEntry, null)) {
       let superInput = {};
-      for (var i = 0; (i < resolvedParams.length); (i++)) {
+      for (let i = 0; (i < resolvedParams.length); (i++)) {
         superInput[('arg' + __ball_to_string(i))] = resolvedParams.values.elementAt(i);
       }
       return this._callFunction(superCtorEntry.module, superCtorEntry.func, superInput);
@@ -3978,7 +3973,7 @@ export class BallEngine {
         if ((!__ball_eq(ctorEntry, null) && hasMetadata(ctorEntry.func))) {
           let params = this._extractParams(ctorEntry.func.metadata);
           let paramsMeta = this._extractParamsMeta(ctorEntry.func.metadata);
-          for (var i = 0; (i < params.length); (i++)) {
+          for (let i = 0; (i < params.length); (i++)) {
             let param = __ball_index(params, i);
             let value = __no_init__;
             if ((param in fields)) {
@@ -4458,7 +4453,7 @@ export class BallEngine {
           }
         }
         if (!(paramNames.length === 0)) {
-          for (var i = 0; (i < paramNames.length); (i++)) {
+          for (let i = 0; (i < paramNames.length); (i++)) {
             let p = __ball_index(paramNames, i);
             if (!lambdaScope.has(p)) {
               if ((p in inputMap)) {
@@ -5772,13 +5767,24 @@ export class BallEngine {
       return null;
     }
     let result = __no_init__;
-    do {
-      result = await this._evalExpression(body, scope);
-      if ((((result instanceof _FlowSignal) && __ball_eq(result.kind, 'goto')) && __ball_eq(result.label, label))) {
-        continue;
+    let repeat = true;
+    while (repeat) {
+      repeat = false;
+      try {
+        result = await this._evalExpression(body, scope);
+      } catch (__ball_active_error) {
+        const e = __ball_active_error;
+        let signal = e;
+        if ((((signal instanceof _FlowSignal) && __ball_eq(signal.kind, 'goto')) && __ball_eq(signal.label, label))) {
+          repeat = true;
+        } else {
+          throw __ball_active_error;
+        }
       }
-      break;
-    } while (true);
+      if ((((!repeat && (result instanceof _FlowSignal)) && __ball_eq(result.kind, 'goto')) && __ball_eq(result.label, label))) {
+        repeat = true;
+      }
+    }
     return result;
   }
 
@@ -5859,7 +5865,19 @@ export class BallEngine {
         if (false /* BallMap is Map in TS */) {
           unwrappedSelf = self.entries;
         } else {
-          unwrappedSelf = self;
+          if ((typeof self === 'number' || self instanceof BallDouble)) {
+            unwrappedSelf = self;
+          } else {
+            if ((typeof self === 'number' && Number.isInteger(self))) {
+              unwrappedSelf = self.value;
+            } else {
+              if ((typeof self === 'number' || self instanceof BallDouble)) {
+                unwrappedSelf = self.value;
+              } else {
+                unwrappedSelf = self;
+              }
+            }
+          }
         }
       }
     }
@@ -5912,7 +5930,7 @@ export class BallEngine {
         else if ((__sw === 'sort')) {
           if ((typeof arg0 === 'function')) {
             let sorted = [...self];
-            for (var j = 1; (j < sorted.length); (j++)) {
+            for (let j = 1; (j < sorted.length); (j++)) {
               let key = __ball_index(sorted, j);
               let k = __ball_sub(j, 1);
               while ((k >= 0)) {
@@ -6637,7 +6655,10 @@ export class BallEngine {
         const input = i;
         return this._stdConvert(i, ((v) => {
           const input = v;
-          return __ball_to_string(v);
+          if ((typeof v === 'number' || v instanceof BallDouble)) {
+            return __ball_to_string(v);
+          }
+          return __ball_to_string(new BallDouble(v));
         }));
       }), ['string_to_int']: ((i) => {
         const input = i;
@@ -6649,7 +6670,7 @@ export class BallEngine {
         const input = i;
         return this._stdConvert(i, ((v) => {
           const input = v;
-          return __ball_parse_double(v);
+          return new BallDouble(__ball_parse_double(v));
         }));
       }), ['to_double']: ((i) => {
         const input = i;
@@ -6940,7 +6961,7 @@ export class BallEngine {
           }));
           return sorted;
         }
-        for (var j = 1; (j < sorted.length); (j++)) {
+        for (let j = 1; (j < sorted.length); (j++)) {
           let key = __ball_index(sorted, j);
           let k = __ball_sub(j, 1);
           while ((k >= 0)) {
@@ -7029,10 +7050,16 @@ export class BallEngine {
           if ((r != null)) {
             r = await r;
           }
-          if (Array.isArray(r)) {
-            __ball_push_all(result, r);
+          if (false /* BallList is List in TS */) {
+            for (const item of r.items) {
+              result = (result.push(item), result);
+            }
           } else {
-            result = (result.push(r), result);
+            if (Array.isArray(r)) {
+              __ball_push_all(result, r);
+            } else {
+              result = (result.push(r), result);
+            }
           }
         }
         return result;
@@ -7378,7 +7405,8 @@ export class BallEngine {
         return new _FlowSignal('yield_each', { value: this._extractUnaryArg(i) });
       }), ['symbol']: ((i) => {
         const input = i;
-        return this._extractField(i, 'value');
+        let name = this._extractField(i, 'value');
+        return (('Symbol("' + __ball_to_string(name)) + '")');
       }), ['type_literal']: ((i) => {
         const input = i;
         return this._extractField(i, 'type');
@@ -8096,7 +8124,7 @@ export class BallEngine {
     }
     this._trackMemoryAllocation(__ball_mul(length, _ballPointerBytes));
     let result = [];
-    for (var index = 0; (index < length); (index++)) {
+    for (let index = 0; (index < length); (index++)) {
       let value = generator(index);
       if ((value != null)) {
         value = await value;
@@ -8246,7 +8274,7 @@ export class BallEngine {
           }
         }
         if (__ball_eq(objTypeArgs.length, typeArgs.length)) {
-          for (var i = 0; (i < typeArgs.length); (i++)) {
+          for (let i = 0; (i < typeArgs.length); (i++)) {
             if (!__ball_eq(__ball_index(objTypeArgs, i), __ball_index(typeArgs, i))) {
               return false;
             }
@@ -8340,7 +8368,7 @@ export class BallEngine {
     let args = [];
     let depth = 0;
     let start = 0;
-    for (var i = 0; (i < str.length); (i++)) {
+    for (let i = 0; (i < str.length); (i++)) {
       if (__ball_eq(__ball_index(str, i), '<')) {
         (depth++);
       }
@@ -8577,7 +8605,7 @@ export class BallEngine {
         if ((!__ball_eq(restIndex, __ball_negate(1)) && (listVal.length < fixedCount))) {
           return false;
         }
-        for (var i = 0; (i < elements.length); (i++)) {
+        for (let i = 0; (i < elements.length); (i++)) {
           let elem = __ball_index(elements, i);
           let elemMap = this._stdAsMap(elem);
           if ((!__ball_eq(elemMap, null) && __ball_eq(this._patternKind(elemMap), 'rest'))) {
@@ -8893,7 +8921,7 @@ export class BallEngine {
 
   _repeatString(s: any, count: any): any {
     let out = '';
-    for (var k = 0; (k < count); (k++)) {
+    for (let k = 0; (k < count); (k++)) {
       out = (__ball_to_string(out) + __ball_to_string(s));
     }
     return out;
@@ -8949,7 +8977,10 @@ export class BallEngine {
 
   _stdUnaryNum(input: any, op: any): any {
     let value = this._extractUnaryArg(input);
-    return op(this._toNum(value));
+    const __vBD = value instanceof BallDouble;
+    const __result = op(this._toNum(value));
+    if (__vBD && typeof __result === 'number') return new BallDouble(__result);
+    return __result;
   }
 
   _stdNot(input: any): any {

package/src/engine_setup.ts

@@ -231,6 +231,12 @@ export function createEngineSetup(mod: EngineModule) {
   }
 
   function _mathAbs(v: any): any {
+    // `_coerceInt` unconditionally truncates through int64 coercion (needed
+    // for BigInt-magnitude int abs), which silently dropped double-ness for
+    // a BallDouble operand — e.g. `(2.5).abs()` returned `2` instead of
+    // `2.5` (#115). Route a BallDouble operand through double abs instead.
+    const BD = (globalThis as any).BallDouble;
+    if (BD && v instanceof BD) return new BD(Math.abs(v.value));
     const coerced = _coerceInt(v);
     if (typeof coerced === 'bigint') {
       return _int64Result(coerced < 0n ? -coerced : coerced);
@@ -569,6 +575,19 @@ export function createEngineSetup(mod: EngineModule) {
           case 'ceil': return Math.ceil(self);
           case 'compareTo': return self < arg0 ? -1 : self > arg0 ? 1 : 0;
           case 'clamp': return Math.min(Math.max(self, arg0), arg1);
+          case 'remainder': return self % Number(_coerceNum(arg0));
+        }
+      }
+      // A BallDouble-wrapped receiver (e.g. `double d = 2.5; d.remainder(2)`)
+      // falls through every case above (`typeof self !== 'number'`), and the
+      // compiled engine's own dispatch calls `self.remainder(...)` — a real
+      // method call that doesn't exist on the BallDouble class (unlike
+      // floor/ceil/round/abs, which work by accident via Math.* coercing
+      // through BallDouble.valueOf()) (#115). Handle it explicitly here.
+      {
+        const BD = (globalThis as any).BallDouble;
+        if (BD && self instanceof BD && fn === 'remainder') {
+          return new BD(self.value % Number(_coerceNum(arg0)));
         }
       }
       if (typeof self === 'object' && self !== null && '__type__' in self) {
@@ -1231,7 +1250,16 @@ export function createEngineSetup(mod: EngineModule) {
     };
 
     e._stdUnaryNum = function(input: any, op: any) {
-      return op(_coerceNum(e._extractUnaryArg(input)));
+      // Preserve BallDouble-ness through negate (#67): a whole-number
+      // double like `-7.0` must not collapse to a bare JS integer. Mirrors
+      // the _stdBinary patch above. bitwise_not (the only other consumer)
+      // always operates on int, so it never sees a BallDouble operand here.
+      const value = e._extractUnaryArg(input);
+      const BD = (globalThis as any).BallDouble;
+      const vBD = BD && value instanceof BD;
+      const result = op(_coerceNum(value));
+      if (vBD && typeof result === 'number') return new BD(result);
+      return result;
     };
 
     e._stdBinaryComp = function(input: any, op: any) {
@@ -1264,6 +1292,25 @@ export function createEngineSetup(mod: EngineModule) {
       return result;
     };
 
+    // `remainder` is the one num instance method the compiled engine's own
+    // `_dispatchBuiltinInstanceMethod` calls as a literal Dart method
+    // (`self.remainder(...)`) rather than routing through a Math.*-backed
+    // std function (floor/ceil/round/abs/truncate all get encoder-routed to
+    // math_floor/math_ceil/etc, which is why they survive a BallDouble
+    // receiver via valueOf() coercion). A BallDouble-wrapped receiver has no
+    // `.remainder` method, so it throws (#115). Intercept just that case.
+    const origDispatchBuiltinInstanceMethod = e._dispatchBuiltinInstanceMethod.bind(e);
+    e._dispatchBuiltinInstanceMethod = async function(self: any, method: any, input: any) {
+      const BD = (globalThis as any).BallDouble;
+      if (BD && self instanceof BD && method === 'remainder') {
+        const rec = e._cfAsMap(input) ?? {};
+        const rawArg = rec['arg0'] ?? rec['value'];
+        const other = (BD && rawArg instanceof BD) ? rawArg.value : _coerceNum(rawArg);
+        return new BD(self.value % Number(other));
+      }
+      return origDispatchBuiltinInstanceMethod(self, method, input);
+    };
+
     const origPatternKind = e._patternKind?.bind(e);
     e._patternKind = function(pattern: any): any {
       const explicit = pattern?.['__pattern_kind__'];
@@ -1669,7 +1716,17 @@ export function createEngineSetup(mod: EngineModule) {
         const rec = e._extractBinaryArgs(i);
         return _int64Modulo(rec[0], rec[1]);
       });
-      handler.register('negate', (i: any) => _int64Negate(e._extractUnaryArg(i)));
+      handler.register('negate', (i: any) => {
+        // `_int64Negate` unconditionally coerces through `_coerceInt` (it's
+        // the int64-safe path for `bigint`-magnitude values), which silently
+        // truncated a double operand to an int — losing double-ness for
+        // e.g. `-7.0` (#67). Route a BallDouble operand through double
+        // negation instead; only a genuine int reaches `_int64Negate`.
+        const value = e._extractUnaryArg(i);
+        const BD = (globalThis as any).BallDouble;
+        if (BD && value instanceof BD) return new BD(-value.value);
+        return _int64Negate(value);
+      });
       handler.register('bitwise_and', (i: any) => e._stdBinaryInt(i, (a: any, b: any) => _int64Binary((l, r) => l & r, a, b)));
       handler.register('bitwise_or', (i: any) => e._stdBinaryInt(i, (a: any, b: any) => _int64Binary((l, r) => l | r, a, b)));
       handler.register('bitwise_xor', (i: any) => e._stdBinaryInt(i, (a: any, b: any) => _int64Binary((l, r) => l ^ r, a, b)));