From 0a5d7b6ab4b95e46aa242b754640b8c72b621314 Mon Sep 17 00:00:00 2001 From: walon Date: Mon, 27 Sep 2021 16:27:13 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=B0=83=E6=95=B4=E3=80=91=E7=A7=BB?= =?UTF-8?q?=E9=99=A4cfg,proto,db=E5=AF=B9const=E5=AE=9A=E4=B9=89=E7=9A=84?= =?UTF-8?q?=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs | 1 - src/Luban.Job.Cfg/Source/Defs/DefAssembly.cs | 7 +- .../Source/Generate/CodeRenderBase.cs | 2 - .../Source/Generate/CppCodeBinRender.cs | 13 --- .../Source/Generate/CppEditorRender.cs | 5 - .../Source/Generate/CppUE4BpRender.cs | 5 - .../Source/Generate/CppUE4EditorRender.cs | 5 - .../Source/Generate/CsCodeRenderBase.cs | 5 - .../Source/Generate/GoCodeRenderBase.cs | 8 -- .../Source/Generate/JavaCodeRenderBase.cs | 5 - .../Source/Generate/LuaCodeBinRender.cs | 3 +- .../Source/Generate/LuaCodeLuaRender.cs | 3 +- .../Source/Generate/LuaCodeRenderBase.cs | 5 - .../Source/Generate/PythonCodeRenderBase.cs | 5 - .../Source/Generate/RustCodeJsonRender.cs | 5 - .../Generate/TypescriptCodeRenderBase.cs | 5 - src/Luban.Job.Cfg/Source/RawDefs/Defines.cs | 2 - .../Source/Defs/CommonDefLoader.cs | 33 ------- src/Luban.Job.Common/Source/Defs/DefConst.cs | 63 ------------- .../Source/Generate/ICodeRender.cs | 2 - src/Luban.Job.Common/Source/RawDefs/Const.cs | 27 ------ .../Source/Utils/RenderUtil.cs | 91 ------------------- src/Luban.Job.Db/Source/Defs/DbDefLoader.cs | 3 - src/Luban.Job.Db/Source/Defs/DefAssembly.cs | 6 -- .../Source/Generate/AsyncCsRender.cs | 6 -- .../Source/Generate/SyncCsRender.cs | 6 -- .../Source/Generate/TypescriptRender.cs | 6 -- src/Luban.Job.Db/Source/RawDefs/Defines.cs | 2 - .../Source/Defs/DefAssembly.cs | 5 - .../Source/Defs/ProtoDefLoader.cs | 1 - .../Source/Generate/CsRender.cs | 6 -- .../Source/Generate/LuaRender.cs | 3 +- .../Source/Generate/TypescriptRender.cs | 6 -- src/Luban.Job.Proto/Source/RawDefs/Defines.cs | 2 - src/Luban.Server/Luban.Server.csproj | 21 ----- .../Templates/common/cpp/const.tpl | 19 ---- .../Templates/common/cs/const.tpl | 21 ----- .../Templates/common/go/const.tpl | 7 -- .../Templates/common/java/const.tpl | 18 ---- .../Templates/common/lua/base.tpl | 1 - .../Templates/common/python/const.tpl | 17 ---- .../Templates/common/rust/const.tpl | 18 ---- .../Templates/common/typescript/const.tpl | 17 ---- .../Templates/config/lua_bin/all.tpl | 12 +-- .../Templates/config/lua_lua/all.tpl | 13 +-- src/Luban.Server/Templates/proto/lua/all.tpl | 15 +-- 46 files changed, 7 insertions(+), 524 deletions(-) delete mode 100644 src/Luban.Job.Common/Source/Defs/DefConst.cs delete mode 100644 src/Luban.Job.Common/Source/RawDefs/Const.cs delete mode 100644 src/Luban.Server/Templates/common/cpp/const.tpl delete mode 100644 src/Luban.Server/Templates/common/cs/const.tpl delete mode 100644 src/Luban.Server/Templates/common/go/const.tpl delete mode 100644 src/Luban.Server/Templates/common/java/const.tpl delete mode 100644 src/Luban.Server/Templates/common/python/const.tpl delete mode 100644 src/Luban.Server/Templates/common/rust/const.tpl delete mode 100644 src/Luban.Server/Templates/common/typescript/const.tpl diff --git a/src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs b/src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs index 6e86638..0545f17 100644 --- a/src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs +++ b/src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs @@ -55,7 +55,6 @@ namespace Luban.Job.Cfg.Defs { TopModule = TopModule, Patches = _patches, - Consts = this._consts, Enums = _enums, Beans = _beans, Tables = _cfgTables, diff --git a/src/Luban.Job.Cfg/Source/Defs/DefAssembly.cs b/src/Luban.Job.Cfg/Source/Defs/DefAssembly.cs index 7882760..66b120b 100644 --- a/src/Luban.Job.Cfg/Source/Defs/DefAssembly.cs +++ b/src/Luban.Job.Cfg/Source/Defs/DefAssembly.cs @@ -156,7 +156,7 @@ namespace Luban.Job.Cfg.Defs } foreach ((var fullTypeName, var type) in this.Types) { - if (!refTypes.ContainsKey(fullTypeName) && (type is DefConst || type is DefEnum)) + if (!refTypes.ContainsKey(fullTypeName) && (type is DefEnum)) { refTypes.Add(fullTypeName, type); } @@ -195,11 +195,6 @@ namespace Luban.Job.Cfg.Defs this._patches.AddRange(defines.Patches); - foreach (var c in defines.Consts) - { - AddType(new DefConst(c)); - } - foreach (var e in defines.Enums) { AddType(new DefEnum(e)); diff --git a/src/Luban.Job.Cfg/Source/Generate/CodeRenderBase.cs b/src/Luban.Job.Cfg/Source/Generate/CodeRenderBase.cs index 13e9a46..fe44a44 100644 --- a/src/Luban.Job.Cfg/Source/Generate/CodeRenderBase.cs +++ b/src/Luban.Job.Cfg/Source/Generate/CodeRenderBase.cs @@ -13,7 +13,6 @@ namespace Luban.Job.Cfg.Generate public abstract void Render(GenContext ctx); - public abstract string Render(DefConst c); public abstract string Render(DefEnum c); public abstract string Render(DefBean b); public abstract string Render(DefTable c); @@ -23,7 +22,6 @@ namespace Luban.Job.Cfg.Generate { switch (o) { - case DefConst c: return Render(c); case DefEnum e: return Render(e); case DefBean b: return Render(b); case DefTable r: return Render(r); diff --git a/src/Luban.Job.Cfg/Source/Generate/CppCodeBinRender.cs b/src/Luban.Job.Cfg/Source/Generate/CppCodeBinRender.cs index 351c86b..0897d4f 100644 --- a/src/Luban.Job.Cfg/Source/Generate/CppCodeBinRender.cs +++ b/src/Luban.Job.Cfg/Source/Generate/CppCodeBinRender.cs @@ -44,14 +44,6 @@ namespace {ctx.TopModule} } } - foreach (var type in ctx.ExportTypes) - { - if (type is DefConst c) - { - headerFileContent.Add(Render(c)); - } - } - foreach (var type in ctx.ExportTypes) { if (type is DefBean e) @@ -103,11 +95,6 @@ namespace {ctx.TopModule} } } - public override string Render(DefConst c) - { - return RenderUtil.RenderCppConstClass(c); - } - public override string Render(DefEnum c) { return RenderUtil.RenderCppEnumClass(c); diff --git a/src/Luban.Job.Cfg/Source/Generate/CppEditorRender.cs b/src/Luban.Job.Cfg/Source/Generate/CppEditorRender.cs index 85ba088..afb7f72 100644 --- a/src/Luban.Job.Cfg/Source/Generate/CppEditorRender.cs +++ b/src/Luban.Job.Cfg/Source/Generate/CppEditorRender.cs @@ -13,11 +13,6 @@ namespace Luban.Job.Cfg.Generate } - public override string Render(DefConst c) - { - return "// const"; - } - public override string Render(DefEnum e) { return "// enum"; diff --git a/src/Luban.Job.Cfg/Source/Generate/CppUE4BpRender.cs b/src/Luban.Job.Cfg/Source/Generate/CppUE4BpRender.cs index dba8ba0..3ce3c3c 100644 --- a/src/Luban.Job.Cfg/Source/Generate/CppUE4BpRender.cs +++ b/src/Luban.Job.Cfg/Source/Generate/CppUE4BpRender.cs @@ -101,11 +101,6 @@ public: return result; } - public override string Render(DefConst c) - { - throw new NotImplementedException(); - } - public override string Render(DefTable c) { throw new NotImplementedException(); diff --git a/src/Luban.Job.Cfg/Source/Generate/CppUE4EditorRender.cs b/src/Luban.Job.Cfg/Source/Generate/CppUE4EditorRender.cs index 9d54284..4cef97e 100644 --- a/src/Luban.Job.Cfg/Source/Generate/CppUE4EditorRender.cs +++ b/src/Luban.Job.Cfg/Source/Generate/CppUE4EditorRender.cs @@ -261,11 +261,6 @@ bool {{type.ue_fname}}FromString(const FString& s, {{type.ue_fname}}& value) return result; } - public override string Render(DefConst c) - { - throw new NotImplementedException(); - } - public override string Render(DefTable c) { throw new NotImplementedException(); diff --git a/src/Luban.Job.Cfg/Source/Generate/CsCodeRenderBase.cs b/src/Luban.Job.Cfg/Source/Generate/CsCodeRenderBase.cs index 85599d1..67f0151 100644 --- a/src/Luban.Job.Cfg/Source/Generate/CsCodeRenderBase.cs +++ b/src/Luban.Job.Cfg/Source/Generate/CsCodeRenderBase.cs @@ -10,11 +10,6 @@ namespace Luban.Job.Cfg.Generate GenerateCodeScatter(ctx); } - public override string Render(DefConst c) - { - return RenderUtil.RenderCsConstClass(c); - } - public override string Render(DefEnum e) { return RenderUtil.RenderCsEnumClass(e); diff --git a/src/Luban.Job.Cfg/Source/Generate/GoCodeRenderBase.cs b/src/Luban.Job.Cfg/Source/Generate/GoCodeRenderBase.cs index a585d4c..2e40860 100644 --- a/src/Luban.Job.Cfg/Source/Generate/GoCodeRenderBase.cs +++ b/src/Luban.Job.Cfg/Source/Generate/GoCodeRenderBase.cs @@ -11,14 +11,6 @@ namespace Luban.Job.Cfg.Generate GenerateCodeScatter(ctx); } - public override string Render(DefConst c) - { - string package = "cfg"; - var template = StringTemplateUtil.GetTemplate("common/go/const"); - var result = template.RenderCode(c, new Dictionary() { ["package"] = package }); - return result; - } - public override string Render(DefEnum e) { string package = "cfg"; diff --git a/src/Luban.Job.Cfg/Source/Generate/JavaCodeRenderBase.cs b/src/Luban.Job.Cfg/Source/Generate/JavaCodeRenderBase.cs index a359e64..0596a5c 100644 --- a/src/Luban.Job.Cfg/Source/Generate/JavaCodeRenderBase.cs +++ b/src/Luban.Job.Cfg/Source/Generate/JavaCodeRenderBase.cs @@ -10,11 +10,6 @@ namespace Luban.Job.Cfg.Generate GenerateCodeScatter(ctx); } - public override string Render(DefConst c) - { - return RenderUtil.RenderJavaConstClass(c); - } - public override string Render(DefEnum c) { return RenderUtil.RenderJavaEnumClass(c); diff --git a/src/Luban.Job.Cfg/Source/Generate/LuaCodeBinRender.cs b/src/Luban.Job.Cfg/Source/Generate/LuaCodeBinRender.cs index bd72374..d468502 100644 --- a/src/Luban.Job.Cfg/Source/Generate/LuaCodeBinRender.cs +++ b/src/Luban.Job.Cfg/Source/Generate/LuaCodeBinRender.cs @@ -12,14 +12,13 @@ namespace Luban.Job.Cfg.Generate { public override string RenderAll(List types) { - var consts = types.Where(t => t is DefConst).ToList(); var enums = types.Where(t => t is DefEnum).ToList(); var beans = types.Where(t => t is DefBean).ToList(); var tables = types.Where(t => t is DefTable).ToList(); var template = StringTemplateUtil.GetOrAddTemplate("common/lua/base_all", fn => Template.Parse(StringTemplateUtil.GetTemplateString("common/lua/base") + StringTemplateUtil.GetTemplateString("config/lua_bin/all"))); - return template.RenderCode(new { Consts = consts, Enums = enums, Beans = beans, Tables = tables }); + return template.RenderCode(new { Enums = enums, Beans = beans, Tables = tables }); } } } diff --git a/src/Luban.Job.Cfg/Source/Generate/LuaCodeLuaRender.cs b/src/Luban.Job.Cfg/Source/Generate/LuaCodeLuaRender.cs index 00a36ac..94bf59f 100644 --- a/src/Luban.Job.Cfg/Source/Generate/LuaCodeLuaRender.cs +++ b/src/Luban.Job.Cfg/Source/Generate/LuaCodeLuaRender.cs @@ -16,13 +16,12 @@ namespace Luban.Job.Cfg.Generate public override string RenderAll(List types) { - var consts = types.Where(t => t is DefConst).ToList(); var enums = types.Where(t => t is DefEnum).ToList(); var beans = types.Where(t => t is DefBean).ToList(); var tables = types.Where(t => t is DefTable).ToList(); var template = t_allRender ??= Template.Parse(StringTemplateUtil.GetTemplateString("common/lua/base") + StringTemplateUtil.GetTemplateString("config/lua_lua/all")); - return template.RenderCode(new { Consts = consts, Enums = enums, Beans = beans, Tables = tables }); + return template.RenderCode(new { Enums = enums, Beans = beans, Tables = tables }); } } } diff --git a/src/Luban.Job.Cfg/Source/Generate/LuaCodeRenderBase.cs b/src/Luban.Job.Cfg/Source/Generate/LuaCodeRenderBase.cs index da147cf..3bb4d1d 100644 --- a/src/Luban.Job.Cfg/Source/Generate/LuaCodeRenderBase.cs +++ b/src/Luban.Job.Cfg/Source/Generate/LuaCodeRenderBase.cs @@ -17,11 +17,6 @@ namespace Luban.Job.Cfg.Generate ctx.GenCodeFilesInOutputCodeDir.Add(new FileInfo() { FilePath = file, MD5 = md5 }); } - public override string Render(DefConst c) - { - throw new System.NotImplementedException(); - } - public override string Render(DefEnum e) { throw new System.NotImplementedException(); diff --git a/src/Luban.Job.Cfg/Source/Generate/PythonCodeRenderBase.cs b/src/Luban.Job.Cfg/Source/Generate/PythonCodeRenderBase.cs index 0b02c20..8a57dff 100644 --- a/src/Luban.Job.Cfg/Source/Generate/PythonCodeRenderBase.cs +++ b/src/Luban.Job.Cfg/Source/Generate/PythonCodeRenderBase.cs @@ -22,11 +22,6 @@ namespace Luban.Job.Cfg.Generate GenerateCodeMonolithic(ctx, "Types.py", lines, PreContent, null); } - public override string Render(DefConst c) - { - return RenderUtil.RenderPythonConstClass(c); - } - public override string Render(DefEnum e) { return RenderUtil.RenderPythonEnumClass(e); diff --git a/src/Luban.Job.Cfg/Source/Generate/RustCodeJsonRender.cs b/src/Luban.Job.Cfg/Source/Generate/RustCodeJsonRender.cs index 3aeb132..a1ec98c 100644 --- a/src/Luban.Job.Cfg/Source/Generate/RustCodeJsonRender.cs +++ b/src/Luban.Job.Cfg/Source/Generate/RustCodeJsonRender.cs @@ -28,11 +28,6 @@ namespace Luban.Job.Cfg.Generate }, null); } - public override string Render(DefConst c) - { - return RenderUtil.RenderRustConstClass(c); - } - public override string Render(DefEnum e) { return RenderUtil.RenderRustEnumClass(e); diff --git a/src/Luban.Job.Cfg/Source/Generate/TypescriptCodeRenderBase.cs b/src/Luban.Job.Cfg/Source/Generate/TypescriptCodeRenderBase.cs index 8401ca8..1d83325 100644 --- a/src/Luban.Job.Cfg/Source/Generate/TypescriptCodeRenderBase.cs +++ b/src/Luban.Job.Cfg/Source/Generate/TypescriptCodeRenderBase.cs @@ -62,11 +62,6 @@ namespace Luban.Job.Cfg.Generate GenerateCodeMonolithic(ctx, "Types.ts", lines, preContent, postContent); } - public override string Render(DefConst c) - { - return RenderUtil.RenderTypescriptConstClass(c); - } - public override string Render(DefEnum e) { return RenderUtil.RenderTypescriptEnumClass(e); diff --git a/src/Luban.Job.Cfg/Source/RawDefs/Defines.cs b/src/Luban.Job.Cfg/Source/RawDefs/Defines.cs index cf11d1f..0b9d2d2 100644 --- a/src/Luban.Job.Cfg/Source/RawDefs/Defines.cs +++ b/src/Luban.Job.Cfg/Source/RawDefs/Defines.cs @@ -11,8 +11,6 @@ namespace Luban.Job.Cfg.RawDefs public List Beans { get; set; } = new List(); - public List Consts { get; set; } = new List(); - public List Enums { get; set; } = new List(); public List Tables { get; set; } = new List
(); diff --git a/src/Luban.Job.Common/Source/Defs/CommonDefLoader.cs b/src/Luban.Job.Common/Source/Defs/CommonDefLoader.cs index b9bdf63..9003c17 100644 --- a/src/Luban.Job.Common/Source/Defs/CommonDefLoader.cs +++ b/src/Luban.Job.Common/Source/Defs/CommonDefLoader.cs @@ -47,7 +47,6 @@ namespace Luban.Job.Common.Defs protected string TopModule { get; private set; } - protected readonly List _consts = new List(); protected readonly List _enums = new List(); protected readonly List _beans = new List(); @@ -58,7 +57,6 @@ namespace Luban.Job.Common.Defs _rootDefineHandlers.Add("topmodule", SetTopModule); _moduleDefineHandlers.Add("module", AddModule); - _moduleDefineHandlers.Add("const", AddConst); _moduleDefineHandlers.Add("enum", AddEnum); _moduleDefineHandlers.Add("bean", AddBean); } @@ -294,37 +292,6 @@ namespace Luban.Job.Common.Defs } } - - private static readonly List _constRequiredAttrs = new List { "name" }; - private static readonly List _constOptionalAttrs = new List { "comment" }; - - private static readonly List _constItemRequiredAttrs = new List { "name", "type" }; - private static readonly List _constItemOptionalAttrs = new List { "value", "comment" }; - - protected void AddConst(string defineFile, XElement e) - { - ValidAttrKeys(defineFile, e, _constOptionalAttrs, _constRequiredAttrs); - var c = new Const() - { - Name = XmlUtil.GetRequiredAttribute(e, "name"), - Namespace = CurNamespace, - Comment = XmlUtil.GetOptionalAttribute(e, "comment"), - }; - foreach (XElement item in e.Elements()) - { - ValidAttrKeys(defineFile, item, _constItemOptionalAttrs, _constItemRequiredAttrs); - c.Items.Add(new ConstItem() - { - Name = XmlUtil.GetRequiredAttribute(item, "name"), - Type = CreateType(item, "type"), - Value = XmlUtil.GetRequiredAttribute(item, "value"), - Comment = XmlUtil.GetOptionalAttribute(item, "comment"), - }); - } - s_logger.Trace("add const {@const}", c); - _consts.Add(c); - } - private static readonly List _enumOptionalAttrs = new List { "flags", "comment", "tags" }; private static readonly List _enumRequiredAttrs = new List { "name" }; diff --git a/src/Luban.Job.Common/Source/Defs/DefConst.cs b/src/Luban.Job.Common/Source/Defs/DefConst.cs deleted file mode 100644 index 0950fef..0000000 --- a/src/Luban.Job.Common/Source/Defs/DefConst.cs +++ /dev/null @@ -1,63 +0,0 @@ -using Luban.Job.Common.RawDefs; -using Luban.Job.Common.Types; -using System; -using System.Collections.Generic; - -namespace Luban.Job.Common.Defs -{ - public class DefConst : DefTypeBase - { - public class Item - { - public string Name { get; set; } - - public string Type { get; set; } - - public string Value { get; set; } - - public TType CType { get; set; } - - public string Comment { get; set; } - } - - public List Items { get; set; } = new List(); - - public DefConst(Const c) - { - Namespace = c.Namespace; - Name = c.Name; - Comment = c.Comment; - - foreach (var item in c.Items) - { - Items.Add(new Item { Name = item.Name, Type = item.Type, Value = item.Value, Comment = item.Comment }); - } - } - - public override void Compile() - { - HashSet names = new HashSet(); - - foreach (var item in Items) - { - if (item.Name.Length == 0) - { - throw new Exception($"'{FullName}' 常量字段名不能为空"); - } - if (!names.Add(item.Name)) - { - throw new Exception($"'{FullName}' 字段名:'{item.Name}' 重复"); - } - if ((item.CType = AssemblyBase.CreateType(Namespace, item.Type)) == null) - { - throw new Exception($"'{FullName}' type:'{item.Type}' 类型不存在"); - } - if (!item.CType.TryParseFrom(item.Value)) - { - throw new Exception($"'{FullName}' value:'{item.Value}' 不是合法的 type:'{item.Type}' 类型值"); - } - } - } - - } -} diff --git a/src/Luban.Job.Common/Source/Generate/ICodeRender.cs b/src/Luban.Job.Common/Source/Generate/ICodeRender.cs index 22038f4..a4e91b6 100644 --- a/src/Luban.Job.Common/Source/Generate/ICodeRender.cs +++ b/src/Luban.Job.Common/Source/Generate/ICodeRender.cs @@ -7,8 +7,6 @@ namespace Luban.Job.Common.Generate { string RenderAny(DefTypeBase o); - string Render(DefConst c); - string Render(DefEnum c); string RenderService(string name, string module, List tables); diff --git a/src/Luban.Job.Common/Source/RawDefs/Const.cs b/src/Luban.Job.Common/Source/RawDefs/Const.cs deleted file mode 100644 index 11dc275..0000000 --- a/src/Luban.Job.Common/Source/RawDefs/Const.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Collections.Generic; - -namespace Luban.Job.Common.RawDefs -{ - public class ConstItem - { - public string Name { get; set; } - - public string Type { get; set; } - - public string Value { get; set; } - - public string Comment { get; set; } - } - - public class Const - { - - public string Namespace { get; set; } - - public string Name { get; set; } - - public string Comment { get; set; } - - public List Items { get; set; } = new List(); - } -} diff --git a/src/Luban.Job.Common/Source/Utils/RenderUtil.cs b/src/Luban.Job.Common/Source/Utils/RenderUtil.cs index 52884ef..18fc24c 100644 --- a/src/Luban.Job.Common/Source/Utils/RenderUtil.cs +++ b/src/Luban.Job.Common/Source/Utils/RenderUtil.cs @@ -5,21 +5,6 @@ namespace Luban.Job.Common.Utils { public static class RenderUtil { - public static string RenderCsConstClass(DefConst c) - { - var ctx = new TemplateContext(); - var env = new TTypeTemplateCommonExtends - { - ["x"] = c - }; - ctx.PushGlobal(env); - - var template = StringTemplateUtil.GetTemplate("common/cs/const"); - var result = template.Render(ctx); - - return result; - } - public static string RenderCsEnumClass(DefEnum e) { var template = StringTemplateUtil.GetTemplate("common/cs/enum"); @@ -28,22 +13,6 @@ namespace Luban.Job.Common.Utils return result; } - public static string RenderJavaConstClass(DefConst c) - { - var ctx = new TemplateContext(); - var env = new TTypeTemplateCommonExtends - { - ["x"] = c - }; - ctx.PushGlobal(env); - - - var template = StringTemplateUtil.GetTemplate("common/java/const"); - var result = template.Render(ctx); - - return result; - } - public static string RenderJavaEnumClass(DefEnum e) { var template = StringTemplateUtil.GetTemplate("common/java/enum"); @@ -52,21 +21,6 @@ namespace Luban.Job.Common.Utils return result; } - public static string RenderCppConstClass(DefConst c) - { - var ctx = new TemplateContext(); - var env = new TTypeTemplateCommonExtends - { - ["x"] = c - }; - ctx.PushGlobal(env); - - - var template = StringTemplateUtil.GetTemplate("common/cpp/const"); - var result = template.Render(ctx); - return result; - } - public static string RenderCppEnumClass(DefEnum e) { var template = StringTemplateUtil.GetTemplate("common/cpp/enum"); @@ -74,22 +28,6 @@ namespace Luban.Job.Common.Utils return result; } - public static string RenderPythonConstClass(DefConst c) - { - var ctx = new TemplateContext(); - var env = new TTypeTemplateCommonExtends - { - ["x"] = c - }; - ctx.PushGlobal(env); - - - var template = StringTemplateUtil.GetTemplate("common/python/const"); - var result = template.Render(ctx); - - return result; - } - public static string RenderPythonEnumClass(DefEnum e) { var template = StringTemplateUtil.GetTemplate("common/python/enum"); @@ -98,22 +36,6 @@ namespace Luban.Job.Common.Utils return result; } - public static string RenderTypescriptConstClass(DefConst c) - { - var ctx = new TemplateContext(); - var env = new TTypeTemplateCommonExtends - { - ["x"] = c - }; - ctx.PushGlobal(env); - - - var template = StringTemplateUtil.GetTemplate("common/typescript/const"); - var result = template.Render(ctx); - - return result; - } - public static string RenderTypescriptEnumClass(DefEnum e) { var template = StringTemplateUtil.GetTemplate("common/typescript/enum"); @@ -121,19 +43,6 @@ namespace Luban.Job.Common.Utils return result; } - public static string RenderRustConstClass(DefConst c) - { - var ctx = new TemplateContext(); - var env = new TTypeTemplateCommonExtends - { - ["x"] = c - }; - ctx.PushGlobal(env); - var template = StringTemplateUtil.GetTemplate("common/rust/const"); - var result = template.Render(ctx); - return result; - } - public static string RenderRustEnumClass(DefEnum e) { var template = StringTemplateUtil.GetTemplate("common/rust/enum"); diff --git a/src/Luban.Job.Db/Source/Defs/DbDefLoader.cs b/src/Luban.Job.Db/Source/Defs/DbDefLoader.cs index 18a03d7..3e199d8 100644 --- a/src/Luban.Job.Db/Source/Defs/DbDefLoader.cs +++ b/src/Luban.Job.Db/Source/Defs/DbDefLoader.cs @@ -23,15 +23,12 @@ namespace Luban.Job.Db.Defs return new Defines() { TopModule = TopModule, - Consts = _consts, Enums = _enums, Beans = _beans, DbTables = _tables, }; } - - private readonly List _tableOptionalAttrs = new List { "memory", "comment" }; private readonly List _tableRequireAttrs = new List { "name", "id", "key", "value" }; diff --git a/src/Luban.Job.Db/Source/Defs/DefAssembly.cs b/src/Luban.Job.Db/Source/Defs/DefAssembly.cs index 448c035..fcf67d5 100644 --- a/src/Luban.Job.Db/Source/Defs/DefAssembly.cs +++ b/src/Luban.Job.Db/Source/Defs/DefAssembly.cs @@ -34,12 +34,6 @@ namespace Luban.Job.Db.Defs this.Agent = agent; TopModule = defines.TopModule; - - foreach (var c in defines.Consts) - { - AddType(new DefConst(c)); - } - foreach (var e in defines.Enums) { AddType(new DefEnum(e)); diff --git a/src/Luban.Job.Db/Source/Generate/AsyncCsRender.cs b/src/Luban.Job.Db/Source/Generate/AsyncCsRender.cs index ef23a73..92cbc71 100644 --- a/src/Luban.Job.Db/Source/Generate/AsyncCsRender.cs +++ b/src/Luban.Job.Db/Source/Generate/AsyncCsRender.cs @@ -12,7 +12,6 @@ namespace Luban.Job.Db.Generate { switch (o) { - case DefConst c: return Render(c); case DefEnum e: return Render(e); case DefBean b: return Render(b); case DefTable p: return Render(p); @@ -20,11 +19,6 @@ namespace Luban.Job.Db.Generate } } - public string Render(DefConst c) - { - return RenderUtil.RenderCsConstClass(c); - } - public string Render(DefEnum e) { return RenderUtil.RenderCsEnumClass(e); diff --git a/src/Luban.Job.Db/Source/Generate/SyncCsRender.cs b/src/Luban.Job.Db/Source/Generate/SyncCsRender.cs index 199db2d..0bb7872 100644 --- a/src/Luban.Job.Db/Source/Generate/SyncCsRender.cs +++ b/src/Luban.Job.Db/Source/Generate/SyncCsRender.cs @@ -12,7 +12,6 @@ namespace Luban.Job.Db.Generate { switch (o) { - case DefConst c: return Render(c); case DefEnum e: return Render(e); case DefBean b: return Render(b); case DefTable p: return Render(p); @@ -20,11 +19,6 @@ namespace Luban.Job.Db.Generate } } - public string Render(DefConst c) - { - return RenderUtil.RenderCsConstClass(c); - } - public string Render(DefEnum e) { return RenderUtil.RenderCsEnumClass(e); diff --git a/src/Luban.Job.Db/Source/Generate/TypescriptRender.cs b/src/Luban.Job.Db/Source/Generate/TypescriptRender.cs index 459a1eb..e79fef8 100644 --- a/src/Luban.Job.Db/Source/Generate/TypescriptRender.cs +++ b/src/Luban.Job.Db/Source/Generate/TypescriptRender.cs @@ -12,7 +12,6 @@ namespace Luban.Job.Db.Generate { switch (o) { - case DefConst c: return Render(c); case DefEnum e: return Render(e); case DefBean b: return Render(b); case DefTable r: return Render(r); @@ -20,11 +19,6 @@ namespace Luban.Job.Db.Generate } } - private string Render(DefConst c) - { - return RenderUtil.RenderTypescriptConstClass(c); - } - private string Render(DefEnum e) { return RenderUtil.RenderTypescriptEnumClass(e); diff --git a/src/Luban.Job.Db/Source/RawDefs/Defines.cs b/src/Luban.Job.Db/Source/RawDefs/Defines.cs index 7f47561..9f9eaf2 100644 --- a/src/Luban.Job.Db/Source/RawDefs/Defines.cs +++ b/src/Luban.Job.Db/Source/RawDefs/Defines.cs @@ -9,8 +9,6 @@ namespace Luban.Job.Db.RawDefs public List Beans { get; set; } = new List(); - public List Consts { get; set; } = new List(); - public List Enums { get; set; } = new List(); public List
DbTables { get; set; } = new List
(); diff --git a/src/Luban.Job.Proto/Source/Defs/DefAssembly.cs b/src/Luban.Job.Proto/Source/Defs/DefAssembly.cs index 850f020..6294eb0 100644 --- a/src/Luban.Job.Proto/Source/Defs/DefAssembly.cs +++ b/src/Luban.Job.Proto/Source/Defs/DefAssembly.cs @@ -33,11 +33,6 @@ namespace Luban.Job.Proto.Defs this.Agent = agent; TopModule = defines.TopModule; - foreach (var c in defines.Consts) - { - AddType(new DefConst(c)); - } - foreach (var e in defines.Enums) { AddType(new DefEnum(e)); diff --git a/src/Luban.Job.Proto/Source/Defs/ProtoDefLoader.cs b/src/Luban.Job.Proto/Source/Defs/ProtoDefLoader.cs index 830de43..c97d27d 100644 --- a/src/Luban.Job.Proto/Source/Defs/ProtoDefLoader.cs +++ b/src/Luban.Job.Proto/Source/Defs/ProtoDefLoader.cs @@ -27,7 +27,6 @@ namespace Luban.Job.Proto.Defs return new Defines() { TopModule = TopModule, - Consts = _consts, Enums = _enums, Beans = _beans, Protos = _protos, diff --git a/src/Luban.Job.Proto/Source/Generate/CsRender.cs b/src/Luban.Job.Proto/Source/Generate/CsRender.cs index 4365a3c..cf86987 100644 --- a/src/Luban.Job.Proto/Source/Generate/CsRender.cs +++ b/src/Luban.Job.Proto/Source/Generate/CsRender.cs @@ -12,7 +12,6 @@ namespace Luban.Job.Proto.Generate { switch (o) { - case DefConst c: return Render(c); case DefEnum e: return Render(e); case DefBean b: return Render(b); case DefProto p: return Render(p); @@ -22,11 +21,6 @@ namespace Luban.Job.Proto.Generate } } - private string Render(DefConst c) - { - return RenderUtil.RenderCsConstClass(c); - } - private string Render(DefEnum e) { return RenderUtil.RenderCsEnumClass(e); diff --git a/src/Luban.Job.Proto/Source/Generate/LuaRender.cs b/src/Luban.Job.Proto/Source/Generate/LuaRender.cs index 1009888..079d2d9 100644 --- a/src/Luban.Job.Proto/Source/Generate/LuaRender.cs +++ b/src/Luban.Job.Proto/Source/Generate/LuaRender.cs @@ -10,13 +10,12 @@ namespace Luban.Job.Proto.Generate { public string RenderTypes(List types) { - var consts = types.Where(t => t is DefConst).ToList(); var enums = types.Where(t => t is DefEnum).ToList(); var beans = types.Where(t => t is DefBean).ToList(); var protos = types.Where(t => t is DefProto).ToList(); var rpcs = types.Where(t => t is DefRpc).ToList(); var template = StringTemplateUtil.GetTemplate("proto/lua/all"); - return template.RenderCode(new { Consts = consts, Enums = enums, Beans = beans, Protos = protos, Rpcs = rpcs }); + return template.RenderCode(new { Enums = enums, Beans = beans, Protos = protos, Rpcs = rpcs }); } } } diff --git a/src/Luban.Job.Proto/Source/Generate/TypescriptRender.cs b/src/Luban.Job.Proto/Source/Generate/TypescriptRender.cs index b8fda28..2051494 100644 --- a/src/Luban.Job.Proto/Source/Generate/TypescriptRender.cs +++ b/src/Luban.Job.Proto/Source/Generate/TypescriptRender.cs @@ -12,7 +12,6 @@ namespace Luban.Job.Proto.Generate { switch (o) { - case DefConst c: return Render(c); case DefEnum e: return Render(e); case DefBean b: return Render(b); case DefProto p: return Render(p); @@ -22,11 +21,6 @@ namespace Luban.Job.Proto.Generate } } - private string Render(DefConst c) - { - return RenderUtil.RenderTypescriptConstClass(c); - } - private string Render(DefEnum e) { return RenderUtil.RenderTypescriptEnumClass(e); diff --git a/src/Luban.Job.Proto/Source/RawDefs/Defines.cs b/src/Luban.Job.Proto/Source/RawDefs/Defines.cs index fe0dcc9..3a0d5e1 100644 --- a/src/Luban.Job.Proto/Source/RawDefs/Defines.cs +++ b/src/Luban.Job.Proto/Source/RawDefs/Defines.cs @@ -11,8 +11,6 @@ namespace Luban.Job.Proto.RawDefs public List Beans { get; set; } = new List(); - public List Consts { get; set; } = new List(); - public List Enums { get; set; } = new List(); public List Protos { get; set; } = new List(); diff --git a/src/Luban.Server/Luban.Server.csproj b/src/Luban.Server/Luban.Server.csproj index 8dcaa5d..474e170 100644 --- a/src/Luban.Server/Luban.Server.csproj +++ b/src/Luban.Server/Luban.Server.csproj @@ -34,48 +34,27 @@ - - PreserveNewest - PreserveNewest - - PreserveNewest - PreserveNewest - - PreserveNewest - PreserveNewest - - PreserveNewest - PreserveNewest PreserveNewest - - PreserveNewest - PreserveNewest - - PreserveNewest - PreserveNewest - - PreserveNewest - PreserveNewest diff --git a/src/Luban.Server/Templates/common/cpp/const.tpl b/src/Luban.Server/Templates/common/cpp/const.tpl deleted file mode 100644 index 091dc74..0000000 --- a/src/Luban.Server/Templates/common/cpp/const.tpl +++ /dev/null @@ -1,19 +0,0 @@ - -{{x.cpp_namespace_begin}} -{{~if comment != '' ~}} -/** - * {{comment}} - */ -{{~end~}} -struct {{x.name}} -{ - {{~ for item in x.items ~}} -{{~if item.comment != '' ~}} - /** - * {{item.comment}} - */ -{{~end~}} - static constexpr {{cpp_define_type item.ctype}} {{item.name}} = {{cpp_const_value item.ctype item.value}}; - {{~end~}} -}; -{{x.cpp_namespace_end}} diff --git a/src/Luban.Server/Templates/common/cs/const.tpl b/src/Luban.Server/Templates/common/cs/const.tpl deleted file mode 100644 index 62c1dff..0000000 --- a/src/Luban.Server/Templates/common/cs/const.tpl +++ /dev/null @@ -1,21 +0,0 @@ - -namespace {{x.namespace_with_top_module}} -{ -{{~if x.comment != '' ~}} - /// - /// {{x.comment}} - /// -{{~end~}} - public sealed class {{x.name}} - { - {{~ for item in x.items ~}} -{{~if item.comment != '' ~}} - /// - /// {{item.comment}} - /// -{{~end~}} - public const {{cs_define_type item.ctype}} {{item.name}} = {{cs_const_value item.ctype item.value}}; - {{~end~}} - } -} - diff --git a/src/Luban.Server/Templates/common/go/const.tpl b/src/Luban.Server/Templates/common/go/const.tpl deleted file mode 100644 index 238e33b..0000000 --- a/src/Luban.Server/Templates/common/go/const.tpl +++ /dev/null @@ -1,7 +0,0 @@ -package {{package}} - -const ( - {{~for item in x.items ~}} - {{x.go_full_name}}_{{item.name}} = {{go_const_value item.ctype item.value}} - {{~end~}} -) diff --git a/src/Luban.Server/Templates/common/java/const.tpl b/src/Luban.Server/Templates/common/java/const.tpl deleted file mode 100644 index 08f920c..0000000 --- a/src/Luban.Server/Templates/common/java/const.tpl +++ /dev/null @@ -1,18 +0,0 @@ - -package {{x.namespace_with_top_module}}; - -{{~if x.comment != '' ~}} -/** - * {{x.comment}} - */ -{{~end~}} -public final class {{x.name}} { - {{~ for item in x.items ~}} -{{~if item.comment != '' ~}} - /** - * {{item.comment}} - */ -{{~end~}} - public static final {{java_define_type item.ctype}} {{item.name}} = {{java_const_value item.ctype item.value}}; - {{~end~}} -} diff --git a/src/Luban.Server/Templates/common/lua/base.tpl b/src/Luban.Server/Templates/common/lua/base.tpl index 1f177c6..ff4fcce 100644 --- a/src/Luban.Server/Templates/common/lua/base.tpl +++ b/src/Luban.Server/Templates/common/lua/base.tpl @@ -1,5 +1,4 @@ {{ - consts = x.consts enums = x.enums beans = x.beans tables = x.tables diff --git a/src/Luban.Server/Templates/common/python/const.tpl b/src/Luban.Server/Templates/common/python/const.tpl deleted file mode 100644 index be8a98f..0000000 --- a/src/Luban.Server/Templates/common/python/const.tpl +++ /dev/null @@ -1,17 +0,0 @@ -{{~if x.comment != '' ~}} -''' -{{x.comment}} -''' -{{~end~}} -class {{x.py_full_name}}: - {{~ for item in x.items ~}} -{{~if item.comment != '' ~}} - ''' - {{item.comment}} - ''' -{{~end~}} - {{item.name}} = {{py_const_value item.ctype item.value}} - {{~end~}} - {{~if (x.items == empty)~}} - pass - {{~end~}} diff --git a/src/Luban.Server/Templates/common/rust/const.tpl b/src/Luban.Server/Templates/common/rust/const.tpl deleted file mode 100644 index 8260828..0000000 --- a/src/Luban.Server/Templates/common/rust/const.tpl +++ /dev/null @@ -1,18 +0,0 @@ -{{~if x.comment != '' ~}} -/** - * {{x.comment}} - */ -{{~end~}} - -#[allow(non_snake_case)] -pub mod {{x.rust_full_name}} { - {{~ for item in x.items ~}} -{{~if item.comment != '' ~}} - /** - * {{item.comment}} - */ -{{~end~}} - #[allow(dead_code)] - pub const {{string.upcase item.name}}: {{rust_define_type item.ctype}} = {{rust_const_value item.ctype item.value}}; - {{~end~}} -} diff --git a/src/Luban.Server/Templates/common/typescript/const.tpl b/src/Luban.Server/Templates/common/typescript/const.tpl deleted file mode 100644 index 840c398..0000000 --- a/src/Luban.Server/Templates/common/typescript/const.tpl +++ /dev/null @@ -1,17 +0,0 @@ -{{x.typescript_namespace_begin}} -{{~if x.comment != '' ~}} -/** - * {{x.comment}} - */ -{{~end~}} -export class {{x.name}} { - {{~ for item in x.items ~}} -{{~if item.comment != '' ~}} - /** - * {{item.comment}} - */ -{{~end~}} - static {{item.name}} = {{ts_const_value item.ctype item.value}}; - {{~end~}} -} -{{x.typescript_namespace_end}} diff --git a/src/Luban.Server/Templates/config/lua_bin/all.tpl b/src/Luban.Server/Templates/config/lua_bin/all.tpl index 0b52783..b0fbd5d 100644 --- a/src/Luban.Server/Templates/config/lua_bin/all.tpl +++ b/src/Luban.Server/Templates/config/lua_bin/all.tpl @@ -1,13 +1,3 @@ -local consts = -{ - {{~ for c in consts ~}} - ---@class {{c.full_name}} - {{~ for item in c.items ~}} - ---@field public {{item.name}} {{item.type}} - {{~end~}} - ['{{c.full_name}}'] = { {{ for item in c.items }} {{item.name}}={{lua_const_value item.ctype item.value}}, {{end}} }; - {{~end~}} -} local enums = { @@ -129,7 +119,7 @@ local function InitTypes(methods) {{~end~}} {{~end~}} } - return { consts = consts, enums = enums, beans = beans, tables = tables } + return { enums = enums, beans = beans, tables = tables } end return { InitTypes = InitTypes } diff --git a/src/Luban.Server/Templates/config/lua_lua/all.tpl b/src/Luban.Server/Templates/config/lua_lua/all.tpl index 61f5740..94c073a 100644 --- a/src/Luban.Server/Templates/config/lua_lua/all.tpl +++ b/src/Luban.Server/Templates/config/lua_lua/all.tpl @@ -1,14 +1,3 @@ -local consts = -{ - {{~ for c in consts ~}} - ---@class {{c.full_name}} - {{~ for item in c.items ~}} - ---@field public {{item.name}} {{item.type}} - {{~end~}} - ['{{c.full_name}}'] = { {{ for item in c.items }} {{item.name}}={{lua_const_value item.ctype item.value}}, {{end}} }; - {{~end~}} -} - local enums = { {{~ for c in enums ~}} @@ -46,4 +35,4 @@ local tables = {{~end~}} } -return { consts = consts, enums = enums, beans = beans, tables = tables } +return { enums = enums, beans = beans, tables = tables } diff --git a/src/Luban.Server/Templates/proto/lua/all.tpl b/src/Luban.Server/Templates/proto/lua/all.tpl index 3d5f746..e282bbe 100644 --- a/src/Luban.Server/Templates/proto/lua/all.tpl +++ b/src/Luban.Server/Templates/proto/lua/all.tpl @@ -1,5 +1,4 @@ {{ - consts = x.consts enums = x.enums beans = x.beans protos = x.protos @@ -21,7 +20,6 @@ local function SimpleClass() return class end - local function get_map_size(m) local n = 0 for _ in pairs(m) do @@ -30,17 +28,6 @@ local function get_map_size(m) return n end -local consts = -{ - {{~ for c in consts ~}} - ---@class {{c.full_name}} - {{~ for item in c.items ~}} - ---@field public {{item.name}} {{item.type}} - {{~end~}} - ['{{c.full_name}}'] = { {{ for item in c.items }} {{item.name}}={{lua_const_value item.ctype item.value}}, {{end}} }; - {{~end~}} -} - local enums = { {{~ for c in enums ~}} @@ -252,7 +239,7 @@ local function InitTypes(methods) end {{end}} - return { consts = consts, enums = enums, beans = beans, protos = protos } + return { enums = enums, beans = beans, protos = protos } end return { InitTypes = InitTypes}