Merge pull request #2 from boyter/master

update code
boyter · Jul 17, 2021 · e752e09 · e752e09
2 parents a9f1b58 + 6130432
commit e752e09
Show file tree

Hide file tree

Showing 20 changed files with 176 additions and 91 deletions.
diff --git a/LANGUAGES.md b/LANGUAGES.md
@@ -231,7 +231,7 @@ Verilog (vg,vh,v)
 Verilog Args File (irunargs,xrunargs)
 Vertex Shader File (vsh)
 VHDL (vhd,vhdl)
-Vim Script (vim)
+Vim Script (vim,vimrc,gvimrc,_vimrc,.vimrc,_gvimrc,.gvimrc,vimrc,gvimrc)
 Visual Basic (vb)
 Visual Basic for Applications (cls)
 Vue (vue)

diff --git a/README.md b/README.md
@@ -691,7 +691,7 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/boyter/scc/processor"
+	"github.com/boyter/scc/v3/processor"
 )
 
 type statsProcessor struct{}

diff --git a/SCC-OUTPUT-REPORT.html b/SCC-OUTPUT-REPORT.html
@@ -11,13 +11,13 @@
 	</tr></thead>
 	<tbody><tr>
 		<th>Go</th>
-		<th>34</th>
-		<th>8548</th>
-		<th>1396</th>
-		<th>398</th>
-		<th>6754</th>
-		<th>1392</th>
-		<th>335679</th>
+		<th>43</th>
+		<th>8670</th>
+		<th>1437</th>
+		<th>404</th>
+		<th>6829</th>
+		<th>1377</th>
+		<th>337105</th>
 	</tr><tr>
 		<th>Java</th>
 		<th>24</th>
@@ -39,21 +39,21 @@
 	</tr><tr>
 		<th>Markdown</th>
 		<th>11</th>
-		<th>1275</th>
-		<th>309</th>
+		<th>1282</th>
+		<th>312</th>
 		<th>0</th>
-		<th>966</th>
+		<th>970</th>
 		<th>0</th>
-		<th>52209</th>
+		<th>52379</th>
 	</tr><tr>
 		<th>Python</th>
-		<th>9</th>
-		<th>350</th>
-		<th>20</th>
-		<th>20</th>
-		<th>310</th>
-		<th>32</th>
-		<th>10072</th>
+		<th>10</th>
+		<th>368</th>
+		<th>31</th>
+		<th>198</th>
+		<th>139</th>
+		<th>53</th>
+		<th>10706</th>
 	</tr><tr>
 		<th>CSS</th>
 		<th>5</th>
@@ -74,13 +74,13 @@
 		<th>3425</th>
 	</tr><tr>
 		<th>YAML</th>
-		<th>4</th>
-		<th>78</th>
+		<th>5</th>
+		<th>482</th>
 		<th>13</th>
-		<th>20</th>
-		<th>45</th>
+		<th>21</th>
+		<th>448</th>
 		<th>0</th>
-		<th>2153</th>
+		<th>7372</th>
 	</tr><tr>
 		<th>gitignore</th>
 		<th>4</th>
@@ -93,21 +93,39 @@
 	</tr><tr>
 		<th>Shell</th>
 		<th>3</th>
-		<th>1073</th>
-		<th>142</th>
-		<th>84</th>
-		<th>847</th>
+		<th>1084</th>
+		<th>144</th>
+		<th>86</th>
+		<th>854</th>
 		<th>94</th>
-		<th>38597</th>
+		<th>39018</th>
 	</tr><tr>
 		<th>C#</th>
 		<th>2</th>
 		<th>623</th>
-		<th>58</th>
-		<th>73</th>
-		<th>492</th>
-		<th>26</th>
+		<th>83</th>
+		<th>130</th>
+		<th>410</th>
+		<th>45</th>
 		<th>19739</th>
+	</tr><tr>
+		<th>HTML</th>
+		<th>2</th>
+		<th>1216</th>
+		<th>0</th>
+		<th>0</th>
+		<th>1216</th>
+		<th>0</th>
+		<th>17758</th>
+	</tr><tr>
+		<th>JSON</th>
+		<th>2</th>
+		<th>7230</th>
+		<th>0</th>
+		<th>0</th>
+		<th>7230</th>
+		<th>0</th>
+		<th>110403</th>
 	</tr><tr>
 		<th>JavaServer Pages</th>
 		<th>2</th>
@@ -207,6 +225,15 @@
 		<th>139</th>
 		<th>1</th>
 		<th>6900</th>
+	</tr><tr>
+		<th>C</th>
+		<th>1</th>
+		<th>0</th>
+		<th>0</th>
+		<th>0</th>
+		<th>0</th>
+		<th>0</th>
+		<th>0</th>
 	</tr><tr>
 		<th>C Header</th>
 		<th>1</th>
@@ -225,6 +252,15 @@
 		<th>1</th>
 		<th>0</th>
 		<th>6</th>
+	</tr><tr>
+		<th>CSV</th>
+		<th>1</th>
+		<th>66</th>
+		<th>0</th>
+		<th>0</th>
+		<th>66</th>
+		<th>0</th>
+		<th>1754</th>
 	</tr><tr>
 		<th>Clojure</th>
 		<th>1</th>
@@ -360,24 +396,6 @@
 		<th>10</th>
 		<th>0</th>
 		<th>245</th>
