Skip to content

Fix ++ argument , all handled Identifier arguments (like x++) and #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jucasoliveira merged 2 commits into from
Feb 6, 2026
Merged

Fix ++ argument , all handled Identifier arguments (like x++) and #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
446476f
Fix ++ argument , all handled Identifier arguments (like x++) and
jucasoliveira Feb 6, 2026
29587cf
fix bare return and array detection
jucasoliveira Feb 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
155 changes: 155 additions & 0 deletions bootstrap/emitter.ot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,10 @@ function emit(emitter: Emitter, node: Node | null): void {
emitUnaryExpression(emitter, node);
return;
}
if (typeVal == "UpdateExpression") {
emitUpdateExpression(emitter, node);
return;
}
if (typeVal == "AssignmentExpression") {
emitAssignmentExpression(emitter, node);
return;
Expand Down Expand Up @@ -537,6 +541,157 @@ function emitUnaryExpression(emitter: Emitter, node: UnaryExpression): void {
return;
}

function emitUpdateExpression(emitter: Emitter, node: UpdateExpression): void {
// ++x or x++, and obj.prop++ / ++obj.prop
let addOpcode: number = 2; // binary ADD
let subOpcode: number = 3; // binary SUB

if (node.argument.type == "Identifier") {
let isLocal: boolean = false;
let slot: number = -1;
if (emitter.scope != null) {
slot = scopeResolve(emitter.scope, node.argument.name);
if (slot != -1) {
isLocal = true;
}
}

if (isLocal) {
emitLoadLocal(emitter, slot);
} else {
emitU8(emitter, OP.LOAD);
emitString(emitter, node.argument.name);
}

if (!node.prefix) {
emitU8(emitter, OP.DUP);
}

emitU8(emitter, OP.PUSH);
emitU8(emitter, TYPE.NUMBER);
emitF64(emitter, 1);

if (node.operator == "++") {
emitU8(emitter, addOpcode);
} else {
emitU8(emitter, subOpcode);
}

if (node.prefix) {
emitU8(emitter, OP.DUP);
}

if (isLocal) {
emitStoreLocal(emitter, slot);
} else {
emitU8(emitter, OP.STORE);
emitString(emitter, node.argument.name);
}
} else if (node.argument.type == "MemberExpression") {
let memberNode: MemberExpression = node.argument;

if (node.prefix) {
// ++obj.prop
emit(emitter, memberNode.object);
emitU8(emitter, OP.DUP);
if (memberNode.computed) {
emit(emitter, memberNode.property);
emitU8(emitter, OP.LOAD_ELEMENT);
} else {
emitU8(emitter, OP.GET_PROP);
let propName: string = "";
if (memberNode.property.type == "Identifier") {
propName = memberNode.property.name;
}
emitString(emitter, propName);
}
emitU8(emitter, OP.PUSH);
emitU8(emitter, TYPE.NUMBER);
emitF64(emitter, 1);
if (node.operator == "++") {
emitU8(emitter, addOpcode);
} else {
emitU8(emitter, subOpcode);
}
// Stack: [obj, new_val] -> SET_PROP -> []
if (memberNode.computed) {
emit(emitter, memberNode.property);
emitU8(emitter, OP.STORE_ELEMENT);
} else {
emitU8(emitter, OP.SET_PROP);
let propName2: string = "";
if (memberNode.property.type == "Identifier") {
propName2 = memberNode.property.name;
}
emitString(emitter, propName2);
}
// Reload the new value
emit(emitter, memberNode.object);
if (memberNode.computed) {
emit(emitter, memberNode.property);
emitU8(emitter, OP.LOAD_ELEMENT);
} else {
emitU8(emitter, OP.GET_PROP);
let propName3: string = "";
if (memberNode.property.type == "Identifier") {
propName3 = memberNode.property.name;
}
emitString(emitter, propName3);
}
} else {
// obj.prop++
emit(emitter, memberNode.object);
if (memberNode.computed) {
emit(emitter, memberNode.property);
emitU8(emitter, OP.LOAD_ELEMENT);
} else {
emitU8(emitter, OP.GET_PROP);
let propName4: string = "";
if (memberNode.property.type == "Identifier") {
propName4 = memberNode.property.name;
}
emitString(emitter, propName4);
}
// Stack: [old_val] - this is the return value
// Now store new value back
emit(emitter, memberNode.object);
emitU8(emitter, OP.DUP);
if (memberNode.computed) {
emit(emitter, memberNode.property);
emitU8(emitter, OP.LOAD_ELEMENT);
} else {
emitU8(emitter, OP.GET_PROP);
let propName5: string = "";
if (memberNode.property.type == "Identifier") {
propName5 = memberNode.property.name;
}
emitString(emitter, propName5);
}
emitU8(emitter, OP.PUSH);
emitU8(emitter, TYPE.NUMBER);
emitF64(emitter, 1);
if (node.operator == "++") {
emitU8(emitter, addOpcode);
} else {
emitU8(emitter, subOpcode);
}
// Stack: [old_val, obj, new_val] -> SET_PROP -> [old_val]
if (memberNode.computed) {
emit(emitter, memberNode.property);
emitU8(emitter, OP.STORE_ELEMENT);
} else {
emitU8(emitter, OP.SET_PROP);
let propName6: string = "";
if (memberNode.property.type == "Identifier") {
propName6 = memberNode.property.name;
}
emitString(emitter, propName6);
}
}
}
return;
}

function emitAssignmentExpression(emitter: Emitter, node: AssignmentExpression): void {
let leftNode: Expression = node.left;
let rightNode: Expression = node.right;
Expand Down
103 changes: 103 additions & 0 deletions compiler/codegen/emitter.ot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1107,6 +1107,109 @@ function emitUpdateExpression(emitter, node) {
emitU8(emitter, OP.STORE);
emitString(emitter, node.argument.name);
}
} else if (node.argument.type == "MemberExpression") {
// obj.prop++ / ++obj.prop / obj[key]++ / ++obj[key]
let memberNode = node.argument;

if (node.prefix) {
// ++obj.prop: compute new value, store, reload new value
emitNode(emitter, memberNode.object);
emitU8(emitter, OP.DUP);
if (memberNode.computed) {
emitNode(emitter, memberNode.property);
emitU8(emitter, OP.GET_PROP_COMPUTED);
} else {
emitU8(emitter, OP.GET_PROP);
let propName = "";
if (memberNode.property.type == "Identifier") {
propName = memberNode.property.name;
}
emitString(emitter, propName);
}
// Stack: [obj, old_val]
emitU8(emitter, OP.PUSH);
emitU8(emitter, TYPE.NUMBER);
emitF64(emitter, 1);
if (node.operator == "++") {
emitU8(emitter, OP.ADD);
} else {
emitU8(emitter, OP.SUB);
}
// Stack: [obj, new_val] -> SetProp -> []
if (memberNode.computed) {
emitNode(emitter, memberNode.property);
emitU8(emitter, OP.SET_PROP_COMPUTED);
} else {
emitU8(emitter, OP.SET_PROP);
let propName2 = "";
if (memberNode.property.type == "Identifier") {
propName2 = memberNode.property.name;
}
emitString(emitter, propName2);
}
// Reload the new value
emitNode(emitter, memberNode.object);
if (memberNode.computed) {
emitNode(emitter, memberNode.property);
emitU8(emitter, OP.GET_PROP_COMPUTED);
} else {
emitU8(emitter, OP.GET_PROP);
let propName3 = "";
if (memberNode.property.type == "Identifier") {
propName3 = memberNode.property.name;
}
emitString(emitter, propName3);
}
} else {
// obj.prop++: save old value, compute new, store back
emitNode(emitter, memberNode.object);
emitU8(emitter, OP.DUP);
if (memberNode.computed) {
emitNode(emitter, memberNode.property);
emitU8(emitter, OP.GET_PROP_COMPUTED);
} else {
emitU8(emitter, OP.GET_PROP);
let propName4 = "";
if (memberNode.property.type == "Identifier") {
propName4 = memberNode.property.name;
}
emitString(emitter, propName4);
}
// Stack: [obj, old_val] -> Swap -> [old_val, obj]
emitU8(emitter, OP.SWAP);
emitU8(emitter, OP.DUP);
if (memberNode.computed) {
emitNode(emitter, memberNode.property);
emitU8(emitter, OP.GET_PROP_COMPUTED);
} else {
emitU8(emitter, OP.GET_PROP);
let propName5 = "";
if (memberNode.property.type == "Identifier") {
propName5 = memberNode.property.name;
}
emitString(emitter, propName5);
}
emitU8(emitter, OP.PUSH);
emitU8(emitter, TYPE.NUMBER);
emitF64(emitter, 1);
if (node.operator == "++") {
emitU8(emitter, OP.ADD);
} else {
emitU8(emitter, OP.SUB);
}
// Stack: [old_val, obj, new_val] -> SetProp -> [old_val]
if (memberNode.computed) {
emitNode(emitter, memberNode.property);
emitU8(emitter, OP.SET_PROP_COMPUTED);
} else {
emitU8(emitter, OP.SET_PROP);
let propName6 = "";
if (memberNode.property.type == "Identifier") {
propName6 = memberNode.property.name;
}
emitString(emitter, propName6);
}
}
}
}

