bahasa-simpl 1.0.5 → 1.0.7

package/dist/simpl-interpreter.js

@@ -49,117 +49,6 @@ class Environment {
 
 }
 
-const RESERVED_KEYWORDS = [
-    "rubah",
-    "kalau",
-    "namun",
-    "slagi",
-    "untuk",
-    "cetak",
-    "henti",
-    "lewat",
-    "dalam",
-    "hasil",
-    "kerja",
-    "datum",
-    "jenis",
-    "model",
-    "error",
-    "tetap",
-    "modul",
-];
-
-const RUBAH = 0,
-    KALAU = 1,
-    NAMUN = 2,
-    SLAGI = 3,
-    UNTUK = 4,
-    CETAK = 5,
-    HENTI = 6,
-    LEWAT = 7,
-    DALAM = 8,
-    HASIL = 9,
-    KERJA = 10,
-    DATUM = 11,
-    JENIS = 12,
-    MODEL = 13,
-    TETAP = 15,
-    MODUL = 16,
-    EOF = 17,
-    ID = 18,
-    LITERAL = 19,
-    PLUS = 20,
-    MINUS = 21,
-    STAR = 22,
-    SLASH = 23,
-    LPAREN = 24,
-    RPAREN = 25,
-    GREATER = 26,
-    GREATER_EQUAL = 27,
-    LESS = 28,
-    LESS_EQUAL = 29,
-    EQUAL = 30,
-    EQUAL_EQUAL = 31,
-    DOT = 32,
-    LCURLY = 33,
-    RCURLY = 34,
-    COMMA = 35,
-    LSQUARE = 36,
-    RSQUARE = 37,
-    PIPE = 38,
-    AMPERSAND = 39,
-    BANG = 40,
-    ARROW = 41,
-    BANG_EQUAL = 42,
-    MODULUS = 43;
-
-const TOKEN_STRING = [
-    "RUBAH",
-    "KALAU",
-    "NAMUN",
-    "SLAGI",
-    "UNTUK",
-    "CETAK",
-    "HENTI",
-    "LEWAT",
-    "DALAM",
-    "HASIL",
-    "KERJA",
-    "DATUM",
-    "JENIS",
-    "MODEL",
-    "ERROR",
-    "TETAP",
-    "MODUL",
-    "EOF",
-    "ID",
-    "LITERAL",
-    "PLUS",
-    "MINUS",
-    "BINTANG",
-    "GARIS_MIRING",
-    "LPAREN",
-    "RPAREN",
-    "LEBIH",
-    "LEBIH_SAMA",
-    "KURANG",
-    "KURANG_SAMA",
-    "SAMA",
-    "SAMA_SAMA",
-    "DOT",
-    "LCURLY",
-    "RCURLY",
-    "COMMA",
-    "LSQUARE",
-    "RSQUARE",
-    "PIPA",
-    "AMPERSAN",
-    "SERU",
-    "ARROW",
-    "SERU_SAMA",
-    "MODULUS",
-];
-
 const RESERVED_NAMES = [
     "petik", "angka", "logis", "mesin", "baris", "stipe", "modul"
 ];
