Moved all the classical orders to the global orders package - they ar…

…e, after all, used by all variants.
zond · Apr 5, 2018 · 81ca8be · 81ca8be
1 parent fd31afd
commit 81ca8be
Show file tree

Hide file tree

Showing 21 changed files with 30 additions and 29 deletions.
diff --git a/gae/common/common.go b/gae/common/common.go
@@ -3,7 +3,7 @@ package common
 import (
 	"github.com/zond/godip/state"
 	"github.com/zond/godip/variants/classical"
-	"github.com/zond/godip/variants/classical/orders"
+	"github.com/zond/godip/orders"
 	"github.com/zond/godip/variants/common"
 
 	dip "github.com/zond/godip/common"

diff --git a/variants/classical/orders/build.go → orders/build.go b/variants/classical/orders/build.go → orders/build.go
diff --git a/variants/classical/orders/convoy.go → orders/convoy.go b/variants/classical/orders/convoy.go → orders/convoy.go
diff --git a/variants/classical/orders/disband.go → orders/disband.go b/variants/classical/orders/disband.go → orders/disband.go
diff --git a/variants/classical/orders/hold.go → orders/hold.go b/variants/classical/orders/hold.go → orders/hold.go
diff --git a/variants/classical/orders/move.go → orders/move.go b/variants/classical/orders/move.go → orders/move.go
diff --git a/variants/classical/orders/support.go → orders/support.go b/variants/classical/orders/support.go → orders/support.go
diff --git a/variants/ancientmediterranean/ancientmediterranean_test.go b/variants/ancientmediterranean/ancientmediterranean_test.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/zond/godip/state"
-	"github.com/zond/godip/variants/classical/orders"
+	"github.com/zond/godip/orders"
 
 	dip "github.com/zond/godip/common"
 	cla "github.com/zond/godip/variants/classical/common"

diff --git a/variants/classical/classical.go b/variants/classical/classical.go
@@ -4,12 +4,12 @@ import (
 	"fmt"
 
 	"github.com/zond/godip/state"
-	"github.com/zond/godip/variants/classical/orders"
 	"github.com/zond/godip/variants/classical/start"
 	"github.com/zond/godip/variants/common"
 
 	dip "github.com/zond/godip/common"
 	cla "github.com/zond/godip/variants/classical/common"
+	ord "github.com/zond/godip/variants/classical/orders"
 )
 
 var ClassicalVariant = common.Variant{
@@ -20,7 +20,7 @@ var ClassicalVariant = common.Variant{
 		result = Blank(Phase(1900, cla.Fall, cla.Adjustment))
 		return
 	},
-	Parser:     orders.ClassicalParser,
+	Parser:     ord.ClassicalParser,
 	Graph:      func() dip.Graph { return start.Graph() },
 	Phase:      Phase,
 	Nations:    cla.Nations,
@@ -51,7 +51,7 @@ func Blank(phase dip.Phase) *state.State {
 }
 
 func Start() (result *state.State, err error) {
-	result = state.New(start.Graph(), &phase{1901, cla.Spring, cla.Movement, orders.ClassicalParser}, BackupRule)
+	result = state.New(start.Graph(), &phase{1901, cla.Spring, cla.Movement, ord.ClassicalParser}, BackupRule)
 	if err = result.SetUnits(start.Units()); err != nil {
 		return
 	}

diff --git a/variants/classical/classical_test.go b/variants/classical/classical_test.go
@@ -6,12 +6,13 @@ import (
 	"time"
 
 	"github.com/zond/godip/datc"
+	"github.com/zond/godip/orders"
 	"github.com/zond/godip/state"
-	"github.com/zond/godip/variants/classical/orders"
 	"github.com/zond/godip/variants/classical/start"
 
 	dip "github.com/zond/godip/common"
 	cla "github.com/zond/godip/variants/classical/common"
+	ord "github.com/zond/godip/variants/classical/orders"
 	tst "github.com/zond/godip/variants/testing"
 )
 
@@ -420,7 +421,7 @@ func TestBULOptions(t *testing.T) {
 // Test that por M spa supported by mid works in
 // https://diplicity-engine.appspot.com/Game/ahJzfmRpcGxpY2l0eS1lbmdpbmVyEQsSBEdhbWUYgICAgOr0mgoM/Phase/12/Map
 func TestMIDPORSPASupportOptions(t *testing.T) {
-	judge := state.New(start.Graph(), &phase{1903, cla.Fall, cla.Movement, orders.ClassicalParser}, BackupRule)
+	judge := state.New(start.Graph(), &phase{1903, cla.Fall, cla.Movement, ord.ClassicalParser}, BackupRule)
 	if err := judge.SetUnits(start.Units()); err != nil {
 		t.Fatal(err)
 	}

diff --git a/variants/classical/datc.go b/variants/classical/datc.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	cla "github.com/zond/godip/variants/classical/common"
-	"github.com/zond/godip/variants/classical/orders"
+	"github.com/zond/godip/orders"
 	"github.com/zond/godip/variants/classical/start"
 	dip "github.com/zond/godip/common"
 )

diff --git a/variants/classical/orders/orders.go b/variants/classical/orders/orders.go
@@ -7,11 +7,11 @@ import (
 )
 
 var ClassicalParser = orders.NewParser([]dip.Order{
-	BuildOrder,
-	ConvoyOrder,
-	DisbandOrder,
-	HoldOrder,
-	MoveOrder,
-	MoveViaConvoyOrder,
-	SupportOrder,
+	orders.BuildOrder,
+	orders.ConvoyOrder,
+	orders.DisbandOrder,
+	orders.HoldOrder,
+	orders.MoveOrder,
+	orders.MoveViaConvoyOrder,
+	orders.SupportOrder,
 })
diff --git a/variants/classical/phase.go b/variants/classical/phase.go
@@ -6,36 +6,36 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/zond/godip/variants/classical/orders"
+	"github.com/zond/godip/orders"
 
 	dip "github.com/zond/godip/common"
-	ord "github.com/zond/godip/orders"
 	cla "github.com/zond/godip/variants/classical/common"
+	ord "github.com/zond/godip/variants/classical/orders"
 )
 
-func PhaseGenerator(parser ord.Parser) func(int, dip.Season, dip.PhaseType) dip.Phase {
+func PhaseGenerator(parser orders.Parser) func(int, dip.Season, dip.PhaseType) dip.Phase {
 	return func(year int, season dip.Season, typ dip.PhaseType) dip.Phase {
 		return &phase{year, season, typ, parser}
 	}
 }
 
 func Phase(year int, season dip.Season, typ dip.PhaseType) dip.Phase {
-	return PhaseGenerator(orders.ClassicalParser)(year, season, typ)
+	return PhaseGenerator(ord.ClassicalParser)(year, season, typ)
 }
 
 type phase struct {
 	year   int
 	season dip.Season
 	typ    dip.PhaseType
-	parser ord.Parser
+	parser orders.Parser
 }
 
 func (self *phase) String() string {
 	return fmt.Sprintf("%s %d, %s", self.season, self.year, self.typ)
 }
 
 func (self *phase) Options(s dip.Validator, nation dip.Nation) (result dip.Options) {
-	return s.Options(orders.ClassicalParser.Orders(), nation)
+	return s.Options(ord.ClassicalParser.Orders(), nation)
 }
 
 func shortestDistance(s dip.State, src dip.Province, dst []dip.Province) (result int, err error) {

diff --git a/variants/coldwar/coldwar_test.go b/variants/coldwar/coldwar_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/zond/godip/state"
 	"github.com/zond/godip/variants/classical"
-	"github.com/zond/godip/variants/classical/orders"
+	"github.com/zond/godip/orders"
 
 	dip "github.com/zond/godip/common"
 	cla "github.com/zond/godip/variants/classical/common"

diff --git a/variants/hundred/hundred.go b/variants/hundred/hundred.go
@@ -4,7 +4,7 @@ import (
 	"github.com/zond/godip/graph"
 	"github.com/zond/godip/state"
 	"github.com/zond/godip/variants/classical"
-	"github.com/zond/godip/variants/classical/orders"
+	"github.com/zond/godip/orders"
 	"github.com/zond/godip/variants/common"
 
 	dip "github.com/zond/godip/common"

diff --git a/variants/hundred/hundred_test.go b/variants/hundred/hundred_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/zond/godip/state"
 	"github.com/zond/godip/variants/classical"
-	"github.com/zond/godip/variants/classical/orders"
+	"github.com/zond/godip/orders"
 
 	dip "github.com/zond/godip/common"
 	cla "github.com/zond/godip/variants/classical/common"

diff --git a/variants/hundred/hundredphase.go b/variants/hundred/hundredphase.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"github.com/zond/godip/variants/classical"
-	"github.com/zond/godip/variants/classical/orders"
+	"github.com/zond/godip/orders"
 
 	dip "github.com/zond/godip/common"
 	cla "github.com/zond/godip/variants/classical/common"

diff --git a/variants/pure/pure.go b/variants/pure/pure.go
@@ -4,7 +4,7 @@ import (
 	"github.com/zond/godip/graph"
 	"github.com/zond/godip/state"
 	"github.com/zond/godip/variants/classical"
-	"github.com/zond/godip/variants/classical/orders"
+	"github.com/zond/godip/orders"
 	"github.com/zond/godip/variants/common"
 
 	dip "github.com/zond/godip/common"

diff --git a/variants/testing/games_testing.go b/variants/testing/games_testing.go
@@ -13,7 +13,7 @@ import (
 	"time"
 
 	"github.com/zond/godip/state"
-	"github.com/zond/godip/variants/classical/orders"
+	"github.com/zond/godip/orders"
 	"github.com/zond/godip/variants/common"
 
 	dip "github.com/zond/godip/common"

diff --git a/variants/testing/testing.go b/variants/testing/testing.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 
 	"github.com/zond/godip/state"
-	"github.com/zond/godip/variants/classical/orders"
+	"github.com/zond/godip/orders"
 
 	dip "github.com/zond/godip/common"
 	cla "github.com/zond/godip/variants/classical/common"

diff --git a/variants/youngstownredux/youngstownredux_test.go b/variants/youngstownredux/youngstownredux_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/zond/godip/state"
 	"github.com/zond/godip/variants/classical"
-	"github.com/zond/godip/variants/classical/orders"
+	"github.com/zond/godip/orders"
 
 	dip "github.com/zond/godip/common"
 	cla "github.com/zond/godip/variants/classical/common"