aboutsummaryrefslogtreecommitdiff
path: root/lux-jvm/source/luxc/lang/directive
diff options
context:
space:
mode:
authorEduardo Julian2020-11-24 05:18:04 -0400
committerEduardo Julian2020-11-24 05:18:04 -0400
commitc4bbfea18d995948012f45a6afda7a6e6ba56f84 (patch)
treeb3c425471830788965776fd173169f084d9f6af4 /lux-jvm/source/luxc/lang/directive
parentd89d837de3475b75587a4293e094d755d2cd4626 (diff)
Better error messages when re-using a name when making a definition.
Diffstat (limited to '')
-rw-r--r--lux-jvm/source/luxc/lang/directive/jvm.lux28
1 files changed, 14 insertions, 14 deletions
diff --git a/lux-jvm/source/luxc/lang/directive/jvm.lux b/lux-jvm/source/luxc/lang/directive/jvm.lux
index 798cf8298..0ec4fb1d5 100644
--- a/lux-jvm/source/luxc/lang/directive/jvm.lux
+++ b/lux-jvm/source/luxc/lang/directive/jvm.lux
@@ -223,8 +223,8 @@
(-> /.Object Inst)
(case instruction
(^template [<tag> <inst>]
- (<tag> class field-name field-type)
- (<inst> class field-name field-type))
+ [(<tag> class field-name field-type)
+ (<inst> class field-name field-type)])
([#/.GETSTATIC _.GETSTATIC]
[#/.PUTSTATIC _.PUTSTATIC]
[#/.GETFIELD _.GETFIELD]
@@ -236,8 +236,8 @@
(#/.CHECKCAST type) (_.CHECKCAST type)
(^template [<tag> <inst>]
- (<tag> class method-name method-type)
- (<inst> class method-name method-type))
+ [(<tag> class method-name method-type)
+ (<inst> class method-name method-type)])
([#/.INVOKEINTERFACE _.INVOKEINTERFACE]
[#/.INVOKESPECIAL _.INVOKESPECIAL]
[#/.INVOKESTATIC _.INVOKESTATIC]
@@ -402,9 +402,9 @@
(Re-labeler /.Branching)
(case instruction
(^template [<tag>]
- (<tag> label)
- (let [[mapping label] (..relabel [mapping label])]
- [mapping (<tag> label)]))
+ [(<tag> label)
+ (let [[mapping label] (..relabel [mapping label])]
+ [mapping (<tag> label)])])
([#/.IF_ICMPEQ] [#/.IF_ICMPGE] [#/.IF_ICMPGT] [#/.IF_ICMPLE] [#/.IF_ICMPLT] [#/.IF_ICMPNE]
[#/.IFEQ] [#/.IFNE] [#/.IFGE] [#/.IFGT] [#/.IFLE] [#/.IFLT]
@@ -444,16 +444,16 @@
(Re-labeler /.Control)
(case instruction
(^template [<tag> <relabel>]
- (<tag> instruction)
- (let [[mapping instruction] (<relabel> [mapping instruction])]
- [mapping (<tag> instruction)]))
+ [(<tag> instruction)
+ (let [[mapping instruction] (<relabel> [mapping instruction])]
+ [mapping (<tag> instruction)])])
([#/.GOTO ..relabel]
[#/.Branching ..relabel-branching]
[#/.Exception ..relabel-exception])
(^template [<tag>]
- (<tag> instruction)
- [mapping (<tag> instruction)])
+ [(<tag> instruction)
+ [mapping (<tag> instruction)]])
([#/.Concurrency] [#/.Return])
))
@@ -463,8 +463,8 @@
#/.NOP [mapping #/.NOP]
(^template [<tag>]
- (<tag> instruction)
- [mapping (<tag> instruction)])
+ [(<tag> instruction)
+ [mapping (<tag> instruction)]])
([#/.Constant]
[#/.Arithmetic]
[#/.Bitwise]