L-system: rename some words to new conventions

Move the angle brackets from tuple names to their <constructors>.

diff --git a/extra/L-system/L-system.factor b/extra/L-system/L-system.factor
index dfae72c629c998e9e7af7c6da5461623a7322108..23e9d3d8afb3bd173233944eafcc075bf3449918 100644 (file)
--- a/extra/L-system/L-system.factor
+++ b/extra/L-system/L-system.factor
@@ -12,7 +12,7 @@ IN: L-system
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-TUPLE: <turtle> pos ori angle length thickness color vertices saved ;
+TUPLE: turtle pos ori angle length thickness color vertices saved ;
 
 DEFER: default-L-parser-values
 
@@ -24,7 +24,7 @@ DEFER: default-L-parser-values
 
   default-L-parser-values ;
 
-: turtle ( -- turtle ) <turtle> new reset-turtle ;
+: <turtle> ( -- turtle ) turtle new reset-turtle ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
@@ -257,7 +257,7 @@ DEFER: default-L-parser-values
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-TUPLE: <L-system> < gadget
+TUPLE: L-system < gadget
   camera display-list pedestal paused
   turtle-values
   commands axiom rules string ;
@@ -376,7 +376,7 @@ TUPLE: <L-system> < gadget
 
   L-SYSTEM display-list>> GL_COMPILE glNewList
 
-    turtle
+    <turtle>
     L-SYSTEM turtle-values>> [ ] or call( turtle -- turtle )
     L-SYSTEM string>> L-SYSTEM axiom>> or
     L-SYSTEM commands>>
@@ -387,7 +387,7 @@ TUPLE: <L-system> < gadget
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-M:: <L-system> draw-gadget* ( L-SYSTEM -- )
+M:: L-system draw-gadget* ( L-SYSTEM -- )
 
   COLOR: black gl-clear
 
@@ -417,7 +417,7 @@ M:: <L-system> draw-gadget* ( L-SYSTEM -- )
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-M:: <L-system> graft* ( L-SYSTEM -- )
+M:: L-system graft* ( L-SYSTEM -- )
 
   L-SYSTEM find-gl-context
 
