Merge pull request #18 from deresmos/feature/add_do_statement

Support do loop statement

Author: Kazuma Arimura

domain/vbscript.go

@@ -7,6 +7,8 @@ const (
 	VBScriptEndIfPattern       = `(?i)^(\s*?)(\t*?)(End if)`
 	VBScriptForPattern         = `(?i)^(\s*?)(\t*?)(For )`
 	VBScriptNextPattern        = `(?i)^(\s*?)(\t*?)(Next)($|(\s+?)(\t+?))`
+	VBScriptDoPattern          = `(?i)^(\s*?)(\t*?)(Do)($|(\s+?)|(\t+?)| While | Until )`
+	VBScriptLoopPattern        = `(?i)^(\s*?)(\t*?)(Loop)($|(\s+?)|(\t+?)| While | Until )`
 	VBScriptFunctionPattern    = `(?i)^(\s*?)(\t*?)(Private |Public (Default )?)?(Function|Sub)`
 	VBScriptEndFunctionPattern = `(?i)^(\s*?)(\t*?)(End (Function|Sub))`
 )

internal/process_control.go

@@ -70,7 +70,12 @@ func isBeginNestStatement(str string) bool {
 		fmt.Printf("err: %v", err)
 	}
 
-	return isIf || isFor
+	isDo, err := regexp.MatchString(domain.VBScriptDoPattern, str)
+	if err != nil {
+		fmt.Printf("err: %v", err)
+	}
+
+	return isIf || isFor || isDo
 }
 
 func isEndNestStatement(str string) bool {
@@ -84,7 +89,12 @@ func isEndNestStatement(str string) bool {
 		fmt.Printf("err: %v", err)
 	}
 
-	return isEndIf || isNext
+	isLoop, err := regexp.MatchString(domain.VBScriptLoopPattern, str)
+	if err != nil {
+		fmt.Printf("err: %v", err)
+	}
+
+	return isEndIf || isNext || isLoop
 }
 
 func isIncrementStatement(str string) bool {

test/do_statements_test.go

@@ -0,0 +1,31 @@
+package test_test
+
+import (
+	"testing"
+
+	"github.com/st-tech/refactoring-conductor/domain"
+	"github.com/st-tech/refactoring-conductor/internal"
+)
+
+func TestDoStatements(t *testing.T) {
+	tests := []struct {
+		filename      string
+		expectedValue int
+	}{
+		{"testdata/do/do.vbs", 1},
+		{"testdata/do/do_while.vbs", 1},
+		{"testdata/do/do_until.vbs", 1},
+		{"testdata/do/do_nest.vbs", 3},
+		{"testdata/do/do_multi.vbs", 2},
+		{"testdata/do/do_whitespace.vbs", 2},
+		{"testdata/do/do_triple_nest.vbs", 6},
+	}
+	for _, test := range tests {
+		vbscript := domain.VBScript{}
+		internal.Read(test.filename, &vbscript)
+
+		if test.expectedValue != vbscript.CognitiveComplexity {
+			t.Errorf("wrong cognitive complexity output: got %v, expected %v (%s)", vbscript.CognitiveComplexity, test.expectedValue, test.filename)
+		}
+	}
+}

test/testdata/do/do.vbs

@@ -0,0 +1,3 @@
+Do ' +1
+    index += 1
+Loop While index <= 10

test/testdata/do/do_multi.vbs

@@ -0,0 +1,7 @@
+Do Until index > 10 ' +1
+    index += 1
+Loop
+
+Do ' +1
+    index += 1
+Loop While index <= 10

test/testdata/do/do_nest.vbs

@@ -0,0 +1,6 @@
+Do ' +1
+    index += 1
+    Do While j <= 10 ' +2
+        j += 1
+    Loop
+Loop While index <= 10

test/testdata/do/do_triple_nest.vbs

@@ -0,0 +1,10 @@
+Do ' +1
+    index += 1
+    Do While j <= 10 ' +2
+        Do ' +3
+            k += 1
+            doTest += 1
+        Loop Until k > 10
+        j += 1
+    Loop
+Loop While index <= 10

test/testdata/do/do_until.vbs

@@ -0,0 +1,3 @@
+Do Until index > 10 ' +1
+    index += 1
+Loop

test/testdata/do/do_while.vbs

@@ -0,0 +1,3 @@
+Do While index <= 10 ' +1
+    index += 1
+Loop

test/testdata/do/do_whitespace.vbs

@@ -0,0 +1,7 @@
+Do Until index > 10 ' +1
+    index += 1
+Loop ' whitespace check
+
+Do ' +1
+    index += 1
+Loop While index <= 10