Skip to content

Commit 61b97e4

Browse files
authored
feat(alphatex): Add missing model features (#1853)
1 parent 192b36b commit 61b97e4

File tree

19 files changed

+1379
-235
lines changed

19 files changed

+1379
-235
lines changed

src.csharp/AlphaTab/Core/EcmaScript/RegExp.cs

+10-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace AlphaTab.Core.EcmaScript;
55

66
internal class RegExp
77
{
8-
private static ConcurrentDictionary<(string pattern, string flags), RegExp> Cache =
8+
private static readonly ConcurrentDictionary<(string pattern, string flags), RegExp> Cache =
99
new ConcurrentDictionary<(string pattern, string flags), RegExp>();
1010

1111
private readonly Regex _regex;
@@ -42,9 +42,15 @@ public RegExp(string regex, string flags = "")
4242
}
4343
}
4444

45-
public bool Exec(string s)
45+
public Match? Exec(string s)
4646
{
47-
return _regex.IsMatch(s);
47+
var match = _regex.Match(s);
48+
if (match.Success)
49+
{
50+
return match;
51+
}
52+
53+
return null;
4854
}
4955

5056
public string Replace(string input, string replacement)
@@ -58,4 +64,4 @@ public string[] Split(string value)
5864
{
5965
return _regex.Split(value);
6066
}
61-
}
67+
}

src/generated/model/NoteCloner.ts

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ export class NoteCloner {
4242
clone.isTieDestination = original.isTieDestination;
4343
clone.leftHandFinger = original.leftHandFinger;
4444
clone.rightHandFinger = original.rightHandFinger;
45-
clone.isFingering = original.isFingering;
4645
clone.trillValue = original.trillValue;
4746
clone.trillSpeed = original.trillSpeed;
4847
clone.durationPercent = original.durationPercent;

src/generated/model/NoteSerializer.ts

-4
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ export class NoteSerializer {
6262
o.set("istiedestination", obj.isTieDestination);
6363
o.set("lefthandfinger", obj.leftHandFinger as number);
6464
o.set("righthandfinger", obj.rightHandFinger as number);
65-
o.set("isfingering", obj.isFingering);
6665
o.set("trillvalue", obj.trillValue);
6766
o.set("trillspeed", obj.trillSpeed as number);
6867
o.set("durationpercent", obj.durationPercent);
@@ -168,9 +167,6 @@ export class NoteSerializer {
168167
case "righthandfinger":
169168
obj.rightHandFinger = JsonHelper.parseEnum<Fingers>(v, Fingers)!;
170169
return true;
171-
case "isfingering":
172-
obj.isFingering = v! as boolean;
173-
return true;
174170
case "trillvalue":
175171
obj.trillValue = v! as number;
176172
return true;

0 commit comments

Comments
 (0)