aboutsummaryrefslogtreecommitdiff
path: root/stdlib/source
diff options
context:
space:
mode:
authorEduardo Julian2017-07-23 15:13:36 -0400
committerEduardo Julian2017-07-23 15:13:36 -0400
commit2c1a4d14de8f968ea0530ad471a1999488983c9d (patch)
tree2bbc900dae612c2d1c53038c70b9b038573772ea /stdlib/source
parentb3e2657c901e42dc14544821a68ded03a4c925ab (diff)
- Relocated the "object" and "concatenative" modules.
Diffstat (limited to 'stdlib/source')
-rw-r--r--stdlib/source/lux/control/concatenative.lux (renamed from stdlib/source/lux/paradigm/concatenative.lux)0
-rw-r--r--stdlib/source/lux/type/object.lux (renamed from stdlib/source/lux/paradigm/object.lux)9
2 files changed, 5 insertions, 4 deletions
diff --git a/stdlib/source/lux/paradigm/concatenative.lux b/stdlib/source/lux/control/concatenative.lux
index a0854ffcf..a0854ffcf 100644
--- a/stdlib/source/lux/paradigm/concatenative.lux
+++ b/stdlib/source/lux/control/concatenative.lux
diff --git a/stdlib/source/lux/paradigm/object.lux b/stdlib/source/lux/type/object.lux
index c7cdcb4d3..961be9b03 100644
--- a/stdlib/source/lux/paradigm/object.lux
+++ b/stdlib/source/lux/type/object.lux
@@ -234,11 +234,12 @@
(do-template [<name> <category>]
[(def: (<name> raw)
(-> Text Text)
- (format raw "//OOP:" <category>))]
+ (let [[module kind] (ident-for <category>)]
+ (format "{" kind "@" module "}" raw)))]
- [signatureN "Signature"]
- [stateN "State"]
- [structN "Struct"]
+ [signatureN #;;Signature]
+ [stateN #;;State]
+ [structN #;;Struct]
)
(def: (getterN export interface g!parameters g!ext g!child ancestors)