Expand Down
36 changes: 36 additions & 0 deletions compiler/ir/builder.ot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -914,6 +914,42 @@ function lowerExpression(ctx, node) {
return currentVal;
}
}
} else if (node.argument.type == "MemberExpression") {
// obj.prop++ / ++obj.prop / obj[key]++ / ++obj[key]
let objReg = lowerExpression(ctx, node.argument.object);
let currentVal;
if (node.argument.computed) {
let indexReg = lowerExpression(ctx, node.argument.property);
currentVal = irBuilderEmitLoadElement(builder, objReg, indexReg);
} else {
let propName = node.argument.property.name;
if (propName == null) {
propName = String(node.argument.property);
}
currentVal = irBuilderEmitLoadProp(builder, objReg, propName);
}
let one = irBuilderEmitConst(builder, 1);
let newVal;
if (node.operator == "++") {
newVal = irBuilderEmitAdd(builder, currentVal, one);
} else {
newVal = irBuilderEmitSub(builder, currentVal, one);
}
if (node.argument.computed) {
let indexReg2 = lowerExpression(ctx, node.argument.property);
irBuilderEmitStoreElement(builder, objReg, indexReg2, newVal);
} else {
let propName2 = node.argument.property.name;
if (propName2 == null) {
propName2 = String(node.argument.property);
}
irBuilderEmitStoreProp(builder, objReg, propName2, newVal);
}
if (node.prefix) {
return newVal;
} else {
return currentVal;
}
}
return irBuilderEmitConst(builder, 0);
}
Expand Down
Loading
Loading