From 4433c9bcd6c6cac44c018aad2e21a5b4d7cc4896 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Wed, 29 Nov 2017 22:49:56 -0400 Subject: - Adapted main codebase to the latest syntatic changes. --- new-luxc/source/luxc/lang/host/jvm.lux | 60 +++++++++++++++++----------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'new-luxc/source/luxc/lang/host/jvm.lux') diff --git a/new-luxc/source/luxc/lang/host/jvm.lux b/new-luxc/source/luxc/lang/host/jvm.lux index f96b3e646..cfe71656c 100644 --- a/new-luxc/source/luxc/lang/host/jvm.lux +++ b/new-luxc/source/luxc/lang/host/jvm.lux @@ -1,4 +1,4 @@ -(;module: +(.module: [lux #- Type Def] (lux (control monad ["p" parser]) @@ -9,11 +9,11 @@ [host])) ## [Host] -(host;import org.objectweb.asm.MethodVisitor) +(host.import org/objectweb/asm/MethodVisitor) -(host;import org.objectweb.asm.ClassWriter) +(host.import org/objectweb/asm/ClassWriter) -(host;import #long org.objectweb.asm.Label +(host.import #long org/objectweb/asm/Label (new [])) ## [Type] @@ -59,7 +59,7 @@ (-> MethodVisitor MethodVisitor)) (type: #export Label - org.objectweb.asm.Label) + org/objectweb/asm/Label) (type: #export Register Nat) @@ -70,45 +70,45 @@ #Default) (type: #export Version - #V1.1 - #V1.2 - #V1.3 - #V1.4 - #V1.5 - #V1.6 - #V1.7 - #V1.8) + #V1_1 + #V1_2 + #V1_3 + #V1_4 + #V1_5 + #V1_6 + #V1_7 + #V1_8) ## [Values] -(syntax: (config: [type s;local-symbol] - [none s;local-symbol] - [++ s;local-symbol] - [options (s;tuple (p;many s;local-symbol))]) - (let [g!type (code;local-symbol type) - g!none (code;local-symbol none) - g!tags+ (list/map code;local-tag options) - g!_left (code;local-symbol "_left") - g!_right (code;local-symbol "_right") +(syntax: (config: [type s.local-symbol] + [none s.local-symbol] + [++ s.local-symbol] + [options (s.tuple (p.many s.local-symbol))]) + (let [g!type (code.local-symbol type) + g!none (code.local-symbol none) + g!tags+ (list/map code.local-tag options) + g!_left (code.local-symbol "_left") + g!_right (code.local-symbol "_right") g!options+ (list/map (function [option] - (` (def: (~' #export) (~ (code;local-symbol option)) + (` (def: (~' #export) (~ (code.local-symbol option)) (~ g!type) (|> (~ g!none) - (set@ (~ (code;local-tag option)) true))))) + (set@ (~ (code.local-tag option)) true))))) options)] (wrap (list& (` (type: (~' #export) (~ g!type) - (~ (code;record (list/map (function [tag] - [tag (` ;Bool)]) + (~ (code.record (list/map (function [tag] + [tag (` .Bool)]) g!tags+))))) (` (def: (~' #export) (~ g!none) (~ g!type) - (~ (code;record (list/map (function [tag] + (~ (code.record (list/map (function [tag] [tag (` false)]) g!tags+))))) - (` (def: (~' #export) ((~ (code;local-symbol ++)) (~ g!_left) (~ g!_right)) + (` (def: (~' #export) ((~ (code.local-symbol ++)) (~ g!_left) (~ g!_right)) (-> (~ g!type) (~ g!type) (~ g!type)) - (~ (code;record (list/map (function [tag] + (~ (code.record (list/map (function [tag] [tag (` (or (get@ (~ tag) (~ g!_left)) (get@ (~ tag) (~ g!_right))))]) g!tags+))))) @@ -123,7 +123,7 @@ ## Labels (def: #export new-label (-> Unit Label) - org.objectweb.asm.Label.new) + org/objectweb/asm/Label::new) (def: #export (simple-class name) (-> Text Class) -- cgit v1.2.3