Read --end into a map

diff --git a/planeteer.go b/planeteer.go
index d5c359aaacf5f65bcc3791508da9342ba31cbc69..c207c13c1fe05719c3e5fcfdc19f677282fcb63c 100644 (file)
--- a/planeteer.go
+++ b/planeteer.go
@@ -32,7 +32,7 @@ var start = flag.String("start", "",
 var flight_plan_string = flag.String("flight_plan", "",
        "Your hidey-holes for the day, comma-separated.")
 
 var flight_plan_string = flag.String("flight_plan", "",
        "Your hidey-holes for the day, comma-separated.")
 

-var end = flag.String("end", "",
+var end_string = flag.String("end", "",

        "A comma-separated list of acceptable ending planets.")
 
 var planet_data_file = flag.String("planet_data_file", "planet-data",
        "A comma-separated list of acceptable ending planets.")
 
 var planet_data_file = flag.String("planet_data_file", "planet-data",


@@ -60,18 +60,29 @@ var visit_string = flag.String("visit", "",
 
 func visit() []string {
        if *visit_string == "" {
 
 func visit() []string {
        if *visit_string == "" {

-               return []string{}
+               return nil

        }
        return strings.Split(*visit_string, ",")
 }
 
 func flight_plan() []string {
        if *flight_plan_string == "" {
        }
        return strings.Split(*visit_string, ",")
 }
 
 func flight_plan() []string {
        if *flight_plan_string == "" {

-               return []string{}
+               return nil

        }
        return strings.Split(*flight_plan_string, ",")
 }
 
        }
        return strings.Split(*flight_plan_string, ",")
 }
 

+func end() map[string]bool {
+       if *end_string == "" {
+               return nil
+       }
+       m := make(map[string]bool)
+       for _, p := range strings.Split(*flight_plan_string, ",") {
+               m[p] = true
+       }
+       return m
+}
+

 type Commodity struct {
        BasePrice int
        CanSell   bool
 type Commodity struct {
        BasePrice int
        CanSell   bool