diff options
Diffstat (limited to '')
| -rw-r--r-- | new-luxc/source/luxc/module.lux | 20 | ||||
| -rw-r--r-- | new-luxc/source/luxc/module/descriptor/annotation.lux | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/new-luxc/source/luxc/module.lux b/new-luxc/source/luxc/module.lux index b53ceefed..68c43c0c1 100644 --- a/new-luxc/source/luxc/module.lux +++ b/new-luxc/source/luxc/module.lux @@ -1,6 +1,6 @@ (;module: lux - (lux (control monad) + (lux (control [monad #+ do]) (data [text "T/" Eq<Text>] text/format ["R" result] @@ -118,15 +118,15 @@ (-> Text (List Text) (Lux Unit)) (do Monad<Lux> [bindings (tags-by-module module-name) - _ (mapM @ - (function [tag] - (case (&;pl-get tag bindings) - #;None - (wrap []) - - (#;Some _) - (&;fail (format "Cannot re-declare tag: " tag)))) - tags)] + _ (monad;map @ + (function [tag] + (case (&;pl-get tag bindings) + #;None + (wrap []) + + (#;Some _) + (&;fail (format "Cannot re-declare tag: " tag)))) + tags)] (wrap []))) (def: #export (declare-tags tags exported? type) diff --git a/new-luxc/source/luxc/module/descriptor/annotation.lux b/new-luxc/source/luxc/module/descriptor/annotation.lux index ed5419974..299616e6b 100644 --- a/new-luxc/source/luxc/module/descriptor/annotation.lux +++ b/new-luxc/source/luxc/module/descriptor/annotation.lux @@ -21,7 +21,7 @@ [nat-signal "N"] [int-signal "I"] [deg-signal "D"] - [real-signal "R"] + [frac-signal "R"] [text-signal "T"] [list-signal "%"] [dict-signal "#"] @@ -51,7 +51,7 @@ [#;NatA nat-signal %n] [#;IntA int-signal %i] [#;DegA deg-signal %d] - [#;RealA real-signal %r] + [#;FracA frac-signal %r] [#;TextA text-signal %t] [#;IdentA ident-signal %ident] [#;ListA list-signal (&;encode-list encode-ann-value)] |