From 29d7a10f4741aef15dd6cd76c0499c23e8224370 Mon Sep 17 00:00:00 2001 From: Rachel Powers <508861+Ryex@users.noreply.github.com> Date: Sat, 20 Apr 2024 10:58:42 -0700 Subject: [PATCH] ensure all numeric values preserve across session --- www/src/ts/app/app.ts | 8 +-- www/src/ts/app/nav.ts | 81 ++++++++++++++++++++----- www/src/ts/session.ts | 6 +- www/src/ts/utils.ts | 70 ++++++++++++--------- www/src/ts/virtual_machine/device.ts | 15 +++-- www/src/ts/virtual_machine/index.ts | 2 +- www/src/ts/virtual_machine/registers.ts | 14 +---- www/src/ts/virtual_machine/stack.ts | 13 +--- 8 files changed, 131 insertions(+), 78 deletions(-) diff --git a/www/src/ts/app/app.ts b/www/src/ts/app/app.ts index 0f35f58..da23b5d 100644 --- a/www/src/ts/app/app.ts +++ b/www/src/ts/app/app.ts @@ -52,7 +52,7 @@ export class App extends BaseElement { `, ]; - version = packageJson.version; + appVersion = packageJson.version; gitVer = __COMMIT_HASH__; buildDate = __BUILD_DATE__; @@ -80,7 +80,7 @@ export class App extends BaseElement { const root = super.createRenderRoot(); root.addEventListener("app-share-session", this._handleShare.bind(this)); root.addEventListener("app-open-file", this._handleOpenFile.bind(this)); - root.addEventListener("app-save-as", this._handleSaveAs.bind(this)); + root.addEventListener("app-export", this._handleExport.bind(this)); root.addEventListener("app-save", this._handleSave.bind(this)); return root; } @@ -88,7 +88,7 @@ export class App extends BaseElement { protected render(): HTMLTemplateResult { return html`
- +
li > a { color: #fff; line-height: 20px; @@ -92,6 +98,10 @@ export class Nav extends BaseElement { constructor() { super(); } + + @property() gitVer: string; + @property() appVer: string; + @property() buildDate: string; protected render(): HTMLTemplateResult { return html`
-
- Stationeers IC10 Emulator +
+
+ + Stationeers IC10 Emulator + +
+
+ v${this.appVer}-${this.gitVer} + +
@@ -183,8 +227,11 @@ export class Nav extends BaseElement { case "save": this.dispatchEvent(new CustomEvent("app-save", { bubbles: true })); break; - case "saveAs": - this.dispatchEvent(new CustomEvent("app-save-as", { bubbles: true })); + case "load": + this.dispatchEvent(new CustomEvent("app-load", { bubbles: true })); + break; + case "export": + this.dispatchEvent(new CustomEvent("app-export", { bubbles: true })); break; case "editorSettings": window.Editor.settingDialog.show(); @@ -192,6 +239,8 @@ export class Nav extends BaseElement { case "keyboardShortcuts": window.Editor.kbShortcuts.show(); break; + case 'preset-demo': + window.location.hash = "demo"; default: console.log("Unknown main menu item", item.value); } diff --git a/www/src/ts/session.ts b/www/src/ts/session.ts index 4241021..78780f9 100644 --- a/www/src/ts/session.ts +++ b/www/src/ts/session.ts @@ -137,6 +137,9 @@ export class Session extends EventTarget { setProgramCode(id: number, code: string) { this._programs.set(id, code); + if (this.app.vm) { + this.app.vm.updateCode(); + } this.save(); } @@ -184,9 +187,6 @@ export class Session extends EventTarget { save() { if (this._save_timeout) clearTimeout(this._save_timeout); this._save_timeout = setTimeout(() => { - if (this.app.vm) { - this.app.vm.updateCode(); - } this.saveToFragment(); this._save_timeout = undefined; }, 1000); diff --git a/www/src/ts/utils.ts b/www/src/ts/utils.ts index 32133a7..44b0db6 100644 --- a/www/src/ts/utils.ts +++ b/www/src/ts/utils.ts @@ -12,21 +12,37 @@ export function docReady(fn: () => void) { } } +function isZeroNegative(zero: number) { + const isZero = zero === 0; + const isNegative = 1 / zero === -Infinity; + return isNegative && isZero; +} -function replacer(key: any, value: any) { - if(value instanceof Map) { +export function numberToString(n: number): string { + if (isZeroNegative(n)) return "-0"; + return n.toString(); +} +export function displayNumber(n: number): string { + return numberToString(n).replace("Infinity", "∞"); +} + +function replacer(_key: any, value: any) { + if (value instanceof Map) { return { - dataType: 'Map', + dataType: "Map", value: Array.from(value.entries()), // or with spread: value: [...value] }; - } else if (Number.isNaN(value)) { + } else if ( + typeof value === "number" && + (!Number.isFinite(value) || Number.isNaN(value) || isZeroNegative(value)) + ) { return { - dataType: 'Number', - value: "NaN", + dataType: "Number", + value: numberToString(value), }; - } else if (typeof value === "undefined" ) { + } else if (typeof value === "undefined") { return { - dataType: 'undefined', + dataType: "undefined", }; } else { return value; @@ -34,12 +50,12 @@ function replacer(key: any, value: any) { } function reviver(_key: any, value: any) { - if(typeof value === 'object' && value !== null) { - if (value.dataType === 'Map') { + if (typeof value === "object" && value !== null) { + if (value.dataType === "Map") { return new Map(value.value); - } else if (value.dataType === 'Number') { - return parseFloat(value.value) - } else if (value.dataType === 'undefined') { + } else if (value.dataType === "Number") { + return parseFloat(value.value); + } else if (value.dataType === "undefined") { return undefined; } } @@ -51,14 +67,13 @@ export function toJson(value: any): string { } export function fromJson(value: string): any { - return JSON.parse(value, reviver) + return JSON.parse(value, reviver); } export function structuralEqual(a: any, b: any): boolean { const _a = JSON.stringify(a, replacer); const _b = JSON.stringify(b, replacer); return _a === _b; - } // probably not needed, fetch() exists now @@ -173,26 +188,26 @@ export async function openFile(editor: Ace.Editor) { export function parseNumber(s: string): number { switch (s.toLowerCase()) { - case 'nan': + case "nan": return Number.NaN; - case 'pinf': + case "pinf": return Number.POSITIVE_INFINITY; - case 'ninf': + case "ninf": return Number.NEGATIVE_INFINITY; - case 'pi': + case "pi": return 3.141592653589793; - case 'deg2rad': + case "deg2rad": return 0.0174532923847437; - case 'rad2deg': + case "rad2deg": return 57.2957801818848; - case 'epsilon': + case "epsilon": return Number.EPSILON; } if (/^%[01]+$/.test(s)) { - return parseInt(s.slice(1), 2) + return parseInt(s.slice(1), 2); } if (/^\$[0-9A-Fa-f]+$/.test(s)) { - return parseInt(s.slice(1), 16) + return parseInt(s.slice(1), 16); } if (/[a-fA-F]/.test(s)) { const hex = parseHex(s); @@ -200,10 +215,11 @@ export function parseNumber(s: string): number { return hex; } } + s.replace("∞", "Infinity"); return parseFloat(s); } -export function parseHex(h: string) : number { +export function parseHex(h: string): number { var val = parseInt(h, 16); if (val.toString(16) === h.toLowerCase()) { return val; @@ -214,10 +230,10 @@ export function parseHex(h: string) : number { export function parseIntWithHexOrBinary(s: string): number { if (/^%[01]+$/.test(s)) { - return parseInt(s.slice(1), 2) + return parseInt(s.slice(1), 2); } if (/^\$[0-9A-Fa-f]+$/.test(s)) { - return parseInt(s.slice(1), 16) + return parseInt(s.slice(1), 16); } if (/[a-fA-F]/.test(s)) { const hex = parseHex(s); diff --git a/www/src/ts/virtual_machine/device.ts b/www/src/ts/virtual_machine/device.ts index ec48977..2f6003d 100644 --- a/www/src/ts/virtual_machine/device.ts +++ b/www/src/ts/virtual_machine/device.ts @@ -36,6 +36,7 @@ import "@shoelace-style/shoelace/dist/components/icon/icon.js"; import SlInput from "@shoelace-style/shoelace/dist/components/input/input.js"; import { + displayNumber, parseIntWithHexOrBinary, parseNumber, structuralEqual, @@ -274,7 +275,7 @@ export class VMDeviceCard extends VMDeviceMixin(BaseElement) { return html` @@ -334,8 +335,14 @@ export class VMDeviceCard extends VMDeviceMixin(BaseElement) {
${fields.map( ([name, field], _index, _fields) => html` - + ${name} ${field.field_type} @@ -1023,7 +1030,7 @@ export class VmDeviceTemplate extends BaseElement { return html` { if (val === Number.NEGATIVE_INFINITY || val === Number.POSITIVE_INFINITY || Number.isNaN(val)) { return "text"; } else { return "number"; } }; - const displayVal = (val: number) => { - if (Number.POSITIVE_INFINITY === val) { - return "∞"; - } else if (Number.NEGATIVE_INFINITY === val) { - return "-∞"; - } else { - return val.toString(); - } - }; const registerAliases: [string, number][] = ( ( [...(this.aliases ?? [])].filter( @@ -83,7 +73,7 @@ export class VMICRegisters extends VMActiveICMixin(BaseElement) {
{ - if (Number.POSITIVE_INFINITY === val) { - return "∞"; - } else if (Number.NEGATIVE_INFINITY === val) { - return "-∞"; - } else { - return val.toString(); - } - }; const sp = this.registers![16]; return html` @@ -67,7 +58,7 @@ export class VMICStack extends VMActiveICMixin(BaseElement) {