lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lang: Plumb through the unified state facility

Browse Source
This commit is contained in:
James Shubin
2024-07-01 14:47:04 -04:00
parent d326917432
commit 4e18c9c67a
6 changed files with 49 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lang/gapi/gapi.go
View File

@@ -49,6 +49,7 @@ import (
"github.com/purpleidea/mgmt/lang/interfaces" "github.com/purpleidea/mgmt/lang/interfaces"
"github.com/purpleidea/mgmt/lang/interpolate" "github.com/purpleidea/mgmt/lang/interpolate"
"github.com/purpleidea/mgmt/lang/parser" "github.com/purpleidea/mgmt/lang/parser"
"github.com/purpleidea/mgmt/lang/types"
"github.com/purpleidea/mgmt/lang/unification" "github.com/purpleidea/mgmt/lang/unification"
"github.com/purpleidea/mgmt/pgraph" "github.com/purpleidea/mgmt/pgraph"
"github.com/purpleidea/mgmt/util" "github.com/purpleidea/mgmt/util"
@@ -290,6 +291,7 @@ func (obj *GAPI) Cli(info *gapi.Info) (*gapi.Deploy, error) {
AST: iast, AST: iast,
Solver: solver, Solver: solver,
Strategy: unificationStrategy, Strategy: unificationStrategy,
UnifiedState: types.NewUnifiedState(),
Debug: debug, Debug: debug,
Logf: unificationLogf, Logf: unificationLogf,
} }

4
lang/interpret_test.go
View File

@@ -60,6 +60,7 @@ import (
"github.com/purpleidea/mgmt/lang/interpolate" "github.com/purpleidea/mgmt/lang/interpolate"
"github.com/purpleidea/mgmt/lang/interpret" "github.com/purpleidea/mgmt/lang/interpret"
"github.com/purpleidea/mgmt/lang/parser" "github.com/purpleidea/mgmt/lang/parser"
"github.com/purpleidea/mgmt/lang/types"
"github.com/purpleidea/mgmt/lang/unification" "github.com/purpleidea/mgmt/lang/unification"
"github.com/purpleidea/mgmt/pgraph" "github.com/purpleidea/mgmt/pgraph"
"github.com/purpleidea/mgmt/util" "github.com/purpleidea/mgmt/util"
@@ -467,6 +468,7 @@ func TestAstFunc1(t *testing.T) {
unifier := &unification.Unifier{ unifier := &unification.Unifier{
AST: iast, AST: iast,
Solver: solver, Solver: solver,
UnifiedState: types.NewUnifiedState(),
Debug: testing.Verbose(), Debug: testing.Verbose(),
Logf: xlogf, Logf: xlogf,
} }
@@ -1043,6 +1045,7 @@ func TestAstFunc2(t *testing.T) {
unifier := &unification.Unifier{ unifier := &unification.Unifier{
AST: iast, AST: iast,
Solver: solver, Solver: solver,
UnifiedState: types.NewUnifiedState(),
Debug: testing.Verbose(), Debug: testing.Verbose(),
Logf: xlogf, Logf: xlogf,
} }
@@ -1851,6 +1854,7 @@ func TestAstFunc3(t *testing.T) {
unifier := &unification.Unifier{ unifier := &unification.Unifier{
AST: iast, AST: iast,
Solver: solver, Solver: solver,
UnifiedState: types.NewUnifiedState(),
Debug: testing.Verbose(), Debug: testing.Verbose(),
Logf: xlogf, Logf: xlogf,
} }

2
lang/lang.go
View File

@@ -49,6 +49,7 @@ import (
"github.com/purpleidea/mgmt/lang/interpolate" "github.com/purpleidea/mgmt/lang/interpolate"
"github.com/purpleidea/mgmt/lang/interpret" "github.com/purpleidea/mgmt/lang/interpret"
"github.com/purpleidea/mgmt/lang/parser" "github.com/purpleidea/mgmt/lang/parser"
"github.com/purpleidea/mgmt/lang/types"
"github.com/purpleidea/mgmt/lang/unification" "github.com/purpleidea/mgmt/lang/unification"
_ "github.com/purpleidea/mgmt/lang/unification/solvers" // import so the solvers register _ "github.com/purpleidea/mgmt/lang/unification/solvers" // import so the solvers register
"github.com/purpleidea/mgmt/pgraph" "github.com/purpleidea/mgmt/pgraph"
@@ -261,6 +262,7 @@ func (obj *Lang) Init(ctx context.Context) error {
AST: obj.ast, AST: obj.ast,
Solver: solver, Solver: solver,
Strategy: obj.Data.UnificationStrategy, Strategy: obj.Data.UnificationStrategy,
UnifiedState: types.NewUnifiedState(),
Debug: obj.Debug, Debug: obj.Debug,
Logf: logf, Logf: logf,
} }

3
lang/unification/interfaces.go
View File

@@ -59,6 +59,9 @@ type Init struct {
// overall cleaner unification algorithm in place. // overall cleaner unification algorithm in place.
Strategy map[string]string Strategy map[string]string
// UnifiedState stores a common representation of our unification vars.
UnifiedState *types.UnifiedState
Debug bool Debug bool
Logf func(format string, v ...interface{}) Logf func(format string, v ...interface{})
} }

1
lang/unification/solvers/unification_test.go
View File

@@ -863,6 +863,7 @@ func TestUnification1(t *testing.T) {
unifier := &unification.Unifier{ unifier := &unification.Unifier{
AST: xast, AST: xast,
Solver: solver, Solver: solver,
UnifiedState: types.NewUnifiedState(),
Debug: debug, Debug: debug,
Logf: logf, Logf: logf,
} }

8
lang/unification/unification.go
View File

@@ -38,6 +38,7 @@ import (
"strings" "strings"
"github.com/purpleidea/mgmt/lang/interfaces" "github.com/purpleidea/mgmt/lang/interfaces"
"github.com/purpleidea/mgmt/lang/types"
) )
// Unifier holds all the data that the Unify function will need for it to run. // Unifier holds all the data that the Unify function will need for it to run.
@@ -52,6 +53,9 @@ type Unifier struct {
// overall cleaner unification algorithm in place. // overall cleaner unification algorithm in place.
Strategy map[string]string Strategy map[string]string
// UnifiedState stores a common representation of our unification vars.
UnifiedState *types.UnifiedState
Debug bool Debug bool
Logf func(format string, v ...interface{}) Logf func(format string, v ...interface{})
} }
@@ -75,12 +79,16 @@ func (obj *Unifier) Unify(ctx context.Context) error {
if obj.Solver == nil { if obj.Solver == nil {
return fmt.Errorf("the Solver is missing") return fmt.Errorf("the Solver is missing")
} }
if obj.UnifiedState == nil {
return fmt.Errorf("the UnifiedState table is missing")
}
if obj.Logf == nil { if obj.Logf == nil {
return fmt.Errorf("the Logf function is missing") return fmt.Errorf("the Logf function is missing")
} }
init := &Init{ init := &Init{
Strategy: obj.Strategy, Strategy: obj.Strategy,
UnifiedState: obj.UnifiedState,
Logf: obj.Logf, Logf: obj.Logf,
Debug: obj.Debug, Debug: obj.Debug,
} }