yukigo-ast 0.2.1 → 0.3.2

package/dist/paradigms/imperative.js

@@ -14,7 +14,7 @@ export class EntryPoint extends ASTNode {
         this.expression = expression;
     }
     accept(visitor) {
-        return visitor.visitEntryPoint?.(this);
+        return this.dispatchVisit(visitor, visitor.visitEntryPoint);
     }
     toJSON() {
         return {
@@ -39,7 +39,7 @@ export class Procedure extends ASTNode {
         this.equations = equations;
     }
     accept(visitor) {
-        return visitor.visitProcedure?.(this);
+        return this.dispatchVisit(visitor, visitor.visitProcedure);
     }
     toJSON() {
         return {
@@ -65,7 +65,7 @@ export class Structure extends ASTNode {
         this.loc = loc;
     }
     accept(visitor) {
-        return visitor.visitStructure?.(this);
+        return this.dispatchVisit(visitor, visitor.visitStructure);
     }
     toJSON() {
         return {
@@ -90,7 +90,7 @@ export class Enumeration extends ASTNode {
         this.contents = contents;
     }
     accept(visitor) {
-        return visitor.visitEnumeration?.(this);
+        return this.dispatchVisit(visitor, visitor.visitEnumeration);
     }
     toJSON() {
         return {
@@ -118,7 +118,7 @@ export class While extends ASTNode {
         this.body = body;
     }
     accept(visitor) {
-        return visitor.visitWhile?.(this);
+        return this.dispatchVisit(visitor, visitor.visitWhile);
     }
     toJSON() {
         return {
@@ -143,7 +143,7 @@ export class Repeat extends ASTNode {
         this.body = body;
     }
     accept(visitor) {
-        return visitor.visitRepeat?.(this);
+        return this.dispatchVisit(visitor, visitor.visitRepeat);
     }
     toJSON() {
         return {
@@ -174,7 +174,7 @@ export class ForLoop extends ASTNode {
         this.body = body;
     }
     accept(visitor) {
-        return visitor.visitForLoop?.(this);
+        return this.dispatchVisit(visitor, visitor.visitForLoop);
     }
     toJSON() {
         return {

package/dist/paradigms/logic.d.ts

@@ -1,5 +1,5 @@
 import { Expression } from "../globals/expressions.js";
-import { ASTNode, SourceLocation } from "../globals/generics.js";
+import { ASTNode, SerializeNode, SourceLocation } from "../globals/generics.js";
 import { Pattern } from "../globals/patterns.js";
 import { Primitive, SymbolPrimitive } from "../globals/primitives.js";
 import { Equation } from "../globals/statements.js";
@@ -19,29 +19,7 @@ export declare class Rule extends ASTNode {
     identifier: SymbolPrimitive;
     constructor(identifier: SymbolPrimitive, equations: Equation[], loc?: SourceLocation);
     accept<R>(visitor: Visitor<R>): R;
-    toJSON(): {
-        type: string;
-        identifier: {
-            type: import("../globals/primitives.js").YukigoPrimitive;
-            value: string;
-        };
-        equations: {
-            type: string;
-            patterns: any[];
-            body: {
-                type: string;
-                sequence: any;
-            } | {
-                type: string;
-                condition: any;
-                body: any;
-            }[];
-            return: {
-                type: string;
-                body: any;
-            };
-        }[];
-    };
+    toJSON(): SerializeNode;
 }
 /**
  * Represents a call to a predicate or goal.
@@ -54,14 +32,7 @@ export declare class Call extends ASTNode {
     callee: SymbolPrimitive;
     constructor(callee: SymbolPrimitive, args: Expression[], loc?: SourceLocation);
     accept<R>(visitor: Visitor<R>): R;
-    toJSON(): {
-        type: string;
-        callee: {
-            type: import("../globals/primitives.js").YukigoPrimitive;
-            value: string;
-        };
-        patterns: any[];
-    };
+    toJSON(): SerializeNode;
 }
 /**
  * Represents a fact, a rule with no body (always true).
@@ -77,14 +48,7 @@ export declare class Fact extends ASTNode {
     identifier: SymbolPrimitive;
     constructor(identifier: SymbolPrimitive, patterns: Pattern[], loc?: SourceLocation);
     accept<R>(visitor: Visitor<R>): R;
-    toJSON(): {
-        type: string;
-        identifier: {
-            type: import("../globals/primitives.js").YukigoPrimitive;
-            value: string;
-        };
-        patterns: any[];
-    };
+    toJSON(): SerializeNode;
 }
 /**
  * Represents a query or goal to be proven.
@@ -98,10 +62,7 @@ export declare class Query extends ASTNode {
     expressions: Expression[];
     constructor(expressions: Expression[], loc?: SourceLocation);
     accept<R>(visitor: Visitor<R>): R;
-    toJSON(): {
-        type: string;
-        expressions: any[];
-    };
+    toJSON(): SerializeNode;
 }
 /**
  * Represents an existential quantification.
@@ -114,14 +75,7 @@ export declare class Exist extends ASTNode {
     identifier: SymbolPrimitive;
     constructor(identifier: SymbolPrimitive, patterns: Pattern[], loc?: SourceLocation);
     accept<R>(visitor: Visitor<R>): R;
-    toJSON(): {
-        type: string;
-        identifier: {
-            type: import("../globals/primitives.js").YukigoPrimitive;
-            value: string;
-        };
-        patterns: any[];
-    };
+    toJSON(): SerializeNode;
 }
 /**
  * Represents logical negation or failure-as-negation.
@@ -132,7 +86,7 @@ export declare class Not extends ASTNode {
     expression: Expression;
     constructor(expression: Expression, loc?: SourceLocation);
     accept<R>(visitor: Visitor<R>): R;
-    toJSON(): any;
+    toJSON(): SerializeNode;
 }
 /**
  * Represents a higher-order predicate finding all solutions (e.g., findall/3).
@@ -147,7 +101,7 @@ export declare class Findall extends ASTNode {
     template: Pattern;
     constructor(template: Pattern, goal: Expression, bag: Pattern, loc?: SourceLocation);
     accept<R>(visitor: Visitor<R>): R;
-    toJSON(): any;
+    toJSON(): SerializeNode;
 }
 /**
  * Represents a universal quantification or forall predicate.
@@ -160,7 +114,7 @@ export declare class Forall extends ASTNode {
     condition: Expression;
     constructor(condition: Expression, action: Expression, loc?: SourceLocation);
     accept<R>(visitor: Visitor<R>): R;
-    toJSON(): any;
+    toJSON(): SerializeNode;
 }
 /**
  * Represents a single goal within a logical rule or query.
@@ -173,14 +127,7 @@ export declare class Goal extends ASTNode {
     identifier: SymbolPrimitive;
     constructor(identifier: SymbolPrimitive, args: Pattern[], loc?: SourceLocation);
     accept<R>(visitor: Visitor<R>): R;
-    toJSON(): {
-        type: string;
-        identifier: {
-            type: import("../globals/primitives.js").YukigoPrimitive;
-            value: string;
-        };
-        arguments: any[];
-    };
+    toJSON(): SerializeNode;
 }
 /**
  * Represents a logical constraint or guard that must evaluate to true.
@@ -196,9 +143,6 @@ export declare class LogicConstraint extends ASTNode {
     expression: Expression;
     constructor(expression: Expression, loc?: SourceLocation);
     accept<R>(visitor: Visitor<R>): R;
-    toJSON(): {
-        type: string;
-        expression: any;
-    };
+    toJSON(): SerializeNode;
 }
 //# sourceMappingURL=logic.d.ts.map

package/dist/paradigms/logic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logic.d.ts","sourceRoot":"","sources":["../../src/paradigms/logic.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"logic.d.ts","sourceRoot":"","sources":["../../src/paradigms/logic.ts"],"names":[],"mappings":"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"}

package/dist/paradigms/logic.js

@@ -17,7 +17,7 @@ export class Rule extends ASTNode {
         this.equations = equations;
     }
     accept(visitor) {
-        return visitor.visitRule?.(this);
+        return this.dispatchVisit(visitor, visitor.visitRule);
     }
     toJSON() {
         return {
@@ -42,7 +42,7 @@ export class Call extends ASTNode {
         this.args = args;
     }
     accept(visitor) {
-        return visitor.visitCall?.(this);
+        return this.dispatchVisit(visitor, visitor.visitCall);
     }
     toJSON() {
         return {
@@ -70,7 +70,7 @@ export class Fact extends ASTNode {
         this.patterns = patterns;
     }
     accept(visitor) {
-        return visitor.visitFact?.(this);
+        return this.dispatchVisit(visitor, visitor.visitFact);
     }
     toJSON() {
         return {
@@ -95,7 +95,7 @@ export class Query extends ASTNode {
         this.expressions = expressions;
     }
     accept(visitor) {
-        return visitor.visitQuery?.(this);
+        return this.dispatchVisit(visitor, visitor.visitQuery);
     }
     toJSON() {
         return {
@@ -119,7 +119,7 @@ export class Exist extends ASTNode {
         this.patterns = patterns;
     }
     accept(visitor) {
-        return visitor.visitExist?.(this);
+        return this.dispatchVisit(visitor, visitor.visitExist);
     }
     toJSON() {
         return {
@@ -141,7 +141,7 @@ export class Not extends ASTNode {
         this.expression = expression;
     }
     accept(visitor) {
-        return visitor.visitNot?.(this);
+        return this.dispatchVisit(visitor, visitor.visitNot);
     }
     toJSON() {
         return {
@@ -168,7 +168,7 @@ export class Findall extends ASTNode {
         this.bag = bag;
     }
     accept(visitor) {
-        return visitor.visitFindall?.(this);
+        return this.dispatchVisit(visitor, visitor.visitFindall);
     }
     toJSON() {
         return {
@@ -194,7 +194,7 @@ export class Forall extends ASTNode {
         this.action = action;
     }
     accept(visitor) {
-        return visitor.visitForall?.(this);
+        return this.dispatchVisit(visitor, visitor.visitForall);
     }
     toJSON() {
         return {
@@ -219,7 +219,7 @@ export class Goal extends ASTNode {
         this.args = args;
     }
     accept(visitor) {
-        return visitor.visitGoal?.(this);
+        return this.dispatchVisit(visitor, visitor.visitGoal);
     }
     toJSON() {
         return {
@@ -246,7 +246,7 @@ export class LogicConstraint extends ASTNode {
         this.expression = expression;
     }
     accept(visitor) {
-        return visitor.visitLogicConstraint?.(this);
+        return this.dispatchVisit(visitor, visitor.visitLogicConstraint);
     }
     toJSON() {
         return {

package/dist/paradigms/object.d.ts

@@ -1,5 +1,5 @@
 import { Expression } from "../globals/expressions.js";
-import { ASTNode, SourceLocation } from "../globals/generics.js";
+import { ASTNode, SerializeNode, SourceLocation } from "../globals/generics.js";
 import { Operator } from "../globals/operators.js";
 import { SymbolPrimitive } from "../globals/primitives.js";
 import { Equation } from "../globals/statements.js";
@@ -18,31 +18,11 @@ export declare class Method extends ASTNode {
     equations: Equation[];
     /** @hidden */
     identifier: SymbolPrimitive;
-    constructor(identifier: SymbolPrimitive, equations: Equation[], loc?: SourceLocation);
+    /** @hidden */
+    isAbstract: boolean;
+    constructor(identifier: SymbolPrimitive, equations: Equation[], loc?: SourceLocation, isAbstract?: boolean);
     accept<R>(visitor: Visitor<R>): R;
-    toJSON(): {
-        type: string;
-        identifier: {
-            type: import("../globals/primitives.js").YukigoPrimitive;
-            value: string;
-        };
-        equations: {
-            type: string;
-            patterns: any[];
-            body: {
-                type: string;
-                sequence: any;
-            } | {
-                type: string;
-                condition: any;
-                body: any;
-            }[];
-            return: {
-                type: string;
-                body: any;
-            };
-        }[];
-    };
+    toJSON(): SerializeNode;
 }
 /**
  * Represents an attribute or instance variable of an object.
@@ -55,14 +35,7 @@ export declare class Attribute extends ASTNode {
     identifier: SymbolPrimitive;
     constructor(identifier: SymbolPrimitive, expression: Expression, loc?: SourceLocation);
     accept<R>(visitor: Visitor<R>): R;
-    toJSON(): {
-        type: string;
-        identifier: {
-            type: import("../globals/primitives.js").YukigoPrimitive;
-            value: string;
-        };
-        expression: any;
-    };
+    toJSON(): SerializeNode;
 }
 /**
  * Represents an object definition or a singleton object.
@@ -76,16 +49,13 @@ export declare class Object extends ASTNode {
     expression: Expression;
     /** @hidden */
     identifier: SymbolPrimitive;
+    /** @hidden */
+    extendsSymbol?: SymbolPrimitive;
+    /** @hidden */
+    extendsArgs?: Expression[];
     constructor(identifier: SymbolPrimitive, expression: Expression, loc?: SourceLocation);
     accept<R>(visitor: Visitor<R>): R;
-    toJSON(): {
-        type: string;
-        identifier: {
-            type: import("../globals/primitives.js").YukigoPrimitive;
-            value: string;
-        };
-        expression: any;
-    };
+    toJSON(): SerializeNode;
 }
 /**
  * Represents a class definition, a blueprint for objects.
@@ -107,29 +77,7 @@ export declare class Class extends ASTNode {
     includes: SymbolPrimitive[];
     constructor(identifier: SymbolPrimitive, extendsSymbol: SymbolPrimitive | undefined, implementsNode: Implement | undefined, includes: SymbolPrimitive[], expression: Expression, loc?: SourceLocation);
     accept<R>(visitor: Visitor<R>): R;
-    toJSON(): {
-        type: string;
-        identifier: {
-            type: import("../globals/primitives.js").YukigoPrimitive;
-            value: string;
-        };
-        extends: {
-            type: import("../globals/primitives.js").YukigoPrimitive;
-            value: string;
-        };
-        implements: {
-            type: string;
-            identifier: {
-                type: import("../globals/primitives.js").YukigoPrimitive;
-                value: string;
-            };
-        };
-        includes: {
-            type: import("../globals/primitives.js").YukigoPrimitive;
-            value: string;
-        }[];
-        expression: any;
-    };
+    toJSON(): SerializeNode;
 }
 /**
  * Represents an interface or protocol definition.
@@ -144,18 +92,7 @@ export declare class Interface extends ASTNode {
     identifier: SymbolPrimitive;
     constructor(identifier: SymbolPrimitive, extendsSymbol: SymbolPrimitive[], expression: Expression, loc?: SourceLocation);
     accept<R>(visitor: Visitor<R>): R;
-    toJSON(): {
-        type: string;
-        identifier: {
-            type: import("../globals/primitives.js").YukigoPrimitive;
-            value: string;
-        };
-        extends: {
-            type: import("../globals/primitives.js").YukigoPrimitive;
-            value: string;
-        }[];
-        expression: any;
-    };
+    toJSON(): SerializeNode;
 }
 /**
  * Represents a message send or method invocation on an object.
@@ -174,15 +111,7 @@ export declare class Send extends ASTNode {
     /** @hidden */
     constructor(receiver: Expression, selector: SymbolPrimitive, args: Expression[], loc?: SourceLocation);
     accept<R>(visitor: Visitor<R>): R;
-    toJSON(): {
-        type: string;
-        receiver: any;
-        selector: {
-            type: import("../globals/primitives.js").YukigoPrimitive;
-            value: string;
-        };
-        arguments: any[];
-    };
+    toJSON(): SerializeNode;
 }
 /**
  * Represents the instantiation of a class.
@@ -198,7 +127,7 @@ export declare class New extends ASTNode {
     identifier: SymbolPrimitive;
     constructor(identifier: SymbolPrimitive, args: Expression[], loc?: SourceLocation);
     accept<R>(visitor: Visitor<R>): R;
-    toJSON(): any;
+    toJSON(): SerializeNode;
 }
 /**
  * Represents an implementation clause for an interface.
@@ -209,13 +138,7 @@ export declare class Implement extends ASTNode {
     identifier: SymbolPrimitive;
     constructor(identifier: SymbolPrimitive, loc?: SourceLocation);
     accept<R>(visitor: Visitor<R>): R;
-    toJSON(): {
-        type: string;
-        identifier: {
-            type: import("../globals/primitives.js").YukigoPrimitive;
-            value: string;
-        };
-    };
+    toJSON(): SerializeNode;
 }
 /**
  * Represents a reference to the current object instance (self/this).
@@ -223,9 +146,7 @@ export declare class Implement extends ASTNode {
  */
 export declare class Self extends ASTNode {
     accept<R>(visitor: Visitor<R>): R;
-    toJSON(): {
-        type: string;
-    };
+    toJSON(): SerializeNode;
 }
 /**
  * Represents a reference to the superclass or parent object.
@@ -236,10 +157,7 @@ export declare class Super extends ASTNode {
     args: Expression[];
     constructor(args: Expression[], loc?: SourceLocation);
     accept<R>(visitor: Visitor<R>): R;
-    toJSON(): {
-        type: string;
-        args: Expression[];
-    };
+    toJSON(): SerializeNode;
 }
 /**
  * Declaration of custom primitive operators - also known as operator overriding.
@@ -256,10 +174,6 @@ export declare class PrimitiveMethod extends ASTNode {
     equations: Equation[];
     constructor(operator: Operator, equations: Equation[], loc: SourceLocation);
     accept<R>(visitor: Visitor<R>): R;
-    toJSON(): {
-        type: string;
-        operator: Operator;
-        equations: Equation[];
-    };
+    toJSON(): SerializeNode;
 }
 //# sourceMappingURL=object.d.ts.map

package/dist/paradigms/object.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../../src/paradigms/object.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"object.d.ts","sourceRoot":"","sources":["../../src/paradigms/object.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C;;;;;;;;GAQG;AACH,qBAAa,MAAO,SAAQ,OAAO;IACjC,cAAc;IACP,SAAS,EAAE,QAAQ,EAAE,CAAC;IAC7B,cAAc;IACP,UAAU,EAAE,eAAe,CAAC;IACnC,cAAc;IACP,UAAU,EAAE,OAAO,CAAC;gBAEzB,UAAU,EAAE,eAAe,EAC3B,SAAS,EAAE,QAAQ,EAAE,EACrB,GAAG,CAAC,EAAE,cAAc,EACpB,UAAU,GAAE,OAAe;IAOtB,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;IAGjC,MAAM,IAAI,aAAa;CAO/B;AAED;;;GAGG;AACH,qBAAa,SAAU,SAAQ,OAAO;IACpC,cAAc;IACP,UAAU,EAAE,UAAU,CAAC;IAC9B,cAAc;IACP,UAAU,EAAE,eAAe,CAAC;gBAGjC,UAAU,EAAE,eAAe,EAC3B,UAAU,EAAE,UAAU,EACtB,GAAG,CAAC,EAAE,cAAc;IAMf,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;IAGjC,MAAM,IAAI,aAAa;CAO/B;AAED;;;;;;GAMG;AACH,qBAAa,MAAO,SAAQ,OAAO;IACjC,cAAc;IACP,UAAU,EAAE,UAAU,CAAC;IAC9B,cAAc;IACP,UAAU,EAAE,eAAe,CAAC;IACnC,cAAc;IACP,aAAa,CAAC,EAAE,eAAe,CAAC;IACvC,cAAc;IACP,WAAW,CAAC,EAAE,UAAU,EAAE,CAAC;gBAGhC,UAAU,EAAE,eAAe,EAC3B,UAAU,EAAE,UAAU,EACtB,GAAG,CAAC,EAAE,cAAc;IAMf,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;IAGjC,MAAM,IAAI,aAAa;CAS/B;AAED;;;;;;GAMG;AACH,qBAAa,KAAM,SAAQ,OAAO;IAChC,cAAc;IACP,UAAU,EAAE,UAAU,CAAC;IAC9B,cAAc;IACP,cAAc,EAAE,SAAS,GAAG,SAAS,CAAC;IAC7C,cAAc;IACP,aAAa,EAAE,eAAe,GAAG,SAAS,CAAC;IAClD,cAAc;IACP,UAAU,EAAE,eAAe,CAAC;IACnC,cAAc;IACP,QAAQ,EAAE,eAAe,EAAE,CAAC;gBAGjC,UAAU,EAAE,eAAe,EAC3B,aAAa,EAAE,eAAe,GAAG,SAAS,EAC1C,cAAc,EAAE,SAAS,GAAG,SAAS,EACrC,QAAQ,EAAE,eAAe,EAAE,EAC3B,UAAU,EAAE,UAAU,EACtB,GAAG,CAAC,EAAE,cAAc;IASf,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;IAGjC,MAAM,IAAI,aAAa;CAU/B;AAED;;;GAGG;AACH,qBAAa,SAAU,SAAQ,OAAO;IACpC,cAAc;IACP,UAAU,EAAE,UAAU,CAAC;IAC9B,cAAc;IACP,aAAa,EAAE,eAAe,EAAE,CAAC;IACxC,cAAc;IACP,UAAU,EAAE,eAAe,CAAC;gBAGjC,UAAU,EAAE,eAAe,EAC3B,aAAa,EAAE,eAAe,EAAE,EAChC,UAAU,EAAE,UAAU,EACtB,GAAG,CAAC,EAAE,cAAc;IAOf,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;IAGjC,MAAM,IAAI,aAAa;CAQ/B;AAED;;;;;;GAMG;AACH,qBAAa,IAAK,SAAQ,OAAO;IAC/B,cAAc;IACP,IAAI,EAAE,UAAU,EAAE,CAAC;IAC1B,cAAc;IACP,QAAQ,EAAE,eAAe,CAAC;IACjC,cAAc;IACP,QAAQ,EAAE,UAAU,CAAC;IAC5B,cAAc;gBAEZ,QAAQ,EAAE,UAAU,EACpB,QAAQ,EAAE,eAAe,EACzB,IAAI,EAAE,UAAU,EAAE,EAClB,GAAG,CAAC,EAAE,cAAc;IAOf,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;IAGjC,MAAM,IAAI,aAAa;CAQ/B;AAED;;;;;;GAMG;AACH,qBAAa,GAAI,SAAQ,OAAO;IAC9B,cAAc;IACP,IAAI,EAAE,UAAU,EAAE,CAAC;IAC1B,cAAc;IACP,UAAU,EAAE,eAAe,CAAC;gBAGjC,UAAU,EAAE,eAAe,EAC3B,IAAI,EAAE,UAAU,EAAE,EAClB,GAAG,CAAC,EAAE,cAAc;IAMf,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;IAGjC,MAAM,IAAI,aAAa;CAO/B;AAED;;;GAGG;AACH,qBAAa,SAAU,SAAQ,OAAO;IACpC,cAAc;IACP,UAAU,EAAE,eAAe,CAAC;gBAEvB,UAAU,EAAE,eAAe,EAAE,GAAG,CAAC,EAAE,cAAc;IAItD,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;IAGjC,MAAM,IAAI,aAAa;CAM/B;AAED;;;GAGG;AACH,qBAAa,IAAK,SAAQ,OAAO;IACxB,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;IAGjC,MAAM,IAAI,aAAa;CAK/B;AACD;;;GAGG;AACH,qBAAa,KAAM,SAAQ,OAAO;IAChC,cAAc;IACP,IAAI,EAAE,UAAU,EAAE,CAAC;gBACd,IAAI,EAAE,UAAU,EAAE,EAAE,GAAG,CAAC,EAAE,cAAc;IAI7C,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;IAGjC,MAAM,IAAI,aAAa;CAM/B;AACD;;;;;;;;;GASG;AACH,qBAAa,eAAgB,SAAQ,OAAO;IACnC,QAAQ,EAAE,QAAQ,CAAC;IACnB,SAAS,EAAE,QAAQ,EAAE,CAAC;gBACjB,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,GAAG,EAAE,cAAc;IAKnE,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;IAGjC,MAAM,IAAI,aAAa;CAO/B"}

package/dist/paradigms/object.js

@@ -1,4 +1,4 @@
-import { ASTNode, } from "../globals/generics.js";
+import { ASTNode } from "../globals/generics.js";
 /**
  * Represents a method definition within a class or object.
  *
@@ -13,13 +13,16 @@ export class Method extends ASTNode {
     equations;
     /** @hidden */
     identifier;
-    constructor(identifier, equations, loc) {
+    /** @hidden */
+    isAbstract;
+    constructor(identifier, equations, loc, isAbstract = false) {
         super(loc);
         this.identifier = identifier;
         this.equations = equations;
+        this.isAbstract = isAbstract;
     }
     accept(visitor) {
-        return visitor.visitMethod?.(this);
+        return this.dispatchVisit(visitor, visitor.visitMethod);
     }
     toJSON() {
         return {
@@ -44,7 +47,7 @@ export class Attribute extends ASTNode {
         this.expression = expression;
     }
     accept(visitor) {
-        return visitor.visitAttribute?.(this);
+        return this.dispatchVisit(visitor, visitor.visitAttribute);
     }
     toJSON() {
         return {
@@ -66,19 +69,25 @@ export class Object extends ASTNode {
     expression;
     /** @hidden */
     identifier;
+    /** @hidden */
+    extendsSymbol;
+    /** @hidden */
+    extendsArgs;
     constructor(identifier, expression, loc) {
         super(loc);
         this.identifier = identifier;
         this.expression = expression;
     }
     accept(visitor) {
-        return visitor.visitObject?.(this);
+        return this.dispatchVisit(visitor, visitor.visitObject);
     }
     toJSON() {
         return {
             type: "Object",
             identifier: this.identifier.toJSON(),
             expression: this.expression.toJSON(),
+            extendsSymbol: this.extendsSymbol ? this.extendsSymbol.toJSON() : undefined,
+            extendsArgs: this.extendsArgs ? this.extendsArgs.map(a => a.toJSON()) : undefined,
         };
     }
 }
@@ -109,14 +118,14 @@ export class Class extends ASTNode {
         this.expression = expression;
     }
     accept(visitor) {
-        return visitor.visitClass?.(this);
+        return this.dispatchVisit(visitor, visitor.visitClass);
     }
     toJSON() {
         return {
             type: "Class",
             identifier: this.identifier.toJSON(),
-            extends: this.extendsSymbol.toJSON(),
-            implements: this.implementsNode.toJSON(),
+            extends: this.extendsSymbol?.toJSON(),
+            implements: this.implementsNode?.toJSON(),
             includes: this.includes.map((s) => s.toJSON()),
             expression: this.expression.toJSON(),
         };
@@ -140,7 +149,7 @@ export class Interface extends ASTNode {
         this.expression = expression;
     }
     accept(visitor) {
-        return visitor.visitInterface?.(this);
+        return this.dispatchVisit(visitor, visitor.visitInterface);
     }
     toJSON() {
         return {
@@ -173,7 +182,7 @@ export class Send extends ASTNode {
         this.args = args;
     }
     accept(visitor) {
-        return visitor.visitSend?.(this);
+        return this.dispatchVisit(visitor, visitor.visitSend);
     }
     toJSON() {
         return {
@@ -202,7 +211,7 @@ export class New extends ASTNode {
         this.args = args;
     }
     accept(visitor) {
-        return visitor.visitNew?.(this);
+        return this.dispatchVisit(visitor, visitor.visitNew);
     }
     toJSON() {
         return {
@@ -224,7 +233,7 @@ export class Implement extends ASTNode {
         this.identifier = identifier;
     }
     accept(visitor) {
-        return visitor.visitImplement?.(this);
+        return this.dispatchVisit(visitor, visitor.visitImplement);
     }
     toJSON() {
         return {
@@ -239,7 +248,7 @@ export class Implement extends ASTNode {
  */
 export class Self extends ASTNode {
     accept(visitor) {
-        return visitor.visitSelf?.(this);
+        return this.dispatchVisit(visitor, visitor.visitSelf);
     }
     toJSON() {
         return {
@@ -259,7 +268,7 @@ export class Super extends ASTNode {
         this.args = args;
     }
     accept(visitor) {
-        return visitor.visitSuper?.(this);
+        return this.dispatchVisit(visitor, visitor.visitSuper);
     }
     toJSON() {
         return {
@@ -287,7 +296,7 @@ export class PrimitiveMethod extends ASTNode {
         this.equations = equations;
     }
     accept(visitor) {
-        return visitor.visitPrimitiveMethod?.(this);
+        return this.dispatchVisit(visitor, visitor.visitPrimitiveMethod);
     }
     toJSON() {
         return {