Simplify turtle API

src/inc/turtle.plh

@@ -2,13 +2,10 @@ import turtle
     predef initTurtle(width, height)#0
     predef clipLine(x1, y1, x2, y2)#0
     predef clipRect(left, top, right, bottom)#0
-    predef fillRect(left, top, right, bottom)#0
     predef turnTo(angle)#0
-    predef turnLeft(angle)#0
-    predef turnRight(angle)#0
+    predef turn(angle)#0
     predef moveTo(x, y)#0
-    predef moveForward(dist)#0
-    predef moveBackward(dist)#0
+    predef move(dist)#0
     predef penUp#0
     predef penDown#0
 end

src/libsrc/turtle.pla

@@ -94,14 +94,6 @@ export def clipRect(left, top, right, bottom)#0
     clipBottom = bottom
 end
 
-export def fillRect(left, top, right, bottom)#0
-    var y
-
-    for y = top to bottom
-        clipLine(left, y, right, y)
-    next
-end
-
 export def initTurtle(width, height, linefunc)#0
     drawLine     = linefunc
     clipRect(0, 0, width - 1, height - 1)
@@ -117,11 +109,7 @@ export def turnTo(angle)#0
     while turtleAngle < 0; turtleAngle = turtleAngle + 360; loop
 end
 
-export def turnLeft(angle)#0
-    turnTo(turtleAngle - angle)
-end
-
-export def turnRight(angle)#0
+export def turn(angle)#0
     turnTo(turtleAngle + angle)
 end
 
@@ -133,7 +121,7 @@ export def moveTo(x, y)#0
     turtleYp4 = y << 4
 end
 
-export def moveForward(dist)#0
+export def move(dist)#0
     var oldX, oldY
 
     oldX      = turtleXp4 >> 4
@@ -145,10 +133,6 @@ export def moveForward(dist)#0
     fin
 end
 
-export def moveBackward(dist)#0
-    moveForward(-dist)
-end
-
 export def penUp#0
     pen = 0
 end

src/scripts/grturtle.4th

@@ -12,10 +12,10 @@ PFA PLOT SETLINEPLOT
 ;
 
 : SQUARE
-    DUP MOVEFORWARD 90 TURNRIGHT
-    DUP MOVEFORWARD 90 TURNRIGHT
-    DUP MOVEFORWARD 90 TURNRIGHT
-        MOVEFORWARD 90 TURNRIGHT
+    DUP MOVE 90 TURN
+    DUP MOVE 90 TURN
+    DUP MOVE 90 TURN
+        MOVE 90 TURN
 ;
 
 : SPIN

src/scripts/hrturtle.4th

@@ -16,10 +16,10 @@ SRC" TURTLE.4TH"
 ;
 
 : SQUARE
-    DUP MOVEFORWARD 90 TURNRIGHT
-    DUP MOVEFORWARD 90 TURNRIGHT
-    DUP MOVEFORWARD 90 TURNRIGHT
-        MOVEFORWARD 90 TURNRIGHT
+    DUP MOVE 90 TURN
+    DUP MOVE 90 TURN
+    DUP MOVE 90 TURN
+        MOVE 90 TURN
 ;
 
 : SPIN

src/scripts/turtle.4th

@@ -5,12 +5,9 @@
 LOOKUP INITTURTLE    PLASMA INITTURTLE
 LOOKUP CLIPLINE      PLASMA CLIPLINE
 LOOKUP CLIPRECT      PLASMA CLIPRECT
-LOOKUP FILLRECT      PLASMA FILLRECT
 LOOKUP TURNTO        PLASMA TURNTO
-LOOKUP TURNLEFT      PLASMA TURNLEFT
-LOOKUP TURNRIGHT     PLASMA TURNRIGHT
+LOOKUP TURN          PLASMA TURN
 LOOKUP MOVETO        PLASMA MOVETO
-LOOKUP MOVEFORWARD   PLASMA MOVEFORWARD
-LOOKUP MOVEBACKWARD  PLASMA MOVEBACKWARD
+LOOKUP MOVE          PLASMA MOVE
 LOOKUP PENUP         PLASMA PENUP
 LOOKUP PENDOWN       PLASMA PENDOWN