From 81ca8be528bad0ce71c5dafd18f447522d0dd220 Mon Sep 17 00:00:00 2001 From: Martin Bruse Date: Thu, 5 Apr 2018 09:26:47 +0200 Subject: [PATCH] Moved all the classical orders to the global orders package - they are, after all, used by all variants. --- gae/common/common.go | 2 +- {variants/classical/orders => orders}/build.go | 0 {variants/classical/orders => orders}/convoy.go | 0 {variants/classical/orders => orders}/disband.go | 0 {variants/classical/orders => orders}/hold.go | 0 {variants/classical/orders => orders}/move.go | 0 {variants/classical/orders => orders}/support.go | 0 .../ancientmediterranean_test.go | 2 +- variants/classical/classical.go | 6 +++--- variants/classical/classical_test.go | 5 +++-- variants/classical/datc.go | 2 +- variants/classical/orders/orders.go | 14 +++++++------- variants/classical/phase.go | 12 ++++++------ variants/coldwar/coldwar_test.go | 2 +- variants/hundred/hundred.go | 2 +- variants/hundred/hundred_test.go | 2 +- variants/hundred/hundredphase.go | 2 +- variants/pure/pure.go | 2 +- variants/testing/games_testing.go | 2 +- variants/testing/testing.go | 2 +- variants/youngstownredux/youngstownredux_test.go | 2 +- 21 files changed, 30 insertions(+), 29 deletions(-) rename {variants/classical/orders => orders}/build.go (100%) rename {variants/classical/orders => orders}/convoy.go (100%) rename {variants/classical/orders => orders}/disband.go (100%) rename {variants/classical/orders => orders}/hold.go (100%) rename {variants/classical/orders => orders}/move.go (100%) rename {variants/classical/orders => orders}/support.go (100%) diff --git a/gae/common/common.go b/gae/common/common.go index f880efa0..a9b5967a 100644 --- 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 b/orders/build.go similarity index 100% rename from variants/classical/orders/build.go rename to orders/build.go diff --git a/variants/classical/orders/convoy.go b/orders/convoy.go similarity index 100% rename from variants/classical/orders/convoy.go rename to orders/convoy.go diff --git a/variants/classical/orders/disband.go b/orders/disband.go similarity index 100% rename from variants/classical/orders/disband.go rename to orders/disband.go diff --git a/variants/classical/orders/hold.go b/orders/hold.go similarity index 100% rename from variants/classical/orders/hold.go rename to orders/hold.go diff --git a/variants/classical/orders/move.go b/orders/move.go similarity index 100% rename from variants/classical/orders/move.go rename to orders/move.go diff --git a/variants/classical/orders/support.go b/orders/support.go similarity index 100% rename from variants/classical/orders/support.go rename to orders/support.go diff --git a/variants/ancientmediterranean/ancientmediterranean_test.go b/variants/ancientmediterranean/ancientmediterranean_test.go index 5b7a326a..723d7638 100644 --- 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 index 37e69643..fa0ae46b 100644 --- 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 index cad8cb68..3ffcafc0 100644 --- 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 index 88ed5fc5..0e6ca5cc 100644 --- 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 index 47b9467a..b19d6419 100644 --- 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 index 536c2015..a9c63538 100644 --- a/variants/classical/phase.go +++ b/variants/classical/phase.go @@ -6,28 +6,28 @@ 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 { @@ -35,7 +35,7 @@ func (self *phase) String() string { } 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 index 4d08336a..5d8126aa 100644 --- 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 index 797772ae..ad421c60 100644 --- 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 index 648d0c91..6935204a 100644 --- 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 index bba89ebf..bc9e6f7f 100644 --- 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 index d824fb91..81490202 100644 --- 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 index d57faff0..ec9c1821 100644 --- 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 index 65dae5df..9f4c59aa 100644 --- 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 index be0843f9..ed777aab 100644 --- 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"