From 3d1580d3a459065b21f2bdea5a88047579566473 Mon Sep 17 00:00:00 2001 From: zhaojunxia Date: Wed, 25 May 2022 10:36:49 +0800 Subject: [PATCH] repair generate param error Signed-off-by: zhaojunxia --- src/gen/analyze.js | 4 ++-- src/gen/analyze/params.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gen/analyze.js b/src/gen/analyze.js index 8db9dcaf..72bbbf81 100644 --- a/src/gen/analyze.js +++ b/src/gen/analyze.js @@ -57,7 +57,7 @@ function analyze(data, result) { let matchs = re.match(" *\n*", data) //只剩下空格和回车时,解析完成 if (matchs && matchs.regs[0][1] == data.length) break - matchs = re.match("export default ([a-zA-Z]+);", data); + matchs = re.match("export default ([a-zA-Z_]+);", data); if (matchs != null) { let exportName = re.getReg(data, matchs.regs[1]) data = re.removeReg(data, matchs.regs[0]); @@ -93,7 +93,7 @@ function analyze(data, result) { } function analyzeMatchNamespace(matchs, data, result) { - matchs = re.match("declare namespace ([a-zA-Z0-9]+) *({)", data); + matchs = re.match("declare namespace ([a-zA-Z_0-9]+) *({)", data); // 解析declare if (matchs != null) { let namespaceName = re.getReg(data, matchs.regs[1]) diff --git a/src/gen/analyze/params.js b/src/gen/analyze/params.js index 7befd130..7bb09779 100644 --- a/src/gen/analyze/params.js +++ b/src/gen/analyze/params.js @@ -26,7 +26,7 @@ function analyzeParams(values) { if (v == null) v = values values = values.substring(v.length, values.length) - let matchs = re.match("([a-zA-Z0-9\\.]+)\\?*: *([a-zA-Z<>_0-9\\[\\]\\(\\):='{}]+)", v) + let matchs = re.match("([a-zA-Z_0-9\\.]+)\\?*: *([a-zA-Z<>_0-9\\[\\]\\(\\):='{}]+)", v) if (matchs != null) { let type = re.getReg(v, matchs.regs[2]) result.push({ "name": re.getReg(v, matchs.regs[1]), "type": type }) -- Gitee