Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 0 additions & 69 deletions Godeps/Godeps.json

This file was deleted.

5 changes: 0 additions & 5 deletions Godeps/Readme

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Cross platform compiler for Sass
# Usage

``` shell
go get -u github.com/wellington/sass/sass
GO111MODULE=on go get github.com/wellington/sass/sass
```

``` shell
Expand Down
2 changes: 1 addition & 1 deletion ast/calc.go
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ func otherOp(op token.Token, x, y *BasicLit, combine bool) (*BasicLit, error) {
case y.Kind == token.INT || y.Kind == token.FLOAT:
default:
if op == token.MUL {
return nil, fmt.Errorf("unsupported operation: %s %s %s", x, op, y)
return nil, fmt.Errorf("unsupported operation: %v %v %v", x, op, y)
}
}

Expand Down
2 changes: 1 addition & 1 deletion ast/convert.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func ToValue(expr Expr, keys ...string) Expr {
return val
}
default:
log.Printf("failed to cast % #v\n")
log.Printf("failed to cast %#v\n", v)
}
return nil
}
6 changes: 3 additions & 3 deletions ast/unit/convert_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func TestSub(t *testing.T) {
t.Errorf("got: %s wanted: %s", samp[0].Unit, x.Unit)
}
if e := decimal.NewFromFloat(0.0); e.Cmp(x.dec) != 0 {
t.Errorf("got: %f wanted: %f", x.dec, e)
t.Errorf("got: %v wanted: %v", x.dec, e)
}
}
}
Expand All @@ -68,7 +68,7 @@ func TestMul(t *testing.T) {
t.Errorf("got: %s wanted: %s", samp[0].Unit, x.Unit)
}
if e := decimal.NewFromFloat(1.0); e.Cmp(x.dec) != 0 {
t.Errorf("got: %f wanted: %f", x.dec, e)
t.Errorf("got: %v wanted: %v", x.dec, e)
}
}
}
Expand All @@ -81,7 +81,7 @@ func TestDiv(t *testing.T) {
t.Errorf("got: %s wanted: %s", samp[0].Unit, x.Unit)
}
if e := decimal.NewFromFloat(1.0); e.Cmp(x.dec) != 0 {
t.Errorf("got: %f wanted: %f", x.dec, e)
t.Errorf("got: %v wanted: %v", x.dec, e)
}
}
}
20 changes: 20 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
module github.com/wellington/sass

go 1.14

require (
github.com/BurntSushi/toml v0.1.1-0.20160102144748-5c4df71dfe9a
github.com/hashicorp/hcl v0.0.0-20160119202737-578dd9746824
github.com/kr/pretty v0.0.0-20150520163514-e6ac2fc51e89
github.com/kr/text v0.0.0-20150905224508-bb797dc4fb83
github.com/magiconair/properties v1.6.1-0.20151221213149-c81f9d71af8f
github.com/mitchellh/mapstructure v0.0.0-20150717051158-281073eb9eb0
github.com/shopspring/decimal v0.0.0-20160311124526-74d668a796fa
github.com/spf13/cast v0.0.0-20151218135219-ee7b3e035316
github.com/spf13/cobra v0.0.0-20160117030938-8e91712f174c
github.com/spf13/jwalterweatherman v0.0.0-20151231185856-d00654080cdd
github.com/spf13/pflag v0.0.0-20151218134703-7f60f83a2c81
github.com/spf13/viper v0.0.0-20160111150723-a212099cbe6f
gopkg.in/fsnotify.v1 v1.2.9
gopkg.in/yaml.v2 v2.0.0-20150224225758-49c95bdc2184
)
28 changes: 28 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
github.com/BurntSushi/toml v0.1.1-0.20160102144748-5c4df71dfe9a h1:xrUE5z0ZdXKgezv7ImgqXATQ+tMal+fdF8fE7SE+gJA=
github.com/BurntSushi/toml v0.1.1-0.20160102144748-5c4df71dfe9a/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/hashicorp/hcl v0.0.0-20160119202737-578dd9746824 h1:HVcjV7by+C4mSaxWw8MJO9Ig1pA1OUqwGtE+N901118=
github.com/hashicorp/hcl v0.0.0-20160119202737-578dd9746824/go.mod h1:oZtUIOe8dh44I2q6ScRibXws4Ajl+d+nod3AaR9vL5w=
github.com/kr/pretty v0.0.0-20150520163514-e6ac2fc51e89 h1:Smt4CPhAnATQEGlX/nyqGETX4Tj8bg/7shBT5gH8d7s=
github.com/kr/pretty v0.0.0-20150520163514-e6ac2fc51e89/go.mod h1:Bvhd+E3laJ0AVkG0c9rmtZcnhV0HQ3+c3YxxqTvc/gA=
github.com/kr/text v0.0.0-20150905224508-bb797dc4fb83 h1:zIzxNaBxRxmbPPCgya4J5KccVN23qXA/V75oApRNahI=
github.com/kr/text v0.0.0-20150905224508-bb797dc4fb83/go.mod h1:sjUstKUATFIcff4qlB53Kml0wQPtJVc/3fWrmuUmcfA=
github.com/magiconair/properties v1.6.1-0.20151221213149-c81f9d71af8f h1:i0qIYnnNb+u80O3KUCNlVOFezoKlKg1J96/XzTILLnI=
github.com/magiconair/properties v1.6.1-0.20151221213149-c81f9d71af8f/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
github.com/mitchellh/mapstructure v0.0.0-20150717051158-281073eb9eb0 h1:6VeKv8nNMVKA6qmZLYnPTx0tJ//NbDj1SbubWIikJ9k=
github.com/mitchellh/mapstructure v0.0.0-20150717051158-281073eb9eb0/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
github.com/shopspring/decimal v0.0.0-20160311124526-74d668a796fa h1:gFq7Y8hi9/SqWL91P43mCigM3uUkyNnq5rf3+1GGZAI=
github.com/shopspring/decimal v0.0.0-20160311124526-74d668a796fa/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
github.com/spf13/cast v0.0.0-20151218135219-ee7b3e035316 h1:ewDvguiDYTmhbP+hILV+IplQQM88stMcBcjFOPV7lSE=
github.com/spf13/cast v0.0.0-20151218135219-ee7b3e035316/go.mod h1:r2rcYCSwa1IExKTDiTfzaxqT2FNHs8hODu4LnUfgKEg=
github.com/spf13/cobra v0.0.0-20160117030938-8e91712f174c h1:/ODmDm3R+Y64VFQ1uI4byBgBdkqSVNmMYFoSjk2ZEDE=
github.com/spf13/cobra v0.0.0-20160117030938-8e91712f174c/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
github.com/spf13/jwalterweatherman v0.0.0-20151231185856-d00654080cdd h1:9bF+yGiaGsgj11cktC7g+ir97H+vzvSvXv6asp/f0rs=
github.com/spf13/jwalterweatherman v0.0.0-20151231185856-d00654080cdd/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
github.com/spf13/pflag v0.0.0-20151218134703-7f60f83a2c81 h1:e8OMOPK+iXlzdnq5GOtSZDnw9HJi1faEKhCoEIxVUrY=
github.com/spf13/pflag v0.0.0-20151218134703-7f60f83a2c81/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
github.com/spf13/viper v0.0.0-20160111150723-a212099cbe6f h1:T1rEZOdhsGHqU9MsaeM++g5Q89YaqJBFmA0Smj9bj6E=
github.com/spf13/viper v0.0.0-20160111150723-a212099cbe6f/go.mod h1:A8kyI5cUJhb8N+3pkfONlcEcZbueH6nhAm0Fq7SrnBM=
gopkg.in/fsnotify.v1 v1.2.9 h1:sQ4u2nqc93srqGq6uKE2mzSxC2XJF34qBut5caJJUQw=
gopkg.in/fsnotify.v1 v1.2.9/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
gopkg.in/yaml.v2 v2.0.0-20150224225758-49c95bdc2184 h1:KB2Ivedb+azEd6clzE91FFyZ1ifGv+UKRUt71KmvREw=
gopkg.in/yaml.v2 v2.0.0-20150224225758-49c95bdc2184/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
6 changes: 3 additions & 3 deletions parser/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ func (p *parser) pop() error {
if ferr != nil {
log.Println("abs fail", err)
}
err = fmt.Errorf("failed to read: %s", err, abs)
err = fmt.Errorf("failed to read %s: %v", abs, err)
return err
}
if p.queue != nil {
Expand Down Expand Up @@ -1332,7 +1332,7 @@ func (p *parser) tryVarType(isParam bool) ast.Expr {
}
return typ
} else if p.tok == token.INTERP {
log.Fatalf("interp!", p.lit)
log.Fatalf("interp! %v", p.lit)
}

return p.tryIdentOrType()
Expand Down Expand Up @@ -3080,7 +3080,7 @@ func (p *parser) processFuncArgs(scope *ast.Scope, signature *ast.FieldList, arg

for k, v := range toDeclare {
if k == nil {
fmt.Printf("FIXME: nil declaration...", k)
fmt.Printf("FIXME: nil declaration... %v", k)
astPrint(v)
continue
}
Expand Down
2 changes: 0 additions & 2 deletions sass/cmd/compile.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ Usage: sass compile file.scss
err error
)
if len(outFile) > 0 {
err = compiler.File(file, outFile)
} else {
s, err = compiler.Run(file)
}

Expand Down
2 changes: 1 addition & 1 deletion scanner/scanner.go
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ L:
var queue []prefetch
defer func() {
if e := recover(); e != nil {
fmt.Printf("stack %q\n", queue)
fmt.Printf("stack %v\n", queue)
panic(e)
}
}()
Expand Down
5 changes: 0 additions & 5 deletions vendor/github.com/BurntSushi/toml/.gitignore

This file was deleted.

12 changes: 0 additions & 12 deletions vendor/github.com/BurntSushi/toml/.travis.yml

This file was deleted.

3 changes: 0 additions & 3 deletions vendor/github.com/BurntSushi/toml/COMPATIBLE

This file was deleted.

14 changes: 0 additions & 14 deletions vendor/github.com/BurntSushi/toml/COPYING

This file was deleted.

19 changes: 0 additions & 19 deletions vendor/github.com/BurntSushi/toml/Makefile

This file was deleted.

Loading