From dced8d50f4492e29936304ea683b7325ab32d1dc Mon Sep 17 00:00:00 2001 From: Cade Mack <24661281+cademack@users.noreply.github.com> Date: Tue, 27 Aug 2024 11:53:16 -0400 Subject: [PATCH 1/3] updates for renamed debugger output --- src/debugger/runtime.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/debugger/runtime.ts b/src/debugger/runtime.ts index 6a347da..7655c84 100644 --- a/src/debugger/runtime.ts +++ b/src/debugger/runtime.ts @@ -37,7 +37,7 @@ export enum RuntimeEvent { export enum RuntimeStackType { CALL = "Call", // The amalgam "call" stack CONSTRUCTION = "Construction", // The construction stack - INTERPRET_NODE = "Interpret node", // Standard debugger call stack + INTERPRET_NODE = "Opcode", // Standard debugger call stack } /** The types of breakpoints */ @@ -186,7 +186,7 @@ export class AmalgamRuntime extends EventEmitter { breakpointLine: /^ {2}(?\d+)(?: (?.+))?$/gm, // Breakpoints and stack are matched via the header line and existing subsequent nested lines breakpoints: /^(?Line) Breakpoints:\n(?^(?:\s{2}.+)+)$/gm, - stack: /^(?Interpret node) stack:\n(?^(?:\s{2}.+)+)$/gm, + stack: /^(?Opcode) stack:\n(?^(?:\s{2}.+)+)$/gm, // Expression results match all lines up to final empty line expression: /^(?[\s\S]+)\n{2}$/gm, // Results match all lines starting with 2 spaces From e73c46a04efd3ee08031e590c3e55c3f301a0c14 Mon Sep 17 00:00:00 2001 From: Cade Mack <24661281+cademack@users.noreply.github.com> Date: Tue, 27 Aug 2024 13:11:46 -0400 Subject: [PATCH 2/3] be backwards compatible --- src/debugger/runtime.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/debugger/runtime.ts b/src/debugger/runtime.ts index 7655c84..dff4cbd 100644 --- a/src/debugger/runtime.ts +++ b/src/debugger/runtime.ts @@ -37,7 +37,8 @@ export enum RuntimeEvent { export enum RuntimeStackType { CALL = "Call", // The amalgam "call" stack CONSTRUCTION = "Construction", // The construction stack - INTERPRET_NODE = "Opcode", // Standard debugger call stack + INTERPRET_NODE = "Interpret node", // Standard debugger call stack Amalgam<54.3.8 + OPCODE = "Opcode" // Standard debugger call stack Amalgam>=54.3.8 } /** The types of breakpoints */ @@ -186,7 +187,7 @@ export class AmalgamRuntime extends EventEmitter { breakpointLine: /^ {2}(?\d+)(?: (?.+))?$/gm, // Breakpoints and stack are matched via the header line and existing subsequent nested lines breakpoints: /^(?Line) Breakpoints:\n(?^(?:\s{2}.+)+)$/gm, - stack: /^(?Opcode) stack:\n(?^(?:\s{2}.+)+)$/gm, + stack: /^(?Interpret node|Opcode) stack:\n(?^(?:\s{2}.+)+)$/gm, // Expression results match all lines up to final empty line expression: /^(?[\s\S]+)\n{2}$/gm, // Results match all lines starting with 2 spaces @@ -823,7 +824,7 @@ export class AmalgamRuntime extends EventEmitter { while ((matches = reg.exec(lines)) != null) { if (matches.groups) { const type = matches.groups.type; - if (type !== RuntimeStackType.INTERPRET_NODE) { + if (type !== RuntimeStackType.INTERPRET_NODE && type !== RuntimeStackType.OPCODE) { continue; } let frameReg: RegExp; From 02851c1e0e79fb289d40bd3196e1c4e6d7a488cd Mon Sep 17 00:00:00 2001 From: Cade Mack <24661281+cademack@users.noreply.github.com> Date: Tue, 27 Aug 2024 13:24:04 -0400 Subject: [PATCH 3/3] patch bump --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 70eda17..8071698 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "amalgam-lang", - "version": "2.1.0", + "version": "2.1.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "amalgam-lang", - "version": "2.1.0", + "version": "2.1.1", "license": "AGPL-3.0-only", "dependencies": { "@vscode/debugadapter": "^1.59.0", diff --git a/package.json b/package.json index 392659e..49f4799 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "amalgam-lang", - "version": "2.1.0", + "version": "2.1.1", "type": "commonjs", "publisher": "howso", "displayName": "Amalgam Language",