@swf2es/player-hosts 0.1.4 → 0.1.6

package/dist/thread/player/playerglobal/flash/filesystem/writes.js

@@ -7,7 +7,7 @@
 import { avm2 } from "../../../../runtime/index.js";
 import { NativePaths } from "./paths.js";
 /** "Error #id: message", as an IOErrorEvent's text begins. */
-export function errorText(id) {
+function errorText(id) {
     return `Error #${id}: ${avm2.errorMessages[id]}`;
 }
 /** Throws adl's SecurityError where `at` is in the application's directory by its app: URL. */

package/dist/thread/player/playerglobal/flash/globalization/locale.js

@@ -1,7 +1,7 @@
 // LastOperationStatus's values.
 export const NO_ERROR = "noError";
 export const USING_FALLBACK_WARNING = "usingFallbackWarning";
-export const USING_DEFAULT_WARNING = "usingDefaultWarning";
+const USING_DEFAULT_WARNING = "usingDefaultWarning";
 export const PARSE_ERROR = "parseError";
 export const UNSUPPORTED_ERROR = "unsupportedError";
 export const PATTERN_SYNTAX_ERROR = "patternSyntaxError";

package/dist/thread/player/scripting/events.js

@@ -4,9 +4,9 @@
 // player's input and frame events and playerglobal's dispatchEvent all
 // go through it.
 import { avm2 } from "../../runtime/index.js";
-export const CAPTURING_PHASE = 1;
+const CAPTURING_PHASE = 1;
 export const AT_TARGET = 2;
-export const BUBBLING_PHASE = 3;
+const BUBBLING_PHASE = 3;
 /** The fields of `s`'s events, found once playerglobal is loaded. */
 export function eventFields(s) {
     if (s.eventFields) {

package/dist/thread/player/scripting/lifecycle.js

@@ -45,7 +45,7 @@ export class Lifecycle {
      * order, as Flash dispatches them.
      */
     added(display) {
-        this.orphans.delete(display.serial);
+        this.dropOrphan(display.serial);
         this.dispatch(display.object, "added", true);
         if (this.onStage(display)) {
             this.eachObject(display, (o) => this.dispatch(o, "addedToStage", false));
@@ -136,6 +136,7 @@ export class Lifecycle {
     orphan(display, keep = true) {
         if (display.object && !this.orphans.has(display.serial)) {
             this.orphans.set(display.serial, { ref: display.ref, keep, since: this.s.frames });
+            this.sortedOrphans = null;
             scriptWork.changes++;
         }
     }
@@ -152,24 +153,42 @@ export class Lifecycle {
             display.fresh = true;
         }
     }
-    /** The orphans still there, newest first, as Flash runs their frames. */
-    orphanRoots() {
-        const roots = [];
-        for (const [serial, orphan] of this.orphans) {
-            const display = orphan.ref.deref();
+    /**
+     * The orphans, newest first, as Flash runs their frames: kept sorted
+     * until one comes or goes, as the player walks them twice a frame.
+     */
+    sortedOrphans = null;
+    dropOrphan(serial) {
+        if (this.orphans.delete(serial)) {
+            this.sortedOrphans = null;
+        }
+    }
+    /** Each orphan still there, newest first, to `f`, which must leave the orphans as they are. */
+    eachOrphanRoot(f) {
+        let sorted = this.sortedOrphans;
+        if (!sorted) {
+            sorted = [];
+            for (const [serial, orphan] of this.orphans) {
+                sorted.push({ serial, ref: orphan.ref });
+            }
+            sorted.sort((a, b) => b.serial - a.serial);
+            this.sortedOrphans = sorted;
+        }
+        for (let i = 0; i < sorted.length; i++) {
+            const display = sorted[i].ref.deref();
             if (!display) {
-                this.orphans.delete(serial);
+                this.dropOrphan(sorted[i].serial);
                 continue;
             }
-            roots.push(display);
+            f(display);
         }
-        return roots.sort((a, b) => b.serial - a.serial);
     }
     /** Whether `display` or anything under it listens for a frame's broadcast events. */
     hearsFrames(display) {
         if (display.object) {
-            for (const targets of this.s.broadcasts.values()) {
-                if (targets.has(display.object)) {
+            const sets = this.s.broadcastSets;
+            for (let i = 0; i < sets.length; i++) {
+                if (sets[i].has(display.object)) {
                     return true;
                 }
             }
@@ -187,7 +206,7 @@ export class Lifecycle {
      * does: timelines stopped, frame broadcasts no longer heard, no orphan.
      */
     stopAll(display) {
-        this.orphans.delete(display.serial);
+        this.dropOrphan(display.serial);
         stopTimelineSoundsUnder(this.s, display);
         const stop = (o) => {
             if (o instanceof MovieClip) {
@@ -230,24 +249,25 @@ export class Lifecycle {
         // What the timeline took off this frame has had its frame; it stops here. So
         // does one that has played ORPHAN_FRAMES off the list, but for one that
         // listens for a frame's events, which hold it in Flash too.
-        for (const [serial, orphan] of this.orphans) {
+        // forEach, as for-of makes an entry for each of what may be thousands, every frame.
+        this.orphans.forEach((orphan, serial) => {
             if (!orphan.keep) {
-                this.orphans.delete(serial);
-                continue;
+                this.dropOrphan(serial);
+                return;
             }
             if (this.s.frames - orphan.since < ORPHAN_FRAMES) {
-                continue;
+                return;
             }
             const display = orphan.ref.deref();
             if (display && this.hearsFrames(display)) {
                 orphan.since = this.s.frames;
-                continue;
+                return;
             }
-            this.orphans.delete(serial);
+            this.dropOrphan(serial);
             if (display) {
                 stopTimelineSoundsUnder(this.s, display);
             }
-        }
+        });
         // What scripts made this frame and left off the display list plays on as an orphan.
         const made = this.madeThisFrame.splice(0);
         if (made.length > 0) {

package/dist/thread/player/scripting/symbols.js

@@ -269,36 +269,30 @@ export class Symbols {
                 }
                 return display;
             }
-            if (t.name === "flash.display::SimpleButton") {
-                return new ButtonObject();
-            }
-            if (t.name === "flash.display::MovieClip") {
-                return new MovieClip(EMPTY_TIMELINE, library);
-            }
-            if (t.name === "flash.display::Shape") {
-                return new ShapeObject(null);
-            }
-            // Only a timeline makes a MorphShape or a StaticText.
-            if (t.name === "flash.display::MorphShape") {
-                throw this.s.rt.error("ArgumentError", 2012, "MorphShape$");
-            }
-            if (t.name === "flash.text::StaticText") {
-                throw this.s.rt.error("ArgumentError", 2012, "StaticText$");
-            }
-            // Only a load of an AVM1 SWF makes one (requestLoad).
-            if (t.name === "flash.display::AVM1Movie") {
-                throw this.s.rt.error("ArgumentError", 2012, "AVM1Movie$");
-            }
-            if (t.name === "flash.display::Bitmap") {
-                return new BitmapObject(null);
-            }
-            if (t.name === "flash.media::Video") {
-                return new VideoObject();
-            }
-            if (t.name === "flash.text::TextField") {
-                const text = new TextObject(null);
-                text.fonts = (this.s.code.codeLibrary() ?? library).fonts;
-                return text;
+            switch (t.name) {
+                case "flash.display::SimpleButton":
+                    return new ButtonObject();
+                case "flash.display::MovieClip":
+                    return new MovieClip(EMPTY_TIMELINE, library);
+                case "flash.display::Shape":
+                    return new ShapeObject(null);
+                // Only a timeline makes a MorphShape or a StaticText.
+                case "flash.display::MorphShape":
+                    throw this.s.rt.error("ArgumentError", 2012, "MorphShape$");
+                case "flash.text::StaticText":
+                    throw this.s.rt.error("ArgumentError", 2012, "StaticText$");
+                // Only a load of an AVM1 SWF makes one (requestLoad).
+                case "flash.display::AVM1Movie":
+                    throw this.s.rt.error("ArgumentError", 2012, "AVM1Movie$");
+                case "flash.display::Bitmap":
+                    return new BitmapObject(null);
+                case "flash.media::Video":
+                    return new VideoObject();
+                case "flash.text::TextField": {
+                    const text = new TextObject(null);
+                    text.fonts = (this.s.code.codeLibrary() ?? library).fonts;
+                    return text;
+                }
             }
         }
         return new Container();

package/dist/thread/player/scripting.js

@@ -203,13 +203,13 @@ export class Scripting {
     inFrameScript = null;
     /** The display objects listening for each frame event, in the order they first listened; a broadcast reaches these. */
     broadcasts = new Map();
+    /** The same sets, for a walk by index that makes no iterator; the map never lets one go. */
+    broadcastSets = [];
     /** The dispatchers listening for ACTIVATE or DEACTIVATE, held weakly. */
     activation = new Map();
     /** What flash.display.Stage reports and sets; the player copies the frame rate back each frame. */
     stageWidth = 0;
     stageHeight = 0;
-    /** Live Stage layout is part of the opt-in Context3D installation. */
-    liveStageLayout = false;
     stageScaleMode = "showAll";
     stageAlign = "";
     /** A script's setting takes precedence over the embedding's defaults. */
@@ -581,14 +581,12 @@ export class Scripting {
         if (!targets) {
             targets = new Set();
             this.broadcasts.set(type, targets);
+            this.broadcastSets.push(targets);
         }
         return targets;
     }
     /** Embedding defaults apply until ActionScript sets the corresponding property. */
     setStageDefaults(scaleMode, align) {
-        if (!this.liveStageLayout) {
-            return;
-        }
         if (!this.stageScaleModeSet) {
             this.stageScaleMode = scaleMode;
         }
@@ -598,7 +596,7 @@ export class Scripting {
     }
     /** The host's visible size in noScale, the authored size in other modes. */
     resizeStage(width, height) {
-        if (!this.liveStageLayout || (width === this.stageWidth && height === this.stageHeight)) {
+        if (width === this.stageWidth && height === this.stageHeight) {
             return;
         }
         this.stageWidth = width;
@@ -797,9 +795,7 @@ export class Scripting {
                 }
             }
         };
-        for (const orphan of this.lifecycle.orphanRoots()) {
-            visit(orphan);
-        }
+        this.lifecycle.eachOrphanRoot(visit);
         visit(root);
         for (const display of this.lifecycle.fresh) {
             visit(display);

package/dist/thread/runtime/avm1/errors.js

@@ -16,7 +16,7 @@ export class Halt extends Error {
  * own check (adl; Ruffle's continue_if_base_clip_exists). One instance,
  * thrown as a signal and never shown.
  */
-export class BaseRemoved extends Error {
+class BaseRemoved extends Error {
     name = "Avm1BaseRemoved";
 }
 export const BASE_REMOVED = new BaseRemoved("the clip whose code runs was removed");

package/dist/thread/runtime/avm1/numbers.js

@@ -43,14 +43,13 @@ export function numberToString(n) {
     if (Number.isNaN(n)) {
         return "NaN";
     }
-    if (n === Number.POSITIVE_INFINITY) {
-        return "Infinity";
-    }
-    if (n === Number.NEGATIVE_INFINITY) {
-        return "-Infinity";
-    }
-    if (n === 0) {
-        return "0";
+    switch (n) {
+        case Number.POSITIVE_INFINITY:
+            return "Infinity";
+        case Number.NEGATIVE_INFINITY:
+            return "-Infinity";
+        case 0:
+            return "0";
     }
     if (n >= -2147483648 && n <= 2147483647 && Number.isInteger(n)) {
         return String(n);

package/dist/thread/runtime/avm2/amf.js

@@ -13,8 +13,9 @@
 // the Mozilla Public License, v. 2.0: http://mozilla.org/MPL/2.0/.
 import { FloatValue } from "./float.js";
 import { NS_PackageInternal, NS_Public, namespace, publicQname, qname } from "./names.js";
-import { bytesOf, fromUtf8, utf8 } from "./natives/bytearray.js";
+import { bytesOf } from "./natives/bytearray.js";
 import { xmlToXMLString } from "./natives/xml/strings.js";
+import { fromUtf8, utf8 } from "./utf8.js";
 const kUndefined = 0;
 const kNull = 1;
 const kFalse = 2;

package/dist/thread/runtime/avm2/names.js

@@ -7,9 +7,6 @@ import { NO_CACHE } from "./property-cache.js";
 /** Namespace kinds, numbered as the compiler's NS_* constants. */
 export const NS_Public = 0;
 export const NS_PackageInternal = 1;
-export const NS_Protected = 2;
-export const NS_Explicit = 3;
-export const NS_StaticProtected = 4;
 export const NS_Private = 5;
 export class Namespace {
     kind;
@@ -77,7 +74,6 @@ export const CONSTANT_Multiname = 0x09;
 export const CONSTANT_MultinameA = 0x0e;
 export const CONSTANT_MultinameL = 0x1b;
 export const CONSTANT_MultinameLA = 0x1c;
-export const CONSTANT_TypeName = 0x1d;
 /**
  * A name as a property lookup uses it: its namespaces, each with the API
  * version it sees bindings at, and its local name, null for any name.

package/dist/thread/runtime/avm2/natives/bytearray.js

@@ -2,13 +2,14 @@
 // DataInput/DataOutput implement them. The buffer keeps avmplus' capacity:
 // it grows as avmplus' Grower grows it, zeroing what a reallocation adds,
 // so bytes a shorter length left behind come back when the length grows
-// within the capacity, as they do in avmplus. UTF-8 is avmplus' own: an
-// invalid byte reads as the character of its value.
+// within the capacity, as they do in avmplus. UTF-8 is avmplus' own
+// (utf8.ts).
 //
-// Translated from avmplus' core/ByteArrayGlue.cpp, core/DataIO.cpp and
-// core/UnicodeUtils.cpp, this file is subject to the Mozilla Public
-// License, v. 2.0: http://mozilla.org/MPL/2.0/.
+// Translated from avmplus' core/ByteArrayGlue.cpp and core/DataIO.cpp,
+// this file is subject to the Mozilla Public License, v. 2.0:
+// http://mozilla.org/MPL/2.0/.
 import { CompressedDataError, CompressedDataTooLargeError, deflateCompress, LZMA_HEADER, lzmaByteArrayCompress, lzmaByteArrayUncompress, zlibCompress, zlibUncompress, } from "../../../format/index.js";
+import { fromCodes, fromUtf8, utf8 } from "../utf8.js";
 import { registerNativeClass } from "./define.js";
 const kGrowthIncr = 4096;
 const kHugeGrowthThreshold = 24 * 1024 * 1024;
@@ -527,167 +528,6 @@ export function sharedByteArray(rt, memory) {
 export function knownSharedByteArray(rt, id) {
     return sharedObjectsOf(rt).get(id)?.deref();
 }
-/** The host's UTF-8 encoder, which writes a lone surrogate as U+FFFD, as utf8() does. */
-const encoder = new TextEncoder();
-/**
- * Below this length, a string encodes faster here than through
- * TextEncoder, whose call costs more than the loop saves (about 90
- * characters in V8).
- */
-const ENCODER_LENGTH = 96;
-/**
- * As UnicodeUtils::Utf16ToUtf8: a surrogate pair as four bytes, a lone
- * surrogate as U+FFFD. avmshell's writeUTFBytes loses characters around a
- * lone one instead; this keeps them, and the UTF-8 valid.
- */
-export function utf8(s) {
-    if (s.length >= ENCODER_LENGTH) {
-        return encoder.encode(s);
-    }
-    // ASCII, byte for byte.
-    let ascii = true;
-    for (let i = 0; i < s.length && ascii; i++) {
-        ascii = s.charCodeAt(i) < 0x80;
-    }
-    if (ascii) {
-        const out = new Uint8Array(s.length);
-        for (let i = 0; i < s.length; i++) {
-            out[i] = s.charCodeAt(i);
-        }
-        return out;
-    }
-    const out = new Uint8Array(s.length * 3);
-    let n = 0;
-    for (let i = 0; i < s.length; i++) {
-        let ch = s.charCodeAt(i);
-        if (ch < 0x80) {
-            out[n++] = ch;
-            continue;
-        }
-        if (ch < 0x800) {
-            out[n++] = 0xc0 | ((ch >> 6) & 0x1f);
-            out[n++] = 0x80 | (ch & 0x3f);
-            continue;
-        }
-        if (ch >= 0xd800 && ch <= 0xdbff) {
-            const ch2 = i + 1 < s.length ? s.charCodeAt(i + 1) : 0;
-            if (ch2 >= 0xdc00 && ch2 <= 0xdfff) {
-                i++;
-                const ucs4 = ((ch - 0xd800) << 10) + (ch2 - 0xdc00) + 0x10000;
-                out[n++] = 0xf0 | ((ucs4 >> 18) & 0x07);
-                out[n++] = 0x80 | ((ucs4 >> 12) & 0x3f);
-                out[n++] = 0x80 | ((ucs4 >> 6) & 0x3f);
-                out[n++] = 0x80 | (ucs4 & 0x3f);
-                continue;
-            }
-            ch = 0xfffd;
-        }
-        else if (ch >= 0xdc00 && ch <= 0xdfff) {
-            ch = 0xfffd;
-        }
-        out[n++] = 0xe0 | ((ch >> 12) & 0x0f);
-        out[n++] = 0x80 | ((ch >> 6) & 0x3f);
-        out[n++] = 0x80 | (ch & 0x3f);
-    }
-    return out.subarray(0, n);
-}
-/**
- * As UnicodeUtils::Utf8ToUtf16, not strict: a byte that does not start a
- * valid sequence is the character of its value, and a four-byte sequence
- * may start with 0xF8 to 0xFF, as Flash Player 9 and 10 read them.
- */
-/** The length from which fromUtf8 first looks for ASCII. */
-const ASCII_LENGTH = 16;
-export function fromUtf8(bytes) {
-    const n = bytes.length;
-    // ASCII, as most text is: its bytes are its characters. Below
-    // ASCII_LENGTH bytes, a character at a time, until one is not.
-    if (n < ASCII_LENGTH) {
-        let s = "";
-        let k = 0;
-        for (; k < n && bytes[k] < 0x80; k++) {
-            s += String.fromCharCode(bytes[k]);
-        }
-        if (k === n) {
-            return s;
-        }
-    }
-    else {
-        let ascii = 0;
-        while (ascii < n && bytes[ascii] < 0x80) {
-            ascii++;
-        }
-        if (ascii === n) {
-            let s = "";
-            for (let k = 0; k < n; k += 8192) {
-                s += String.fromCharCode.apply(null, bytes.subarray(k, k + 8192));
-            }
-            return s;
-        }
-    }
-    const out = [];
-    let i = 0;
-    while (i < n) {
-        const c = bytes[i];
-        const left = n - i;
-        switch (c >> 4) {
-            case 12:
-            case 13: {
-                if (left >= 2 && (bytes[i + 1] & 0xc0) === 0x80) {
-                    const ch = ((c << 6) & 0x7c0) | (bytes[i + 1] & 0x3f);
-                    if (ch >= 0x80) {
-                        out.push(ch);
-                        i += 2;
-                        continue;
-                    }
-                }
-                break;
-            }
-            case 14: {
-                if (left >= 3 && (bytes[i + 1] & 0xc0) === 0x80 && (bytes[i + 2] & 0xc0) === 0x80) {
-                    const ch = ((c << 12) & 0xf000) | ((bytes[i + 1] << 6) & 0xfc0) | (bytes[i + 2] & 0x3f);
-                    if (ch >= 0x800) {
-                        out.push(ch);
-                        i += 3;
-                        continue;
-                    }
-                }
-                break;
-            }
-            case 15: {
-                if (left >= 4 &&
-                    (bytes[i + 1] & 0xc0) === 0x80 &&
-                    (bytes[i + 2] & 0xc0) === 0x80 &&
-                    (bytes[i + 3] & 0xc0) === 0x80) {
-                    const ch = ((c << 18) & 0x1c0000) |
-                        ((bytes[i + 1] << 12) & 0x3f000) |
-                        ((bytes[i + 2] << 6) & 0xfc0) |
-                        (bytes[i + 3] & 0x3f);
-                    if (ch >= 0x10000) {
-                        out.push((((ch - 0x10000) >> 10) & 0x3ff) + 0xd800, ((ch - 0x10000) & 0x3ff) + 0xdc00);
-                        i += 4;
-                        continue;
-                    }
-                }
-                break;
-            }
-            default:
-                break;
-        }
-        // Not a sequence: the byte itself.
-        out.push(c);
-        i++;
-    }
-    return fromCodes(out);
-}
-/** A string of UTF-16 code units, in chunks, as String.fromCharCode takes only so many arguments. */
-function fromCodes(units) {
-    let s = "";
-    for (let k = 0; k < units.length; k += 8192) {
-        s += String.fromCharCode(...units.slice(k, k + 8192));
-    }
-    return s;
-}
 /** The bytes up to the first NUL, as avmplus reads a C string. */
 function toNul(bytes) {
     const nul = bytes.indexOf(0);

package/dist/thread/runtime/avm2/natives/regexp.js

@@ -170,25 +170,25 @@ function variableLookbehind(source) {
     /** The length of the item at i, which it steps past. */
     const item = () => {
         const c = source[i++];
-        if (c === "(") {
-            return group();
-        }
-        if (c === "^" || c === "$") {
-            return 0;
-        }
-        if (c === "[") {
-            if (source[i] === "^") {
-                i++;
-            }
-            // A ] first is a literal.
-            if (source[i] === "]") {
+        switch (c) {
+            case "(":
+                return group();
+            case "^":
+            case "$":
+                return 0;
+            case "[":
+                if (source[i] === "^") {
+                    i++;
+                }
+                // A ] first is a literal.
+                if (source[i] === "]") {
+                    i++;
+                }
+                while (i < source.length && source[i] !== "]") {
+                    i += source[i] === "\\" ? 2 : 1;
+                }
                 i++;
-            }
-            while (i < source.length && source[i] !== "]") {
-                i += source[i] === "\\" ? 2 : 1;
-            }
-            i++;
-            return 1;
+                return 1;
         }
         if (c !== "\\") {
             // A character beyond the BMP is one in PCRE's UTF-8 too.
@@ -265,57 +265,61 @@ function nestedTooDeep(source) {
     for (let i = 0; i < source.length; i++) {
         const c = source[i];
         let item = 2;
-        if (c === "(") {
-            const capture = source[i + 1] !== "?" || source.startsWith("(?P<", i);
-            outer.push(held);
-            held += previous + (capture ? 5 : 3);
-            previous = 0;
-            if (held > WORKSPACE) {
-                return true;
-            }
-            // Past the group's kind: ?: ?= ?! ?<= ?<! ?P<name> or flags.
-            if (source[i + 1] === "?") {
-                const end = source.slice(i + 2).search(/[:=!>)]/);
-                i = end < 0 ? source.length : i + 2 + end;
+        switch (c) {
+            case "(": {
+                const capture = source[i + 1] !== "?" || source.startsWith("(?P<", i);
+                outer.push(held);
+                held += previous + (capture ? 5 : 3);
+                previous = 0;
+                if (held > WORKSPACE) {
+                    return true;
+                }
+                // Past the group's kind: ?: ?= ?! ?<= ?<! ?P<name> or flags.
+                if (source[i + 1] === "?") {
+                    const end = source.slice(i + 2).search(/[:=!>)]/);
+                    i = end < 0 ? source.length : i + 2 + end;
+                }
+                continue;
             }
-            continue;
-        }
-        if (c === ")") {
-            held = outer.pop() ?? held;
-            // The group is the next one's previous item, but what it holds is gone.
-            previous = 0;
-            continue;
-        }
-        if (c === "|") {
-            previous = 0;
-            continue;
-        }
-        if (c === "\\") {
-            i++;
-        }
-        else if (c === "[") {
-            // A class is its opcode and a 32-byte bitmap.
-            item = 33;
-            i++;
-            if (source[i] === "^") {
+            case ")":
+                held = outer.pop() ?? held;
+                // The group is the next one's previous item, but what it holds is gone.
+                previous = 0;
+                continue;
+            case "|":
+                previous = 0;
+                continue;
+            case "\\":
                 i++;
-            }
-            // A ] first is a literal.
-            if (source[i] === "]") {
+                break;
+            case "[":
+                // A class is its opcode and a 32-byte bitmap.
+                item = 33;
                 i++;
-            }
-            while (i < source.length && source[i] !== "]") {
-                if (source[i] === "\\") {
+                if (source[i] === "^") {
                     i++;
                 }
-                i++;
-            }
-        }
-        else if (c === "." || c === "^" || c === "$") {
-            item = 1;
-        }
-        else if ("*+?{".includes(c)) {
-            continue;
+                // A ] first is a literal.
+                if (source[i] === "]") {
+                    i++;
+                }
+                while (i < source.length && source[i] !== "]") {
+                    if (source[i] === "\\") {
+                        i++;
+                    }
+                    i++;
+                }
+                break;
+            case ".":
+            case "^":
+            case "$":
+                item = 1;
+                break;
+            case "*":
+            case "+":
+            case "?":
+            case "{":
+                continue;
         }
         previous = item;
         if (held + previous > WORKSPACE) {