From 89beca8b32b3fcb43abcb6167709caad1ffe94ee Mon Sep 17 00:00:00 2001 From: nsensfel Date: Fri, 31 Aug 2018 17:15:10 +0200 Subject: Adds a directory for shared code. --- src/battle/elm-package.json | 3 ++- src/battle/src/Util/Array.elm | 34 ---------------------------------- src/battle/src/Util/Html.elm | 6 ------ src/battle/src/Util/List.elm | 16 ---------------- src/character/elm-package.json | 3 ++- src/character/src/Util/Array.elm | 34 ---------------------------------- src/character/src/Util/Html.elm | 6 ------ src/character/src/Util/List.elm | 16 ---------------- src/login/elm-package.json | 3 ++- src/login/src/Util/Array.elm | 34 ---------------------------------- src/login/src/Util/Html.elm | 6 ------ src/login/src/Util/List.elm | 16 ---------------- src/map-editor/elm-package.json | 3 ++- src/map-editor/src/Util/Array.elm | 34 ---------------------------------- src/map-editor/src/Util/Html.elm | 6 ------ src/map-editor/src/Util/List.elm | 36 ------------------------------------ src/shared/elm/Util/Array.elm | 34 ++++++++++++++++++++++++++++++++++ src/shared/elm/Util/Html.elm | 6 ++++++ src/shared/elm/Util/List.elm | 36 ++++++++++++++++++++++++++++++++++++ 19 files changed, 84 insertions(+), 248 deletions(-) delete mode 100644 src/battle/src/Util/Array.elm delete mode 100644 src/battle/src/Util/Html.elm delete mode 100644 src/battle/src/Util/List.elm delete mode 100644 src/character/src/Util/Array.elm delete mode 100644 src/character/src/Util/Html.elm delete mode 100644 src/character/src/Util/List.elm delete mode 100644 src/login/src/Util/Array.elm delete mode 100644 src/login/src/Util/Html.elm delete mode 100644 src/login/src/Util/List.elm delete mode 100644 src/map-editor/src/Util/Array.elm delete mode 100644 src/map-editor/src/Util/Html.elm delete mode 100644 src/map-editor/src/Util/List.elm create mode 100644 src/shared/elm/Util/Array.elm create mode 100644 src/shared/elm/Util/Html.elm create mode 100644 src/shared/elm/Util/List.elm (limited to 'src') diff --git a/src/battle/elm-package.json b/src/battle/elm-package.json index 43957bf..e824a29 100644 --- a/src/battle/elm-package.json +++ b/src/battle/elm-package.json @@ -4,7 +4,8 @@ "repository": "https://github.com/nsensfel/tacticians-client.git", "license": "Apache 2.0", "source-directories": [ - "src" + "src", + "../shared/elm" ], "exposed-modules": [], "dependencies": { diff --git a/src/battle/src/Util/Array.elm b/src/battle/src/Util/Array.elm deleted file mode 100644 index 9e57c18..0000000 --- a/src/battle/src/Util/Array.elm +++ /dev/null @@ -1,34 +0,0 @@ -module Util.Array exposing - ( - update, - update_unsafe, - filter_first - ) - -import Array - -update : ( - Int -> - ((Maybe t) -> (Maybe t)) -> - (Array.Array t) -> - (Array.Array t) - ) -update index fun array = - case (fun (Array.get index array)) of - Nothing -> array - (Just e) -> (Array.set index e array) - -update_unsafe : ( - Int -> - (t -> t) -> - (Array.Array t) -> - (Array.Array t) - ) -update_unsafe index fun array = - case (Array.get index array) of - Nothing -> array - (Just e) -> (Array.set index (fun e) array) - -filter_first : (t -> Bool) -> (Array.Array t) -> (Maybe t) -filter_first fun array = - (Array.get 0 (Array.filter fun array)) diff --git a/src/battle/src/Util/Html.elm b/src/battle/src/Util/Html.elm deleted file mode 100644 index 42eadba..0000000 --- a/src/battle/src/Util/Html.elm +++ /dev/null @@ -1,6 +0,0 @@ -module Util.Html exposing (nothing) - -import Html - -nothing : (Html.Html a) -nothing = (Html.text "") diff --git a/src/battle/src/Util/List.elm b/src/battle/src/Util/List.elm deleted file mode 100644 index 2bc5217..0000000 --- a/src/battle/src/Util/List.elm +++ /dev/null @@ -1,16 +0,0 @@ -module Util.List exposing (..) - -import List - -pop : List a -> (Maybe (a, List a)) -pop l = - case - ((List.head l), (List.tail l)) - of - (Nothing, _) -> Nothing - (_ , Nothing) -> Nothing - ((Just head), (Just tail)) -> (Just (head, tail)) - -get_first : (a -> Bool) -> (List a) -> (Maybe a) -get_first fun list = - (List.head (List.filter fun list)) diff --git a/src/character/elm-package.json b/src/character/elm-package.json index 5f6573f..d62239e 100644 --- a/src/character/elm-package.json +++ b/src/character/elm-package.json @@ -4,7 +4,8 @@ "repository": "https://github.com/nsensfel/tacticians-client.git", "license": "Apache 2.0", "source-directories": [ - "src" + "src", + "../shared/elm" ], "exposed-modules": [], "dependencies": { diff --git a/src/character/src/Util/Array.elm b/src/character/src/Util/Array.elm deleted file mode 100644 index 9e57c18..0000000 --- a/src/character/src/Util/Array.elm +++ /dev/null @@ -1,34 +0,0 @@ -module Util.Array exposing - ( - update, - update_unsafe, - filter_first - ) - -import Array - -update : ( - Int -> - ((Maybe t) -> (Maybe t)) -> - (Array.Array t) -> - (Array.Array t) - ) -update index fun array = - case (fun (Array.get index array)) of - Nothing -> array - (Just e) -> (Array.set index e array) - -update_unsafe : ( - Int -> - (t -> t) -> - (Array.Array t) -> - (Array.Array t) - ) -update_unsafe index fun array = - case (Array.get index array) of - Nothing -> array - (Just e) -> (Array.set index (fun e) array) - -filter_first : (t -> Bool) -> (Array.Array t) -> (Maybe t) -filter_first fun array = - (Array.get 0 (Array.filter fun array)) diff --git a/src/character/src/Util/Html.elm b/src/character/src/Util/Html.elm deleted file mode 100644 index 42eadba..0000000 --- a/src/character/src/Util/Html.elm +++ /dev/null @@ -1,6 +0,0 @@ -module Util.Html exposing (nothing) - -import Html - -nothing : (Html.Html a) -nothing = (Html.text "") diff --git a/src/character/src/Util/List.elm b/src/character/src/Util/List.elm deleted file mode 100644 index 2bc5217..0000000 --- a/src/character/src/Util/List.elm +++ /dev/null @@ -1,16 +0,0 @@ -module Util.List exposing (..) - -import List - -pop : List a -> (Maybe (a, List a)) -pop l = - case - ((List.head l), (List.tail l)) - of - (Nothing, _) -> Nothing - (_ , Nothing) -> Nothing - ((Just head), (Just tail)) -> (Just (head, tail)) - -get_first : (a -> Bool) -> (List a) -> (Maybe a) -get_first fun list = - (List.head (List.filter fun list)) diff --git a/src/login/elm-package.json b/src/login/elm-package.json index 5f6573f..d62239e 100644 --- a/src/login/elm-package.json +++ b/src/login/elm-package.json @@ -4,7 +4,8 @@ "repository": "https://github.com/nsensfel/tacticians-client.git", "license": "Apache 2.0", "source-directories": [ - "src" + "src", + "../shared/elm" ], "exposed-modules": [], "dependencies": { diff --git a/src/login/src/Util/Array.elm b/src/login/src/Util/Array.elm deleted file mode 100644 index 9e57c18..0000000 --- a/src/login/src/Util/Array.elm +++ /dev/null @@ -1,34 +0,0 @@ -module Util.Array exposing - ( - update, - update_unsafe, - filter_first - ) - -import Array - -update : ( - Int -> - ((Maybe t) -> (Maybe t)) -> - (Array.Array t) -> - (Array.Array t) - ) -update index fun array = - case (fun (Array.get index array)) of - Nothing -> array - (Just e) -> (Array.set index e array) - -update_unsafe : ( - Int -> - (t -> t) -> - (Array.Array t) -> - (Array.Array t) - ) -update_unsafe index fun array = - case (Array.get index array) of - Nothing -> array - (Just e) -> (Array.set index (fun e) array) - -filter_first : (t -> Bool) -> (Array.Array t) -> (Maybe t) -filter_first fun array = - (Array.get 0 (Array.filter fun array)) diff --git a/src/login/src/Util/Html.elm b/src/login/src/Util/Html.elm deleted file mode 100644 index 42eadba..0000000 --- a/src/login/src/Util/Html.elm +++ /dev/null @@ -1,6 +0,0 @@ -module Util.Html exposing (nothing) - -import Html - -nothing : (Html.Html a) -nothing = (Html.text "") diff --git a/src/login/src/Util/List.elm b/src/login/src/Util/List.elm deleted file mode 100644 index 2bc5217..0000000 --- a/src/login/src/Util/List.elm +++ /dev/null @@ -1,16 +0,0 @@ -module Util.List exposing (..) - -import List - -pop : List a -> (Maybe (a, List a)) -pop l = - case - ((List.head l), (List.tail l)) - of - (Nothing, _) -> Nothing - (_ , Nothing) -> Nothing - ((Just head), (Just tail)) -> (Just (head, tail)) - -get_first : (a -> Bool) -> (List a) -> (Maybe a) -get_first fun list = - (List.head (List.filter fun list)) diff --git a/src/map-editor/elm-package.json b/src/map-editor/elm-package.json index 43957bf..e824a29 100644 --- a/src/map-editor/elm-package.json +++ b/src/map-editor/elm-package.json @@ -4,7 +4,8 @@ "repository": "https://github.com/nsensfel/tacticians-client.git", "license": "Apache 2.0", "source-directories": [ - "src" + "src", + "../shared/elm" ], "exposed-modules": [], "dependencies": { diff --git a/src/map-editor/src/Util/Array.elm b/src/map-editor/src/Util/Array.elm deleted file mode 100644 index 9e57c18..0000000 --- a/src/map-editor/src/Util/Array.elm +++ /dev/null @@ -1,34 +0,0 @@ -module Util.Array exposing - ( - update, - update_unsafe, - filter_first - ) - -import Array - -update : ( - Int -> - ((Maybe t) -> (Maybe t)) -> - (Array.Array t) -> - (Array.Array t) - ) -update index fun array = - case (fun (Array.get index array)) of - Nothing -> array - (Just e) -> (Array.set index e array) - -update_unsafe : ( - Int -> - (t -> t) -> - (Array.Array t) -> - (Array.Array t) - ) -update_unsafe index fun array = - case (Array.get index array) of - Nothing -> array - (Just e) -> (Array.set index (fun e) array) - -filter_first : (t -> Bool) -> (Array.Array t) -> (Maybe t) -filter_first fun array = - (Array.get 0 (Array.filter fun array)) diff --git a/src/map-editor/src/Util/Html.elm b/src/map-editor/src/Util/Html.elm deleted file mode 100644 index 42eadba..0000000 --- a/src/map-editor/src/Util/Html.elm +++ /dev/null @@ -1,6 +0,0 @@ -module Util.Html exposing (nothing) - -import Html - -nothing : (Html.Html a) -nothing = (Html.text "") diff --git a/src/map-editor/src/Util/List.elm b/src/map-editor/src/Util/List.elm deleted file mode 100644 index 1f914b1..0000000 --- a/src/map-editor/src/Util/List.elm +++ /dev/null @@ -1,36 +0,0 @@ -module Util.List exposing (..) - -import List - -pop : List a -> (Maybe (a, List a)) -pop l = - case - ((List.head l), (List.tail l)) - of - (Nothing, _) -> Nothing - (_ , Nothing) -> Nothing - ((Just head), (Just tail)) -> (Just (head, tail)) - -get_first : (a -> Bool) -> (List a) -> (Maybe a) -get_first fun list = - (List.head (List.filter fun list)) - -product_map : (a -> b -> c) -> (List a) -> (List b) -> (List c) -product_map product_fun list_a list_b = - (product_map_rec (product_fun) list_a list_b []) - -product_map_rec : (a -> b -> c) -> (List a) -> (List b) -> (List c) -> (List c) -product_map_rec product_fun list_a list_b result = - case (pop list_a) of - Nothing -> result - (Just (head, tail)) -> - (product_map_rec - (product_fun) - tail - list_b - (List.append - (List.map (product_fun head) list_b) - result - ) - ) - diff --git a/src/shared/elm/Util/Array.elm b/src/shared/elm/Util/Array.elm new file mode 100644 index 0000000..9e57c18 --- /dev/null +++ b/src/shared/elm/Util/Array.elm @@ -0,0 +1,34 @@ +module Util.Array exposing + ( + update, + update_unsafe, + filter_first + ) + +import Array + +update : ( + Int -> + ((Maybe t) -> (Maybe t)) -> + (Array.Array t) -> + (Array.Array t) + ) +update index fun array = + case (fun (Array.get index array)) of + Nothing -> array + (Just e) -> (Array.set index e array) + +update_unsafe : ( + Int -> + (t -> t) -> + (Array.Array t) -> + (Array.Array t) + ) +update_unsafe index fun array = + case (Array.get index array) of + Nothing -> array + (Just e) -> (Array.set index (fun e) array) + +filter_first : (t -> Bool) -> (Array.Array t) -> (Maybe t) +filter_first fun array = + (Array.get 0 (Array.filter fun array)) diff --git a/src/shared/elm/Util/Html.elm b/src/shared/elm/Util/Html.elm new file mode 100644 index 0000000..42eadba --- /dev/null +++ b/src/shared/elm/Util/Html.elm @@ -0,0 +1,6 @@ +module Util.Html exposing (nothing) + +import Html + +nothing : (Html.Html a) +nothing = (Html.text "") diff --git a/src/shared/elm/Util/List.elm b/src/shared/elm/Util/List.elm new file mode 100644 index 0000000..1f914b1 --- /dev/null +++ b/src/shared/elm/Util/List.elm @@ -0,0 +1,36 @@ +module Util.List exposing (..) + +import List + +pop : List a -> (Maybe (a, List a)) +pop l = + case + ((List.head l), (List.tail l)) + of + (Nothing, _) -> Nothing + (_ , Nothing) -> Nothing + ((Just head), (Just tail)) -> (Just (head, tail)) + +get_first : (a -> Bool) -> (List a) -> (Maybe a) +get_first fun list = + (List.head (List.filter fun list)) + +product_map : (a -> b -> c) -> (List a) -> (List b) -> (List c) +product_map product_fun list_a list_b = + (product_map_rec (product_fun) list_a list_b []) + +product_map_rec : (a -> b -> c) -> (List a) -> (List b) -> (List c) -> (List c) +product_map_rec product_fun list_a list_b result = + case (pop list_a) of + Nothing -> result + (Just (head, tail)) -> + (product_map_rec + (product_fun) + tail + list_b + (List.append + (List.map (product_fun head) list_b) + result + ) + ) + -- cgit v1.2.3-70-g09d2