aboutsummaryrefslogtreecommitdiff
path: root/lux-jvm/source/luxc/lang
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--lux-jvm/source/luxc/lang/directive/jvm.lux32
-rw-r--r--lux-jvm/source/luxc/lang/host/jvm.lux24
-rw-r--r--lux-jvm/source/luxc/lang/host/jvm/inst.lux4
-rw-r--r--lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux2
4 files changed, 31 insertions, 31 deletions
diff --git a/lux-jvm/source/luxc/lang/directive/jvm.lux b/lux-jvm/source/luxc/lang/directive/jvm.lux
index ff0e5cecf..5f1b09ec9 100644
--- a/lux-jvm/source/luxc/lang/directive/jvm.lux
+++ b/lux-jvm/source/luxc/lang/directive/jvm.lux
@@ -649,26 +649,26 @@
(def: inheritance
(Parser Inheritance)
($_ <>.or
- (<code>.text! "final")
- (<code>.text! "abstract")
- (<code>.text! "default")
+ (<code>.this_text "final")
+ (<code>.this_text "abstract")
+ (<code>.this_text "default")
))
(def: privacy
(Parser Privacy)
($_ <>.or
- (<code>.text! "public")
- (<code>.text! "private")
- (<code>.text! "protected")
- (<code>.text! "default")
+ (<code>.this_text "public")
+ (<code>.this_text "private")
+ (<code>.this_text "protected")
+ (<code>.this_text "default")
))
(def: state
(Parser State)
($_ <>.or
- (<code>.text! "volatile")
- (<code>.text! "final")
- (<code>.text! "default")
+ (<code>.this_text "volatile")
+ (<code>.this_text "final")
+ (<code>.this_text "default")
))
(type: Field
@@ -678,7 +678,7 @@
(Parser Field)
(<code>.form
(do <>.monad
- [_ (<code>.text! "variable")
+ [_ (<code>.this_text "variable")
name <code>.text
privacy ..privacy
state ..state
@@ -763,7 +763,7 @@
(<>.and ..value
<code>.any)))]
(<| <code>.form
- (<>.after (<code>.text! "init"))
+ (<>.after (<code>.this_text "init"))
($_ <>.and
..privacy
<code>.bit
@@ -779,7 +779,7 @@
(def: override
(Parser (Override Code))
(<| <code>.form
- (<>.after (<code>.text! "override"))
+ (<>.after (<code>.this_text "override"))
($_ <>.and
..class_declaration
<code>.text
@@ -796,7 +796,7 @@
(def: virtual
(Parser (Virtual Code))
(<| <code>.form
- (<>.after (<code>.text! "virtual"))
+ (<>.after (<code>.this_text "virtual"))
($_ <>.and
<code>.text
..privacy
@@ -814,7 +814,7 @@
(def: static
(Parser (Static Code))
(<| <code>.form
- (<>.after (<code>.text! "static"))
+ (<>.after (<code>.this_text "static"))
($_ <>.and
<code>.text
..privacy
@@ -830,7 +830,7 @@
(def: abstract
(Parser Abstract)
(<| <code>.form
- (<>.after (<code>.text! "abstract"))
+ (<>.after (<code>.this_text "abstract"))
($_ <>.and
<code>.text
..privacy
diff --git a/lux-jvm/source/luxc/lang/host/jvm.lux b/lux-jvm/source/luxc/lang/host/jvm.lux
index dc942529d..22d901d51 100644
--- a/lux-jvm/source/luxc/lang/host/jvm.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm.lux
@@ -94,20 +94,20 @@
(type: .public (Generator i)
(-> Phase Archive i (Operation Inst)))
-(syntax: (config: [type <code>.local_symbol
- none <code>.local_symbol
- ++ <code>.local_symbol
- options (<code>.tuple (<>.many <code>.local_symbol))])
- (let [g!type (code.local_symbol type)
- g!none (code.local_symbol none)
- g!tags+ (list#each (|>> (format "#") code.local_symbol) options)
- g!_left (code.local_symbol "_left")
- g!_right (code.local_symbol "_right")
+(syntax: (config: [type <code>.local
+ none <code>.local
+ ++ <code>.local
+ options (<code>.tuple (<>.many <code>.local))])
+ (let [g!type (code.local type)
+ g!none (code.local none)
+ g!tags+ (list#each (|>> (format "#") code.local) options)
+ g!_left (code.local "_left")
+ g!_right (code.local "_right")
g!options+ (list#each (function (_ option)
- (` (def: .public (~ (code.local_symbol option))
+ (` (def: .public (~ (code.local option))
(~ g!type)
(|> (~ g!none)
- (has (~ (code.local_symbol (format "#" option))) #1)))))
+ (has (~ (code.local (format "#" option))) #1)))))
options)]
(in (list& (` (type: .public (~ g!type)
(.Record
@@ -125,7 +125,7 @@
list#conjoint
code.tuple))))
- (` (def: .public ((~ (code.local_symbol ++)) (~ g!_left) (~ g!_right))
+ (` (def: .public ((~ (code.local ++)) (~ g!_left) (~ g!_right))
(-> (~ g!type) (~ g!type) (~ g!type))
(~ (|> g!tags+
(list#each (function (_ tag)
diff --git a/lux-jvm/source/luxc/lang/host/jvm/inst.lux b/lux-jvm/source/luxc/lang/host/jvm/inst.lux
index 8b75e4169..34074c43c 100644
--- a/lux-jvm/source/luxc/lang/host/jvm/inst.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm/inst.lux
@@ -47,9 +47,9 @@
(import: java/lang/String
"[1]::[0]")
-(syntax: (declare [codes (p.many s.local_symbol)])
+(syntax: (declare [codes (p.many s.local)])
(|> codes
- (list@each (function (_ code) (` ((~' "static") (~ (code.local_symbol code)) (~' int)))))
+ (list@each (function (_ code) (` ((~' "static") (~ (code.local code)) (~' int)))))
in))
(`` (import: org/objectweb/asm/Opcodes
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 820e230db..91b664b54 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux
@@ -859,7 +859,7 @@
(Parser [(Environment Synthesis) (/.Overriden_Method Synthesis)])
(<synthesis>.tuple
(do <>.monad
- [_ (<synthesis>.text! /.overriden_tag)
+ [_ (<synthesis>.this_text /.overriden_tag)
ownerT ..class
name <synthesis>.text
strict_fp? <synthesis>.bit