diff options
Diffstat (limited to 'stdlib/source/program')
| -rw-r--r-- | stdlib/source/program/aedifex/parser.lux | 7 | ||||
| -rw-r--r-- | stdlib/source/program/aedifex/profile.lux | 14 |
2 files changed, 11 insertions, 10 deletions
diff --git a/stdlib/source/program/aedifex/parser.lux b/stdlib/source/program/aedifex/parser.lux index 30660e707..5255067fd 100644 --- a/stdlib/source/program/aedifex/parser.lux +++ b/stdlib/source/program/aedifex/parser.lux @@ -10,8 +10,9 @@ ["[0]" text] [collection ["[0]" set (.only Set)] - ["[0]" dictionary (.only Dictionary) - ["[0]" plist (.only PList)]]]] + ["[0]" dictionary (.only Dictionary)] + [list + ["[0]" property]]]] [macro ["[0]" code (.only) ["<[1]>" \\parser (.only Parser)]]] @@ -244,7 +245,7 @@ (<| (at ! each (dictionary.of_list text.hash)) (<>.else (list)) (..plural input "deploy_repositories" ..deploy_repository))) - ^configuration (is (Parser (PList Text)) + ^configuration (is (Parser (property.List Text)) (<| (<>.else (list)) (..plural input "configuration" ..configuration/1))) ^java (|> ..runtime diff --git a/stdlib/source/program/aedifex/profile.lux b/stdlib/source/program/aedifex/profile.lux index ff8710893..5f9435dd5 100644 --- a/stdlib/source/program/aedifex/profile.lux +++ b/stdlib/source/program/aedifex/profile.lux @@ -11,10 +11,10 @@ ["[0]" product] ["[0]" text (.use "[1]#[0]" equivalence)] [collection - ["[0]" list (.use "[1]#[0]" monoid)] ["[0]" set (.only Set)] - ["[0]" dictionary (.only Dictionary) - ["[0]" plist (.only PList) (.use "[1]#[0]" monoid)]]]] + ["[0]" dictionary (.only Dictionary)] + ["[0]" list (.use "[1]#[0]" monoid) + ["[0]" property (.use "[1]#[0]" monoid)]]]] [macro ["^" pattern] ["[0]" template]] @@ -179,7 +179,7 @@ #program (Maybe Module) #test (Maybe Module) #deploy_repositories (Dictionary Text Address) - #configuration (PList Text) + #configuration (property.List Text) #java Runtime #js Runtime #python Runtime @@ -214,7 +214,7 @@ ... #deploy_repositories (dictionary.equivalence text.equivalence) ... #configuration - (plist.equivalence text.equivalence) + (property.equivalence text.equivalence) ... #java runtime.equivalence ... #js @@ -242,7 +242,7 @@ #program {.#None} #test {.#None} #deploy_repositories (dictionary.empty text.hash) - #configuration plist.empty + #configuration property.empty #java runtime.default_java #js runtime.default_js #python runtime.default_python @@ -270,7 +270,7 @@ #program (maybe#composite (the #program override) (the #program baseline)) #test (maybe#composite (the #test override) (the #test baseline)) #deploy_repositories (dictionary.composite (the #deploy_repositories override) (the #deploy_repositories baseline)) - #configuration (plist#composite (the #configuration override) (the #configuration baseline)) + #configuration (property#composite (the #configuration override) (the #configuration baseline)) #java (!runtime #java runtime.default_java) #js (!runtime #js runtime.default_js) #python (!runtime #python runtime.default_python) |