From 01e0dea079507a90fb7c2b8b69035fce48aaee90 Mon Sep 17 00:00:00 2001 From: sunlian Date: Thu, 3 Apr 2025 13:59:50 +0800 Subject: [PATCH 1/3] add gen dts test & gen file header Signed-off-by: sunlian --- .../ohosgen/src/main/java/gen/GenDtsFile.java | 21 +- .../src/main/java/gen/GeneratorBase.java | 12 ++ .../src/main/java/grammar/ClassObj.java | 1 + .../src/main/java/grammar/StructObj.java | 27 +++ .../src/main/java/grammar/UnionObj.java | 22 ++ .../src/main/java/utils/Constants.java | 5 + .../src/test/java/gen/GenDtsFileTest.java | 195 +++++++++++++++++- 7 files changed, 272 insertions(+), 11 deletions(-) diff --git a/src/intellij_plugin/ohosgen/src/main/java/gen/GenDtsFile.java b/src/intellij_plugin/ohosgen/src/main/java/gen/GenDtsFile.java index 0c507dff..2354fd2d 100644 --- a/src/intellij_plugin/ohosgen/src/main/java/gen/GenDtsFile.java +++ b/src/intellij_plugin/ohosgen/src/main/java/gen/GenDtsFile.java @@ -137,6 +137,13 @@ public class GenDtsFile extends GeneratorBase { Map.entry(")", "") ); + /** + * 构造函数 + */ + GenDtsFile() { + + } + /** * 将 cpp key 转换成 ts key * @@ -157,7 +164,7 @@ public class GenDtsFile extends GeneratorBase { } /** - * 替换cpptoken + * 将cpp token 替换成对应的dts token * * @param cppKey 语言关键字 * @return 替换后字符串 @@ -175,13 +182,6 @@ public class GenDtsFile extends GeneratorBase { return retKey; } - /** - * 构造函数 - */ - GenDtsFile() { - - } - /** * 获得接口内容 * @@ -285,6 +285,8 @@ public class GenDtsFile extends GeneratorBase { System.out.println("outFileName : " + outFileName); FileUtils.createFile(outFileName); + + FileUtils.appendText(outFileName, this.genFileHeader(filePath + File.separator + fileName)); FileUtils.appendText(outFileName, this.constContent); FileUtils.appendText(outFileName, this.enumContent); FileUtils.appendText(outFileName, this.typeContent); @@ -543,7 +545,8 @@ public class GenDtsFile extends GeneratorBase { String paValue = po.getStrValue(0); int i = 0; resContent += TS_NEW_LINE + TS_EXPORT_TOKEN + TS_BLANK_SPACE + TS_CONST_TOKEN + - TS_BLANK_SPACE + paName + TS_COLON + paType + TS_EQUAL + paValue; + TS_BLANK_SPACE + paName + TS_BLANK_SPACE + TS_COLON + TS_BLANK_SPACE + + paType + TS_EQUAL + paValue; resContent += TS_SEMICOLON + TS_NEW_LINE; } diff --git a/src/intellij_plugin/ohosgen/src/main/java/gen/GeneratorBase.java b/src/intellij_plugin/ohosgen/src/main/java/gen/GeneratorBase.java index 4c1bd1d5..b0b3ce74 100644 --- a/src/intellij_plugin/ohosgen/src/main/java/gen/GeneratorBase.java +++ b/src/intellij_plugin/ohosgen/src/main/java/gen/GeneratorBase.java @@ -16,6 +16,7 @@ package gen; import grammar.*; +import utils.Constants; import java.util.List; @@ -29,6 +30,17 @@ import java.util.List; * @since 2025-02-28 */ public class GeneratorBase { + private final String headerFormat = "// Generated from %s by KaiHong ohgen %s-PLUGIN"; + + /** + * 生成文件头内容 + */ + public String genFileHeader(String filePath) { + String fileHeader = ""; + fileHeader += String.format(headerFormat, filePath, Constants.VERSION); + return fileHeader; + } + /** * 生成内容 * diff --git a/src/intellij_plugin/ohosgen/src/main/java/grammar/ClassObj.java b/src/intellij_plugin/ohosgen/src/main/java/grammar/ClassObj.java index 5b59d895..a2b72a71 100644 --- a/src/intellij_plugin/ohosgen/src/main/java/grammar/ClassObj.java +++ b/src/intellij_plugin/ohosgen/src/main/java/grammar/ClassObj.java @@ -290,6 +290,7 @@ public class ClassObj extends GBaseObject { fo.setName(name); fo.setRetValue(ret); fo.setParamList(poList); + this.funcList.add(fo); } /** diff --git a/src/intellij_plugin/ohosgen/src/main/java/grammar/StructObj.java b/src/intellij_plugin/ohosgen/src/main/java/grammar/StructObj.java index bd076475..dd6f1eec 100644 --- a/src/intellij_plugin/ohosgen/src/main/java/grammar/StructObj.java +++ b/src/intellij_plugin/ohosgen/src/main/java/grammar/StructObj.java @@ -138,6 +138,19 @@ public class StructObj extends GBaseObject { this.memberList.add(po); } + /** + * 增加属性 + * + * @param name 属性名 + * @param type 属性类型 + */ + public void addMember(String name, String type) { + ParamObj po = new ParamObj(); + po.setName(name); + po.setType(type); + this.memberList.add(po); + } + /** * 增加方法 * @@ -147,4 +160,18 @@ public class StructObj extends GBaseObject { this.funcList.add(fo); } + /** + * 增加方法 + * + * @param name 方法名 + * @param retValue 返回值 + * @param pol 方法参数 + */ + public void addFunc(String name, String retValue, List pol) { + FuncObj fo = new FuncObj(); + fo.setName(name); + fo.setRetValue(retValue); + fo.setParamList(pol); + this.funcList.add(fo); + } } diff --git a/src/intellij_plugin/ohosgen/src/main/java/grammar/UnionObj.java b/src/intellij_plugin/ohosgen/src/main/java/grammar/UnionObj.java index 36de6c94..54995959 100644 --- a/src/intellij_plugin/ohosgen/src/main/java/grammar/UnionObj.java +++ b/src/intellij_plugin/ohosgen/src/main/java/grammar/UnionObj.java @@ -15,6 +15,7 @@ package grammar; +import it.unimi.dsi.fastutil.bytes.F; import kotlinx.html.S; import java.util.List; @@ -136,6 +137,19 @@ public class UnionObj extends GBaseObject { this.memList.add(po); } + /** + * 增加属性 + * + * @param name 属性名称 + * @param type 属性类型 + */ + public void addMember(String name, String type) { + ParamObj po = new ParamObj(); + po.setName(name); + po.setType(type); + this.memList.add(po); + } + /** * 增加方法 * @@ -144,4 +158,12 @@ public class UnionObj extends GBaseObject { public void addFunc(FuncObj fo) { this.funcList.add(fo); } + + public void addFunc(String name, String retValue, List pol) { + FuncObj fo = new FuncObj(); + fo.setName(name); + fo.setRetValue(retValue); + fo.setParamList(pol); + this.funcList.add(fo); + } } diff --git a/src/intellij_plugin/ohosgen/src/main/java/utils/Constants.java b/src/intellij_plugin/ohosgen/src/main/java/utils/Constants.java index 42eb455c..df9f7e66 100644 --- a/src/intellij_plugin/ohosgen/src/main/java/utils/Constants.java +++ b/src/intellij_plugin/ohosgen/src/main/java/utils/Constants.java @@ -25,6 +25,11 @@ package utils; * @version 1.0 */ public class Constants { + /** + * 版本号 + */ + public static final String VERSION = "1.0.0"; + /** * 解析未知代码 */ diff --git a/src/intellij_plugin/ohosgen/src/test/java/gen/GenDtsFileTest.java b/src/intellij_plugin/ohosgen/src/test/java/gen/GenDtsFileTest.java index e9c7f49d..b8284df3 100644 --- a/src/intellij_plugin/ohosgen/src/test/java/gen/GenDtsFileTest.java +++ b/src/intellij_plugin/ohosgen/src/test/java/gen/GenDtsFileTest.java @@ -15,16 +15,18 @@ package gen; -import grammar.EnumObj; -import grammar.ParseObj; +import com.thaiopensource.relaxng.edit.Param; +import grammar.*; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import java.io.File; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import static org.junit.jupiter.api.Assertions.*; +import static utils.FileUtils.readText; /** *

类名：该类用于xxx

@@ -47,10 +49,58 @@ class GenDtsFileTest { @Test void genContent() { + ParseObj po = new ParseObj(); + ParamObj pao = new ParamObj(); + pao.setName("TestParam"); + pao.setType("int"); + pao.setStrValue("100"); + List pol = new CopyOnWriteArrayList<>(); + pol.add(pao); + po.setVarList(pol); + + GeneratorBase gb = GenerateFactory.getGenerator("DTS"); + gb.genContent(po); + + if (gb instanceof GenDtsFile gdf) { + String varContent = gdf.getConstContent(); + System.out.println("genVar: " + varContent); + String expect = "\nexport const TestParam : number = 100;\n"; + assertEquals(expect, varContent); + } } @Test void genFile() { + ParseObj po = new ParseObj(); + ParamObj pao = new ParamObj(); + pao.setName("TestParam"); + pao.setType("int"); + pao.setStrValue("100"); + List pol = new CopyOnWriteArrayList<>(); + pol.add(pao); + po.setVarList(pol); + + GeneratorBase gb = GenerateFactory.getGenerator("DTS"); + gb.genContent(po); + gb.genFile("./", "testGenFile.h"); + + File file = new File("./ag_testGenFile_h.d.ts"); + assertEquals(true, file.exists()); + assertEquals(false, file.isDirectory()); + + List fcList = readText("./ag_testGenFile_h.d.ts"); + + assertEquals("// Generated from ./\\testGenFile.h by KaiHong ohgen 1.0.0-PLUGIN", + fcList.get(0)); + assertEquals("export const TestParam : number = 100;", + fcList.get(1)); + + if (gb instanceof GenDtsFile gdf) { + String varContent = gdf.getConstContent(); + System.out.println("genVar: " + varContent); + String expect = "\nexport const TestParam : number = 100;\n"; + assertEquals(expect, varContent); + } } @Test @@ -85,14 +135,119 @@ class GenDtsFileTest { @Test void genClassList() { + GeneratorBase gb = GenerateFactory.getGenerator("DTS"); + ParseObj po = new ParseObj(); + ClassObj co = new ClassObj(); + co.setName("TestClass"); + + co.addParam("name", "char*"); + co.addParam("age", "int"); + + List poList = new CopyOnWriteArrayList<>(); + ParamObj poItem = new ParamObj(); + poItem.setName("a"); + poItem.setType("int"); + poList.add(poItem); + ParamObj poItem2 = new ParamObj(); + poItem2.setName("b"); + poItem2.setType("int"); + poList.add(poItem2); + + co.addFunc("add", "int", poList); + + List col = new CopyOnWriteArrayList<>(); + col.add(co); + po.setClassList(col); + gb.genClassList(po.getClassList()); + + if (gb instanceof GenDtsFile gdf) { + String classContent = gdf.getClassContent(); + System.out.println("genClass: " + classContent); + String expect = "\nexport class TestClass {\n" + + "\tname: string;\n" + + "\tage: number;\n" + + "\tadd(a: number, b: number) : number;\n" + + "};\n"; + assertEquals(expect, classContent); + } } @Test void genFuncList() { + GeneratorBase gb = GenerateFactory.getGenerator("DTS"); + ParseObj po = new ParseObj(); + ClassObj co = new ClassObj(); + co.setName("TestClass"); + + co.addParam("name", "char*"); + co.addParam("age", "int"); + + List poList = new CopyOnWriteArrayList<>(); + ParamObj poItem = new ParamObj(); + poItem.setName("a"); + poItem.setType("int"); + poList.add(poItem); + ParamObj poItem2 = new ParamObj(); + poItem2.setName("b"); + poItem2.setType("int"); + poList.add(poItem2); + + co.addFunc("add", "int", poList); + + List col = new CopyOnWriteArrayList<>(); + col.add(co); + po.setClassList(col); + gb.genClassList(po.getClassList()); + + if (gb instanceof GenDtsFile gdf) { + String classContent = gdf.getClassContent(); + System.out.println("genClass: " + classContent); + String expect = "\nexport class TestClass {\n" + + "\tname: string;\n" + + "\tage: number;\n" + + "\tadd(a: number, b: number) : number;\n" + + "};\n"; + assertEquals(expect, classContent); + } } @Test void genStructList() { + GeneratorBase gb = GenerateFactory.getGenerator("DTS"); + ParseObj po = new ParseObj(); + StructObj so = new StructObj(); + so.setName("TestStruct"); + + so.addMember("name", "char*"); + so.addMember("age", "int"); + + List poList = new CopyOnWriteArrayList<>(); + ParamObj poItem = new ParamObj(); + poItem.setName("a"); + poItem.setType("int"); + poList.add(poItem); + ParamObj poItem2 = new ParamObj(); + poItem2.setName("b"); + poItem2.setType("int"); + poList.add(poItem2); + + so.addFunc("add", "int", poList); + + List sol = new CopyOnWriteArrayList<>(); + sol.add(so); + po.setStructList(sol); + gb.genStructList(po.getStructList()); + + if (gb instanceof GenDtsFile gdf) { + String structContent = gdf.getStructContent(); + System.out.println("genStruct: " + structContent); + String expect = "\nexport class TestStruct {\n" + + "\tname: string;\n" + + "\tage: number;\n" + + "\tadd(a: number, b: number) : number;\n" + + "};\n"; + assertEquals(expect, structContent); + } } @Test @@ -101,9 +256,45 @@ class GenDtsFileTest { @Test void genUnionList() { + GeneratorBase gb = GenerateFactory.getGenerator("DTS"); + ParseObj po = new ParseObj(); + UnionObj uo = new UnionObj(); + uo.setName("TestUnion"); + + uo.addMember("name", "char*"); + uo.addMember("age", "int"); + + List uol = new CopyOnWriteArrayList<>(); + uol.add(uo); + po.setUnionList(uol); + gb.genUnionList(po.getUnionList()); + + if (gb instanceof GenDtsFile gdf) { + String unionContent = gdf.getUnionContent(); + System.out.println("genUnion: " + unionContent); + String expect = "\nexport type TestUnion = string | number;\n"; + assertEquals(expect, unionContent); + } } @Test void genVarList() { + GeneratorBase gb = GenerateFactory.getGenerator("DTS"); + ParseObj po = new ParseObj(); + ParamObj pao = new ParamObj(); + pao.setName("TestParam"); + pao.setType("int"); + pao.setStrValue("100"); + List pol = new CopyOnWriteArrayList<>(); + pol.add(pao); + po.setVarList(pol); + gb.genVarList(po.getVarList()); + + if (gb instanceof GenDtsFile gdf) { + String varContent = gdf.getConstContent(); + System.out.println("genVar: " + varContent); + String expect = "\nexport const TestParam : number = 100;\n"; + assertEquals(expect, varContent); + } } } \ No newline at end of file -- Gitee From 6de00ddfe1635c453737461ffeb1c22c6b27c185 Mon Sep 17 00:00:00 2001 From: sunlian Date: Thu, 3 Apr 2025 15:36:06 +0800 Subject: [PATCH 2/3] fix code check & add gen cpp file Signed-off-by: sunlian --- .../ohosgen/src/main/java/Dts2cpp.java | 2 +- .../java/antlr/cpp/CPP14CustomListener.java | 5 +- .../ohosgen/src/main/java/gen/GenCppFile.java | 415 +++++++++++++++++- .../src/main/java/grammar/UnionObj.java | 7 + .../src/test/java/gen/GenDtsFileTest.java | 27 +- .../src/test/java/parse/ParseCppTest.java | 128 +++--- .../src/test/java/parse/ParseTsTest.java | 64 +-- 7 files changed, 536 insertions(+), 112 deletions(-) diff --git a/src/intellij_plugin/ohosgen/src/main/java/Dts2cpp.java b/src/intellij_plugin/ohosgen/src/main/java/Dts2cpp.java index 1396d982..b72b0384 100644 --- a/src/intellij_plugin/ohosgen/src/main/java/Dts2cpp.java +++ b/src/intellij_plugin/ohosgen/src/main/java/Dts2cpp.java @@ -55,7 +55,7 @@ public class Dts2cpp extends AnAction { * @param file 文件 */ private void doProgress(Project project, VirtualFile file) { - ParseTask pt = new ParseTask(project, "TS", true); + ParseTask pt = new ParseTask(project, "ts2cpp", true); pt.setFile(file); ProgressManager.getInstance().run(pt); } diff --git a/src/intellij_plugin/ohosgen/src/main/java/antlr/cpp/CPP14CustomListener.java b/src/intellij_plugin/ohosgen/src/main/java/antlr/cpp/CPP14CustomListener.java index ab88d4c0..7e147150 100644 --- a/src/intellij_plugin/ohosgen/src/main/java/antlr/cpp/CPP14CustomListener.java +++ b/src/intellij_plugin/ohosgen/src/main/java/antlr/cpp/CPP14CustomListener.java @@ -412,7 +412,10 @@ public class CPP14CustomListener extends CPP14ParserBaseListener implements Pars List dscl = ctx.declSpecifierSeq().declSpecifier(); type = !dscl.isEmpty() ? "" : type; for (CPP14Parser.DeclSpecifierContext dscItem : dscl) { - type += dscItem.getText() + " "; + type += dscItem.typeSpecifier().trailingTypeSpecifier().elaboratedTypeSpecifier() != null ? + dscItem.typeSpecifier().trailingTypeSpecifier().elaboratedTypeSpecifier().classKey().getText() + + " " + dscItem.typeSpecifier().trailingTypeSpecifier().elaboratedTypeSpecifier().Identifier().getText() : + dscItem.getText() + " "; } if (!dscl.isEmpty()) { type = StringUtils.removeLastSpace(type); diff --git a/src/intellij_plugin/ohosgen/src/main/java/gen/GenCppFile.java b/src/intellij_plugin/ohosgen/src/main/java/gen/GenCppFile.java index 967ed190..62abd3d3 100644 --- a/src/intellij_plugin/ohosgen/src/main/java/gen/GenCppFile.java +++ b/src/intellij_plugin/ohosgen/src/main/java/gen/GenCppFile.java @@ -16,8 +16,12 @@ package gen; import grammar.*; +import utils.FileUtils; +import utils.StringUtils; +import java.io.File; import java.util.List; +import java.util.Map; /** *

类名：该类用于xxx

@@ -29,6 +33,89 @@ import java.util.List; * @version 1.0 */ public class GenCppFile extends GeneratorBase { + private static final String CPP_ENUM_TOKEN = "enum"; + private static final String CPP_CLASS_TOKEN = "class"; + private static final String CPP_EXPORT_TOKEN = "export"; + private static final String CPP_IMPLEMENCPP_TOKEN = "implements"; + private static final String CPP_EXTENDS_TOKEN = "extends"; + private static final String CPP_CONST_TOKEN = "const"; + private static final String CPP_PRIVATE_TOKEN = "private"; + private static final String CPP_PUBLIC_TOKEN = "public"; + private static final String CPP_INTERFACE_TOKEN = "interface"; + private static final String CPP_PROTECTED_TOKEN = "protected"; + private static final String CPP_STATIC_TOKEN = "static"; + private static final String CPP_ANY_TOKEN = "any"; + private static final String CPP_NUMBER_TOKEN = "number"; + private static final String CPP_NEVER_TOKEN = "never"; + private static final String CPP_BOOLEAN_TOKEN = "boolean"; + private static final String CPP_STRING_TOKEN = "string"; + private static final String CPP_UNIQUE_TOKEN = "unique"; + private static final String CPP_SYMBOL_TOKEN = "symbol"; + private static final String CPP_UNDEFINED_TOKEN = "undefined"; + private static final String CPP_OBJECT_TOKEN = "object"; + private static final String CPP_OF_TOKEN = "of"; + private static final String CPP_KEYOF_TOKEN = "keyof"; + private static final String CPP_TYPE_TOKEN = "type"; + private static final String CPP_CONSTRUCTOR_TOKEN = "constructor"; + private static final String CPP_NAMESPACE_TOKEN = "namespace"; + private static final String CPP_REQUIRE_TOKEN = "require"; + private static final String CPP_MODULE_TOKEN = "module"; + private static final String CPP_DECLARE_TOKEN = "declare"; + private static final String CPP_ABSTRACT_TOKEN = "abstract"; + private static final String CPP_DEBUGGER_TOKEN = "debugger"; + private static final String CPP_FUNCTION_TOKEN = "function"; + private static final String CPP_THIS_TOKEN = "this"; + private static final String CPP_WITH_TOKEN = "with"; + private static final String CPP_DEFAULT_TOKEN = "default"; + private static final String CPP_READONLY_TOKEN = "readonly"; + private static final String CPP_ASYNC_TOKEN = "async"; + private static final String CPP_AWAIT_TOKEN = "await"; + private static final String CPP_YIELD_TOKEN = "yield"; + private static final String CPP_NEW_LINE = "\n"; + private static final String CPP_TAB_SPACE = "\t"; + private static final String CPP_BLANK_SPACE = " "; + private static final String CPP_SPLIT = " | "; + private static final String CPP_EQUAL = " = "; + private static final String CPP_COMMA = ","; + private static final String CPP_SEMICOLON = ";"; + private static final String CPP_COLON = ":"; + private static final String CPP_LEFT_BRACE = "{"; + private static final String CPP_RIGHT_BRACE = "}"; + private static final String CPP_LEFT_PARENTHESES = "("; + private static final String CPP_RIGHT_PARENTHESES = ")"; + private static final String CPP_LEFT_SQUARE_BRACKET = "["; + private static final String CPP_RIGHT_SQUARE_BRACKET = "]"; + private static final String CPP_LEFT_ANGLE_BRACKET = "<"; + private static final String CPP_RIGHT_ANGLE_BRACKET = ">"; + + private static final String CPP_FILE_PREFIX = "ag_"; + private static final String CPP_FILE_H_SUFFIX = ".h"; + private static final String CPP_FILE_CPP_SUFFIX = ".cpp"; + private static final String CPP_FILE_C_SUFFIX = ".c"; + + private String interfaceContent = ""; + private String enumContent = ""; + private String classContent = ""; + private String funcContent = ""; + private String structContent = ""; + private String typeContent = ""; + private String unionContent = ""; + private String constContent = ""; + + private final Map ts2cppMap = Map.ofEntries( + Map.entry("any", "auto"), + Map.entry("boolean", "bool"), + Map.entry("string", "char*"), + Map.entry("number", "int"), + Map.entry("void", "void") + ); + + private final Map tsTokenMap = Map.ofEntries( + Map.entry("*", ""), + Map.entry("&", ""), + Map.entry("(", ""), + Map.entry(")", "") + ); /** * 构造函数 */ @@ -36,6 +123,116 @@ public class GenCppFile extends GeneratorBase { } + /** + * 将 cpp key 转换成 ts key + * + * @param cppKey 枚举对象列表 + * @return ts key + */ + private String ts2CppKey(String cppKey) { + String retKey = cppKey; + for (Map.Entry entry : ts2cppMap.entrySet()) { + String key = entry.getKey(); + String value = entry.getValue(); + int ret = cppKey.indexOf(key); + if (ret >= 0) { + return value; + } + } + return retKey; + } + + /** + * 将cpp token 替换成对应的dts token + * + * @param cppKey 语言关键字 + * @return 替换后字符串 + */ + private String replaceTsToken(String cppKey) { + String retKey = cppKey; + for (Map.Entry entry : tsTokenMap.entrySet()) { + String key = entry.getKey(); + String value = entry.getValue(); + int ret = retKey.indexOf(key); + if (ret >= 0) { + retKey = retKey.replace(key, value); + } + } + return retKey; + } + + /** + * 获得接口内容 + * + * @return 接口内容 + */ + public String getInterfaceContent() { + return interfaceContent; + } + + /** + * 获得枚举内容 + * + * @return 枚举内容 + */ + public String getEnumContent() { + return enumContent; + } + + /** + * 获得类内容 + * + * @return 类内容 + */ + public String getClassContent() { + return classContent; + } + + /** + * 获得方法内容 + * + * @return 方法内容 + */ + public String getFuncContent() { + return funcContent; + } + + /** + * 获得结构体内容 + * + * @return 结构体内容 + */ + public String getStructContent() { + return structContent; + } + + /** + * 获得type内容 + * + * @return type内容 + */ + public String getTypeContent() { + return typeContent; + } + + /** + * 获得联合体内容 + * + * @return 联合体内容 + */ + public String getUnionContent() { + return unionContent; + } + + /** + * 获得常量内容 + * + * @return 常量内容 + */ + public String getConstContent() { + return constContent; + } + /** * 生成输出内容 * @@ -52,6 +249,33 @@ public class GenCppFile extends GeneratorBase { genUnionList(po.getUnionList()); } + /** + * 生成文件 + * + * @param fileName 文件名 + * @param filePath 文件路径 + */ + @Override + public void genFile(String filePath, String fileName) { + System.out.println("genFile : " + filePath + fileName); + String outFileName = filePath + File.separator + CPP_FILE_PREFIX + + fileName.replace(".", "_") + CPP_FILE_H_SUFFIX; + System.out.println("outFileName : " + outFileName); + + FileUtils.createFile(outFileName); + + FileUtils.appendText(outFileName, this.genFileHeader(filePath + File.separator + fileName)); + FileUtils.appendText(outFileName, this.constContent); + FileUtils.appendText(outFileName, this.enumContent); + FileUtils.appendText(outFileName, this.typeContent); + FileUtils.appendText(outFileName, this.interfaceContent); + FileUtils.appendText(outFileName, this.unionContent); + FileUtils.appendText(outFileName, this.funcContent); + FileUtils.appendText(outFileName, this.structContent); + FileUtils.appendText(outFileName, this.classContent); + + } + /** * 生成输出内容 * @@ -59,7 +283,7 @@ public class GenCppFile extends GeneratorBase { */ @Override public void genInterfaceList(List iol) { - + System.out.println("genInterfaceList" + iol.toString()); }; /** @@ -69,7 +293,30 @@ public class GenCppFile extends GeneratorBase { */ @Override public void genEnumList(List eol) { + System.out.println("genEnumList" + eol.toString()); + String resContent = ""; + for (EnumObj eo : eol) { + String enumName = eo.getName(); + enumName = !enumName.isEmpty() ? enumName : eo.getAlias(); + List memList = eo.getMemberList(); + List vaList = eo.getValueList(); + int i = 0; + resContent += CPP_NEW_LINE + CPP_ENUM_TOKEN + + CPP_BLANK_SPACE + enumName + CPP_BLANK_SPACE + CPP_LEFT_BRACE; + for (String memItem : memList) { + resContent += CPP_NEW_LINE + CPP_TAB_SPACE + memItem; + if (vaList.size() > i && !vaList.get(i).isEmpty()) { + resContent += CPP_EQUAL + vaList.get(i) + CPP_COMMA; + } else { + resContent += CPP_COMMA; + } + i++; + } + resContent = StringUtils.removeLastSpace(resContent); + resContent += CPP_NEW_LINE + CPP_RIGHT_BRACE + CPP_SEMICOLON + CPP_NEW_LINE; + } + this.enumContent = resContent; }; /** @@ -79,7 +326,53 @@ public class GenCppFile extends GeneratorBase { */ @Override public void genClassList(List col) { + System.out.println("genClassList" + col.toString()); + + String resContent = ""; + for (ClassObj co : col) { + String className = co.getName(); + className = !className.isEmpty() ? className : co.getAlias(); + + List paList = co.getParamList(); + resContent += CPP_NEW_LINE + CPP_CLASS_TOKEN + + CPP_BLANK_SPACE + className + CPP_BLANK_SPACE + CPP_LEFT_BRACE; + + for (ParamObj paItem : paList) { + String paType = paItem.getType(); + resContent += CPP_NEW_LINE + CPP_TAB_SPACE + replaceTsToken(paItem.getName()) + + CPP_COLON + CPP_BLANK_SPACE + ts2CppKey(paType); + List initVList = paItem.getvList(); + int vaSize = initVList.size(); + if (vaSize > 0) { + resContent += CPP_EQUAL + initVList.get(0) + CPP_SEMICOLON; + } else { + resContent += CPP_SEMICOLON; + } + } + List funcList = co.getFuncList(); + for (FuncObj funcItem : funcList) { + resContent += CPP_NEW_LINE + CPP_TAB_SPACE + replaceTsToken(funcItem.getName()) + + CPP_LEFT_PARENTHESES; + List pol = funcItem.getParamList(); + for (ParamObj poItem : pol) { + String retType = ts2CppKey(poItem.getType()); + resContent += replaceTsToken(poItem.getName()) + CPP_COLON + + CPP_BLANK_SPACE + retType + CPP_COMMA + CPP_BLANK_SPACE; + } + if (pol.size() > 0) { + resContent = StringUtils.removeLastCharacter(resContent, 2); + } + + String retValue = funcItem.getRetValue(); + resContent += CPP_RIGHT_PARENTHESES + CPP_BLANK_SPACE + CPP_COLON + + CPP_BLANK_SPACE + ts2CppKey(retValue) + CPP_SEMICOLON; + } + + resContent = StringUtils.removeLastSpace(resContent); + resContent += CPP_NEW_LINE + CPP_RIGHT_BRACE + CPP_SEMICOLON + CPP_NEW_LINE; + } + this.classContent = resContent; }; /** @@ -89,7 +382,34 @@ public class GenCppFile extends GeneratorBase { */ @Override public void genFuncList(List fol) { + System.out.println("genFuncList : " + fol.toString()); + String resContent = ""; + for (FuncObj fo : fol) { + String funcName = fo.getName(); + funcName = !funcName.isEmpty() ? funcName : fo.getAlias(); + List paList = fo.getParamList(); + int i = 0; + resContent += CPP_NEW_LINE + CPP_FUNCTION_TOKEN + + CPP_BLANK_SPACE + replaceTsToken(funcName) + CPP_LEFT_PARENTHESES; + + for (ParamObj poItem : paList) { + String paType = ts2CppKey(poItem.getType()); + String paName = poItem.getName(); + resContent += !paName.isEmpty() ? replaceTsToken(paName) + CPP_COLON + + CPP_BLANK_SPACE + paType + CPP_COMMA + CPP_BLANK_SPACE : + paType + CPP_COMMA + CPP_BLANK_SPACE; + } + if (paList.size() > 0) { + resContent = StringUtils.removeLastCharacter(resContent, 2); + } + + String retValue = fo.getRetValue(); + resContent += CPP_RIGHT_PARENTHESES + CPP_BLANK_SPACE + CPP_COLON + + CPP_BLANK_SPACE + ts2CppKey(retValue) + CPP_SEMICOLON; + } + this.funcContent = resContent; + System.out.println("genFuncList : " + resContent); }; /** @@ -99,7 +419,52 @@ public class GenCppFile extends GeneratorBase { */ @Override public void genStructList(List sol) { + System.out.println("genStructList" + sol.toString()); + + String resContent = ""; + for (StructObj so : sol) { + String structName = so.getName(); + structName = !structName.isEmpty() ? structName : so.getAlias(); + + List paList = so.getMemberList(); + resContent += CPP_NEW_LINE + CPP_EXPORT_TOKEN + CPP_BLANK_SPACE + CPP_CLASS_TOKEN + + CPP_BLANK_SPACE + structName + CPP_BLANK_SPACE + CPP_LEFT_BRACE; + for (ParamObj paItem : paList) { + String paType = paItem.getType(); + resContent += CPP_NEW_LINE + CPP_TAB_SPACE + paItem.getName() + + CPP_COLON + CPP_BLANK_SPACE + ts2CppKey(paType); + List initVList = paItem.getvList(); + int vaSize = initVList.size(); + if (vaSize > 0) { + resContent += CPP_EQUAL + initVList.get(0) + CPP_SEMICOLON; + } else { + resContent += CPP_SEMICOLON; + } + } + + List funcList = so.getFuncList(); + for (FuncObj funcItem : funcList) { + resContent += CPP_NEW_LINE + CPP_TAB_SPACE + replaceTsToken(funcItem.getName()) + CPP_LEFT_PARENTHESES; + List pol = funcItem.getParamList(); + for (ParamObj poItem : pol) { + String retType = ts2CppKey(poItem.getType()); + resContent += replaceTsToken(poItem.getName()) + CPP_COLON + + CPP_BLANK_SPACE + retType + CPP_COMMA + CPP_BLANK_SPACE; + } + if (!pol.isEmpty()) { + resContent = StringUtils.removeLastCharacter(resContent, 2); + } + + String retValue = funcItem.getRetValue(); + resContent += CPP_RIGHT_PARENTHESES + CPP_BLANK_SPACE + CPP_COLON + + CPP_BLANK_SPACE + ts2CppKey(retValue) + CPP_SEMICOLON; + } + + resContent = StringUtils.removeLastSpace(resContent); + resContent += CPP_NEW_LINE + CPP_RIGHT_BRACE + CPP_SEMICOLON + CPP_NEW_LINE; + } + this.structContent = resContent; }; /** @@ -109,7 +474,7 @@ public class GenCppFile extends GeneratorBase { */ @Override public void genTypeList(List tol) { - + System.out.println("genTypeList : " + tol.toString()); }; /** @@ -119,6 +484,52 @@ public class GenCppFile extends GeneratorBase { */ @Override public void genUnionList(List uol) { + System.out.println("genUnionList : " + uol.toString()); + + String resContent = ""; + for (UnionObj uo : uol) { + String unionName = uo.getName(); + unionName = !unionName.isEmpty() ? unionName : uo.getAlias(); + List paList = uo.getMemList(); + int i = 0; + resContent += CPP_NEW_LINE + CPP_EXPORT_TOKEN + CPP_BLANK_SPACE + CPP_TYPE_TOKEN + + CPP_BLANK_SPACE + unionName + CPP_EQUAL; + for (ParamObj paItem : paList) { + String paType = paItem.getType(); + resContent += ts2CppKey(paType) + CPP_SPLIT; + + i++; + } + + resContent = StringUtils.removeLastCharacter(resContent, 3); + resContent += CPP_SEMICOLON + CPP_NEW_LINE; + } + this.unionContent = resContent; }; + + /** + * 生成输出内容 + * + * @param pol 常量列表 + */ + @Override + public void genVarList(List pol) { + System.out.println("genVarList : " + pol.toString()); + + String resContent = ""; + for (ParamObj po : pol) { + String paName = po.getName(); + String paType = ts2CppKey(po.getType()); + String paValue = po.getStrValue(0); + int i = 0; + resContent += CPP_NEW_LINE + CPP_CONST_TOKEN + + CPP_BLANK_SPACE + paName + CPP_BLANK_SPACE + CPP_COLON + CPP_BLANK_SPACE + + paType + CPP_EQUAL + paValue; + + resContent += CPP_SEMICOLON + CPP_NEW_LINE; + } + this.constContent = resContent; + System.out.println("genVarList : " + resContent); + } } diff --git a/src/intellij_plugin/ohosgen/src/main/java/grammar/UnionObj.java b/src/intellij_plugin/ohosgen/src/main/java/grammar/UnionObj.java index 54995959..a2567ecd 100644 --- a/src/intellij_plugin/ohosgen/src/main/java/grammar/UnionObj.java +++ b/src/intellij_plugin/ohosgen/src/main/java/grammar/UnionObj.java @@ -159,6 +159,13 @@ public class UnionObj extends GBaseObject { this.funcList.add(fo); } + /** + * 增加方法 + * + * @param name 方法名 + * @param retValue 返回值 + * @param pol 方法参数 + */ public void addFunc(String name, String retValue, List pol) { FuncObj fo = new FuncObj(); fo.setName(name); diff --git a/src/intellij_plugin/ohosgen/src/test/java/gen/GenDtsFileTest.java b/src/intellij_plugin/ohosgen/src/test/java/gen/GenDtsFileTest.java index b8284df3..d4a76293 100644 --- a/src/intellij_plugin/ohosgen/src/test/java/gen/GenDtsFileTest.java +++ b/src/intellij_plugin/ohosgen/src/test/java/gen/GenDtsFileTest.java @@ -71,13 +71,14 @@ class GenDtsFileTest { @Test void genFile() { - ParseObj po = new ParseObj(); ParamObj pao = new ParamObj(); pao.setName("TestParam"); pao.setType("int"); pao.setStrValue("100"); List pol = new CopyOnWriteArrayList<>(); pol.add(pao); + + ParseObj po = new ParseObj(); po.setVarList(pol); GeneratorBase gb = GenerateFactory.getGenerator("DTS"); @@ -109,7 +110,6 @@ class GenDtsFileTest { @Test void genEnumList() { - GeneratorBase gb = GenerateFactory.getGenerator("DTS"); ParseObj po = new ParseObj(); EnumObj eo = new EnumObj(); eo.setName("TestEnum"); @@ -120,6 +120,7 @@ class GenDtsFileTest { List eol = new CopyOnWriteArrayList<>(); eol.add(eo); po.setEnumList(eol); + GeneratorBase gb = GenerateFactory.getGenerator("DTS"); gb.genEnumList(po.getEnumList()); if (gb instanceof GenDtsFile gdf) { @@ -135,8 +136,6 @@ class GenDtsFileTest { @Test void genClassList() { - GeneratorBase gb = GenerateFactory.getGenerator("DTS"); - ParseObj po = new ParseObj(); ClassObj co = new ClassObj(); co.setName("TestClass"); @@ -157,7 +156,10 @@ class GenDtsFileTest { List col = new CopyOnWriteArrayList<>(); col.add(co); + + ParseObj po = new ParseObj(); po.setClassList(col); + GeneratorBase gb = GenerateFactory.getGenerator("DTS"); gb.genClassList(po.getClassList()); if (gb instanceof GenDtsFile gdf) { @@ -174,8 +176,6 @@ class GenDtsFileTest { @Test void genFuncList() { - GeneratorBase gb = GenerateFactory.getGenerator("DTS"); - ParseObj po = new ParseObj(); ClassObj co = new ClassObj(); co.setName("TestClass"); @@ -196,7 +196,9 @@ class GenDtsFileTest { List col = new CopyOnWriteArrayList<>(); col.add(co); + ParseObj po = new ParseObj(); po.setClassList(col); + GeneratorBase gb = GenerateFactory.getGenerator("DTS"); gb.genClassList(po.getClassList()); if (gb instanceof GenDtsFile gdf) { @@ -213,8 +215,6 @@ class GenDtsFileTest { @Test void genStructList() { - GeneratorBase gb = GenerateFactory.getGenerator("DTS"); - ParseObj po = new ParseObj(); StructObj so = new StructObj(); so.setName("TestStruct"); @@ -235,7 +235,10 @@ class GenDtsFileTest { List sol = new CopyOnWriteArrayList<>(); sol.add(so); + ParseObj po = new ParseObj(); po.setStructList(sol); + + GeneratorBase gb = GenerateFactory.getGenerator("DTS"); gb.genStructList(po.getStructList()); if (gb instanceof GenDtsFile gdf) { @@ -256,8 +259,6 @@ class GenDtsFileTest { @Test void genUnionList() { - GeneratorBase gb = GenerateFactory.getGenerator("DTS"); - ParseObj po = new ParseObj(); UnionObj uo = new UnionObj(); uo.setName("TestUnion"); @@ -266,7 +267,9 @@ class GenDtsFileTest { List uol = new CopyOnWriteArrayList<>(); uol.add(uo); + ParseObj po = new ParseObj(); po.setUnionList(uol); + GeneratorBase gb = GenerateFactory.getGenerator("DTS"); gb.genUnionList(po.getUnionList()); if (gb instanceof GenDtsFile gdf) { @@ -279,15 +282,15 @@ class GenDtsFileTest { @Test void genVarList() { - GeneratorBase gb = GenerateFactory.getGenerator("DTS"); - ParseObj po = new ParseObj(); ParamObj pao = new ParamObj(); pao.setName("TestParam"); pao.setType("int"); pao.setStrValue("100"); List pol = new CopyOnWriteArrayList<>(); pol.add(pao); + ParseObj po = new ParseObj(); po.setVarList(pol); + GeneratorBase gb = GenerateFactory.getGenerator("DTS"); gb.genVarList(po.getVarList()); if (gb instanceof GenDtsFile gdf) { diff --git a/src/intellij_plugin/ohosgen/src/test/java/parse/ParseCppTest.java b/src/intellij_plugin/ohosgen/src/test/java/parse/ParseCppTest.java index 44e61758..e606bdee 100644 --- a/src/intellij_plugin/ohosgen/src/test/java/parse/ParseCppTest.java +++ b/src/intellij_plugin/ohosgen/src/test/java/parse/ParseCppTest.java @@ -226,7 +226,7 @@ class ParseCppTest { @Test void parseCStreamEnum1() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "enum Colors {\n" + " Red = 1,\n" + " Green = 2,\n" + @@ -252,7 +252,7 @@ class ParseCppTest { @Test void parseCStreamEnum2() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "enum {\n" + " Red = 1,\n" + " Green = 2,\n" + @@ -278,7 +278,7 @@ class ParseCppTest { @Test void parseCStreamEnum3() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "typedef enum {\n" + " Red = 1,\n" + " Green = 2,\n" + @@ -305,7 +305,7 @@ class ParseCppTest { @Test void parseCStreamEnum4() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "typedef enum Colors {\n" + " Red = 1,\n" + " Green = 2,\n" + @@ -332,7 +332,7 @@ class ParseCppTest { @Test void parseCStreamStruct1() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "struct tree_el {\n" + " int val;\n" + " struct tree_el * right, * left;\n" + @@ -348,16 +348,16 @@ class ParseCppTest { assertEquals(3, ml.size()); assertEquals("val", ml.get(0).getName()); assertEquals("int", ml.get(0).getType()); - assertEquals("structtree_el", ml.get(1).getType()); + assertEquals("struct tree_el", ml.get(1).getType()); assertEquals("*right", ml.get(1).getName()); - assertEquals("structtree_el", ml.get(2).getType()); + assertEquals("struct tree_el", ml.get(2).getType()); assertEquals("*left", ml.get(2).getName()); } @Test void parseCStreamStruct2() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "struct {\n" + " int val;\n" + " Tree_el_T * right, * left;\n" + @@ -382,7 +382,7 @@ class ParseCppTest { @Test void parseCStreamStruct3() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "typedef struct {\n" + " int val;\n" + " Tree_el_T * right, * left;\n" + @@ -408,7 +408,7 @@ class ParseCppTest { @Test void parseCStreamStruct4() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "typedef struct tree_el {\n" + " int val;\n" + " struct tree_el * right, * left;\n" + @@ -425,16 +425,16 @@ class ParseCppTest { assertEquals(3, ml.size()); assertEquals("val", ml.get(0).getName()); assertEquals("int", ml.get(0).getType()); - assertEquals("structtree_el", ml.get(1).getType()); + assertEquals("struct tree_el", ml.get(1).getType()); assertEquals("*right", ml.get(1).getName()); - assertEquals("structtree_el", ml.get(2).getType()); + assertEquals("struct tree_el", ml.get(2).getType()); assertEquals("*left", ml.get(2).getName()); } @Test void parseCStreamUnion1() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "union tree_el {\n" + " int val;\n" + " struct tree_el * right, * left;\n" + @@ -450,16 +450,16 @@ class ParseCppTest { assertEquals(3, ml.size()); assertEquals("val", ml.get(0).getName()); assertEquals("int", ml.get(0).getType()); - assertEquals("structtree_el", ml.get(1).getType()); + assertEquals("struct tree_el", ml.get(1).getType()); assertEquals("*right", ml.get(1).getName()); - assertEquals("structtree_el", ml.get(2).getType()); + assertEquals("struct tree_el", ml.get(2).getType()); assertEquals("*left", ml.get(2).getName()); } @Test void parseCStreamUnion2() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "union {\n" + " int val;\n" + " struct tree_el * right, * left;\n" + @@ -474,16 +474,16 @@ class ParseCppTest { assertEquals(3, ml.size()); assertEquals("val", ml.get(0).getName()); assertEquals("int", ml.get(0).getType()); - assertEquals("structtree_el", ml.get(1).getType()); + assertEquals("struct tree_el", ml.get(1).getType()); assertEquals("*right", ml.get(1).getName()); - assertEquals("structtree_el", ml.get(2).getType()); + assertEquals("struct tree_el", ml.get(2).getType()); assertEquals("*left", ml.get(2).getName()); } @Test void parseCStreamUnion3() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "typedef union {\n" + " int val;\n" + " Tree_el_T * right, * left;\n" + @@ -509,7 +509,7 @@ class ParseCppTest { @Test void parseCStreamUnion4() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "typedef union tree_el {\n" + " int val;\n" + " struct tree_el * right, * left;\n" + @@ -526,16 +526,16 @@ class ParseCppTest { assertEquals(3, ml.size()); assertEquals("val", ml.get(0).getName()); assertEquals("int", ml.get(0).getType()); - assertEquals("structtree_el", ml.get(1).getType()); + assertEquals("struct tree_el", ml.get(1).getType()); assertEquals("*right", ml.get(1).getName()); - assertEquals("structtree_el", ml.get(2).getType()); + assertEquals("struct tree_el", ml.get(2).getType()); assertEquals("*left", ml.get(2).getName()); } @Test void parseCStreamClass1() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "class tree_el {\n" + " int val;\n" + " struct tree_el * right, * left;\n" + @@ -551,16 +551,16 @@ class ParseCppTest { assertEquals(3, pl.size()); assertEquals("val", pl.get(0).getName()); assertEquals("int", pl.get(0).getType()); - assertEquals("structtree_el", pl.get(1).getType()); + assertEquals("struct tree_el", pl.get(1).getType()); assertEquals("*right", pl.get(1).getName()); - assertEquals("structtree_el", pl.get(2).getType()); + assertEquals("struct tree_el", pl.get(2).getType()); assertEquals("*left", pl.get(2).getName()); } @Test void parseCStreamClass2() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "class {\n" + " int val;\n" + " struct tree_el * right, * left;\n" + @@ -575,15 +575,15 @@ class ParseCppTest { assertEquals(3, pl.size()); assertEquals("val", pl.get(0).getName()); assertEquals("int", pl.get(0).getType()); - assertEquals("structtree_el", pl.get(1).getType()); + assertEquals("struct tree_el", pl.get(1).getType()); assertEquals("*right", pl.get(1).getName()); - assertEquals("structtree_el", pl.get(2).getType()); + assertEquals("struct tree_el", pl.get(2).getType()); assertEquals("*left", pl.get(2).getName()); } @Test void parseCStreamClass3() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "typedef class {\n" + " int val;\n" + " struct tree_el * right, * left;\n" + @@ -599,16 +599,16 @@ class ParseCppTest { assertEquals(3, pl.size()); assertEquals("val", pl.get(0).getName()); assertEquals("int", pl.get(0).getType()); - assertEquals("structtree_el", pl.get(1).getType()); + assertEquals("struct tree_el", pl.get(1).getType()); assertEquals("*right", pl.get(1).getName()); - assertEquals("structtree_el", pl.get(2).getType()); + assertEquals("struct tree_el", pl.get(2).getType()); assertEquals("*left", pl.get(2).getName()); } @Test void parseCStreamClass4() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "typedef class tree_el {\n" + " int val;\n" + " struct tree_el * right, * left;\n" + @@ -625,16 +625,16 @@ class ParseCppTest { assertEquals(3, pl.size()); assertEquals("val", pl.get(0).getName()); assertEquals("int", pl.get(0).getType()); - assertEquals("structtree_el", pl.get(1).getType()); + assertEquals("struct tree_el", pl.get(1).getType()); assertEquals("*right", pl.get(1).getName()); - assertEquals("structtree_el", pl.get(2).getType()); + assertEquals("struct tree_el", pl.get(2).getType()); assertEquals("*left", pl.get(2).getName()); } @Test void parseCStreamFunction1() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "int foo();"; CodePointCharStream cStream = CharStreams.fromString(testEnum); ParseObj po = parser.parseCStream(cStream); @@ -647,7 +647,7 @@ class ParseCppTest { @Test void parseCStreamFunction2() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "int foo( short s );"; CodePointCharStream cStream = CharStreams.fromString(testEnum); ParseObj po = parser.parseCStream(cStream); @@ -664,7 +664,7 @@ class ParseCppTest { @Test void parseCStreamFunction3() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "int foo( short int si );"; CodePointCharStream cStream = CharStreams.fromString(testEnum); ParseObj po = parser.parseCStream(cStream); @@ -681,7 +681,7 @@ class ParseCppTest { @Test void parseCStreamFunction4() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "int foo( signed short ss );"; CodePointCharStream cStream = CharStreams.fromString(testEnum); ParseObj po = parser.parseCStream(cStream); @@ -698,7 +698,7 @@ class ParseCppTest { @Test void parseCStreamFunction5() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "int foo( signed short int ssi);"; CodePointCharStream cStream = CharStreams.fromString(testEnum); ParseObj po = parser.parseCStream(cStream); @@ -715,7 +715,7 @@ class ParseCppTest { @Test void parseCStreamFunction6() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "int foo( unsigned short us );"; CodePointCharStream cStream = CharStreams.fromString(testEnum); ParseObj po = parser.parseCStream(cStream); @@ -732,7 +732,7 @@ class ParseCppTest { @Test void parseCStreamFunction7() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "int foo( unsigned short int usi );"; CodePointCharStream cStream = CharStreams.fromString(testEnum); ParseObj po = parser.parseCStream(cStream); @@ -749,7 +749,7 @@ class ParseCppTest { @Test void parseCStreamFunction8() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "int foo( int i);"; CodePointCharStream cStream = CharStreams.fromString(testEnum); ParseObj po = parser.parseCStream(cStream); @@ -766,7 +766,7 @@ class ParseCppTest { @Test void parseCStreamFunction9() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "int foo( signed s );"; CodePointCharStream cStream = CharStreams.fromString(testEnum); ParseObj po = parser.parseCStream(cStream); @@ -783,7 +783,7 @@ class ParseCppTest { @Test void parseCStreamFunction10() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "int foo( signed int si );"; CodePointCharStream cStream = CharStreams.fromString(testEnum); ParseObj po = parser.parseCStream(cStream); @@ -800,7 +800,7 @@ class ParseCppTest { @Test void parseCStreamFunction11() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "int foo( unsigned u );"; CodePointCharStream cStream = CharStreams.fromString(testEnum); ParseObj po = parser.parseCStream(cStream); @@ -817,7 +817,7 @@ class ParseCppTest { @Test void parseCStreamFunction12() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "int foo( unsigned int ui );"; CodePointCharStream cStream = CharStreams.fromString(testEnum); ParseObj po = parser.parseCStream(cStream); @@ -834,7 +834,7 @@ class ParseCppTest { @Test void parseCStreamFunction13() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "int foo( long l );"; CodePointCharStream cStream = CharStreams.fromString(testEnum); ParseObj po = parser.parseCStream(cStream); @@ -851,7 +851,7 @@ class ParseCppTest { @Test void parseCStreamFunction14() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "int foo( long int li );"; CodePointCharStream cStream = CharStreams.fromString(testEnum); ParseObj po = parser.parseCStream(cStream); @@ -868,7 +868,7 @@ class ParseCppTest { @Test void parseCStreamFunction15() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "int foo( signed long sl );"; CodePointCharStream cStream = CharStreams.fromString(testEnum); ParseObj po = parser.parseCStream(cStream); @@ -885,7 +885,7 @@ class ParseCppTest { @Test void parseCStreamFunction16() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "int foo( signed long int sli );"; CodePointCharStream cStream = CharStreams.fromString(testEnum); ParseObj po = parser.parseCStream(cStream); @@ -902,7 +902,7 @@ class ParseCppTest { @Test void parseCStreamFunction17() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "int foo( unsigned long ul );"; CodePointCharStream cStream = CharStreams.fromString(testEnum); ParseObj po = parser.parseCStream(cStream); @@ -919,7 +919,7 @@ class ParseCppTest { @Test void parseCStreamFunction18() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "int foo( unsigned long int uli );"; CodePointCharStream cStream = CharStreams.fromString(testEnum); ParseObj po = parser.parseCStream(cStream); @@ -936,7 +936,7 @@ class ParseCppTest { @Test void parseCStreamFunction19() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "int foo( long long ll );"; CodePointCharStream cStream = CharStreams.fromString(testEnum); ParseObj po = parser.parseCStream(cStream); @@ -953,7 +953,7 @@ class ParseCppTest { @Test void parseCStreamFunction20() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "int foo( long long int lli );"; CodePointCharStream cStream = CharStreams.fromString(testEnum); ParseObj po = parser.parseCStream(cStream); @@ -970,7 +970,7 @@ class ParseCppTest { @Test void parseCStreamFunction21() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "int foo( signed long long sll );"; CodePointCharStream cStream = CharStreams.fromString(testEnum); ParseObj po = parser.parseCStream(cStream); @@ -987,7 +987,7 @@ class ParseCppTest { @Test void parseCStreamFunction22() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "int foo( signed long long int slli );"; CodePointCharStream cStream = CharStreams.fromString(testEnum); ParseObj po = parser.parseCStream(cStream); @@ -1004,7 +1004,7 @@ class ParseCppTest { @Test void parseCStreamFunction23() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "int foo( unsigned long long ull );"; CodePointCharStream cStream = CharStreams.fromString(testEnum); ParseObj po = parser.parseCStream(cStream); @@ -1021,7 +1021,7 @@ class ParseCppTest { @Test void parseCStreamFunction24() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "int foo( unsigned long long int ulli );"; CodePointCharStream cStream = CharStreams.fromString(testEnum); ParseObj po = parser.parseCStream(cStream); @@ -1038,7 +1038,7 @@ class ParseCppTest { @Test void parseCStreamFunction25() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "int foo( double d );"; CodePointCharStream cStream = CharStreams.fromString(testEnum); ParseObj po = parser.parseCStream(cStream); @@ -1055,7 +1055,7 @@ class ParseCppTest { @Test void parseCStreamFunction26() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "int foo( long double ld );"; CodePointCharStream cStream = CharStreams.fromString(testEnum); ParseObj po = parser.parseCStream(cStream); @@ -1072,7 +1072,7 @@ class ParseCppTest { @Test void parseCStreamFunction27() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "int foo( unsigned long );"; CodePointCharStream cStream = CharStreams.fromString(testEnum); ParseObj po = parser.parseCStream(cStream); @@ -1089,7 +1089,7 @@ class ParseCppTest { @Test void parseCStreamFunction28() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "int foo( unsigned long int );"; CodePointCharStream cStream = CharStreams.fromString(testEnum); ParseObj po = parser.parseCStream(cStream); @@ -1106,7 +1106,7 @@ class ParseCppTest { @Test void parseCStreamFunction29() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "int foo( long long );"; CodePointCharStream cStream = CharStreams.fromString(testEnum); ParseObj po = parser.parseCStream(cStream); @@ -1123,7 +1123,7 @@ class ParseCppTest { @Test void parseCStreamFunction30() { - ParseBase parser = ParseFactory.getParser("cpp"); + ParseBase parser = ParseFactory.getParser("h2dts"); String testEnum = "int foo( long long int );"; CodePointCharStream cStream = CharStreams.fromString(testEnum); ParseObj po = parser.parseCStream(cStream); diff --git a/src/intellij_plugin/ohosgen/src/test/java/parse/ParseTsTest.java b/src/intellij_plugin/ohosgen/src/test/java/parse/ParseTsTest.java index 8341475d..3a6c8a54 100644 --- a/src/intellij_plugin/ohosgen/src/test/java/parse/ParseTsTest.java +++ b/src/intellij_plugin/ohosgen/src/test/java/parse/ParseTsTest.java @@ -318,7 +318,7 @@ class ParseTsTest { @Test void parseCStreamEnum() { - ParseBase parser = ParseFactory.getParser("ts"); + ParseBase parser = ParseFactory.getParser("ts2cpp"); String testEnum = "enum Colors {\n" + " Red = \"RED\",\n" + " Green = \"GREEN\",\n" + @@ -344,7 +344,7 @@ class ParseTsTest { @Test void parseCStreamFunc_1() { - ParseBase parser = ParseFactory.getParser("ts"); + ParseBase parser = ParseFactory.getParser("ts2cpp"); String testFunc = "export function transform2D(\n" + "\tdirection: number,\n" + "\tangle: number,\n" + @@ -371,7 +371,7 @@ class ParseTsTest { @Test void parseCStreamFunc_2() { - ParseBase parser = ParseFactory.getParser("ts"); + ParseBase parser = ParseFactory.getParser("ts2cpp"); String testFunc = testFunc2; CodePointCharStream cStream = CharStreams.fromString(testFunc); ParseObj po = parser.parseCStream(cStream); @@ -425,7 +425,7 @@ class ParseTsTest { @Test void parseCStreamFunc_3() { - ParseBase parser = ParseFactory.getParser("ts"); + ParseBase parser = ParseFactory.getParser("ts2cpp"); String testFunc = testFunc3; CodePointCharStream cStream = CharStreams.fromString(testFunc); ParseObj po = parser.parseCStream(cStream); @@ -443,7 +443,7 @@ class ParseTsTest { @Test void parseCStreamFunc_4() { - ParseBase parser = ParseFactory.getParser("ts"); + ParseBase parser = ParseFactory.getParser("ts2cpp"); String testFunc = testFunc4; CodePointCharStream cStream = CharStreams.fromString(testFunc); ParseObj po = parser.parseCStream(cStream); @@ -457,7 +457,7 @@ class ParseTsTest { @Test void parseCStreamFunc_5() { - ParseBase parser = ParseFactory.getParser("ts"); + ParseBase parser = ParseFactory.getParser("ts2cpp"); String testFunc = testFunc5; CodePointCharStream cStream = CharStreams.fromString(testFunc); ParseObj po = parser.parseCStream(cStream); @@ -475,7 +475,7 @@ class ParseTsTest { @Test void parseCStreamFunc_6() { - ParseBase parser = ParseFactory.getParser("ts"); + ParseBase parser = ParseFactory.getParser("ts2cpp"); String testFunc = testFunc6; CodePointCharStream cStream = CharStreams.fromString(testFunc); ParseObj po = parser.parseCStream(cStream); @@ -494,7 +494,7 @@ class ParseTsTest { @Test void parseCStreamFunc_7() { - ParseBase parser = ParseFactory.getParser("ts"); + ParseBase parser = ParseFactory.getParser("ts2cpp"); String testFunc = testFunc7; CodePointCharStream cStream = CharStreams.fromString(testFunc); ParseObj po = parser.parseCStream(cStream); @@ -511,7 +511,7 @@ class ParseTsTest { @Test void parseCStreamFunc_8() { - ParseBase parser = ParseFactory.getParser("ts"); + ParseBase parser = ParseFactory.getParser("ts2cpp"); String testFunc = testFunc8; CodePointCharStream cStream = CharStreams.fromString(testFunc); ParseObj po = parser.parseCStream(cStream); @@ -529,7 +529,7 @@ class ParseTsTest { @Test void parseCStreamFunc_9() { - ParseBase parser = ParseFactory.getParser("ts"); + ParseBase parser = ParseFactory.getParser("ts2cpp"); String testFunc = testFunc9; CodePointCharStream cStream = CharStreams.fromString(testFunc); ParseObj po = parser.parseCStream(cStream); @@ -547,7 +547,7 @@ class ParseTsTest { @Test void parseCStreamFunc_10() { - ParseBase parser = ParseFactory.getParser("ts"); + ParseBase parser = ParseFactory.getParser("ts2cpp"); String testFunc = testFunc10; CodePointCharStream cStream = CharStreams.fromString(testFunc); ParseObj po = parser.parseCStream(cStream); @@ -565,7 +565,7 @@ class ParseTsTest { @Test void parseCStreamFunc_11() { - ParseBase parser = ParseFactory.getParser("ts"); + ParseBase parser = ParseFactory.getParser("ts2cpp"); String testFunc = testFunc11; CodePointCharStream cStream = CharStreams.fromString(testFunc); ParseObj po = parser.parseCStream(cStream); @@ -577,7 +577,7 @@ class ParseTsTest { @Test void parseCStreamFunc_12() { - ParseBase parser = ParseFactory.getParser("ts"); + ParseBase parser = ParseFactory.getParser("ts2cpp"); String testFunc = testFunc12; CodePointCharStream cStream = CharStreams.fromString(testFunc); ParseObj po = parser.parseCStream(cStream); @@ -595,7 +595,7 @@ class ParseTsTest { @Test void parseCStreamFunc_13() { - ParseBase parser = ParseFactory.getParser("ts"); + ParseBase parser = ParseFactory.getParser("ts2cpp"); String testFunc = testFunc13; CodePointCharStream cStream = CharStreams.fromString(testFunc); ParseObj po = parser.parseCStream(cStream); @@ -614,7 +614,7 @@ class ParseTsTest { @Test void parseCStreamFunc_14() { - ParseBase parser = ParseFactory.getParser("ts"); + ParseBase parser = ParseFactory.getParser("ts2cpp"); String testFunc = testFunc14; CodePointCharStream cStream = CharStreams.fromString(testFunc); ParseObj po = parser.parseCStream(cStream); @@ -631,7 +631,7 @@ class ParseTsTest { @Test void parseCStreamFunc_15() { - ParseBase parser = ParseFactory.getParser("ts"); + ParseBase parser = ParseFactory.getParser("ts2cpp"); String testFunc = testFunc15; CodePointCharStream cStream = CharStreams.fromString(testFunc); ParseObj po = parser.parseCStream(cStream); @@ -651,7 +651,7 @@ class ParseTsTest { @Test void parseCStreamFunc_16() { - ParseBase parser = ParseFactory.getParser("ts"); + ParseBase parser = ParseFactory.getParser("ts2cpp"); String testFunc = testFunc16; CodePointCharStream cStream = CharStreams.fromString(testFunc); ParseObj po = parser.parseCStream(cStream); @@ -667,7 +667,7 @@ class ParseTsTest { @Test void parseCStreamFunc_17() { - ParseBase parser = ParseFactory.getParser("ts"); + ParseBase parser = ParseFactory.getParser("ts2cpp"); String testFunc = testFunc17; CodePointCharStream cStream = CharStreams.fromString(testFunc); ParseObj po = parser.parseCStream(cStream); @@ -685,7 +685,7 @@ class ParseTsTest { @Test void parseCStreamFunc_18() { - ParseBase parser = ParseFactory.getParser("ts"); + ParseBase parser = ParseFactory.getParser("ts2cpp"); String testFunc = testFunc18; CodePointCharStream cStream = CharStreams.fromString(testFunc); ParseObj po = parser.parseCStream(cStream); @@ -703,7 +703,7 @@ class ParseTsTest { @Test void parseCStreamFunc_19() { - ParseBase parser = ParseFactory.getParser("ts"); + ParseBase parser = ParseFactory.getParser("ts2cpp"); String testFunc = testFunc19; CodePointCharStream cStream = CharStreams.fromString(testFunc); ParseObj po = parser.parseCStream(cStream); @@ -719,7 +719,7 @@ class ParseTsTest { @Test void parseCStreamFunc_20() { - ParseBase parser = ParseFactory.getParser("ts"); + ParseBase parser = ParseFactory.getParser("ts2cpp"); String testFunc = testFunc20; CodePointCharStream cStream = CharStreams.fromString(testFunc); ParseObj po = parser.parseCStream(cStream); @@ -737,7 +737,7 @@ class ParseTsTest { @Test void parseCStreamFunc_21() { - ParseBase parser = ParseFactory.getParser("ts"); + ParseBase parser = ParseFactory.getParser("ts2cpp"); String testFunc = testFunc21; CodePointCharStream cStream = CharStreams.fromString(testFunc); ParseObj po = parser.parseCStream(cStream); @@ -754,7 +754,7 @@ class ParseTsTest { @Test void parseCStreamFunc_22() { - ParseBase parser = ParseFactory.getParser("ts"); + ParseBase parser = ParseFactory.getParser("ts2cpp"); String testFunc = testFunc22; CodePointCharStream cStream = CharStreams.fromString(testFunc); ParseObj po = parser.parseCStream(cStream); @@ -774,7 +774,7 @@ class ParseTsTest { @Test void parseCStreamFunc_23() { - ParseBase parser = ParseFactory.getParser("ts"); + ParseBase parser = ParseFactory.getParser("ts2cpp"); String testFunc = testFunc23; CodePointCharStream cStream = CharStreams.fromString(testFunc); ParseObj po = parser.parseCStream(cStream); @@ -793,7 +793,7 @@ class ParseTsTest { @Test void parseCStreamFunc_24() { - ParseBase parser = ParseFactory.getParser("ts"); + ParseBase parser = ParseFactory.getParser("ts2cpp"); String testFunc = testFunc24; CodePointCharStream cStream = CharStreams.fromString(testFunc); ParseObj po = parser.parseCStream(cStream); @@ -810,7 +810,7 @@ class ParseTsTest { @Test void parseCStreamFunc_25() { - ParseBase parser = ParseFactory.getParser("ts"); + ParseBase parser = ParseFactory.getParser("ts2cpp"); String testFunc = testFunc25; CodePointCharStream cStream = CharStreams.fromString(testFunc); ParseObj po = parser.parseCStream(cStream); @@ -827,7 +827,7 @@ class ParseTsTest { @Test void parseCStreamFunc_26() { - ParseBase parser = ParseFactory.getParser("ts"); + ParseBase parser = ParseFactory.getParser("ts2cpp"); String testFunc = testFunc26; CodePointCharStream cStream = CharStreams.fromString(testFunc); ParseObj po = parser.parseCStream(cStream); @@ -847,7 +847,7 @@ class ParseTsTest { @Test void parseCStreamFunc_27() { - ParseBase parser = ParseFactory.getParser("ts"); + ParseBase parser = ParseFactory.getParser("ts2cpp"); String testFunc = testFunc27; CodePointCharStream cStream = CharStreams.fromString(testFunc); ParseObj po = parser.parseCStream(cStream); @@ -864,7 +864,7 @@ class ParseTsTest { @Test void parseCStreamFunc_28() { - ParseBase parser = ParseFactory.getParser("ts"); + ParseBase parser = ParseFactory.getParser("ts2cpp"); String testFunc = testFunc28; CodePointCharStream cStream = CharStreams.fromString(testFunc); ParseObj po = parser.parseCStream(cStream); @@ -882,7 +882,7 @@ class ParseTsTest { @Test void parseCStreamFunc_29() { - ParseBase parser = ParseFactory.getParser("ts"); + ParseBase parser = ParseFactory.getParser("ts2cpp"); String testFunc = testFunc29; CodePointCharStream cStream = CharStreams.fromString(testFunc); ParseObj po = parser.parseCStream(cStream); @@ -899,7 +899,7 @@ class ParseTsTest { @Test void parseCStreamInterface() { - ParseBase parser = ParseFactory.getParser("ts"); + ParseBase parser = ParseFactory.getParser("ts2cpp"); String testInterface = testInterface1; CodePointCharStream cStream = CharStreams.fromString(testInterface); ParseObj po = parser.parseCStream(cStream); @@ -920,7 +920,7 @@ class ParseTsTest { @Test void parseCStreamType() { - ParseBase parser = ParseFactory.getParser("ts"); + ParseBase parser = ParseFactory.getParser("ts2cpp"); String testType = "export type TestShap_t = TestShape;"; CodePointCharStream cStream = CharStreams.fromString(testType); ParseObj po = parser.parseCStream(cStream); -- Gitee From f846b876ebb5e3a897481d49fc96f1ba55f0ec23 Mon Sep 17 00:00:00 2001 From: sunlian Date: Thu, 3 Apr 2025 15:46:30 +0800 Subject: [PATCH 3/3] fix code check Signed-off-by: sunlian --- src/intellij_plugin/ohosgen/src/main/java/gen/GenCppFile.java | 1 + .../ohosgen/src/main/java/gen/GeneratorBase.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/intellij_plugin/ohosgen/src/main/java/gen/GenCppFile.java b/src/intellij_plugin/ohosgen/src/main/java/gen/GenCppFile.java index 62abd3d3..1ed4a8cf 100644 --- a/src/intellij_plugin/ohosgen/src/main/java/gen/GenCppFile.java +++ b/src/intellij_plugin/ohosgen/src/main/java/gen/GenCppFile.java @@ -116,6 +116,7 @@ public class GenCppFile extends GeneratorBase { Map.entry("(", ""), Map.entry(")", "") ); + /** * 构造函数 */ diff --git a/src/intellij_plugin/ohosgen/src/main/java/gen/GeneratorBase.java b/src/intellij_plugin/ohosgen/src/main/java/gen/GeneratorBase.java index b0b3ce74..3129574f 100644 --- a/src/intellij_plugin/ohosgen/src/main/java/gen/GeneratorBase.java +++ b/src/intellij_plugin/ohosgen/src/main/java/gen/GeneratorBase.java @@ -34,6 +34,9 @@ public class GeneratorBase { /** * 生成文件头内容 + * + * @param filePath 文件路径 + * @return 返回文件头 */ public String genFileHeader(String filePath) { String fileHeader = ""; -- Gitee