Split If and Else statement classes

iamgio · Jul 18, 2023 · 20b5821 · 20b5821
1 parent c8491fc
commit 20b5821
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 39 deletions.
diff --git a/core/src/main/kotlin/eu/iamgio/pikt/statement/statements/ElseStatement.kt b/core/src/main/kotlin/eu/iamgio/pikt/statement/statements/ElseStatement.kt
@@ -0,0 +1,48 @@
+package eu.iamgio.pikt.statement.statements
+
+import eu.iamgio.pikt.image.PixelReader
+import eu.iamgio.pikt.properties.ColorsProperties
+import eu.iamgio.pikt.statement.Statement
+import eu.iamgio.pikt.statement.StatementData
+import eu.iamgio.pikt.statement.StatementOptions
+import eu.iamgio.pikt.statement.StatementSyntax
+
+/**
+ * Runs if the previous [IfStatement] did not run. Can be followed by another [IfStatement] in order to create an `if else` statement.
+ * <%else%> <<%if%> <condition>?> <lambda or statement>
+ *
+ * @author Giorgio Garofalo
+ */
+class ElseStatement : Statement() {
+
+    override val options = StatementOptions(opensTemporaryScope = true)
+
+    override fun getSyntax() = StatementSyntax(
+        StatementSyntax.Member("else", StatementSyntax.Type.SCHEME_OBLIGATORY, mark = StatementSyntax.Mark.CORRECT),
+        StatementSyntax.MemberGroup(
+            "ifcondition", StatementSyntax.Type.OPTIONAL, mark = StatementSyntax.Mark.UNSET,
+            StatementSyntax.Member("if", StatementSyntax.Type.SCHEME_OBLIGATORY),
+            StatementSyntax.Member("condition", StatementSyntax.Type.OBLIGATORY)
+        ),
+        StatementSyntax.Member("lambda|statement", StatementSyntax.Type.OBLIGATORY)
+    )
+
+    override fun getColors(colors: ColorsProperties) = colors.keywords.`else`
+
+    override fun generate(reader: PixelReader, syntax: StatementSyntax, data: StatementData): CharSequence {
+        /*if(previousStatement !is IfStatement) {
+            reader.error("\"else\" has no \"if\".")
+        }*/
+        // TODO check if 'else' has 'if'
+
+        if(data.nextStatement is IfStatement) {
+            syntax.mark("ifcondition", StatementSyntax.Mark.CORRECT)
+        } else if(data.nextStatement == null) {
+            syntax.mark("lambda|statement", StatementSyntax.Mark.WRONG)
+            reader.error("\"else\" has empty body.", syntax)
+        }
+
+        // Output: else
+        return "else"
+    }
+}
diff --git a/.../statement/statements/IfElseStatements.kt → .../pikt/statement/statements/IfStatement.kt b/.../statement/statements/IfElseStatements.kt → .../pikt/statement/statements/IfStatement.kt
@@ -42,42 +42,3 @@ class IfStatement : Statement() {
         return "if ((${condition.code}).bool)"
     }
 }
-
-/**
- * Runs if the previous [IfStatement] did not run. Can be followed by another [IfStatement] in order to create an `if else` statement.
- * <%else%> <<%if%> <condition>?> <lambda or statement>
- *
- * @author Giorgio Garofalo
- */
-class ElseStatement : Statement() {
-
-    override val options = StatementOptions(opensTemporaryScope = true)
-
-    override fun getSyntax() = StatementSyntax(
-            StatementSyntax.Member("else", StatementSyntax.Type.SCHEME_OBLIGATORY, mark = StatementSyntax.Mark.CORRECT),
-            StatementSyntax.MemberGroup("ifcondition", StatementSyntax.Type.OPTIONAL, mark = StatementSyntax.Mark.UNSET,
-                    StatementSyntax.Member("if", StatementSyntax.Type.SCHEME_OBLIGATORY),
-                    StatementSyntax.Member("condition", StatementSyntax.Type.OBLIGATORY)
-            ),
-            StatementSyntax.Member("lambda|statement", StatementSyntax.Type.OBLIGATORY)
-    )
-
-    override fun getColors(colors: ColorsProperties) = colors.keywords.`else`
-
-    override fun generate(reader: PixelReader, syntax: StatementSyntax, data: StatementData): CharSequence {
-        /*if(previousStatement !is IfStatement) {
-            reader.error("\"else\" has no \"if\".")
-        }*/
-        // TODO check if 'else' has 'if'
-
-        if(data.nextStatement is IfStatement) {
-            syntax.mark("ifcondition", StatementSyntax.Mark.CORRECT)
-        } else if(data.nextStatement == null) {
-            syntax.mark("lambda|statement", StatementSyntax.Mark.WRONG)
-            reader.error("\"else\" has empty body.", syntax)
-        }
-
-        // Output: else
-        return "else"
-    }
-}