Skip to content

Commit

Permalink
Fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
fpotier committed Jul 16, 2024
1 parent 016feb6 commit aa690bc
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 30 deletions.
File renamed without changes.
6 changes: 3 additions & 3 deletions .github/workflows/golangci-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: '1.20'
cache: false
go-version: stable
cache-dependency-path: go/go.sum
- name: golangci-lint
uses: golangci/golangci-lint-action@v6
with:
install-mode: "goinstall"
version: latest
version: v1.59
working-directory: go
args: --config="${GITHUB_WORKSPACE}/go/.golangci.yaml"
2 changes: 1 addition & 1 deletion go/cmd/glox/glox_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const TestDirectory = "../../../test/"
func TestRunFile(t *testing.T) {
t.Parallel()

err := filepath.WalkDir(TestDirectory, func(path string, d fs.DirEntry, err error) error {
err := filepath.WalkDir(TestDirectory, func(path string, _ fs.DirEntry, _ error) error {
pattern := regexp.MustCompile("^.*expect: (.*)$")

t.Run(path, func(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion go/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/fpotier/lox/go

go 1.20
go 1.21

require github.com/sean-/sysexits v1.0.0

Expand Down
7 changes: 5 additions & 2 deletions go/pkg/ast/loxvalue.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package ast

import "fmt"
import (
"fmt"
"strconv"
)

type Kind uint8

Expand Down Expand Up @@ -35,7 +38,7 @@ func NewBooleanValue(v bool) *BooleanValue {
}
func (b BooleanValue) Kind() Kind { return Boolean }
func (b BooleanValue) IsTruthy() bool { return b.Value }
func (b BooleanValue) String() string { return fmt.Sprintf("%v", b.Value) }
func (b BooleanValue) String() string { return strconv.FormatBool(b.Value) }
func (b BooleanValue) Equals(v LoxValue) bool {
if v, ok := v.(*BooleanValue); ok {
return b.Value == v.Value
Expand Down
42 changes: 21 additions & 21 deletions go/pkg/ast/visitor.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,26 @@ type Statement interface {
}

type Visitor interface {
VisitAssignmentExpression(*AssignmentExpression)
VisitBinaryExpression(*BinaryExpression)
VisitCallExpression(*CallExpression)
VisitGetExpression(*GetExpression)
VisitGroupingExpression(*GroupingExpression)
VisitLiteralExpression(*LiteralExpression)
VisitLogicalExpression(*LogicalExpression)
VisitSetExpression(*SetExpression)
VisitSuperExpression(*SuperExpression)
VisitThisExpression(*ThisExpression)
VisitUnaryExpression(*UnaryExpression)
VisitVariableExpression(*VariableExpression)
VisitAssignmentExpression(assignementExpression *AssignmentExpression)
VisitBinaryExpression(binaryExpression *BinaryExpression)
VisitCallExpression(callExpression *CallExpression)
VisitGetExpression(getExpression *GetExpression)
VisitGroupingExpression(groupingExpression *GroupingExpression)
VisitLiteralExpression(literalExpression *LiteralExpression)
VisitLogicalExpression(logicalExpression *LogicalExpression)
VisitSetExpression(setExpression *SetExpression)
VisitSuperExpression(superExpression *SuperExpression)
VisitThisExpression(thisExpression *ThisExpression)
VisitUnaryExpression(unaryExpression *UnaryExpression)
VisitVariableExpression(variableExpression *VariableExpression)

VisitBlockStatement(*BlockStatement)
VisitClassStatement(*ClassStatement)
VisitExpressionStatement(*ExpressionStatement)
VisitFunctionStatement(*FunctionStatement)
VisitIfStatement(*IfStatement)
VisitPrintStatement(*PrintStatement)
VisitReturnStatement(*ReturnStatement)
VisitVariableStatement(*VariableStatement)
VisitWhileStatement(*WhileStatement)
VisitBlockStatement(blockStatement *BlockStatement)
VisitClassStatement(classStatement *ClassStatement)
VisitExpressionStatement(expressionStatement *ExpressionStatement)
VisitFunctionStatement(functionStatement *FunctionStatement)
VisitIfStatement(ifStatement *IfStatement)
VisitPrintStatement(printStatement *PrintStatement)
VisitReturnStatement(returnStatement *ReturnStatement)
VisitVariableStatement(variableStatement *VariableStatement)
VisitWhileStatement(whileStatement *WhileStatement)
}
2 changes: 1 addition & 1 deletion go/pkg/lexer/token.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func (t *Token) String() string {
return fmt.Sprintf("%v (value:%v)", tokenRepresentation[t.Type], t.Literal.String())
}

return fmt.Sprintf("%v", tokenRepresentation[t.Type])
return tokenRepresentation[t.Type]
}

const (
Expand Down
2 changes: 1 addition & 1 deletion go/pkg/runtime/loxcallable.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package runtime
import "github.com/fpotier/lox/go/pkg/ast"

type LoxCallable interface {
Call(*Interpreter, []ast.LoxValue) ast.LoxValue
Call(interpreter *Interpreter, arguments []ast.LoxValue) ast.LoxValue
Arity() int
}

Expand Down

0 comments on commit aa690bc

Please sign in to comment.