From 53d741a6ef94e33438195b35c0ed57d26553a37d Mon Sep 17 00:00:00 2001 From: Alexander Iljin Date: Tue, 4 Aug 2020 09:38:53 +0200 Subject: [PATCH] L-system: rename some words to new conventions Move the angle brackets from tuple names to their . --- extra/L-system/L-system.factor | 24 +++++++++---------- extra/L-system/models/abop-1/abop-1.factor | 4 ++-- extra/L-system/models/abop-2/abop-2.factor | 4 ++-- extra/L-system/models/abop-3/abop-3.factor | 4 ++-- extra/L-system/models/abop-4/abop-4.factor | 4 ++-- .../abop-5-angular/abop-5-angular.factor | 4 ++-- extra/L-system/models/abop-5/abop-5.factor | 4 ++-- extra/L-system/models/abop-6/abop-6.factor | 4 ++-- .../L-system/models/airhorse/airhorse.factor | 4 ++-- extra/L-system/models/tree-5/tree-5.factor | 4 ++-- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/extra/L-system/L-system.factor b/extra/L-system/L-system.factor index dfae72c629..23e9d3d8af 100644 --- a/extra/L-system/L-system.factor +++ b/extra/L-system/L-system.factor @@ -12,7 +12,7 @@ IN: L-system ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -TUPLE: 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 ) new reset-turtle ; +: ( -- turtle ) turtle new reset-turtle ; ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -257,7 +257,7 @@ DEFER: default-L-parser-values ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -TUPLE: < gadget +TUPLE: L-system < gadget camera display-list pedestal paused turtle-values commands axiom rules string ; @@ -376,7 +376,7 @@ TUPLE: < gadget L-SYSTEM display-list>> GL_COMPILE glNewList - turtle + L-SYSTEM turtle-values>> [ ] or call( turtle -- turtle ) L-SYSTEM string>> L-SYSTEM axiom>> or L-SYSTEM commands>> @@ -387,7 +387,7 @@ TUPLE: < gadget ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -M:: draw-gadget* ( L-SYSTEM -- ) +M:: L-system draw-gadget* ( L-SYSTEM -- ) COLOR: black gl-clear @@ -417,7 +417,7 @@ M:: draw-gadget* ( L-SYSTEM -- ) ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -M:: graft* ( L-SYSTEM -- ) +M:: L-system graft* ( L-SYSTEM -- ) L-SYSTEM find-gl-context @@ -425,7 +425,7 @@ M:: graft* ( L-SYSTEM -- ) ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -M:: pref-dim* ( L-SYSTEM -- dim ) { 400 400 } ; +M:: L-system pref-dim* ( L-SYSTEM -- dim ) { 400 400 } ; ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -435,7 +435,7 @@ M:: pref-dim* ( L-SYSTEM -- dim ) { 400 400 } ; ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - +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 ) - new + L-system new 0 >>pedestal - ! turtle 45 turn-left 45 pitch-up 5 step-turtle 180 turn-left >>camera ; + ! 45 turn-left 45 pitch-up 5 step-turtle 180 turn-left >>camera ; - turtle 90 pitch-down -5 step-turtle 2 strafe-up >>camera + 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 34f1d4777a..10dfe407cd 100644 --- 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 ( -- ) +: 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 ( -- ) [ 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 1168780300..7490b1ce7e 100644 --- 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 ( -- ) +: 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 ( -- ) [ 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 f594cafcd3..2950a8cacc 100644 --- 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 ( -- ) +: 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 ( -- ) [ 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 71cf32d4d7..57650abb0c 100644 --- 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 ( -- ) +: 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 ( -- ) [ 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 9e78258d89..0e28fe9502 100644 --- 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 ( -- ) +: 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 ( -- ) [ 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 73dc13d44e..788ec2b73e 100644 --- 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 ( -- ) +: 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 ( -- ) [ 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 79680bdbe4..82ad2e8885 100644 --- 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 ( -- ) +: 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 ( -- ) [ 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 07f4224155..eec1a9146c 100644 --- 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 ( -- ) +: 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 ( -- ) [ 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 d4026ef069..19f700b038 100644 --- 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 ( -- ) +: 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 ( -- ) [ tree-5 "L-system" open-window ] with-ui ; MAIN: main