From ef78c1f92ab29c4370193591b170535dd9e743f7 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Thu, 5 Nov 2020 22:54:05 -0400 Subject: Improved error reporting for syntax macros. --- stdlib/source/program/aedifex/parser.lux | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'stdlib/source/program/aedifex/parser.lux') diff --git a/stdlib/source/program/aedifex/parser.lux b/stdlib/source/program/aedifex/parser.lux index 4fa6612c0..45e1e6a6a 100644 --- a/stdlib/source/program/aedifex/parser.lux +++ b/stdlib/source/program/aedifex/parser.lux @@ -21,6 +21,7 @@ ["/" profile] ["#." project (#+ Project)] ["#." dependency] + ["#." repository] ["#." artifact (#+ Artifact) ["#/." type]]]) @@ -136,7 +137,7 @@ ))) (def: repository - (Parser //dependency.Repository) + (Parser //repository.Address) ..url) (def: type @@ -164,7 +165,7 @@ .text) (def: deploy-repository - (Parser (List [Text //dependency.Repository])) + (Parser (List [Text //repository.Address])) (.record (<>.some (<>.and .text ..repository)))) @@ -185,7 +186,7 @@ ^info (: (Parser (Maybe /.Info)) (<>.maybe (..singular input "info" ..info))) - ^repositories (: (Parser (Set //dependency.Repository)) + ^repositories (: (Parser (Set //repository.Address)) (|> (..plural input "repositories" ..repository) (:: ! map (set.from-list text.hash)) (<>.default (set.new text.hash)))) @@ -206,7 +207,7 @@ ^test (: (Parser (Maybe Module)) (<>.maybe (..singular input "test" ..module))) - ^deploy-repositories (: (Parser (Dictionary Text //dependency.Repository)) + ^deploy-repositories (: (Parser (Dictionary Text //repository.Address)) (<| (:: ! map (dictionary.from-list text.hash)) (<>.default (list)) (..singular input "deploy-repositories" ..deploy-repository)))]] -- cgit v1.2.3