Skip to content

chores: refactor internal build to call peg via "go tool" #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pointlander merged 4 commits into from
May 19, 2026
Merged

chores: refactor internal build to call peg via "go tool" #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d248aa
go.mod: add ourself as a tool
dolmen May 18, 2026
051eba3
Use "go tool peg" in "//go:generate" lines in grammars
dolmen May 18, 2026
b2d54e2
generate-grammars.bash: simplify
dolmen May 18, 2026
1a1f508
bootstrap.bash: use 'go tool peg' to run peg
dolmen May 18, 2026
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
3 changes: 1 addition & 2 deletions bootstrap.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,4 @@ rm -f peg-bootstrap.peg.go
# Build peg
cd ../..
./cmd/peg-bootstrap/peg-bootstrap < peg.peg > peg.peg.go
go build
./peg -inline -switch peg.peg
go tool peg -inline -switch peg.peg
9 changes: 1 addition & 8 deletions generate-grammars.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
#!/bin/bash

set -Eeuo pipefail

(cd grammars/c/ && go generate)
(cd grammars/calculator/ && go generate)
(cd grammars/calculatorast/ && go generate)
(cd grammars/fexl/ && go generate)
(cd grammars/java/ && go generate)
(cd grammars/longtest/ && go generate)
exec go generate "$@" ./grammars/...
2 changes: 2 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
module github.com/pointlander/peg

go 1.25

tool github.com/pointlander/peg
2 changes: 1 addition & 1 deletion grammars/c/c_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

//go:generate ../../peg -switch -inline c.peg
//go:generate go tool peg -switch -inline c.peg

package c

Expand Down
2 changes: 1 addition & 1 deletion grammars/calculator/calculator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

//go:generate ../../peg -switch -inline calculator.peg
//go:generate go tool peg -switch -inline calculator.peg

package calculator

Expand Down
2 changes: 1 addition & 1 deletion grammars/calculatorast/calculator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

//go:generate ../../peg -switch -inline calculator.peg
//go:generate go tool peg -switch -inline calculator.peg

package calculatorast

Expand Down
2 changes: 1 addition & 1 deletion grammars/fexl/fexl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

//go:generate ../../peg -switch -inline fexl.peg
//go:generate go tool peg -switch -inline fexl.peg

package fexl

Expand Down
2 changes: 1 addition & 1 deletion grammars/java/java_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

//go:generate ../../peg -switch -inline java_1_7.peg
//go:generate go tool peg -switch -inline java_1_7.peg

package java

Expand Down
2 changes: 1 addition & 1 deletion grammars/longtest/long_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

//go:generate ../../peg -switch -inline long.peg
//go:generate go tool peg -switch -inline long.peg

package longtest

Expand Down