From 880cb37c261df20b7b8d968a909557bbc63d6b7f Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Wed, 8 Sep 2021 18:57:27 -0400 Subject: Normalized syntax of "exception:", "actor:" and "message:". --- lux-jvm/source/luxc/lang/translation/jvm.lux | 9 ++++++--- lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux | 2 +- lux-jvm/source/luxc/lang/translation/jvm/structure.lux | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) (limited to 'lux-jvm') diff --git a/lux-jvm/source/luxc/lang/translation/jvm.lux b/lux-jvm/source/luxc/lang/translation/jvm.lux index 0dde7a2e7..db7b5b3fa 100644 --- a/lux-jvm/source/luxc/lang/translation/jvm.lux +++ b/lux-jvm/source/luxc/lang/translation/jvm.lux @@ -62,18 +62,21 @@ (def: .public value_field Text "_value") (def: .public $Value (type.class "java.lang.Object" (list))) -(exception: .public (cannot_load {class Text} {error Text}) +(exception: .public (cannot_load [class Text + error Text]) (exception.report ["Class" class] ["Error" error])) -(exception: .public (invalid_field {class Text} {field Text} {error Text}) +(exception: .public (invalid_field [class Text + field Text + error Text]) (exception.report ["Class" class] ["Field" field] ["Error" error])) -(exception: .public (invalid_value {class Text}) +(exception: .public (invalid_value [class Text]) (exception.report ["Class" class])) diff --git a/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux b/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux index 4539ea17e..131ff0968 100644 --- a/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux +++ b/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux @@ -87,7 +87,7 @@ (All (_ a) (-> (Type a) Text)) (|>> type.descriptor descriptor.descriptor)) -(exception: .public (not_an_object_array {arrayJT (Type Array)}) +(exception: .public (not_an_object_array [arrayJT (Type Array)]) (exception.report ["JVM Type" (..signature arrayJT)])) diff --git a/lux-jvm/source/luxc/lang/translation/jvm/structure.lux b/lux-jvm/source/luxc/lang/translation/jvm/structure.lux index 2a688f4cc..e1c0c9f5f 100644 --- a/lux-jvm/source/luxc/lang/translation/jvm/structure.lux +++ b/lux-jvm/source/luxc/lang/translation/jvm/structure.lux @@ -37,7 +37,7 @@ ["[0]" // ["[1][0]" runtime]]) -(exception: .public (not_a_tuple {size Nat}) +(exception: .public (not_a_tuple [size Nat]) (exception.report ["Expected size" ">= 2"] ["Actual size" (%.nat size)])) -- cgit v1.2.3