add project config

gopherd · Sep 30, 2024 · bac7d38 · bac7d38
1 parent 5e91db4
commit bac7d38
Show file tree

Hide file tree

Showing 15 changed files with 2,343 additions and 836 deletions.
diff --git a/Makefile b/Makefile
@@ -117,7 +117,7 @@ example/gen:
 		-O php=${EXAMPLE_DIR}/gen/php -T php=${EXAMPLE_DIR}/templates/php \
 		-O lua=${EXAMPLE_DIR}/gen/lua -T lua=${EXAMPLE_DIR}/templates/lua \
 		-M "c.vector=void*" -M "c.map=void*" \
-		-s -g ${EXAMPLE_DIR}/grammar.json \
+		-s -g ${EXAMPLE_DIR}/grammar.yaml \
 		${EXAMPLE_DIR}/next/
 	@if [ -d ${EXAMPLE_DIR}/gen/rust ]; then cd ${EXAMPLE_DIR}/gen/rust && cargo init --vcs none -q; fi
 

diff --git a/go.mod b/go.mod
@@ -7,3 +7,5 @@ require (
 	github.com/gopherd/core v0.0.0-20240926071129-6d591f1f639c
 	github.com/mattn/go-shellwords v1.0.12
 )
+
+require gopkg.in/yaml.v3 v3.0.1 // indirect
diff --git a/go.sum b/go.sum
@@ -6,3 +6,6 @@ github.com/gopherd/core v0.0.0-20240926071129-6d591f1f639c h1:jMKV3OIqDnGW6VlIdL
 github.com/gopherd/core v0.0.0-20240926071129-6d591f1f639c/go.mod h1:KfAPtxaKLEFiby8PpGwdgp86auCmLU82+khBzHhUTaM=
 github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk=
 github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/src/compile/annotation.go b/src/compile/annotation.go
@@ -597,8 +597,8 @@ func (c *Compiler) solveAnnotations() error {
 	parser := shellwords.NewParser()
 	parser.ParseEnv = true
 	programs := make(map[string][][]string)
-	keys := make([]string, 0, len(c.flags.solvers))
-	for name, solvers := range c.flags.solvers {
+	keys := make([]string, 0, len(c.options.Solvers))
+	for name, solvers := range c.options.Solvers {
 		if name == "next" {
 			return fmt.Errorf("'next' is a reserved annotation for the next compiler, please don't use solvers for it")
 		}