some style clean up

Fault-lang · Feb 3, 2022 · b53cc34 · b53cc34
1 parent 76323e1
commit b53cc34
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 15 deletions.
diff --git a/go.mod b/go.mod
@@ -4,7 +4,6 @@ go 1.14
 
 require (
 	github.com/antlr/antlr4 v0.0.0-20210127041528-be7bc5d81b91
-	github.com/fatih/color v1.10.0
 	github.com/llir/ll v0.0.0-20210426224459-a0543cd69183 // indirect
 	github.com/llir/llvm v0.3.3
 	github.com/olekukonko/tablewriter v0.0.5

diff --git a/go.sum b/go.sum
@@ -7,8 +7,6 @@ github.com/antlr/antlr4 v0.0.0-20210127041528-be7bc5d81b91/go.mod h1:T7PbCXFs94r
 github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg=
-github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
 github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g=
@@ -31,10 +29,6 @@ github.com/llir/ll v0.0.0-20210426224459-a0543cd69183 h1:WNFJh/ifKou10AcIrpEiLTL
 github.com/llir/ll v0.0.0-20210426224459-a0543cd69183/go.mod h1:8W5HJz80PitAyPZUpOcljQxTu6LD5YKW1URTo+OjVoc=
 github.com/llir/llvm v0.3.3 h1:MIoiY0L1+cXn5xIPoTIabiJsiVs11/Pmg1XAY8DqdXU=
 github.com/llir/llvm v0.3.3/go.mod h1:2a5gsxl6FHDMmjCPukrHL5WkjuySxHliNtxQ8zC2RMY=
-github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
-github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mewmew/float v0.0.0-20201204173432-505706aa38fa h1:R27wrYHe8Zik4z/EV8xxfoH3cwMJw3qI4xsI3yYkGDQ=
@@ -86,8 +80,6 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210304124612-50617c2ba197/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

diff --git a/llvm/alloc.go b/llvm/alloc.go
@@ -44,7 +44,7 @@ func (c *Compiler) allocVariable(id []string, val value.Value, pos []int) {
 	switch v := val.(type) {
 	case *constant.CharArray:
 		l := uint64(len(v.X))
-		alloc = c.contextBlock.NewAlloca(&irtypes.ArrayType{"string", l, irtypes.I8})
+		alloc = c.contextBlock.NewAlloca(&irtypes.ArrayType{TypeName: "string", Len: l, ElemType: irtypes.I8})
 		alloc.SetName(name)
 		store = c.contextBlock.NewStore(v, alloc)
 	case *constant.Int:

diff --git a/llvm/compiler.go b/llvm/compiler.go
@@ -519,7 +519,7 @@ func (c *Compiler) getInstances(ex ast.Expression) map[string][]string {
 
 func (c *Compiler) generateOrder(pairs map[string]ast.Node) []string {
 	keys := []string{}
-	for k, _ := range pairs {
+	for k := range pairs {
 		if k != "___base" {
 			keys = append(keys, k)
 		}
@@ -1095,7 +1095,3 @@ func evalInt(i1 int64, i2 int64, op string) int64 {
 }
 
 type Panic string
-
-func compilePanic(message string) {
-	panic(Panic(fmt.Sprintf("compile panic: %s\n", message)))
-}