diff options
Diffstat (limited to 'stdlib/source/lux/host/jvm.lux')
| -rw-r--r-- | stdlib/source/lux/host/jvm.lux | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/stdlib/source/lux/host/jvm.lux b/stdlib/source/lux/host/jvm.lux index b8139760c..b0030c84f 100644 --- a/stdlib/source/lux/host/jvm.lux +++ b/stdlib/source/lux/host/jvm.lux @@ -14,6 +14,7 @@ ["/." magic (#+ Magic)] ["/." index (#+ Index)] ["/." attribute (#+ Attribute)] + ["/." field (#+ Field)] [modifier ["/.M" class]] ["/." constant (#+ Constant) @@ -22,9 +23,6 @@ (type: #export Interface (Index /constant.Class)) -(type: #export Field - Any) - (type: #export Method Any) @@ -57,8 +55,8 @@ interfaces)] (wrap [@this @super @interfaces]))) -(def: #export (class version access super this interfaces) - (-> Major /classM.Modifier Internal Internal (List Internal) Class) +(def: #export (class version access super this interfaces fields) + (-> Major /classM.Modifier Internal Internal (List Internal) (Row Field) Class) (let [[pool [@this @super @interfaces]] (state.run (: Pool row.empty) (install-classes this super interfaces))] {#magic /magic.code @@ -69,7 +67,7 @@ #this @this #super @super #interfaces @interfaces - #fields row.empty + #fields fields #methods row.empty #attributes row.empty})) @@ -80,10 +78,10 @@ /version.format /version.format /pool.format - /classM.format + /classM.modifier-format /index.format /index.format (binary.row/16 /index.format) + (binary.row/16 /field.format) (binary.row/16 (binary.ignore [])) - (binary.row/16 (binary.ignore [])) - (binary.row/16 (binary.ignore [])))) + (binary.row/16 /attribute.format))) |