diff options
Diffstat (limited to 'stdlib/source/lux/tool/compiler/phase/extension/analysis/jvm.lux')
| -rw-r--r-- | stdlib/source/lux/tool/compiler/phase/extension/analysis/jvm.lux | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/stdlib/source/lux/tool/compiler/phase/extension/analysis/jvm.lux b/stdlib/source/lux/tool/compiler/phase/extension/analysis/jvm.lux index 94aec9628..fa31254c8 100644 --- a/stdlib/source/lux/tool/compiler/phase/extension/analysis/jvm.lux +++ b/stdlib/source/lux/tool/compiler/phase/extension/analysis/jvm.lux @@ -15,7 +15,7 @@ ["." maybe] ["." product] ["." text ("#@." equivalence) - format] + ["%" format (#+ format)]] [collection ["." list ("#@." fold monad monoid)] ["." array (#+ Array)] @@ -92,7 +92,7 @@ (template [<name>] [(exception: #export (<name> {type .Type}) (exception.report - ["Type" (%type type)]))] + ["Type" (%.type type)]))] [non-object] [non-array] @@ -101,7 +101,7 @@ (template [<name>] [(exception: #export (<name> {class Text}) (exception.report - ["Class/type" (%t class)]))] + ["Class/type" (%.text class)]))] [non-interface] [non-throwable] @@ -110,8 +110,8 @@ (exception: #export (cannot-set-a-final-field {field Text} {class Text}) (exception.report - ["Field" (%t field)] - ["Class" (%t class)])) + ["Field" (%.text field)] + ["Class" (%.text class)])) (template [<name>] [(exception: #export (<name> {class Text} @@ -121,8 +121,8 @@ (exception.report ["Class" class] ["Method" method] - ["Arguments" (exception.enumerate %t arg-classes)] - ["Hints" (exception.enumerate %type (list@map product.left hints))]))] + ["Arguments" (exception.enumerate %.text arg-classes)] + ["Hints" (exception.enumerate %.type (list@map product.left hints))]))] [no-candidates] [too-many-candidates] @@ -130,9 +130,9 @@ (exception: #export (cannot-cast {from .Type} {to .Type} {value Code}) (exception.report - ["From" (%type from)] - ["To" (%type to)] - ["Value" (%code value)])) + ["From" (%.type from)] + ["To" (%.type to)] + ["Value" (%.code value)])) (template [<name>] [(exception: #export (<name> {message Text}) @@ -627,7 +627,7 @@ (wrap (#/////analysis.Extension extension-name (list (/////analysis.text class))))) _ - (/////analysis.throw ///.invalid-syntax [extension-name %code args])) + (/////analysis.throw ///.invalid-syntax [extension-name %.code args])) _ (/////analysis.throw ///.incorrect-arity [extension-name 1 (list.size args)])))) @@ -807,7 +807,7 @@ (/////analysis.throw cannot-cast [fromT toT fromC]))) _ - (/////analysis.throw ///.invalid-syntax [extension-name %code args])))) + (/////analysis.throw ///.invalid-syntax [extension-name %.code args])))) (def: bundle::object Bundle @@ -1443,7 +1443,7 @@ (exception.report ["Methods" (exception.enumerate (function (_ [name method]) - (format (%t name) " " (jvm.method-signature method))) + (format (%.text name) " " (jvm.method-signature method))) methods)]))] [missing-abstract-methods] @@ -1837,9 +1837,9 @@ (exception: #export (class-parameter-mismatch {expected (List Text)} {actual (List jvm.Generic)}) (exception.report - ["Expected (amount)" (%n (list.size expected))] - ["Expected (parameters)" (exception.enumerate %t expected)] - ["Actual (amount)" (%n (list.size actual))] + ["Expected (amount)" (%.nat (list.size expected))] + ["Expected (parameters)" (exception.enumerate %.text expected)] + ["Actual (amount)" (%.nat (list.size actual))] ["Actual (parameters)" (exception.enumerate (|>> #jvm.Generic jvm.signature) actual)])) (type: Renamer (Dictionary Text Text)) @@ -1934,7 +1934,7 @@ id macro.count] (wrap (format (text.replace-all .module-separator ..jvm-package-separator where) ..jvm-package-separator - "anonymous-class" (%n id))))) + "anonymous-class" (%.nat id))))) super-classT (typeA.with-env (luxT.class mapping super-class)) super-interfaceT+ (typeA.with-env |