@@ -425,7 +425,7 @@ M:: <L-system> graft* ( L-SYSTEM -- )
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-M:: <L-system> pref-dim* ( L-SYSTEM -- dim ) { 400 400 } ;
+M:: L-system pref-dim* ( L-SYSTEM -- dim ) { 400 400 } ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
@@ -435,7 +435,7 @@ M:: <L-system> pref-dim* ( L-SYSTEM -- dim ) { 400 400 } ;
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-<L-system>
+L-system
 H{
   { T{ key-down f f "LEFT"  } [ [  5 turn-left   ] with-camera ] }
   { T{ key-down f f "RIGHT" } [ [  5 turn-right  ] with-camera ] }
@@ -472,15 +472,15 @@ set-gestures
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: L-system ( -- L-system )
+: <L-system> ( -- L-system )
 
-  <L-system> new
+  L-system new
 
     0 >>pedestal
   
-    ! turtle 45 turn-left 45 pitch-up 5 step-turtle 180 turn-left >>camera ;
+    ! <turtle> 45 turn-left 45 pitch-up 5 step-turtle 180 turn-left >>camera ;
 
-    turtle 90 pitch-down -5 step-turtle 2 strafe-up >>camera
+    <turtle> 90 pitch-down -5 step-turtle 2 strafe-up >>camera
 
     dup start-rotation-thread
 

diff --git a/extra/L-system/models/abop-1/abop-1.factor b/extra/L-system/models/abop-1/abop-1.factor
index 34f1d4777a986df4abe87cf81caa07671a729915..10dfe407cd6e3cbe2fcafd28b066dabc07c5dca4 100644 (file)
--- a/extra/L-system/models/abop-1/abop-1.factor
+++ b/extra/L-system/models/abop-1/abop-1.factor
@@ -5,7 +5,7 @@ IN: L-system.models.abop-1
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: abop-1 ( <L-system> -- <L-system> )
+: abop-1 ( L-system -- L-system )
   
   L-parser-dialect >>commands
 
@@ -22,6 +22,6 @@ IN: L-system.models.abop-1
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: main ( -- ) [ L-system abop-1 "L-system" open-window ] with-ui ;
+: main ( -- ) [ <L-system> abop-1 "L-system" open-window ] with-ui ;
 
 MAIN: main

diff --git a/extra/L-system/models/abop-2/abop-2.factor b/extra/L-system/models/abop-2/abop-2.factor
index 1168780300276250fdeea00e9a06b6b1c2d3cff8..7490b1ce7e912bcb96b21196528253a8cd515989 100644 (file)
--- a/extra/L-system/models/abop-2/abop-2.factor
+++ b/extra/L-system/models/abop-2/abop-2.factor
@@ -5,7 +5,7 @@ IN: L-system.models.abop-2
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: abop-2 ( <L-system> -- <L-system> )
+: abop-2 ( L-system -- L-system )
 
   L-parser-dialect >>commands
 
@@ -26,6 +26,6 @@ IN: L-system.models.abop-2
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: main ( -- ) [ L-system abop-2 "L-system" open-window ] with-ui ;
+: main ( -- ) [ <L-system> abop-2 "L-system" open-window ] with-ui ;
 
 MAIN: main

diff --git a/extra/L-system/models/abop-3/abop-3.factor b/extra/L-system/models/abop-3/abop-3.factor
index f594cafcd310c2ee37cef20b98ca1dc5f4ac2370..2950a8cacc79503623ddf16fb59f5dfd4bbdd9d4 100644 (file)
--- a/extra/L-system/models/abop-3/abop-3.factor
+++ b/extra/L-system/models/abop-3/abop-3.factor
@@ -5,7 +5,7 @@ IN: L-system.models.abop-3
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: abop-3 ( <L-system> -- <L-system> )
+: abop-3 ( L-system -- L-system )
 
   L-parser-dialect >>commands
 
@@ -22,6 +22,6 @@ IN: L-system.models.abop-3
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: main ( -- ) [ L-system abop-3 "L-system" open-window ] with-ui ;
+: main ( -- ) [ <L-system> abop-3 "L-system" open-window ] with-ui ;
 
 MAIN: main

diff --git a/extra/L-system/models/abop-4/abop-4.factor b/extra/L-system/models/abop-4/abop-4.factor
index 71cf32d4d7da1d05e045978739c32b23621efc5d..57650abb0cb4aa2a8d1318b692155da2b07f5b3a 100644 (file)
--- a/extra/L-system/models/abop-4/abop-4.factor
+++ b/extra/L-system/models/abop-4/abop-4.factor
@@ -5,7 +5,7 @@ IN: L-system.models.abop-4
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: abop-4 ( <L-system> -- <L-system> )
+: abop-4 ( L-system -- L-system )
 
   L-parser-dialect >>commands
 
@@ -51,6 +51,6 @@ IN: L-system.models.abop-4
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: main ( -- ) [ L-system abop-4 "L-system" open-window ] with-ui ;
+: main ( -- ) [ <L-system> abop-4 "L-system" open-window ] with-ui ;
 
 MAIN: main

diff --git a/extra/L-system/models/abop-5-angular/abop-5-angular.factor b/extra/L-system/models/abop-5-angular/abop-5-angular.factor
index 9e78258d89e97ef82ac30900945122135ccac1e1..0e28fe95028503d1a3d9ddf5bb202082ecc2faff 100644 (file)
--- a/extra/L-system/models/abop-5-angular/abop-5-angular.factor
+++ b/extra/L-system/models/abop-5-angular/abop-5-angular.factor
@@ -5,7 +5,7 @@ IN: L-system.models.abop-5-angular
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: abop-5-angular ( <L-system> -- <L-system> )
+: abop-5-angular ( L-system -- L-system )
 
   L-parser-dialect >>commands
 
@@ -27,7 +27,7 @@ IN: L-system.models.abop-5-angular
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: main ( -- ) [ L-system abop-5-angular "L-system" open-window ] with-ui ;
+: main ( -- ) [ <L-system> abop-5-angular "L-system" open-window ] with-ui ;
 
 MAIN: main
 

diff --git a/extra/L-system/models/abop-5/abop-5.factor b/extra/L-system/models/abop-5/abop-5.factor
index 73dc13d44e5b65829c9158420244b97ec9000683..788ec2b73edcb8d42344d959f4cb3ab28d868107 100644 (file)
--- a/extra/L-system/models/abop-5/abop-5.factor
+++ b/extra/L-system/models/abop-5/abop-5.factor
@@ -5,7 +5,7 @@ IN: L-system.models.abop-5
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: abop-5 ( <L-system> -- <L-system> )
+: abop-5 ( L-system -- L-system )
 
   L-parser-dialect >>commands
 
@@ -29,7 +29,7 @@ IN: L-system.models.abop-5
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: main ( -- ) [ L-system abop-5 "L-system" open-window ] with-ui ;
+: main ( -- ) [ <L-system> abop-5 "L-system" open-window ] with-ui ;
 
 MAIN: main
 

diff --git a/extra/L-system/models/abop-6/abop-6.factor b/extra/L-system/models/abop-6/abop-6.factor
index 79680bdbe4d02f88d73153a334c945682c48b4a9..82ad2e8885d523de6e98c465f324372e85101455 100644 (file)
--- a/extra/L-system/models/abop-6/abop-6.factor
+++ b/extra/L-system/models/abop-6/abop-6.factor
@@ -5,7 +5,7 @@ IN: L-system.models.abop-6
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: abop-6 ( <L-system> -- <L-system> )
+: abop-6 ( L-system -- L-system )
 
   L-parser-dialect >>commands
 
@@ -28,7 +28,7 @@ IN: L-system.models.abop-6
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: main ( -- ) [ L-system abop-6 "L-system" open-window ] with-ui ;
+: main ( -- ) [ <L-system> abop-6 "L-system" open-window ] with-ui ;
 
 MAIN: main
 

diff --git a/extra/L-system/models/airhorse/airhorse.factor b/extra/L-system/models/airhorse/airhorse.factor
index 07f42241555a98f9b0f3eaa99b3f603b39fac597..eec1a9146ca1ff1aebb24c325e92cade70debf77 100644 (file)
--- a/extra/L-system/models/airhorse/airhorse.factor
+++ b/extra/L-system/models/airhorse/airhorse.factor
@@ -5,7 +5,7 @@ IN: L-system.models.airhorse
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: airhorse ( <L-system> -- <L-system> )
+: airhorse ( L-system -- L-system )
 
   L-parser-dialect >>commands
 
@@ -47,6 +47,6 @@ IN: L-system.models.airhorse
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: main ( -- ) [ L-system airhorse "L-system" open-window ] with-ui ;
+: main ( -- ) [ <L-system> airhorse "L-system" open-window ] with-ui ;
 
 MAIN: main

diff --git a/extra/L-system/models/tree-5/tree-5.factor b/extra/L-system/models/tree-5/tree-5.factor
index d4026ef069f3ed5bf539a1e60a3ba6a17fa41f00..19f700b03817a033893d82f54661d011cea7fae5 100644 (file)
--- a/extra/L-system/models/tree-5/tree-5.factor
+++ b/extra/L-system/models/tree-5/tree-5.factor
@@ -5,7 +5,7 @@ IN: L-system.models.tree-5
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: tree-5 ( <L-system> -- <L-system> )
+: tree-5 ( L-system -- L-system )
 
   L-parser-dialect >>commands
 
@@ -31,6 +31,6 @@ IN: L-system.models.tree-5
 
 ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-: main ( -- ) [ L-system tree-5 "L-system" open-window ] with-ui ;
+: main ( -- ) [ <L-system> tree-5 "L-system" open-window ] with-ui ;
 
 MAIN: main