Merge pull request #8 from apiiro/noy/LIM-24152/addFortranLanguage

Add fortran language to complexity

Author: noy-apiiro

README.md

@@ -118,6 +118,7 @@ Following languages are currently supported:
 * Rust
 * Scala
 * Php
+* Fortran
 
 ### Credits
 

calculate/calculate_test.go

@@ -68,7 +68,9 @@ func TestIncludeExcludePatterns(t *testing.T) {
 	touch(filepath.Join(basePath, "b.js"))
 	touch(filepath.Join(basePath, "src", "svc.java"))
 	touch(filepath.Join(basePath, "src", "api.js"))
+	touch(filepath.Join(basePath, "src", "foo.F15"))
 	touch(filepath.Join(basePath, "src", "nested", "util.js"))
+	touch(filepath.Join(basePath, "src", "nested", "util2.f90"))
 
 	filesCount, err := getFileCount(
 		basePath,
@@ -89,14 +91,16 @@ func TestIncludeExcludePatterns(t *testing.T) {
 		},
 	)
 	r.Nil(err)
-	r.Equal(float64(4), filesCount)
+	r.Equal(float64(6), filesCount)
 
 	filesCount, err = getFileCount(
 		basePath,
 		[]string{},
 		[]string{
 			"*/*.java",
 			"a.js",
+			"**/nested/util2.f90",
+			"**/foo.F15",
 		},
 	)
 	r.Nil(err)
@@ -198,8 +202,8 @@ func TestDogFood(t *testing.T) {
 	inRange(r, total.Lines, 2000, 4000)
 	inRange(r, total.LinesOfCode, 2000, 4000)
 	inRange(r, total.Keywords, 200, 400)
-	inRange(r, total.Indentations, 2500, 3500)
-	inRange(r, total.IndentationsNormalized, 2500, 3500)
+	inRange(r, total.Indentations, 2500, 3700)
+	inRange(r, total.IndentationsNormalized, 2500, 3700)
 	inRange(r, total.IndentationsDiff, 400, 600)
 	inRange(r, total.IndentationsDiffNormalized, 400, 600)
 	inRange(r, total.IndentationsComplexity, 11, 13)
@@ -208,10 +212,10 @@ func TestDogFood(t *testing.T) {
 
 	average := summary.CountersByLanguage["go"].Average
 	inRange(r, average.Lines, 300, 400)
-	inRange(r, average.LinesOfCode, 250, 300)
+	inRange(r, average.LinesOfCode, 250, 330)
 	inRange(r, average.Keywords, 30, 40)
-	inRange(r, average.Indentations, 350, 400)
-	inRange(r, average.IndentationsNormalized, 350, 400)
+	inRange(r, average.Indentations, 350, 420)
+	inRange(r, average.IndentationsNormalized, 350, 420)
 	inRange(r, average.IndentationsDiff, 60, 70)
 	inRange(r, average.IndentationsDiffNormalized, 60, 70)
 	inRange(r, average.IndentationsComplexity, 1, 2)
@@ -2055,3 +2059,59 @@ func TestCountersForPhpFullSample(t *testing.T) {
 	r.Equal(float64(144), math.Round(counters.IndentationsComplexity*100))
 	r.Equal(float64(21), math.Round(counters.IndentationsDiffComplexity*100))
 }
+
+func TestCountersForFortran(t *testing.T) {
+	r := assert.New(t)
+
+	// language=Fortran
+	code := `
+program factorial
+    implicit none
+    integer :: n, fact, i
+
+    ! Prompt user for input
+    print *, "Enter a positive integer:"
+    read *, n
+
+    fact = 1  ! Initialize factorial
+
+    ! Calculate factorial
+    do i = 1, n
+        fact = fact * i
+    end do
+
+    ! Output the result
+    print *, "Factorial of", n, "is", fact
+end program factorial
+`
+	counters, err := getCountersForCode(code, "fortran")
+	r.Nil(err)
+	r.NotNil(counters)
+
+	r.Equal(float64(20), counters.Lines)
+	r.Equal(float64(14), counters.LinesOfCode)
+	r.Equal(float64(8), counters.Keywords)
+	r.Equal(float64(52), counters.Indentations)
+	r.Equal(float64(13), math.Round(counters.IndentationsNormalized))
+	r.Equal(float64(8), math.Round(counters.IndentationsDiff))
+	r.Equal(float64(2), math.Round(counters.IndentationsDiffNormalized))
+}
+
+func TestCountersForFortranFullSample(t *testing.T) {
+	r := assert.New(t)
+
+	counters, err := getCountersForCode(test_resources.FortranCode, "fortran")
+	r.Nil(err)
+	r.NotNil(counters)
+
+	r.Equal(float64(346), counters.Lines)
+	r.Equal(float64(306), counters.LinesOfCode)
+	r.Equal(float64(146), counters.Keywords)
+	r.Equal(float64(2376), counters.Indentations)
+	r.Equal(float64(594), math.Round(counters.IndentationsNormalized))
+	r.Equal(float64(160), math.Round(counters.IndentationsDiff))
+	r.Equal(float64(40), math.Round(counters.IndentationsDiffNormalized))
+	r.Equal(float64(48), math.Round(counters.KeywordsComplexity*100))
+	r.Equal(float64(194), math.Round(counters.IndentationsComplexity*100))
+	r.Equal(float64(13), math.Round(counters.IndentationsDiffComplexity*100))
+}

calculate/keywords.go

@@ -427,6 +427,92 @@ var languageToKeywords = map[Language][]string{
 		"xor",
 		"yield",
 	},
+	"fortran": {
+		"abstract",
+		"allocatable",
+		"allocate",
+		"assign",
+		"associate",
+		"asynchronous",
+		"backspace",
+		"block",
+		"block data",
+		"case",
+		"codimension",
+		"common",
+		"contains",
+		"contiguous",
+		"critical",
+		"cycle",
+		"data",
+		"deallocate",
+		"deferred",
+		"do",
+		"do concurrent",
+		"else",
+		"else if",
+		"end",
+		"endfile",
+		"endif",
+		"entry",
+		"equivalence",
+		"external",
+		"final",
+		"flush",
+		"format",
+		"forall",
+		"function",
+		"generic",
+		"goto",
+		"if",
+		"implicit",
+		"include",
+		"inquire",
+		"intrinsic",
+		"lock",
+		"module",
+		"namelist",
+		"nullify",
+		"only",
+		"operator",
+		"optional",
+		"pause",
+		"pass",
+		"pointer",
+		"procedure",
+		"program",
+		"private",
+		"public",
+		"recursive",
+		"result",
+		"rewrite",
+		"save",
+		"select",
+		"select rank",
+		"sequence",
+		"stop",
+		"submodule",
+		"subroutine",
+		"sync all",
+		"sync images",
+		"sync memory",
+		"target",
+		"then",
+		"use",
+		"volatile",
+		"wait",
+		"while",
+		"write",
+		"impure",
+		"error stop",
+		"non_overridable",
+		"non_recursive",
+		"import (in interfaces)",
+		"element",
+		"elemental",
+		"extend",
+		"enumerator",
+	},
 }
 
 var languagesWithAtSignPrefix = map[Language]bool{

calculate/langauges.go

@@ -17,6 +17,7 @@ var languageToExtensions = map[Language][]string{
 	"rust":       {"rs"},
 	"scala":      {"scala", "sc"},
 	"php":        {"php", "phtml", "php3", "php4", "php5", "php7", "phps", "pht", "phar"},
+	"fortran":    {"f", "for", "f77", "f90", "f95", "f03", "f03p", "f08", "f08p", "f15", "f20", "f18", "f2k", "f2003", "f2008", "f2015", "f2018", "fpp", "ftn", "f05", "F", "FOR", "F77", "F90", "F95", "F03", "F08", "F15", "F18", "F2K", "F2003", "F2015", "F2008", "F2018", "FPP", "FTN"},
 }
 
 var extensionToLanguage = make(map[Language]string)

main.go

@@ -11,7 +11,7 @@ import (
 	"github.com/urfave/cli/v2"
 )
 
-const VERSION = "1.0.7"
+const VERSION = "1.0.8"
 
 func main() {
 	cli.AppHelpTemplate =