-	</tr><tr>
-		<th>HTML</th>
-		<th>1</th>
-		<th>581</th>
-		<th>0</th>
-		<th>0</th>
-		<th>581</th>
-		<th>0</th>
-		<th>8510</th>
-	</tr><tr>
-		<th>JSON</th>
-		<th>1</th>
-		<th>7206</th>
-		<th>0</th>
-		<th>0</th>
-		<th>7206</th>
-		<th>0</th>
-		<th>100328</th>
 	</tr><tr>
 		<th>Korn Shell</th>
 		<th>1</th>
@@ -459,6 +477,15 @@
 		<th>0</th>
 		<th>0</th>
 		<th>0</th>
+	</tr><tr>
+		<th>SQL</th>
+		<th>1</th>
+		<th>204</th>
+		<th>0</th>
+		<th>0</th>
+		<th>204</th>
+		<th>0</th>
+		<th>23687</th>
 	</tr><tr>
 		<th>Sieve</th>
 		<th>1</th>
@@ -526,9 +553,9 @@
 		<th>Wren</th>
 		<th>1</th>
 		<th>188</th>
-		<th>22</th>
-		<th>35</th>
-		<th>131</th>
+		<th>26</th>
+		<th>37</th>
+		<th>125</th>
 		<th>8</th>
 		<th>3544</th>
 	</tr><tr>
@@ -570,12 +597,12 @@
 	</tr></tbody>
 	<tfoot><tr>
 		<th>Total</th>
-		<th>168</th>
-		<th>25795</th>
-		<th>2957</th>
-		<th>1718</th>
-		<th>21120</th>
-		<th>2343</th>
-    	<th>1779796</th>
+		<th>184</th>
+		<th>27286</th>
+		<th>3043</th>
+		<th>1964</th>
+		<th>22279</th>
+		<th>2368</th>
+    	<th>1832430</th>
 	</tr></tfoot>
 	</table></body></html>
diff --git a/examples/ignore/ignorefile.txt b/examples/ignore/ignorefile.txt
diff --git a/examples/issue260/test.c b/examples/issue260/test.c
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/boyter/scc
+module github.com/boyter/scc/v3
 
 go 1.14
 

diff --git a/languages.json b/languages.json
@@ -22,6 +22,39 @@
     ],
     "multi_line": [],
     "quotes": []
+  },
+    "APL": {
+    "complexitychecks": [
+      ":For ",
+      ":If ",
+      ":Case ",
+      ":CaseList ",
+      ":While ",
+      ":Repeat ",
+      ":Else ",
+      "∨",
+      "∧",
+      "≠",
+      "~",
+      "¨",
+      "="
+    ],
+    "extensions": [
+      "apl",
+      "aplf",
+      "apln",
+      "aplc"
+    ],
+    "line_comment": [
+      "⍝"
+    ],
+    "multi_line": [],
+    "quotes": [
+      {
+        "end": "'",
+        "start": "'"
+      }
+    ]
   },
   "ASP": {
     "complexitychecks": [
@@ -2440,6 +2473,8 @@
   },
   "Go": {
     "complexitychecks": [
+      "go ",
+      "defer ",
       "for ",
       "for(",
       "if ",
@@ -4838,15 +4873,28 @@
     "complexitychecks": [
       "for ",
       "for(",
+      "while ",
+      "while(",
       "if ",
       "if(",
-      "switch ",
-      "while ",
+      "elif ",
+      "elif(",
       "else ",
+      "else:",
+      "match ",
+      "match(",
+      "try ",
+      "try:",
+      "except ",
+      "except(",
+      "finally ",
+      "finally:",
+      "with ",
+      "with (",
       "and ",
+      "and(",
       "or ",
-      "not ",
-      "in "
+      "or("
     ],
     "extensions": [
       "py"

diff --git a/main.go b/main.go
@@ -4,7 +4,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/boyter/scc/processor"
+	"github.com/boyter/scc/v3/processor"
 	"github.com/spf13/cobra"
 	"os"
 )

diff --git a/processor/bloom.go b/processor/bloom.go
@@ -29,7 +29,7 @@ func BloomHash(b byte) uint64 {
 	// filter.
 	var hash uint64
 	for i := uint64(0); i < 3; i++ {
-		n := k >> (i*8) & mask64
+		n := k >> (i * 8) & mask64
 		hash |= 1 << n
 	}
 

diff --git a/processor/constants.go b/processor/constants.go
diff --git a/processor/file.go b/processor/file.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/boyter/scc/processor/gitignore"
+	"github.com/boyter/scc/v3/processor/gitignore"
 	"github.com/dbaggerman/cuba"
 )
 

diff --git a/processor/processor.go b/processor/processor.go
@@ -545,7 +545,7 @@ func Process() {
 	if FileOutput == "" {
 		fmt.Println(result)
 	} else {
-		_ = ioutil.WriteFile(FileOutput, []byte(result), 0600)
+		_ = ioutil.WriteFile(FileOutput, []byte(result), 0644)
 		fmt.Println("results written to " + FileOutput)
 	}
 }
diff --git a/processor/state_blank.go b/processor/state_blank.go
@@ -1,6 +1,6 @@
 package processor
 
-type StateBlank struct {}
+type StateBlank struct{}
 
 func (state *StateBlank) String() string {
 	return "blank"

diff --git a/processor/state_code.go b/processor/state_code.go
@@ -1,6 +1,6 @@
 package processor
 
-type StateCode struct {}
+type StateCode struct{}
 
 func (state *StateCode) String() string {
 	return "code"

diff --git a/processor/state_comment_multi.go b/processor/state_comment_multi.go
@@ -1,7 +1,7 @@
 package processor
 
 type StateCommentMulti struct {
-	Stack     [][]byte
+	Stack [][]byte
 }
 
 func (state *StateCommentMulti) String() string {