@@ -194,24 +83,9 @@ class Stipe extends Variable {
     constructor(type, data) {
         super(stipeSymbol, true, data);
         this.symbol = type;
-        this.operators = new Environment();
-        this.member = null;
+        this.member = new Environment();
     }
 
-    operate(visitor, op, right, left) {
-        let opLexeme = TOKEN_STRING[op] + (left ? "" : "_UNARY");
-        let operatorFunc = this.operators.get(opLexeme);
-        if (!operatorFunc)
-            visitor.error(`operator ${opLexeme} tidak terdefinisi untuk Model ${right.type.description}.`);
-
-        let result = null;
-        if (left) { // Binary
-            result = visitor.callFunc(operatorFunc.data, [right, left]);
-        } else { // Unary, safe because valid unary op is just + - ! in the parser
-            result = visitor.callFunc(operatorFunc.data, [right]);
-        }
-        return result;
-    }
 }
 
 class PetikTipe extends Stipe {
@@ -235,9 +109,7 @@ class PetikTipe extends Stipe {
                     if (!thing?.type) return `nihil`;
                     let type = v.environment.get(thing.type.description);
                     if (type?.member.has("kePetik")) {
-                        v.stack.push(v.line);
                         let res = v.callFunc(type.member.get("kePetik").data, [thing]).data;
-                        v.stack.pop();
                         return res;
                     }
                     return `${thing.type.description}<>`;
@@ -251,30 +123,28 @@ class PetikTipe extends Stipe {
 
     init() {
         // BINARY / UNARY OPERATORS
-        this.operators.define("PLUS",
+        this.member.define("PLUS",
             makeBuiltInFunc([petikSymbol, petikSymbol], petikSymbol, (_, [r, l]) => new Value(petikSymbol, l.data + r.data)));
-        this.operators.define("LEBIH",
+        this.member.define("LEBIH",
             makeBuiltInFunc([petikSymbol, petikSymbol], logisSymbol, (_, [r, l]) => new Value(logisSymbol, l.data > r.data)));
-        this.operators.define("KURANG",
+        this.member.define("KURANG",
             makeBuiltInFunc([petikSymbol, petikSymbol], logisSymbol, (_, [r, l]) => new Value(logisSymbol, l.data < r.data)));
-        this.operators.define("SAMA_SAMA",
+        this.member.define("SAMA_SAMA",
             makeBuiltInFunc([petikSymbol, petikSymbol], logisSymbol, (_, [r, l]) => new Value(logisSymbol, l.data === r.data)));
-        this.operators.define("LEBIH_SAMA",
+        this.member.define("LEBIH_SAMA",
             makeBuiltInFunc([petikSymbol, petikSymbol], logisSymbol, (_, [r, l]) => new Value(logisSymbol, l.data >= r.data)));
-        this.operators.define("KURANG_SAMA",
+        this.member.define("KURANG_SAMA",
             makeBuiltInFunc([petikSymbol, petikSymbol], logisSymbol, (_, [r, l]) => new Value(logisSymbol, l.data <= r.data)));
-        this.operators.define("SERU_SAMA",
+        this.member.define("SERU_SAMA",
             makeBuiltInFunc([petikSymbol, petikSymbol], logisSymbol, (_, [r, l]) => new Value(logisSymbol, l.data !== r.data)));
-        this.operators.define("AMPERSAN",
+        this.member.define("AMPERSAN",
             makeBuiltInFunc([petikSymbol, petikSymbol], logisSymbol, (_, [r, l]) => new Value(logisSymbol, l.data && r.data)));
-        this.operators.define("PIPA",
+        this.member.define("PIPA",
             makeBuiltInFunc([petikSymbol, petikSymbol], logisSymbol, (_, [r, l]) => new Value(logisSymbol, l.data || r.data)));
 
-        this.operators.define("SERU_UNARY",
+        this.member.define("SERU_UNER",
             makeBuiltInFunc([petikSymbol], logisSymbol, (_, [r]) => new Value(logisSymbol, !Boolean(r.data))));
 
-        this.member = new Environment();
-
         this.member.define("pisah", makeBuiltInFunc([petikSymbol, petikSymbol], barisSymbol, (_, [d, sep]) => {
             return new Value(barisSymbol, d.data.split(sep.data).map(val => new Value(petikSymbol, val)));
         }));
@@ -320,42 +190,40 @@ class AngkaTipe extends Stipe {
     }
 
     init() {
-        this.operators.define("PLUS",
+        this.member.define("PLUS",
             makeBuiltInFunc([angkaSymbol, angkaSymbol], angkaSymbol, (_, [r, l]) => new Value(angkaSymbol, l.data + r.data)));
-        this.operators.define("MINUS",
+        this.member.define("MINUS",
             makeBuiltInFunc([angkaSymbol, angkaSymbol], angkaSymbol, (_, [r, l]) => new Value(angkaSymbol, l.data - r.data)));
-        this.operators.define("BINTANG",
+        this.member.define("BINTANG",
             makeBuiltInFunc([angkaSymbol, angkaSymbol], angkaSymbol, (_, [r, l]) => new Value(angkaSymbol, l.data * r.data)));
-        this.operators.define("GARIS_MIRING",
+        this.member.define("GARIS_MIRING",
             makeBuiltInFunc([angkaSymbol, angkaSymbol], angkaSymbol, (_, [r, l]) => new Value(angkaSymbol, l.data / r.data)));
-        this.operators.define("MODULUS",
+        this.member.define("MODULUS",
             makeBuiltInFunc([angkaSymbol, angkaSymbol], angkaSymbol, (_, [r, l]) => new Value(angkaSymbol, l.data % r.data)));
 
-        this.operators.define("LEBIH",
+        this.member.define("LEBIH",
             makeBuiltInFunc([angkaSymbol, angkaSymbol], logisSymbol, (_, [r, l]) => new Value(logisSymbol, l.data > r.data)));
-        this.operators.define("KURANG",
+        this.member.define("KURANG",
             makeBuiltInFunc([angkaSymbol, angkaSymbol], logisSymbol, (_, [r, l]) => new Value(logisSymbol, l.data < r.data)));
-        this.operators.define("SAMA_SAMA",
+        this.member.define("SAMA_SAMA",
             makeBuiltInFunc([angkaSymbol, angkaSymbol], logisSymbol, (_, [r, l]) => new Value(logisSymbol, l.data === r.data)));
-        this.operators.define("LEBIH_SAMA",
+        this.member.define("LEBIH_SAMA",
             makeBuiltInFunc([angkaSymbol, angkaSymbol], logisSymbol, (_, [r, l]) => new Value(logisSymbol, l.data >= r.data)));
-        this.operators.define("KURANG_SAMA",
+        this.member.define("KURANG_SAMA",
             makeBuiltInFunc([angkaSymbol, angkaSymbol], logisSymbol, (_, [r, l]) => new Value(logisSymbol, l.data <= r.data)));
-        this.operators.define("SERU_SAMA",
+        this.member.define("SERU_SAMA",
             makeBuiltInFunc([angkaSymbol, angkaSymbol], logisSymbol, (_, [r, l]) => new Value(logisSymbol, l.data !== r.data)));
-        this.operators.define("AMPERSAN",
+        this.member.define("AMPERSAN",
             makeBuiltInFunc([angkaSymbol, angkaSymbol], logisSymbol, (_, [r, l]) => new Value(logisSymbol, l.data && r.data)));
-        this.operators.define("PIPA",
+        this.member.define("PIPA",
             makeBuiltInFunc([angkaSymbol, angkaSymbol], logisSymbol, (_, [r, l]) => new Value(logisSymbol, l.data || r.data)));
-        this.operators.define("SERU_UNARY",
+        this.member.define("SERU_UNER",
             makeBuiltInFunc([angkaSymbol], logisSymbol, (_, [r]) => new Value(logisSymbol, !Boolean(r.data))));
-        this.operators.define("PLUS_UNARY",
+        this.member.define("PLUS_UNER",
             makeBuiltInFunc([angkaSymbol], angkaSymbol, (_, [r]) => new Value(angkaSymbol, +r.data)));
-        this.operators.define("MINUS_UNARY",
+        this.member.define("MINUS_UNER",
             makeBuiltInFunc([angkaSymbol], angkaSymbol, (_, [r]) => new Value(angkaSymbol, -r.data)));
 
-        this.member = new Environment();
-
         this.member.define("bulat", makeBuiltInFunc([angkaSymbol], angkaSymbol, (_, [a]) => {
             return new Value(angkaSymbol, Math.round(a.data));
         }));
@@ -371,25 +239,26 @@ class AngkaTipe extends Stipe {
 class LogisTipe extends Stipe {
     constructor() {
         super(logisSymbol, new Callable(null, (_, args) => {
-            return new Value(logisSymbol, Boolean(args[0].data) || Boolean(args[0].data.member));
+            if (args[0].type === barisSymbol && args[0].data.length === 0) {
+                return new Value(logisSymbol, false);
+            }
+            return new Value(logisSymbol, Boolean(args[0].data) || Boolean(args[0].data?.member?.size));
         }, [[null]], logisSymbol, true)
         );
         this.init();
     }
 
     init() {
-        this.operators.define("SAMA_SAMA",
+        this.member.define("SAMA_SAMA",
             makeBuiltInFunc([logisSymbol, logisSymbol], logisSymbol, (_, [r, l]) => new Value(logisSymbol, l.data === r.data)));
-        this.operators.define("SERU_SAMA",
+        this.member.define("SERU_SAMA",
             makeBuiltInFunc([logisSymbol, logisSymbol], logisSymbol, (_, [r, l]) => new Value(logisSymbol, l.data !== r.data)));
-        this.operators.define("AMPERSAN",
+        this.member.define("AMPERSAN",
             makeBuiltInFunc([logisSymbol, logisSymbol], logisSymbol, (_, [r, l]) => new Value(logisSymbol, l.data && r.data)));
-        this.operators.define("PIPA",
+        this.member.define("PIPA",
             makeBuiltInFunc([logisSymbol, logisSymbol], logisSymbol, (_, [r, l]) => new Value(logisSymbol, l.data || r.data)));
-        this.operators.define("SERU_UNARY",
+        this.member.define("SERU_UNER",
             makeBuiltInFunc([logisSymbol], logisSymbol, (_, [r]) => new Value(logisSymbol, !Boolean(r.data))));
-
-        this.member = new Environment();
     }
 }
 
@@ -400,17 +269,17 @@ class BarisTipe extends Stipe {
     }
 
     init() {
-        this.operators.define("PLUS",
+        this.member.define("PLUS",
             makeBuiltInFunc([barisSymbol, barisSymbol], barisSymbol, (_, [r, l]) =>
                 new Value(barisSymbol, Array(...l.data, ...r.data))
             ));
 
-        this.operators.define("MINUS_UNARY",
+        this.member.define("MINUS_UNER",
             makeBuiltInFunc([barisSymbol], barisSymbol, (_, [r]) =>
                 new Value(barisSymbol, r.data.slice(0, r.length))
             ));
 
-        this.operators.define("SAMA_SAMA",
+        this.member.define("SAMA_SAMA",
             makeBuiltInFunc([barisSymbol, barisSymbol], logisSymbol, (_, [r, l]) => new Value(logisSymbol, ((a, b) => {
                 if (a.length !== b.length) return false;
                 for (let i = 0; i < a.length; i++) {
@@ -420,7 +289,7 @@ class BarisTipe extends Stipe {
             })(l.data, r.data)))
         );
 
-        this.operators.define("SERU_SAMA",
+        this.member.define("SERU_SAMA",
             makeBuiltInFunc([barisSymbol, barisSymbol], logisSymbol, (_, [r, l]) => new Value(logisSymbol, ((a, b) => {
                 if (a.length !== b.length) return true;
                 for (let i = 0; i < a.length; i++) {
@@ -430,15 +299,13 @@ class BarisTipe extends Stipe {
             })(l.data, r.data)))
         );
 
-        this.operators.define("AMPERSAN",
+        this.member.define("AMPERSAN",
             makeBuiltInFunc([barisSymbol, barisSymbol], logisSymbol, (_, [r, l]) => new Value(logisSymbol, l.data && r.data)));
-        this.operators.define("PIPA",
+        this.member.define("PIPA",
             makeBuiltInFunc([barisSymbol, barisSymbol], logisSymbol, (_, [r, l]) => new Value(logisSymbol, l.data || r.data)));
-        this.operators.define("SERU_UNARY",
+        this.member.define("SERU_UNER",
             makeBuiltInFunc([barisSymbol], logisSymbol, (_, [r]) => new Value(logisSymbol, !Boolean(r.data))));
 
-        this.member = new Environment();
-
         this.member.define("hapus", makeBuiltInFunc([barisSymbol, angkaSymbol], barisSymbol, (v, [b, i]) => {
             if (b.data.length <= i.data) {
                 v.error(`Indeks tidak boleh lebih besar atau sama dengan ukuran baris, ${i.data} >= ${b.data.length}`);
@@ -501,7 +368,7 @@ class BarisTipe extends Stipe {
 class MesinTipe extends Stipe {
     constructor() {
         super(mesinSymbol);
-        this.member = new Environment();
+        this.member.define("$", null);
     }
 }
 
@@ -513,15 +380,20 @@ let Model$1 = class Model extends Stipe {
             let obj = new Value(sym, true);
             obj.member = new Environment();
 
+            let callLine = v.line;
+
             for (let i = 0; i < args.length; i++) {
                 let type = params[i][0];
                 let symbol = type.accept(v);
                 let name = params[i][1].lexeme;
 
                 let val = new Variable(symbol, type.tetap, args[i].data);
-                if (args[i].data === null) ; else if (symbol === null) {
+                if (symbol === null) {
                     val.isDatum = true;
                     val.type = args[i].type;
+                } else if (args[i].type !== symbol) {
+                    v.line = callLine;
+                    v.error(`Argumen pembuatan objek tidak sama dengan argumen model, menemukan ${args[i].type?.description}, mengharapkan ${symbol ? symbol.description : "nihil" }`);
                 }
                 val.member = args[i].member;
                 obj.member.define(name, val);
@@ -537,17 +409,20 @@ let Jenis$1 = class Jenis extends Stipe {
     constructor(name, enums) {
         let sym = Symbol(name);
         super(sym, null);
-        this.member = new Environment();
         enums.forEach((thing, idx) => {
             this.member.define(thing.lexeme, new Value(sym, idx));
         });
+        this.member.define("kePetik", makeBuiltInFunc([sym], petikSymbol, (_, [j]) => {
+            let enumName = enums.map(thing=>thing.lexeme)[j.data];
+            return new Value(petikSymbol, `${name}.${enumName}`);
+        }));
         this.init(sym);
     }
 
     init(sym) {
-        this.operators.define("SAMA_SAMA",
+        this.member.define("SAMA_SAMA",
             makeBuiltInFunc([sym, sym], logisSymbol, (_, [r, l]) => new Value(logisSymbol, l.data === r.data)));
-        this.operators.define("SERU_SAMA",
+        this.member.define("SERU_SAMA",
             makeBuiltInFunc([sym, sym], logisSymbol, (_, [r, l]) => new Value(logisSymbol, l.data !== r.data)));
     }
 };
@@ -632,11 +507,146 @@ const GLOBAL_ENV = (() => {
     mtkModul.member.define("akar2", makeBuiltInFunc([angkaSymbol], angkaSymbol, (_, [a]) => {
         return new Value(angkaSymbol, Math.sqrt(a.data));
     }));
+    mtkModul.member.define("min", makeBuiltInFunc([angkaSymbol, angkaSymbol], angkaSymbol, (_, [a, b]) => {
+        return new Value(angkaSymbol, Math.min(a.data, b.data));
+    }));
+    mtkModul.member.define("maks", makeBuiltInFunc([angkaSymbol, angkaSymbol], angkaSymbol, (_, [a, b]) => {
+        return new Value(angkaSymbol, Math.max(a.data, b.data));
+    }));
+
+    const fpb = (a, b) => {
+        [a, b] = [Math.max(a, b), Math.min(a, b)];
+        while (b > 0) {
+            [a, b] = [b, a % b];
+        }
+        return a
+    };
+
+    mtkModul.member.define("fpb", makeBuiltInFunc([angkaSymbol, angkaSymbol], angkaSymbol, (_, [a, b]) => {
+        let fpbVal = fpb(a.data, b.data);
+        return new Value(angkaSymbol, fpbVal);
+    }));
+
+    mtkModul.member.define("kpk", makeBuiltInFunc([angkaSymbol, angkaSymbol], angkaSymbol, (_, [a, b]) => {
+        let fpbVal = fpb(a.data, b.data);
+        return new Value(angkaSymbol, a.data*b*data/fpbVal);
+    }));
 
     env.define("mtk", mtkModul);
     return env;
 })();
 
+const RESERVED_KEYWORDS = [
+    "rubah",
+    "kalau",
+    "namun",
+    "slagi",
+    "untuk",
+    "cetak",
+    "henti",
+    "lewat",
+    "dalam",
+    "hasil",
+    "kerja",
+    "datum",
+    "jenis",
+    "model",
+    "error",
+    "tetap",
+    "modul",
+];
+
+const RUBAH = 0,
+    KALAU = 1,
+    NAMUN = 2,
+    SLAGI = 3,
+    UNTUK = 4,
+    CETAK = 5,
+    HENTI = 6,
+    LEWAT = 7,
+    DALAM = 8,
+    HASIL = 9,
+    KERJA = 10,
+    DATUM = 11,
+    JENIS = 12,
+    MODEL = 13,
+    TETAP = 15,
+    MODUL = 16,
+    EOF = 17,
+    ID = 18,
+    LITERAL = 19,
+    PLUS = 20,
+    MINUS = 21,
+    STAR = 22,
+    SLASH = 23,
+    LPAREN = 24,
+    RPAREN = 25,
+    GREATER = 26,
+    GREATER_EQUAL = 27,
+    LESS = 28,
+    LESS_EQUAL = 29,
+    EQUAL = 30,
+    EQUAL_EQUAL = 31,
+    DOT = 32,
+    LCURLY = 33,
+    RCURLY = 34,
+    COMMA = 35,
+    LSQUARE = 36,
+    RSQUARE = 37,
+    PIPE = 38,
+    AMPERSAND = 39,
+    BANG = 40,
+    ARROW = 41,
+    BANG_EQUAL = 42,
+    MODULUS = 43;
+
+const TOKEN_STRING = [
+    "RUBAH",
+    "KALAU",
+    "NAMUN",
+    "SLAGI",
+    "UNTUK",
+    "CETAK",
+    "HENTI",
+    "LEWAT",
+    "DALAM",
+    "HASIL",
+    "KERJA",
+    "DATUM",
+    "JENIS",
+    "MODEL",
+    "ERROR",
+    "TETAP",
+    "MODUL",
+    "EOF",
+    "ID",
+    "LITERAL",
+    "PLUS",
+    "MINUS",
+    "BINTANG",
+    "GARIS_MIRING",
+    "LPAREN",
+    "RPAREN",
+    "LEBIH",
+    "LEBIH_SAMA",
+    "KURANG",
+    "KURANG_SAMA",
+    "SAMA",
+    "SAMA_SAMA",
+    "DOT",
+    "LCURLY",
+    "RCURLY",
+    "COMMA",
+    "LSQUARE",
+    "RSQUARE",
+    "PIPA",
+    "AMPERSAN",
+    "SERU",
+    "ARROW",
+    "SERU_SAMA",
+    "MODULUS",
+];
+
 let Henti$1 = class Henti { };
 let Lewat$1 = class Lewat { };
 let Hasil$1 = class Hasil {
@@ -855,8 +865,8 @@ class Interpreter {
         }
         this.typeCheck(leftValue, rightValue, `Pada operasi biner ${binaryExpr.op.lexeme}`);
 
-        let result = this.environment.get(leftValue.type.description) // get Model
-            .operate(this, binaryExpr.op.type, rightValue, leftValue); // dispatch the operation
+        let type = this.environment.get(leftValue.type.description);
+        let result = this.operate(type, binaryExpr.op.type, rightValue, leftValue); 
 
         return result;
     }
@@ -871,9 +881,24 @@ class Interpreter {
             this.error(`Tidak bisa mengoperasikan nilai Nihil.`);
         }
 
-        let result = this.environment.get(rightValue.type.description) // get Model
-            .operate(this, unaryExpr.op.type, rightValue); // dispatch the operation
+        let type = this.environment.get(rightValue.type.description); 
+        let result = this.operate(type, unaryExpr.op.type, rightValue); 
+
+        return result;
+    }
+
+    operate(type, op, right, left) {
+        let opLexeme = TOKEN_STRING[op] + (left ? "" : "_UNER");
+        let operatorFunc = type.member.get(opLexeme);
+        if (!operatorFunc)
+            this.error(`operator ${opLexeme} tidak terdefinisi untuk Model ${right.type.description}.`);
 
+        let result = null;
+        if (left) { // Binary
+            result = this.callFunc(operatorFunc.data, [right, left]);
+        } else { // Unary, safe because valid unary op is just + - ! in the parser
+            result = this.callFunc(operatorFunc.data, [right]);
+        }
         return result;
     }
 
@@ -902,8 +927,9 @@ class Interpreter {
             if (type.member?.has(name)) {
                 if (willBeCalled) {
                     this.objectStack = main;
+                    return type.member.get(name);
                 }
-                return type.member.get(name);
+                this.error(`akses titik . dari objek ke model harus berupa panggilan/penggunaaan mesin.`);
             }
             this.error(`nama .${name} tidak ditemukan dalam tipe ${main.type.description}`);
         } else {
@@ -944,12 +970,7 @@ class Interpreter {
                 if (!thing?.type) return `nihil`;
                 let type = this.environment.get(thing.type.description);
                 if (type?.member?.has("kePetik")) {
-                    let prevState = this.state;
-                    this.state = location.MESIN;
-                    this.stack.push(this.line);
                     let res = this.callFunc(type.member.get("kePetik").data, [thing]).data;
-                    this.stack.pop();
-                    this.state = prevState;
                     return res;
                 }
                 return `${thing.type.description}<>`;
@@ -1019,7 +1040,7 @@ class Interpreter {
     visitKalauStmt(kalauStmt) {
         // condition may be null for 'namun', accept the thenBlock if it is
         let condition = kalauStmt.condition?.accept(this);
-        if (condition.type !== logisSymbol) {
+        if (condition?.type && condition?.type !== logisSymbol) {
             this.error(`Ekspresi dalam 'kalau' harus bertipe logis, menemukan ${condition.type ? condition.type.description : "nihil"}`);
         }
         if (condition === null || condition === undefined || condition.data) {
@@ -1151,26 +1172,24 @@ class Interpreter {
             if (variable.type !== stipeSymbol) {
                 this.error(`Modul hanya bisa _ditambahkan_ pada tipe. '${name}' bukan merupakan tipe.`);
             }
-            if (variable.member) {
+            if (variable.member.memory.size > 0) {
                 this.error(`Tipe '${name}' sudah memiliki modul sendiri, tidak bisa definisi ulang.`);
             }
+        } else {
+            variable = new Variable(modulSymbol, true, null);
+            variable.member = new Environment();
+            this.environment.define(name, variable);
         }
 
         let lastEnv = this.environment;
-        this.environment = new Environment(this.environment);
+        variable.member.enclosing = this.environment;
+        this.environment = variable.member;
         for (let stmt of modulStmt.statements) {
             stmt.accept(this);
         }
 
-        [this.environment, lastEnv] = [lastEnv, this.environment];
+        [this.environment, variable.member] = [lastEnv, this.environment];
 
-        if (variable) {
-            variable.member = lastEnv;
-        } else {
-            let res = new Variable(modulSymbol, true, null);
-            res.member = lastEnv;
-            this.environment.define(name, res);
-        }
     }
 
     // UTILITIES
@@ -2277,6 +2296,7 @@ class Simpl {
             let output = this.interpreter.interpret(pohon);
             return output.join("\n");
         } catch (err) {
+            // throw err
             if (err instanceof SimplError) {
                 const errorCode = textLines[err.line - 1];
                 let errorText = (errorCode ? `ERROR! Pada baris ke-${err.line}\n>> ` + errorCode + '\n' : "") + err.message;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bahasa-simpl",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Simpl: Indonesian Mini Programming Language interpreter",
   "main": "./dist/simpl-interpreter.js",
   "scripts": {