Skip to content

Commit

Permalink
feat: assuming that setChild now returns the previously existing valu…
Browse files Browse the repository at this point in the history
…e, a the event operations can be refactored
  • Loading branch information
racoelhosilva committed Jul 26, 2024
1 parent d99bcf9 commit 744deca
Showing 1 changed file with 6 additions and 14 deletions.
20 changes: 6 additions & 14 deletions Clava-JS/src-api/clava/events/EventListener.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ import { Joinpoint } from "../../Joinpoints.js";

const eventListener = new EventEmitter();

// Used for saving previous child in setFirstChild and setLastChild
let auxJP: Joinpoint;

eventListener.on("ACTION", (e: Event) => {

Expand All @@ -23,12 +21,6 @@ eventListener.on("ACTION", (e: Event) => {
case "setType":
changeTypeFromEvent(e);
break;
case "setFirstChild":
auxJP = e.mainJP.firstChild;
break;
case "setLastChild":
auxJP = e.mainJP.lastChild;
break;
case "setInlineComments":
inlineCommentOperationFromEvent(e);
break;
Expand Down Expand Up @@ -64,10 +56,10 @@ eventListener.on("ACTION", (e: Event) => {
replaceSingleOperationFromEvent(e);
break;
case "setFirstChild":
setFirstChildFromEvent(e, auxJP);
setFirstChildFromEvent(e);
break;
case "setLastChild":
setLastChildFromEvent(e, auxJP);
setLastChildFromEvent(e);
break;
default:
break;
Expand Down Expand Up @@ -109,12 +101,12 @@ function detachOperationFromEvent(e: Event) {
ophistory.newOperation(new DetachOperation(e.mainJP, refJP, ref));
}

function setFirstChildFromEvent(e: Event, aux: Joinpoint) {
ophistory.newOperation(new SetChildOperation(e.mainJP.firstChild, aux));
function setFirstChildFromEvent(e: Event) {
ophistory.newOperation(new SetChildOperation(e.mainJP.firstChild, e.returnValue));
}

function setLastChildFromEvent(e: Event, aux: Joinpoint) {
ophistory.newOperation(new SetChildOperation(e.mainJP.lastChild, aux));
function setLastChildFromEvent(e: Event) {
ophistory.newOperation(new SetChildOperation(e.mainJP.lastChild, e.returnValue));
}

function removeChildrenOperationFromEvent(e: Event) {
Expand Down

0 comments on commit 744deca

Please sign in to comment.