variables: typed vars, globals

diff --git a/extra/variables/variables.factor b/extra/variables/variables.factor
index 5b7186e155368a327c86ef48b279379d08d7f0b4..705e1f19458440da20cf4f3b70af2b6671d296e7 100644 (file)
--- a/extra/variables/variables.factor
+++ b/extra/variables/variables.factor
@@ -1,6 +1,8 @@
 ! (c)2010 Joe Groff bsd license
-USING: accessors definitions fry kernel locals.types namespaces parser
-see sequences words ;
+USING: accessors arrays combinators definitions fry kernel
+locals.types namespaces parser quotations see sequences slots
+words ;
+FROM: kernel.private => declare ;
 FROM: help.markup.private => link-effect? ;
 IN: variables
 
@@ -40,10 +42,32 @@ M: variable definition drop f ;
 M: variable link-effect? drop f ;
 M: variable print-stack-effect? drop f ;
 
+PREDICATE: typed-variable < variable
+    "variable-type" word-prop ;
+
+: [typed-getter] ( quot type -- quot )
+    1array '[ @ _ declare ] ;
+: [typed-setter] ( quot type -- quot )
+    instance-check-quot prepose ;
+
+: define-typed-variable ( word type -- )
+    dupd {
+        [ [ [variable-getter] ] dip [typed-getter] ]
+        [ [ [variable-setter] ] dip [typed-setter] ]
+        [ "variable-type" set-word-prop ]
+        [ initial-value swap set-global ]
+    } 2cleave (define-variable) ;
+
+SYNTAX: TYPED-VAR:
+    CREATE-WORD scan-object define-typed-variable ;    
+
+M: typed-variable definer drop \ TYPED-VAR: f ;
+M: typed-variable definition "variable-type" word-prop 1quotation ;
+
 TUPLE: global-box value ;
 
 PREDICATE: global-variable < variable
-    "variable-setter" word-prop def>> first global-box? ;
+    def>> first global-box? ;
 
 : [global-getter] ( box -- quot )
     '[ _ value>> ] ;
@@ -58,3 +82,17 @@ SYNTAX: GLOBAL:
 
 M: global-variable definer drop \ GLOBAL: f ;
 
+INTERSECTION: typed-global-variable
+    global-variable typed-variable ;
+
+: define-typed-global ( word type -- )
+    2dup "variable-type" set-word-prop
+    dup initial-value global-box boa swap
+    [ [ [global-getter] ] dip [typed-getter] ]
+    [ [ [global-setter] ] dip [typed-setter] ] 2bi (define-variable) ;
+
+SYNTAX: TYPED-GLOBAL:
+    CREATE-WORD scan-object define-typed-global ;
+
+M: typed-global-variable definer drop \ TYPED-GLOBAL: f ;
+