diff --git a/ts2panda/src/cmdOptions.ts b/ts2panda/src/cmdOptions.ts index 4e108670db4789dfb4ba0e5bde0af7bc345a089b..3cce689f48390364f68c4670fc9632b933236e3d 100644 --- a/ts2panda/src/cmdOptions.ts +++ b/ts2panda/src/cmdOptions.ts @@ -45,7 +45,6 @@ const ts2pandaOptions = [ { name: 'dts-type-record', alias: 'q', type: Boolean, defaultValue: false, description: "Record type info for .d.ts files. Default: false" }, { name: 'debug-type', alias: 'g', type: Boolean, defaultValue: false, description: "Print type-related log. Default: false" }, { name: 'output-type', type: Boolean, defaultValue: false, description: "set output type."}, - { name: 'enable-typeinfo', type: Boolean, defaultValue: false, description: "Enable typeinfo of pairs of instruction orders and types" }, { name: 'display-typeinfo', type: Boolean, defaultValue: false, description: "Display typeinfo of pairs of instruction orders and types when enable-typeinfo is true" } ] @@ -55,13 +54,6 @@ export class CmdOptions { private static parsedResult: ts.ParsedCommandLine; private static options: commandLineArgs.CommandLineOptions; - static getEnableTypeinfo(): boolean { - if (!this.options) { - return false; - } - return this.options["enable-typeinfo"]; - } - static getDisplayTypeinfo(): boolean { if (!this.options) { return false; diff --git a/ts2panda/src/ts2panda.ts b/ts2panda/src/ts2panda.ts index 52c1823865835a38e28d28a55d222b7401e51aeb..39c62abb7aad19b20d68123d04af339b8e22db65 100644 --- a/ts2panda/src/ts2panda.ts +++ b/ts2panda/src/ts2panda.ts @@ -195,7 +195,6 @@ export class Ts2Panda { "log_enabled": CmdOptions.isEnableDebugLog(), "opt_level": CmdOptions.getOptLevel(), "opt_log_level": CmdOptions.getOptLogLevel(), - "enable_typeinfo": CmdOptions.getEnableTypeinfo(), "display_typeinfo": CmdOptions.getDisplayTypeinfo() }; let jsonOpt = JSON.stringify(options, null, 2); diff --git a/ts2panda/ts2abc/ts2abc.cpp b/ts2panda/ts2abc/ts2abc.cpp index f66e50ce9f674b76c53e2e5425e966c79f8519ee..a457c79bbf8585cf6d96569434ed961011511b41 100644 --- a/ts2panda/ts2abc/ts2abc.cpp +++ b/ts2panda/ts2abc/ts2abc.cpp @@ -900,14 +900,6 @@ static void ParseOptLevel(const Json::Value &rootValue) } } -static void ParseEnableTypeinfo(const Json::Value &rootValue) -{ - Logd("-----------------parse enable_typeinfo-----------------"); - if (rootValue.isMember("enable_typeinfo") && rootValue["enable_typeinfo"].isBool()) { - g_enableTypeinfo = rootValue["enable_typeinfo"].asBool(); - } -} - static void ParseDisplayTypeinfo(const Json::Value &rootValue) { Logd("-----------------parse enable_typeinfo-----------------"); @@ -944,7 +936,6 @@ static void ParseOptions(const Json::Value &rootValue, panda::pandasm::Program & ParseLogEnable(rootValue); ParseDebugMode(rootValue); ParseOptLevel(rootValue); - ParseEnableTypeinfo(rootValue); ParseDisplayTypeinfo(rootValue); ParseOptLogLevel(rootValue); } @@ -1318,10 +1309,8 @@ bool GenerateProgram([[maybe_unused]] const std::string &data, const std::string Logd("parsing done, calling pandasm\n"); - if (g_enableTypeinfo) { - TypeAdapter ada(g_displayTypeinfo); - ada.AdaptTypeForProgram(&prog); - } + TypeAdapter ada(g_displayTypeinfo); + ada.AdaptTypeForProgram(&prog); #ifdef ENABLE_BYTECODE_OPT if (g_optLevel != static_cast(OptLevel::O_LEVEL0) || optLevel != static_cast(OptLevel::O_LEVEL0)) {