fix: EBNF better unicode support

arnaudroques · arnaudroques · commit 99ea667a0c3b · 2024-10-06T12:02:56.000+02:00
diff --git a/src/net/sourceforge/plantuml/ebnf/CommandEBnfSingleLine.java b/src/net/sourceforge/plantuml/ebnf/CommandEBnfSingleLine.java
@@ -66,7 +66,7 @@ static IRegex getRegexConcat() {
 								new RegexLeaf("\\*\\)"), //
 								RegexLeaf.spaceZeroOrMore())), //
 
-				new RegexLeaf("ID", "(\\w[-\\w]*)"), //
+				new RegexLeaf("ID", "([%pLN_][-%pLN_]*)"), //
 
 				new RegexOptional( //
 						new RegexConcat( //
diff --git a/src/net/sourceforge/plantuml/ebnf/CommandEbnfMultilines.java b/src/net/sourceforge/plantuml/ebnf/CommandEbnfMultilines.java
@@ -53,7 +53,7 @@ public CommandEbnfMultilines() {
 
 	static IRegex getRegexConcat() {
 		return RegexConcat.build(CommandEbnfMultilines.class.getName(), RegexLeaf.start(), //
-				new RegexLeaf("LINE", "(\\w[-\\w]*[%s]*=.*)"), //
+				new RegexLeaf("LINE", "([%pLN_][-%pLN_]*[%s]*=.*)"), //
 				RegexLeaf.end());
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public CommandEbnfMultilines() {`
`53`	`53`
`54`	`54`	`static IRegex getRegexConcat() {`
`55`	`55`	`return RegexConcat.build(CommandEbnfMultilines.class.getName(), RegexLeaf.start(), //`
`56`		`- new RegexLeaf("LINE", "(\\w[-\\w][%s]=.*)"), //`
	`56`	`+ new RegexLeaf("LINE", "([%pLN_][-%pLN_][%s]=.*)"), //`
`57`	`57`	`RegexLeaf.end());`
`58`	`58`	`}`
`59`	`59`