Remove 'or any later version' license choice

[planeteer] / planeteer.go

diff --git a/planeteer.go b/planeteer.go
index 513ad1a4e7629704245c1101599fa1122f730327..cf00d563a5cc02a4c1a7dab59839d95bbb303175 100644 (file)
--- a/planeteer.go
+++ b/planeteer.go
@@ -3,8 +3,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
+ * published by the Free Software Foundation, version 3.

  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -146,12 +145,13 @@ func json_slurp(filename string, receptacle interface{}) error {
        return nil
 }
 
        return nil
 }
 

-func ReadData() (data planet_data) {
+func ReadData() planet_data {
+       var data planet_data

        err := json_slurp(*planet_data_file, &data)
        if err != nil {
                panic(err)
        }
        err := json_slurp(*planet_data_file, &data)
        if err != nil {
                panic(err)
        }

-       return
+       return data

 }
 
 /* This program operates by filling in a state table representing the best
 }
 
 /* This program operates by filling in a state table representing the best


@@ -606,7 +606,8 @@ func FindBestState(data planet_data, dims LogicalIndex, table []State, addr Logi
        return max_index
 }
 
        return max_index
 }
 

-func Commas(n Value) (s string) {
+func Commas(n Value) string {
+       var s string

        if n < 0 {
                panic(n)
        }
        if n < 0 {
                panic(n)
        }


@@ -618,7 +619,7 @@ func Commas(n Value) (s string) {
                n /= 1000
        }
        s = fmt.Sprint(r) + s
                n /= 1000
        }
        s = fmt.Sprint(r) + s

-       return
+       return s

 }
 
 func FighterAndShieldCost(data planet_data, dims LogicalIndex, table []State, best PhysicalIndex) {
 }
 
 func FighterAndShieldCost(data planet_data, dims LogicalIndex, table []State, best PhysicalIndex) {


@@ -688,7 +689,8 @@ func EndLocationCost(data planet_data, dims LogicalIndex, table []State, best Ph
        *end_string = save_end_string
 }
 
        *end_string = save_end_string
 }
 

-func DescribePath(data planet_data, dims LogicalIndex, table []State, start PhysicalIndex) (description []string) {
+func DescribePath(data planet_data, dims LogicalIndex, table []State, start PhysicalIndex) []string {
+       var description []string

        for index := start; table[index].from > FROM_ROOT; index = table[index].from {
                if table[index].from == FROM_UNINITIALIZED {
                        panic(index)
        for index := start; table[index].from > FROM_ROOT; index = table[index].from {
                if table[index].from == FROM_UNINITIALIZED {
                        panic(index)


@@ -745,7 +747,7 @@ func DescribePath(data planet_data, dims LogicalIndex, table []State, start Phys
                }
                description = append(description, fmt.Sprintf("%13v ", Commas(table[index].value))+line)
        }
                }
                description = append(description, fmt.Sprintf("%13v ", Commas(table[index].value))+line)
        }

-       return
+       return description

 }
 
 // (Example of a use case for generics in Go)
 }
 
 // (Example of a use case for generics in Go)