Emitter: Fix frame#merge issue, resolve #48

CASC-Lang · May 7, 2022 · 3764140 · 3764140
1 parent 0e74c17
commit 3764140
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/example/Donut.casc b/example/Donut.casc
@@ -30,7 +30,7 @@ impl Donut {
                         (12 + 15 * D * (l * h * n + t * m)) as i32,
                         x + 80 * y,
                         (8 * ((f * e - c * d * g) * m - c * d * e - f * g - l * d * n)) as i32
-                    if 22 > y && y > 0 {
+                    if 22 > y && y > 0 && x > 0 && 80 > x && D > z[o] {
                         z[o] = D
                         b[o] = [char;]{'.', ',', '-', '~', ':', ';', '=', '!', '*', '#', '$', '@'}[Math.max(N, 0)]
                     }

diff --git a/src/main/kotlin/org/casc/lang/emitter/Emitter.kt b/src/main/kotlin/org/casc/lang/emitter/Emitter.kt
@@ -435,8 +435,6 @@ class Emitter(private val preference: AbstractPreference, private val declaratio
             is BinaryExpression -> {
                 when (expression.operator?.type) {
                     TokenType.DoubleAmpersand, TokenType.DoublePipe -> {
-                        emitBinaryExpressions(methodVisitor, expression.left!!, expression.right!!)
-
                         emitAndOrOperators(methodVisitor, expression)
                     }
                     TokenType.Greater, TokenType.GreaterEqual, TokenType.Lesser,