From 3744a2212a89d4ab0f176350d2d2f90696235a40 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Tue, 19 Sep 2017 19:24:09 -0400
Subject: - Function generation.

---
 new-luxc/source/luxc/generator/host/jvm/def.lux | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'new-luxc/source/luxc/generator/host/jvm/def.lux')

diff --git a/new-luxc/source/luxc/generator/host/jvm/def.lux b/new-luxc/source/luxc/generator/host/jvm/def.lux
index bb1d2cd94..18cd4f945 100644
--- a/new-luxc/source/luxc/generator/host/jvm/def.lux
+++ b/new-luxc/source/luxc/generator/host/jvm/def.lux
@@ -50,6 +50,7 @@
 
 (host;import org.objectweb.asm.ClassWriter
   (#static COMPUTE_MAXS int)
+  (#static COMPUTE_FRAMES int)
   (new [int])
   (visit [int int String String String (Array String)] void)
   (visitEnd [] void)
@@ -100,10 +101,10 @@
 (def: (method-flags config)
   (-> $;Method-Config Int)
   ($_ i.+
-      Opcodes.ACC_STRICT
       (if (get@ #$;staticM config) Opcodes.ACC_STATIC 0)
       (if (get@ #$;finalM config) Opcodes.ACC_FINAL 0)
-      (if (get@ #$;synchronizedM config) Opcodes.ACC_SYNCHRONIZED 0)))
+      (if (get@ #$;synchronizedM config) Opcodes.ACC_SYNCHRONIZED 0)
+      (if (get@ #$;strictM config) Opcodes.ACC_STRICT 0)))
 
 (def: (field-flags config)
   (-> $;Field-Config Int)
@@ -145,12 +146,18 @@
                 (L/map (|>. class-to-type $t;signature))
                 (text;join-with "")))))
 
+(def: class-computes
+  Int
+  ($_ i.+
+      ClassWriter.COMPUTE_MAXS
+      ClassWriter.COMPUTE_FRAMES))
+
 (do-template [<name> <flag>]
   [(def: #export (<name> version visibility config name parameters super interfaces
                          definitions)
      (-> $;Version $;Visibility $;Class-Config Text (List $;Parameter) $;Class (List $;Class) $;Def
          host;Byte-Array)
-     (let [writer (|> (do-to (ClassWriter.new ClassWriter.COMPUTE_MAXS)
+     (let [writer (|> (do-to (ClassWriter.new class-computes)
                         (ClassWriter.visit [(version-flag version)
                                             ($_ i.+
                                                 Opcodes.ACC_SUPER
@@ -177,7 +184,7 @@
                          definitions)
   (-> $;Version $;Visibility $;Class-Config Text (List $;Parameter) (List $;Class) $;Def
       host;Byte-Array)
-  (let [writer (|> (do-to (ClassWriter.new ClassWriter.COMPUTE_MAXS)
+  (let [writer (|> (do-to (ClassWriter.new class-computes)
                      (ClassWriter.visit [(version-flag version)
                                          ($_ i.+
                                              Opcodes.ACC_SUPER
@@ -277,4 +284,4 @@
     singleton
 
     (#;Cons head tail)
-    (. head (fuse tail))))
+    (. (fuse tail) head)))
-- 
cgit v1.2.3