diff options
Diffstat (limited to '')
-rw-r--r-- | stdlib/source/lux.lux | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/stdlib/source/lux.lux b/stdlib/source/lux.lux index 226545576..392d3a504 100644 --- a/stdlib/source/lux.lux +++ b/stdlib/source/lux.lux @@ -4220,15 +4220,7 @@ #import-refer {#refer-defs #All #refer-open (list)}}))) - (^ [_ (#Tuple (list [_ (#Symbol ["" m-name])]))]) - (do Monad<Meta> - [import-name (clean-module nested? relative-root m-name)] - (wrap (list {#import-name import-name - #import-alias (#Some m-name) - #import-refer {#refer-defs #Nothing - #refer-open (list)}}))) - - (^ [_ (#Tuple (list& [_ (#Text alias)] [_ (#Symbol ["" m-name])] extra))]) + (^ [_ (#Tuple (list& [_ (#Symbol ["" m-name])] extra))]) (do Monad<Meta> [import-name (clean-module nested? relative-root m-name) referral+extra (parse-referrals extra) @@ -4236,13 +4228,15 @@ openings+extra (parse-openings extra) #let [[openings extra] openings+extra] sub-imports (parse-imports #1 import-name extra)] - (wrap (list& {#import-name import-name - #import-alias (#Some (replace-all "." m-name alias)) - #import-refer {#refer-defs referral - #refer-open openings}} - sub-imports))) + (wrap (case [referral openings] + [#Nothing #Nil] sub-imports + _ (list& {#import-name import-name + #import-alias #None + #import-refer {#refer-defs referral + #refer-open openings}} + sub-imports)))) - (^ [_ (#Tuple (list& [_ (#Symbol ["" m-name])] extra))]) + (^ [_ (#Tuple (list& [_ (#Text alias)] [_ (#Symbol ["" m-name])] extra))]) (do Monad<Meta> [import-name (clean-module nested? relative-root m-name) referral+extra (parse-referrals extra) @@ -4250,13 +4244,11 @@ openings+extra (parse-openings extra) #let [[openings extra] openings+extra] sub-imports (parse-imports #1 import-name extra)] - (wrap (case [referral openings] - [#Nothing #Nil] sub-imports - _ (list& {#import-name import-name - #import-alias (#Some m-name) - #import-refer {#refer-defs referral - #refer-open openings}} - sub-imports)))) + (wrap (list& {#import-name import-name + #import-alias (#Some (replace-all "." m-name alias)) + #import-refer {#refer-defs referral + #refer-open openings}} + sub-imports))) _ (do Monad<Meta> |