Merge pull request #34 from widmogrod/feature/make-inf-more-robust

Make variant inference intensive to --name or -name
widmogrod · Jan 3, 2023 · 69cec26 · 69cec26
2 parents ab87b34 + 5b9493d
commit 69cec26
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 37 deletions.
diff --git a/example/calculator_example.go b/example/calculator_example.go
@@ -1,6 +1,6 @@
 package example
 
-//go:generate go run ../cmd/mkunion/main.go --name=Calc --types=Lit,Sum,Mul
+//go:generate go run ../cmd/mkunion/main.go --name=Calc
 type (
 	Lit struct{ V int }
 	Sum struct{ Left, Right Calc }

diff --git a/example/simple_example.go b/example/simple_example.go
@@ -1,6 +1,6 @@
 package example
 
-//go:generate go run ../cmd/mkunion/main.go -name=Vehicle -types=Plane,Car,Boat
+//go:generate go run ../cmd/mkunion/main.go -name=Vehicle
 type (
 	Car   struct{}
 	Plane struct{}

diff --git a/example/simple_example_mkunion_vehicle_default_reducer.go b/example/simple_example_mkunion_vehicle_default_reducer.go
diff --git a/example/simple_example_mkunion_vehicle_default_visitor.go b/example/simple_example_mkunion_vehicle_default_visitor.go
diff --git a/example/simple_example_mkunion_vehicle_reducer_bfs.go b/example/simple_example_mkunion_vehicle_reducer_bfs.go
diff --git a/example/simple_example_mkunion_vehicle_reducer_dfs.go b/example/simple_example_mkunion_vehicle_reducer_dfs.go
diff --git a/example/simple_example_mkunion_vehicle_visitor.go b/example/simple_example_mkunion_vehicle_visitor.go
diff --git a/example/tree_example.go b/example/tree_example.go
@@ -1,6 +1,6 @@
 package example
 
-//go:generate go run ../cmd/mkunion/main.go -name=Tree -types=Branch,Leaf
+//go:generate go run ../cmd/mkunion/main.go -name=Tree
 type (
 	Branch struct{ L, R Tree }
 	Leaf   struct{ Value int }

diff --git a/example/where_predicate_example.go b/example/where_predicate_example.go
@@ -1,6 +1,6 @@
 package example
 
-//go:generate go run ../cmd/mkunion/main.go -name=WherePredicate -types=Eq,And,Or,Path
+//go:generate go run ../cmd/mkunion/main.go -name=WherePredicate
 type (
 	Eq   struct{ V interface{} }
 	And  []WherePredicate

diff --git a/infer_defaults.go b/infer_defaults.go
@@ -25,7 +25,7 @@ func InferFromFile(filename string) (*InferredInfo, error) {
 }
 
 var (
-	matchGoGenerateExtractUnionName = regexp.MustCompile(`go:generate .* -name=(\w+)`)
+	matchGoGenerateExtractUnionName = regexp.MustCompile(`go:generate .* -{1,2}name=(\w+)`)
 )
 
 type InferredInfo struct {
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,7 @@ func InferFromFile(filename string) (*InferredInfo, error) { @@
     }
     var (
-    	matchGoGenerateExtractUnionName = regexp.MustCompile(`go:generate .* -name=(\w+)`)
+    	matchGoGenerateExtractUnionName = regexp.MustCompile(`go:generate .* -{1,2}name=(\w+)`)
     )
     type InferredInfo struct {
@@ Expand Down @@