Implement "replacement" variable that simply replaces the match
This commit is contained in:
@@ -213,29 +213,35 @@ func (p *RegexProcessor) ProcessContent(content string, pattern string, luaExpr
|
||||
continue
|
||||
}
|
||||
|
||||
// Apply the modifications to the original match
|
||||
replacement := match
|
||||
for i := len(modsMap) - 1; i >= 0; i-- {
|
||||
newVal := modsMap[i]
|
||||
log.Printf("Applying modification: %s", newVal)
|
||||
// Indices of the group are relative to content
|
||||
// To relate them to match we have to subtract the match start index
|
||||
groupStart := groups[i*2] - matchIndices[0]
|
||||
groupEnd := groups[i*2+1] - matchIndices[0]
|
||||
replacement = replacement[:groupStart] + newVal + replacement[groupEnd:]
|
||||
replacement := ""
|
||||
replacementVar := L.GetGlobal("replacement")
|
||||
if replacementVar.Type() != lua.LTNil {
|
||||
replacement = replacementVar.String()
|
||||
}
|
||||
|
||||
for i := len(namedCaptures) - 1; i >= 0; i-- {
|
||||
capture := namedCaptures[i]
|
||||
if capture.Name == "" {
|
||||
continue
|
||||
if replacement == "" {
|
||||
// Apply the modifications to the original match
|
||||
replacement = match
|
||||
for i := len(modsMap) - 1; i >= 0; i-- {
|
||||
newVal := modsMap[i]
|
||||
log.Printf("Applying modification: %s", newVal)
|
||||
// Indices of the group are relative to content
|
||||
// To relate them to match we have to subtract the match start index
|
||||
groupStart := groups[i*2] - matchIndices[0]
|
||||
groupEnd := groups[i*2+1] - matchIndices[0]
|
||||
replacement = replacement[:groupStart] + newVal + replacement[groupEnd:]
|
||||
}
|
||||
groupStart := capture.Range[0] - matchIndices[0]
|
||||
groupEnd := capture.Range[1] - matchIndices[0]
|
||||
luaValue := L.GetGlobal(capture.Name).String()
|
||||
replacement = replacement[:groupStart] + luaValue + replacement[groupEnd:]
|
||||
}
|
||||
|
||||
for i := len(namedCaptures) - 1; i >= 0; i-- {
|
||||
capture := namedCaptures[i]
|
||||
if capture.Name == "" {
|
||||
continue
|
||||
}
|
||||
groupStart := capture.Range[0] - matchIndices[0]
|
||||
groupEnd := capture.Range[1] - matchIndices[0]
|
||||
luaValue := L.GetGlobal(capture.Name).String()
|
||||
replacement = replacement[:groupStart] + luaValue + replacement[groupEnd:]
|
||||
}
|
||||
}
|
||||
modificationCount++
|
||||
result = result[:matchIndices[0]] + replacement + result[matchIndices[1]:]
|
||||
log.Printf("Modification count updated: %d", modificationCount)
|
||||
|
@@ -871,7 +871,7 @@ func TestLuaFunctionsOnNamedCaptures(t *testing.T) {
|
||||
`<user name="(?<name>[^"]+)" role="(?<role>[^"]+)"`,
|
||||
`-- Capitalize first letters for regular users
|
||||
if role == "user" then
|
||||
name = name:gsub("(%w)(%w*)", function(first, rest) return first:upper()..rest end):gsub(" (%w)(%w*)", " %1%2":gsub("%%1", function(x) return x:upper() end))
|
||||
name = name:gsub("(%w)(%w*)", function(first, rest) return first:upper()..rest end):gsub(" (%w)(%w*)", " %1%2")
|
||||
else
|
||||
-- Uppercase for admins
|
||||
name = string.upper(name)
|
||||
@@ -910,10 +910,10 @@ func TestNamedCaptureWithMath(t *testing.T) {
|
||||
p := &RegexProcessor{}
|
||||
result, mods, matches, err := p.ProcessContent(
|
||||
content,
|
||||
`<item price="(?<price>\d+\.\d+)" quantity="(?<qty>\d+)"`,
|
||||
`<item price="(?<price>\d+\.\d+)" quantity="(?<qty>\d+)"!any$`,
|
||||
`-- Calculate and add total
|
||||
replacement = string.format('<item price="%s" quantity="%s" total="%.2f" />',
|
||||
price, qty, price * qty)`)
|
||||
price, qty, price * qty)`)
|
||||
|
||||
if err != nil {
|
||||
t.Fatalf("Error processing content: %v", err)
|
||||
|
Reference in New Issue
Block a user