Renamed definition-input/output to introduce and return

Author: nicolas-p

extra/skov/code/code.factor

@@ -14,8 +14,8 @@ TUPLE: word-definition < definition  defined? result ;
 TUPLE: tuple-definition < definition  defined? ;
 
 TUPLE: node < element ;
-TUPLE: definition-input < node ;
-TUPLE: definition-output < node ;
+TUPLE: introduce < node ;
+TUPLE: return < node ;
 TUPLE: word < node  path ;
 TUPLE: text < node ;
 TUPLE: slot < node  initial-value ;
@@ -32,7 +32,7 @@ TUPLE: special-input < input ;
 TUPLE: special-output < output ;
 
 UNION: special-connector  special-input special-output ;
-UNION: definition-connector  definition-input definition-output ;
+UNION: definition-connector  introduce return ;
 
 TUPLE: result < element ;
 
@@ -49,8 +49,8 @@ M: element connectors>> ( elt -- seq ) contents>> [ definition-connector? ] filt
 M: node connectors>> ( elt -- seq ) contents>> [ connector? ] filter ;
 M: element inputs>> ( elt -- seq ) contents>> [ input? ] filter ;
 M: element outputs>> ( elt -- seq ) contents>> [ output? ] filter ;
-M: word-definition inputs>> ( elt -- seq ) contents>> [ definition-input? ] filter ;
-M: word-definition outputs>> ( elt -- seq ) contents>> [ definition-output? ] filter ;
+M: word-definition inputs>> ( elt -- seq ) contents>> [ introduce? ] filter ;
+M: word-definition outputs>> ( elt -- seq ) contents>> [ return? ] filter ;
 M: node slots>> ( elt -- seq ) contents>> [ slot? ] filter ;
 
 :: add-element ( parent child -- parent )
@@ -139,8 +139,8 @@ M: definition path>>
 
 GENERIC: (add-connectors) ( node -- node )
 M: element (add-connectors)  ;
-M: definition-input (add-connectors)  f >>contents dup name>> output add-with-name ;
-M: definition-output (add-connectors)  f >>contents dup name>> input add-with-name ;
+M: introduce (add-connectors)  f >>contents dup name>> output add-with-name ;
+M: return (add-connectors)  f >>contents dup name>> input add-with-name ;
 M: text (add-connectors)  f >>contents dup name>> output add-with-name add-special-connectors ;
 
 M: word (add-connectors)

extra/skov/execution/execution.factor

@@ -50,7 +50,7 @@ M: node write
     [ outputs>> [ special-output? ] reject [ write-id ":>" swap 2array ] map reverse ]
     tri 3array ;
 
-M: definition-output write
+M: return write
     inputs>> [ link>> write-id ] map ;
 
 M: text write

extra/skov/gadgets/environment-gadget/environment-gadget.factor

@@ -35,8 +35,8 @@ IN: skov.gadgets.environment-gadget
 : make-keyboard-safe ( env quot -- )
     [ world-focus editor? not ] swap smart-when* ; inline
 
-: add-input ( env -- ) [ definition-input add-to-word ] make-keyboard-safe ;
-: add-output ( env -- ) [ definition-output add-to-word ] make-keyboard-safe ;
+: add-input ( env -- ) [ introduce add-to-word ] make-keyboard-safe ;
+: add-output ( env -- ) [ return add-to-word ] make-keyboard-safe ;
 : add-text ( env -- ) [ text add-to-word ] make-keyboard-safe ;
 : add-slot ( env -- ) [ slot add-to-tuple ] make-keyboard-safe ;
 : add-constructor ( env -- ) [ constructor add-to-word ] make-keyboard-safe ;

extra/skov/gadgets/gadgets.factor

@@ -20,9 +20,9 @@ TUPLE: proto-connection < gadget  loc1 loc2 ;
 : connections>> ( def -- seq )  children>> [ connection-gadget? ] filter ;
 M: node-gadget connectors>> ( node-gadget -- seq )  children>> [ connector-gadget? ] filter ;
 M: node-gadget inputs>> ( node-gadget -- seq )
-    connectors>> [ control-value [ input? ] [ definition-input? ] bi or ] filter ;
+    connectors>> [ control-value [ input? ] [ introduce? ] bi or ] filter ;
 M: node-gadget outputs>> ( node-gadget -- seq )
-    connectors>> [ control-value [ output? ] [ definition-output? ] bi or ] filter ;
+    connectors>> [ control-value [ output? ] [ return? ] bi or ] filter ;
 
 : find-env ( gadget -- env )  [ environment-gadget? ] find-parent ;
 : find-vocab ( gadget -- vocab )  [ vocab-gadget? ] find-parent ;

extra/skov/gadgets/help-graph/help-graph.factor

@@ -17,7 +17,7 @@ IN: skov.gadgets.help-graph
     dup contents>> first add-connectors contents>>
     [ special-connector? ] reject [ 
       :> inside
-      inside input? [ definition-input ] [ definition-output ] if new
+      inside input? [ introduce ] [ return ] if new
       inside name>> >>name add-connectors :> outside
       inside outside contents>> first order-connectors connect
       outside add-element

extra/skov/gadgets/plus-button-pile/plus-button-pile.factor

@@ -22,8 +22,8 @@ IN: skov.gadgets.plus-button-pile
     ] smart-when* ;
 
 : plus-buttons-for-word ( -- seq )
-    [ "dark" [ find-env definition-input add-to-word ] <plus-button> "Add input ( i )" >>tooltip
-      "dark" [ find-env definition-output add-to-word ] <plus-button> "Add output ( o )" >>tooltip
+    [ "dark" [ find-env introduce add-to-word ] <plus-button> "Add input ( i )" >>tooltip
+      "dark" [ find-env return add-to-word ] <plus-button> "Add output ( o )" >>tooltip
       <space>
       "green" [ find-env word add-to-word ] <plus-button> "Add word ( w )" >>tooltip
       <space>

extra/skov/import-export/import-export.factor

@@ -37,10 +37,10 @@ M: input (export)
 M: output (export)
     [ name>> ] [ id>> ] bi 2array ;
 
-M: definition-input (export)
+M: introduce (export)
     [ name>> ] [ contents>> [ export ] map >array ] bi 2array ;
 
-M: definition-output (export)
+M: return (export)
     [ name>> ] [ contents>> [ export ] map >array ] bi 2array ;
 
 M: text (export)
@@ -80,13 +80,13 @@ M: definition (import)
 M: word (import)
     swap first3 [ >>name ] [ >>path ] [ [ import add-element ] each ] tri* ;
 
-M: definition-input (import)
+M: introduce (import)
     swap first2 [ >>name ] [ [ import add-element ] each ] bi* ;
 
 M: input (import)
     swap first2 [ >>name ] [ >>link ] bi* ;
 
-M: definition-output (import)
+M: return (import)
     swap first2 [ >>name ] [ [ import add-element ] each ] bi* ;
 
 M: output (import)