From 1c86685d81dd1344b2370766b05b9515d0dc746e Mon Sep 17 00:00:00 2001
From: zy <953725892@qq.com>
Date: Tue, 26 Sep 2023 20:16:37 +0800
Subject: [PATCH] =?UTF-8?q?fix=20#I7SVZF=20=E4=BF=AE=E6=94=B9=E5=8D=A0?=
 =?UTF-8?q?=E4=BD=8D=E7=AC=A6=E6=AD=A3=E5=88=99=E8=A1=A8=E8=BE=BE=E5=BC=8F?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E5=85=B6=E5=8F=AF=E4=BB=A5=E5=8C=B9=E9=85=8D?=
 =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E5=BD=A2=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yomahub/liteflow/parser/helper/ParserHelper.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/helper/ParserHelper.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/helper/ParserHelper.java
index 4d68b24ba..16e626d1e 100644
--- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/helper/ParserHelper.java
+++ b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/helper/ParserHelper.java
@@ -381,7 +381,7 @@ public class ParserHelper {
 		private static final String REGEX_COMMENT = "(?<!(:|@))\\/\\/.*|\\/\\*(\\s|.)*?\\*\\/";
 
 		// abstractChain 占位符正则表达式
-		private static final String REGEX_ABSTRACT_HOLDER = "\\{(\\d+)\\}";
+		private static final String REGEX_ABSTRACT_HOLDER = "\\{\\s*([a-zA-Z_][a-zA-Z_\\d]*|\\d+)\\s*\\}";
 
 
 		/**
@@ -412,14 +412,14 @@ public class ParserHelper {
 			Matcher placeHolderMatcher = placeHolder.matcher(abstractChain);
 			while(placeHolderMatcher.find()){
 				//到implChain中找到对应的占位符实现
-				int index = Integer.parseInt(placeHolderMatcher.group(1));
-				Pattern placeHolderImpl = Pattern.compile("\\{" + index + "\\}=(.*?)(;|$)");
+				String holder = placeHolderMatcher.group(1);
+				Pattern placeHolderImpl = Pattern.compile("\\s*\\{" + holder + "\\}\\s*=\\s*(.*?);");
 				Matcher implMatcher = placeHolderImpl.matcher(implChain);
 				if (implMatcher.find()) {
 					String replacement = implMatcher.group(1).trim();
-					abstractChain = abstractChain.replace("{" + index + "}", replacement);
+					abstractChain = abstractChain.replace("{" + holder + "}", replacement);
 				}else{
-					throw new ParseException("missing abstract chain in expression \r\n" + abstractChain);
+					throw new ParseException("missing implementation of {"+holder+"} in expression \r\n" + implChain);
 				}
 			}
 			return abstractChain;