Fix up the workings

main_test.go

@@ -2,10 +2,18 @@ package main
 
 import (
 	"regexp"
+	"strings"
 	"testing"
 )
 
-func TestSimpleFileSimpleExpression(t *testing.T) {
+// Helper function to normalize whitespace for comparison
+func normalizeWhitespace(s string) string {
+	// Replace all whitespace with a single space
+	re := regexp.MustCompile(`\s+`)
+	return re.ReplaceAllString(strings.TrimSpace(s), " ")
+}
+
+func TestSimpleValueMultiplication(t *testing.T) {
 	fileContents := `
 		<config>
 			<item>
@@ -21,20 +29,25 @@ func TestSimpleFileSimpleExpression(t *testing.T) {
 		</config>
 	`
 
-	regex := regexp.MustCompile(`<value>(\d+)</value>`)
+	// Create a regex pattern with the (?s) flag for multiline matching
+	regex := regexp.MustCompile(`(?s)<value>(\d+)</value>`)
 	luaExpr := `*1.5`
+	luaScript := buildLuaScript(luaExpr)
 
-	modifiedContent, err := process(fileContents, regex, luaExpr)
+	modifiedContent, err := process(fileContents, regex, luaScript)
 	if err != nil {
 		t.Fatalf("Error processing file: %v", err)
 	}
 
-	if modifiedContent != expected {
-		t.Fatalf("Expected modified content to be %v, but got %v", expected, modifiedContent)
+	// Compare normalized content
+	normalizedModified := normalizeWhitespace(modifiedContent)
+	normalizedExpected := normalizeWhitespace(expected)
+	if normalizedModified != normalizedExpected {
+		t.Fatalf("Expected modified content to be %q, but got %q", normalizedExpected, normalizedModified)
 	}
 }
 
-func TestSimpleFileVExpression(t *testing.T) {
+func TestShorthandNotation(t *testing.T) {
 	fileContents := `
 		<config>
 			<item>
@@ -50,20 +63,23 @@ func TestSimpleFileVExpression(t *testing.T) {
 		</config>
 	`
 
-	regex := regexp.MustCompile(`<value>(\d+)</value>`)
+	regex := regexp.MustCompile(`(?s)<value>(\d+)</value>`)
 	luaExpr := `v1 * 1.5`
+	luaScript := buildLuaScript(luaExpr)
 
-	modifiedContent, err := process(fileContents, regex, luaExpr)
+	modifiedContent, err := process(fileContents, regex, luaScript)
 	if err != nil {
 		t.Fatalf("Error processing file: %v", err)
 	}
 
-	if modifiedContent != expected {
-		t.Fatalf("Expected modified content to be %v, but got %v", expected, modifiedContent)
+	normalizedModified := normalizeWhitespace(modifiedContent)
+	normalizedExpected := normalizeWhitespace(expected)
+	if normalizedModified != normalizedExpected {
+		t.Fatalf("Expected modified content to be %q, but got %q", normalizedExpected, normalizedModified)
 	}
 }
 
-func TestSimpleFileTableVExpression(t *testing.T) {
+func TestArrayNotation(t *testing.T) {
 	fileContents := `
 		<config>
 			<item>
@@ -79,20 +95,23 @@ func TestSimpleFileTableVExpression(t *testing.T) {
 		</config>
 	`
 
-	regex := regexp.MustCompile(`<value>(\d+)</value>`)
+	regex := regexp.MustCompile(`(?s)<value>(\d+)</value>`)
 	luaExpr := `v[1] * 1.5`
+	luaScript := buildLuaScript(luaExpr)
 
-	modifiedContent, err := process(fileContents, regex, luaExpr)
+	modifiedContent, err := process(fileContents, regex, luaScript)
 	if err != nil {
 		t.Fatalf("Error processing file: %v", err)
 	}
 
-	if modifiedContent != expected {
-		t.Fatalf("Expected modified content to be %v, but got %v", expected, modifiedContent)
+	normalizedModified := normalizeWhitespace(modifiedContent)
+	normalizedExpected := normalizeWhitespace(expected)
+	if normalizedModified != normalizedExpected {
+		t.Fatalf("Expected modified content to be %q, but got %q", normalizedExpected, normalizedModified)
 	}
 }
 
-func TestComplexFileSimpleExpression(t *testing.T) {
+func TestMultipleMatches(t *testing.T) {
 	fileContents := `
 		<config>
 			<item>
@@ -116,89 +135,169 @@ func TestComplexFileSimpleExpression(t *testing.T) {
 		</config>
 	`
 
-	regex := regexp.MustCompile(`<value>(\d+)</value>`)
+	regex := regexp.MustCompile(`(?s)<value>(\d+)</value>`)
 	luaExpr := `*1.5`
+	luaScript := buildLuaScript(luaExpr)
 
-	modifiedContent, err := process(fileContents, regex, luaExpr)
+	modifiedContent, err := process(fileContents, regex, luaScript)
 	if err != nil {
 		t.Fatalf("Error processing file: %v", err)
 	}
 
-	if modifiedContent != expected {
-		t.Fatalf("Expected modified content to be %v, but got %v", expected, modifiedContent)
+	normalizedModified := normalizeWhitespace(modifiedContent)
+	normalizedExpected := normalizeWhitespace(expected)
+	if normalizedModified != normalizedExpected {
+		t.Fatalf("Expected modified content to be %q, but got %q", normalizedExpected, normalizedModified)
 	}
 }
 
-func TestComplexFileVExpression(t *testing.T) {
+func TestMultipleCaptureGroups(t *testing.T) {
 	fileContents := `
 		<config>
 			<item>
-				<value>100</value>
+				<value>10</value>
+				<multiplier>5</multiplier>
 			</item>
-			<item>
-				<value>200</value>
-			</item>
-			<item> <value>300</value> </item>
 		</config>
 	`
 	expected := `
 		<config>
 			<item>
-				<value>150</value>
+				<value>50</value>
+				<multiplier>5</multiplier>
 			</item>
-			<item>
-				<value>300</value>
-			</item>
-			<item> <value>450</value> </item>
 		</config>
 	`
 
-	regex := regexp.MustCompile(`<value>(\d+)</value>`)
-	luaExpr := `v1 * 1.5`
+	// Use (?s) flag to match across multiple lines
+	regex := regexp.MustCompile(`(?s)<value>(\d+)</value>.*?<multiplier>(\d+)</multiplier>`)
+	luaExpr := `v1 * v2`
+	luaScript := buildLuaScript(luaExpr)
 
-	modifiedContent, err := process(fileContents, regex, luaExpr)
+	// Verify the regex matches before processing
+	matches := regex.FindStringSubmatch(fileContents)
+	if len(matches) <= 1 {
+		t.Fatalf("Regex didn't match any capture groups in test input: %v", fileContents)
+	}
+	t.Logf("Matches: %v", matches)
+
+	modifiedContent, err := process(fileContents, regex, luaScript)
 	if err != nil {
 		t.Fatalf("Error processing file: %v", err)
 	}
 
-	if modifiedContent != expected {
-		t.Fatalf("Expected modified content to be %v, but got %v", expected, modifiedContent)
+	normalizedModified := normalizeWhitespace(modifiedContent)
+	normalizedExpected := normalizeWhitespace(expected)
+	if normalizedModified != normalizedExpected {
+		t.Fatalf("Expected modified content to be %q, but got %q", normalizedExpected, normalizedModified)
 	}
 }
 
-func TestComplexFileTableVExpression(t *testing.T) {
+func TestModifyingMultipleValues(t *testing.T) {
 	fileContents := `
 		<config>
 			<item>
-				<value>100</value>
+				<value>50</value>
+				<multiplier>3</multiplier>
+				<divider>2</divider>
 			</item>
-			<item>
-				<value>200</value>
-			</item>
-			<item> <value>300</value> </item>
 		</config>
 	`
 	expected := `
 		<config>
 			<item>
-				<value>150</value>
+				<value>75</value>
+				<multiplier>5</multiplier>
+				<divider>1</divider>
 			</item>
-			<item>
-				<value>300</value>
-			</item>
-			<item> <value>450</value> </item>
 		</config>
 	`
 
-	regex := regexp.MustCompile(`<value>(\d+)</value>`)
-	luaExpr := `v[1] * 1.5`
+	regex := regexp.MustCompile(`(?s)<value>(\d+)</value>.*?<multiplier>(\d+)</multiplier>.*?<divider>(\d+)</divider>`)
+	luaExpr := `v[1] = v[1] * v[2] / v[3]; v[2] = min(v[2] * 2, 5); v[3] = max(1, v[3] / 2)`
+	luaScript := buildLuaScript(luaExpr)
 
-	modifiedContent, err := process(fileContents, regex, luaExpr)
+	// Verify the regex matches before processing
+	matches := regex.FindStringSubmatch(fileContents)
+	if len(matches) <= 1 {
+		t.Fatalf("Regex didn't match any capture groups in test input: %v", fileContents)
+	}
+	t.Logf("Matches: %v", matches)
+
+	modifiedContent, err := process(fileContents, regex, luaScript)
 	if err != nil {
 		t.Fatalf("Error processing file: %v", err)
 	}
 
-	if modifiedContent != expected {
-		t.Fatalf("Expected modified content to be %v, but got %v", expected, modifiedContent)
+	normalizedModified := normalizeWhitespace(modifiedContent)
+	normalizedExpected := normalizeWhitespace(expected)
+	if normalizedModified != normalizedExpected {
+		t.Fatalf("Expected modified content to be %q, but got %q", normalizedExpected, normalizedModified)
 	}
-}
+}
+
+func TestDecimalValues(t *testing.T) {
+	fileContents := `
+		<config>
+			<item>
+				<value>10.5</value>
+				<multiplier>2.5</multiplier>
+			</item>
+		</config>
+	`
+	expected := `
+		<config>
+			<item>
+				<value>26.25</value>
+				<multiplier>2.5</multiplier>
+			</item>
+		</config>
+	`
+
+	regex := regexp.MustCompile(`(?s)<value>([0-9.]+)</value>.*?<multiplier>([0-9.]+)</multiplier>`)
+	luaExpr := `v1 * v2`
+	luaScript := buildLuaScript(luaExpr)
+
+	modifiedContent, err := process(fileContents, regex, luaScript)
+	if err != nil {
+		t.Fatalf("Error processing file: %v", err)
+	}
+
+	normalizedModified := normalizeWhitespace(modifiedContent)
+	normalizedExpected := normalizeWhitespace(expected)
+	if normalizedModified != normalizedExpected {
+		t.Fatalf("Expected modified content to be %q, but got %q", normalizedExpected, normalizedModified)
+	}
+}
+
+func TestLuaMathFunctions(t *testing.T) {
+	fileContents := `
+		<config>
+			<item>
+				<value>16</value>
+			</item>
+		</config>
+	`
+	expected := `
+		<config>
+			<item>
+				<value>4</value>
+			</item>
+		</config>
+	`
+
+	regex := regexp.MustCompile(`(?s)<value>(\d+)</value>`)
+	luaExpr := `math.sqrt(v1)`
+	luaScript := buildLuaScript(luaExpr)
+
+	modifiedContent, err := process(fileContents, regex, luaScript)
+	if err != nil {
+		t.Fatalf("Error processing file: %v", err)
+	}
+
+	normalizedModified := normalizeWhitespace(modifiedContent)
+	normalizedExpected := normalizeWhitespace(expected)
+	if normalizedModified != normalizedExpected {
+		t.Fatalf("Expected modified content to be %q, but got %q", normalizedExpected, normalizedModified)
+	}
+}