Issue #3: Implement penUp and penDown functions

AmrDeveloper · AmrDeveloper · commit 08c27b386e43 · 2023-08-21T19:45:47.000+02:00
diff --git a/app/src/main/java/com/amrdeveloper/turtle/ui/preview/TurtleCanvasView.kt b/app/src/main/java/com/amrdeveloper/turtle/ui/preview/TurtleCanvasView.kt
@@ -41,6 +41,7 @@ import com.amrdeveloper.lilo.backend.MoveXInst
 import com.amrdeveloper.lilo.backend.MoveYInst
 import com.amrdeveloper.lilo.backend.NewTurtleInst
 import com.amrdeveloper.lilo.backend.Operator
+import com.amrdeveloper.lilo.backend.PenInst
 import com.amrdeveloper.lilo.backend.RectangleInst
 import com.amrdeveloper.lilo.backend.SleepInst
 import com.amrdeveloper.lilo.backend.SpeedInst
@@ -100,26 +101,32 @@ class TurtleCanvasView @JvmOverloads constructor(
             when (val inst = instructionList[sp++]) {
                 is RectangleInst -> {
                     val turtle = turtlePointers[inst.id]
-                    turtlePaint.color = turtle.color
-                    canvas.drawRect(turtle.x, turtle.y, turtle.y + inst.right, turtle.y + inst.bottom, turtlePaint)
+                    if (turtle.isPenDown) {
+                        turtlePaint.color = turtle.color
+                        canvas.drawRect(turtle.x, turtle.y, turtle.y + inst.right, turtle.y + inst.bottom, turtlePaint)
+                    }
                 }
                 is CircleInst -> {
                     val turtle = turtlePointers[inst.id]
-                    turtlePaint.color = turtle.color
-                    canvas.drawCircle(turtle.x, turtle.y, inst.radius, turtlePaint)
+                    if (turtle.isPenDown) {
+                        turtlePaint.color = turtle.color
+                        canvas.drawCircle(turtle.x, turtle.y, inst.radius, turtlePaint)
+                    }
                 }
                 is LineInst -> {
                     val turtle = turtlePointers[inst.id]
-                    val angel = turtle.degree * Math.PI / 180
-                    val length = inst.length
-                    val endX = (turtle.x + length * sin(angel)).toFloat()
-                    val endY = (turtle.y + length * cos(angel)).toFloat()
+                    if (turtle.isPenDown) {
+                        val angel = turtle.degree * Math.PI / 180
+                        val length = inst.length
+                        val endX = (turtle.x + length * sin(angel)).toFloat()
+                        val endY = (turtle.y + length * cos(angel)).toFloat()
 
-                    turtlePaint.color = turtle.color
-                    canvas.drawLine(turtle.x, turtle.y, endX, endY, turtlePaint)
+                        turtlePaint.color = turtle.color
+                        canvas.drawLine(turtle.x, turtle.y, endX, endY, turtlePaint)
 
-                    turtlePointers[inst.id].x = endX
-                    turtlePointers[inst.id].y = endY
+                        turtlePointers[inst.id].x = endX
+                        turtlePointers[inst.id].y = endY
+                    }
                 }
                 is MoveXInst -> {
                     turtlePointers[inst.id].x = inst.amount
@@ -145,6 +152,9 @@ class TurtleCanvasView @JvmOverloads constructor(
                 is VisibilityInst -> {
                     turtlePointers[inst.id].isVisible = inst.isVisible
                 }
+                is PenInst -> {
+                    turtlePointers[inst.id].isPenDown = inst.isDown
+                }
                 is SpeedInst -> {
                     instructionSpeed = inst.time.toLong()
                 }
diff --git a/app/src/main/java/com/amrdeveloper/turtle/ui/preview/TurtlePointer.kt b/app/src/main/java/com/amrdeveloper/turtle/ui/preview/TurtlePointer.kt
@@ -8,4 +8,5 @@ data class TurtlePointer(
     var degree: Float,
     var color : Int = Color.BLACK,
     var isVisible: Boolean = true,
+    var isPenDown : Boolean = true,
 )
diff --git a/lilo/src/main/java/com/amrdeveloper/lilo/ast/Statements.kt b/lilo/src/main/java/com/amrdeveloper/lilo/ast/Statements.kt
@@ -259,6 +259,22 @@ class HidePointerStatement(
     }
 }
 
+class PenUpStatement(
+    override var id: Int = 0,
+) : TurtleStatement(id) {
+    override fun <R> accept(visitor: StatementVisitor<R>): R {
+        return visitor.visit(this)
+    }
+}
+
+class PenDownStatement(
+    override var id: Int = 0,
+) : TurtleStatement(id) {
+    override fun <R> accept(visitor: StatementVisitor<R>): R {
+        return visitor.visit(this)
+    }
+}
+
 class StopStatement : Statement() {
     override fun <R> accept(visitor: StatementVisitor<R>): R {
         return visitor.visit(this)
diff --git a/lilo/src/main/java/com/amrdeveloper/lilo/ast/Visitors.kt b/lilo/src/main/java/com/amrdeveloper/lilo/ast/Visitors.kt
@@ -43,6 +43,8 @@ interface StatementVisitor<R> {
     fun visit(statement: SleepStatement): R
     fun visit(statement: ShowPointerStatement): R
     fun visit(statement: HidePointerStatement): R
+    fun visit(statement: PenUpStatement): R
+    fun visit(statement: PenDownStatement): R
     fun visit(statement: StopStatement): R
     fun visit(statement: RotateStatement): R
     fun visit(statement: ForwardStatement): R
diff --git a/lilo/src/main/java/com/amrdeveloper/lilo/backend/Instruction.kt b/lilo/src/main/java/com/amrdeveloper/lilo/backend/Instruction.kt
@@ -48,6 +48,8 @@ class CircleInst(val id : Int, val radius : Float) : Instruction()
 class LineInst(var id : Int, val length : Float) : Instruction()
 class VisibilityInst(val id : Int, val isVisible : Boolean) : Instruction()
 
+class PenInst(val id : Int, val isDown : Boolean) : Instruction()
+
 class SleepInst(val time: Int) : Instruction()
 
 class SpeedInst ( val time : Int ) : Instruction()
diff --git a/lilo/src/main/java/com/amrdeveloper/lilo/backend/LiloEvaluator.kt b/lilo/src/main/java/com/amrdeveloper/lilo/backend/LiloEvaluator.kt
@@ -252,6 +252,14 @@ class LiloEvaluator : TreeVisitor<Unit, Any> {
         emitInstruction(VisibilityInst(statement.id, false))
     }
 
+    override fun visit(statement: PenUpStatement) {
+        emitInstruction(PenInst(statement.id, false))
+    }
+
+    override fun visit(statement: PenDownStatement) {
+        emitInstruction(PenInst(statement.id, true))
+    }
+
     override fun visit(statement: StopStatement) {
         shouldTerminate = true
     }
diff --git a/lilo/src/main/java/com/amrdeveloper/lilo/fmt/LiloFormatter.kt b/lilo/src/main/java/com/amrdeveloper/lilo/fmt/LiloFormatter.kt
@@ -54,6 +54,8 @@ import com.amrdeveloper.lilo.ast.MoveXStatement
 import com.amrdeveloper.lilo.ast.MoveYStatement
 import com.amrdeveloper.lilo.ast.NewTurtleExpression
 import com.amrdeveloper.lilo.ast.NumberExpression
+import com.amrdeveloper.lilo.ast.PenDownStatement
+import com.amrdeveloper.lilo.ast.PenUpStatement
 import com.amrdeveloper.lilo.ast.RepeatStatement
 import com.amrdeveloper.lilo.ast.ReturnStatement
 import com.amrdeveloper.lilo.ast.RightStatement
@@ -230,6 +232,14 @@ class LiloFormatter : TreeVisitor<String, String> {
         return indentation() + "hide\n"
     }
 
+    override fun visit(statement: PenUpStatement): String {
+        return indentation() + "penUp\n"
+    }
+
+    override fun visit(statement: PenDownStatement): String {
+        return indentation() + "penDown\n"
+    }
+
     override fun visit(statement: StopStatement): String {
         return indentation() + "stop\n"
     }
diff --git a/lilo/src/main/java/com/amrdeveloper/lilo/frontend/LiloParser.kt b/lilo/src/main/java/com/amrdeveloper/lilo/frontend/LiloParser.kt
@@ -113,6 +113,8 @@ class LiloParser(private val tokens: List<Token>, private val diagnostics: LiloD
             TokenType.TOKEN_SPEED -> parseSpeedStatement()
             TokenType.TOKEN_POINTER_SHOW -> parsePointerShowStatement()
             TokenType.TOKEN_POINTER_HIDE -> parsePointerHideStatement()
+            TokenType.TOKEN_PEN_UP -> parsePenUpStatement()
+            TokenType.TOKEN_PEN_DOWN -> parsePenDownStatement()
             TokenType.TOKEN_STOP -> parseStopStatement()
             TokenType.TOKEN_ROTATE -> parseRotateStatement()
             TokenType.TOKEN_FORWARD -> parseForwardStatement()
@@ -244,6 +246,18 @@ class LiloParser(private val tokens: List<Token>, private val diagnostics: LiloD
         return HidePointerStatement()
     }
 
+    private fun parsePenUpStatement(): Statement {
+        Timber.tag(TAG).d("Parse Pointer penUp statement")
+        consume(TokenType.TOKEN_PEN_UP, "Expect penUp keyword.")
+        return PenUpStatement()
+    }
+
+    private fun parsePenDownStatement(): Statement {
+        Timber.tag(TAG).d("Parse Pointer penDown statement")
+        consume(TokenType.TOKEN_PEN_DOWN, "Expect penDown keyword.")
+        return PenDownStatement()
+    }
+
     private fun parseStopStatement(): Statement {
         Timber.tag(TAG).d("Parse Stop statement")
         consume(TokenType.TOKEN_STOP, "Expect Stop keyword.")
diff --git a/lilo/src/main/java/com/amrdeveloper/lilo/frontend/LiloTokenizer.kt b/lilo/src/main/java/com/amrdeveloper/lilo/frontend/LiloTokenizer.kt
@@ -183,6 +183,8 @@ class LiloTokenizer(private val script : String) {
             "sleep" to TokenType.TOKEN_SLEEP,
             "show" to TokenType.TOKEN_POINTER_SHOW,
             "hide" to TokenType.TOKEN_POINTER_HIDE,
+            "penUp" to TokenType.TOKEN_PEN_UP,
+            "penDown" to TokenType.TOKEN_PEN_DOWN,
             "stop" to TokenType.TOKEN_STOP,
             "rotate" to TokenType.TOKEN_ROTATE,
             "forward" to TokenType.TOKEN_FORWARD,
diff --git a/lilo/src/main/java/com/amrdeveloper/lilo/frontend/TokenType.kt b/lilo/src/main/java/com/amrdeveloper/lilo/frontend/TokenType.kt
@@ -45,6 +45,8 @@ enum class TokenType {
     TOKEN_SLEEP,
     TOKEN_POINTER_SHOW,
     TOKEN_POINTER_HIDE,
+    TOKEN_PEN_UP,
+    TOKEN_PEN_DOWN,
     TOKEN_STOP,
     TOKEN_ROTATE,
     TOKEN_FORWARD,

Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,5 @@ data class TurtlePointer(`
`8`	`8`	`var degree: Float,`
`9`	`9`	`var color : Int = Color.BLACK,`
`10`	`10`	`var isVisible: Boolean = true,`
	`11`	`+ var isPenDown : Boolean = true,`
`11`	`12`	`)`
Original file line number	Diff line number	Diff line change
`@@ -252,6 +252,14 @@ class LiloEvaluator : TreeVisitor<Unit, Any> {`
`252`	`252`	`emitInstruction(VisibilityInst(statement.id, false))`
`253`	`253`	`}`
`254`	`254`
	`255`	`+ override fun visit(statement: PenUpStatement) {`
	`256`	`+ emitInstruction(PenInst(statement.id, false))`
	`257`	`+ }`
	`258`	`+`
	`259`	`+ override fun visit(statement: PenDownStatement) {`
	`260`	`+ emitInstruction(PenInst(statement.id, true))`
	`261`	`+ }`
	`262`	`+`
`255`	`263`	`override fun visit(statement: StopStatement) {`
`256`	`264`	`shouldTerminate = true`
`257`	`265`	`}`