From aae83dffb285e004237eb0057fa9206ed7f91b81 Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Sat, 28 Sep 2019 15:12:00 -0700 Subject: [PATCH] Use 5.66 version of Config.mi Adds a single method --- modern/src/maki-interpreter/objectData/config.json | 7 ++++++- modern/src/maki-interpreter/tools/extract-object-types.js | 3 +-- modern/src/maki-interpreter/tools/parse-mi.test.js | 3 +-- modern/src/runtime/ConfigItem.ts | 5 +++++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/modern/src/maki-interpreter/objectData/config.json b/modern/src/maki-interpreter/objectData/config.json index 3bcc7525..9c70d82b 100644 --- a/modern/src/maki-interpreter/objectData/config.json +++ b/modern/src/maki-interpreter/objectData/config.json @@ -62,7 +62,7 @@ ], [ "String", - "default_val" + "default_value" ] ] }, @@ -75,6 +75,11 @@ "attr_name" ] ] + }, + { + "result": "String", + "name": "getName", + "parameters": [] } ], "name": "ConfigItem" diff --git a/modern/src/maki-interpreter/tools/extract-object-types.js b/modern/src/maki-interpreter/tools/extract-object-types.js index 8bf99d59..b0b4a388 100644 --- a/modern/src/maki-interpreter/tools/extract-object-types.js +++ b/modern/src/maki-interpreter/tools/extract-object-types.js @@ -4,13 +4,12 @@ import fs from "fs"; const compilers = path.join(__dirname, "../../../resources/maki_compiler/"); -const libUnknown = path.join(compilers, "Unknown (Winamp 5.03)/lib/"); const lib502 = path.join(compilers, "v1.1.13 (Winamp 5.02)/lib/"); const lib566 = path.join(compilers, "v1.2.0 (Winamp 5.66)/lib/"); const files = { pldir: path.join(lib566, "pldir.mi"), - config: path.join(libUnknown, "config.mi"), + config: path.join(lib566, "config.mi"), std: path.join(lib502, "std.mi"), }; diff --git a/modern/src/maki-interpreter/tools/parse-mi.test.js b/modern/src/maki-interpreter/tools/parse-mi.test.js index 67273d20..f3b26bdd 100644 --- a/modern/src/maki-interpreter/tools/parse-mi.test.js +++ b/modern/src/maki-interpreter/tools/parse-mi.test.js @@ -12,7 +12,6 @@ const compilers = path.join(__dirname, "../../../resources/maki_compiler/"); const lib502 = path.join(compilers, "v1.1.13 (Winamp 5.02)/lib/"); const lib566 = path.join(compilers, "v1.2.0 (Winamp 5.66)/lib/"); -const libUnknown = path.join(compilers, "Unknown (Winamp 5.03)/lib/"); test("std.mi", () => { const parsedObjects = parseFile(path.join(lib502, "std.mi")); @@ -20,7 +19,7 @@ test("std.mi", () => { }); test("config.mi", () => { - const parsedObjects = parseFile(path.join(libUnknown, "config.mi")); + const parsedObjects = parseFile(path.join(lib566, "config.mi")); expect(parsedObjects).toEqual(config); }); diff --git a/modern/src/runtime/ConfigItem.ts b/modern/src/runtime/ConfigItem.ts index 1ec296dd..ab1747e0 100644 --- a/modern/src/runtime/ConfigItem.ts +++ b/modern/src/runtime/ConfigItem.ts @@ -26,6 +26,11 @@ class ConfigItem extends MakiObject { unimplementedWarning("getguid"); return; } + + getname() { + unimplementedWarning("getname"); + return; + } } export default ConfigItem;