Skip to content

bootstrap: refactor bootstrap tool for output on stdout #202

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 1 commit into from
May 24, 2026
+10 −23
Merged

bootstrap: refactor bootstrap tool for output on stdout #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions bootstrap.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ rm -f bootstrap/bootstrap.peg.go
cd cmd/peg-bootstrap

# Remove artefacts from a previous incomplete build
rm -f bootstrap.peg.go peg[123].peg.go peg-bootstrap.peg.go
# Remove binaries produced by previous versions of the build
rm -f peg[0123] peg-bootstrap
rm -f peg[0123].peg.go peg-bootstrap.peg.go
# Remove files produced by previous versions of the build
rm -f peg[0123] peg-bootstrap bootstrap.peg.go

go run ../../bootstrap
go run -tags bootstrap main.go bootstrap.peg.go < bootstrap.peg > peg1.peg.go
go run ../../bootstrap > peg0.peg.go
go run -tags bootstrap main.go peg0.peg.go < bootstrap.peg > peg1.peg.go
go run -tags bootstrap main.go peg1.peg.go < peg.bootstrap.peg > peg2.peg.go
go run -tags bootstrap main.go peg2.peg.go < ../../peg.peg > peg3.peg.go
go run -tags bootstrap main.go peg3.peg.go < ../../peg.peg > peg-bootstrap.peg.go
go run -tags bootstrap main.go peg-bootstrap.peg.go < ../../peg.peg > ../../peg.peg.go

# Remove artefacts from the build
rm -f bootstrap.peg.go peg[123].peg.go peg-bootstrap.peg.go
rm -f peg[0123].peg.go peg-bootstrap.peg.go

# Final rebuild
cd ../..
Expand Down
21 changes: 4 additions & 17 deletions bootstrap/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,13 @@
package main

import (
"log"
"fmt"
"os"

"github.com/pointlander/peg/tree"
)

func main() {
log.SetFlags(0)

t := tree.New(true, true, false)

/*package main
Expand Down Expand Up @@ -529,20 +527,9 @@ func main() {
)
})

filename := "bootstrap.peg.go"
out, err := os.OpenFile(filename, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0o644)
if err != nil {
log.Fatalf("%v: %v\n", filename, err)
return
}
defer func() {
err := out.Close()
if err != nil {
log.Fatalf("%v: %v\n", filename, err)
}
}()
err = t.Compile(filename, os.Args, out)
err := t.Compile("", os.Args, os.Stdout)
if err != nil {
log.Fatalf("%s: %v", filename, err)
fmt.Fprintln(os.Stderr, err)
os.Exit(1)
}
}