Merge pull request #264 from 0xsequence/tweaks/primary-sale-boilerplate

andygruening · web-flow · commit c49182906fd4 · 2024-12-18T17:58:00.000+01:00
Changed abi regex, switched boilerplate contracts, mouse cursor does not disappear
diff --git a/Plugins/SequencePlugin/Content/Samples/FeatureSelection.uasset b/Plugins/SequencePlugin/Content/Samples/FeatureSelection.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c65b459b4ed22a3668fc7114d5f2a40d975b99f2e997f1633611033b4ef71b5d
-size 123360
+oid sha256:d20a731343a26d0edac2e140e1a0c7e8c2291e130fd84e19fc16ed3b2a6a60a0
+size 132117
diff --git a/Plugins/SequencePlugin/Content/Samples/SequenceInventory.uasset b/Plugins/SequencePlugin/Content/Samples/SequenceInventory.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:93bcf13d21aab550ffe8232a56faca75d406c14f46fa6877abe9efcd8dd0f77e
-size 471343
+oid sha256:0321148129122523217b9f988340d109f8cc7290fc26cade417f4aeb82724126
+size 472239
diff --git a/Plugins/SequencePlugin/Content/Samples/SequencePrimarySale.uasset b/Plugins/SequencePlugin/Content/Samples/SequencePrimarySale.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:81ec6a953d967d6bd3f768a8fe3d2c6ece0901111a1d332848853d40f5db12c6
-size 427915
+oid sha256:16cdd428e89061811df3202f1842c81131cea7552d73a9e9e98730531ae54807
+size 457127
diff --git a/Plugins/SequencePlugin/Content/Samples/SequenceProfile.uasset b/Plugins/SequencePlugin/Content/Samples/SequenceProfile.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3d10ae0f4184fa6c3c644537dc10982962008dc1ed2fae8bc9b239ccfefc2816
-size 365727
+oid sha256:151d7db4b9119126d73aeb82f45ea2ba7977304e048eaf7f6cd568cbdbdcf00b
+size 378357
diff --git a/Plugins/SequencePlugin/Source/SequencePlugin/Private/ABI/ABI.cpp b/Plugins/SequencePlugin/Source/SequencePlugin/Private/ABI/ABI.cpp
@@ -97,7 +97,7 @@ void ABI::Decode(TArray<uint8> Data, TArray<TSharedPtr<ABIElement>> Args)
 
 bool ABI::IsValidSignature(FString Signature)
 {
-	const FRegexPattern FunctionABIRegex(TEXT("^[a-z]+\\(([a-z0-9\\[\\]]+(,[a-z0-9\\[\\]]+)*)\\)$"));
+	const FRegexPattern FunctionABIRegex(TEXT("^[A-Z|a-z|_,-|0-9]+\\(([A-Za-z0-9\\[\\]]+(, *[A-Za-z0-9\\[\\]]+)*)?\\)$"));
 	FRegexMatcher MyMatcher(FunctionABIRegex, Signature);
 	return MyMatcher.FindNext();
 }

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ void ABI::Decode(TArray<uint8> Data, TArray<TSharedPtr<ABIElement>> Args)`
`97`	`97`
`98`	`98`	`bool ABI::IsValidSignature(FString Signature)`
`99`	`99`	`{`
`100`		`- const FRegexPattern FunctionABIRegex(TEXT("^[a-z]+\\(([a-z0-9\\[\\]]+(,[a-z0-9\\[\\]]+)*)\\)$"));`
	`100`	`+ const FRegexPattern FunctionABIRegex(TEXT("^[A-Z\|a-z\|_,-\|0-9]+\\(([A-Za-z0-9\\[\\]]+(, [A-Za-z0-9\\[\\]]+))?\\)$"));`
`101`	`101`	`FRegexMatcher MyMatcher(FunctionABIRegex, Signature);`
`102`	`102`	`return MyMatcher.FindNext();`
`103`	`103`	`}`