Skip to content

Update goja #120

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
mstoykov merged 3 commits into from
Mar 9, 2026
Merged

Update goja #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
913bd86
Fixed delete with optional chain as operand. It was returning true, b…
dop251 Feb 26, 2026
6a7976c
Fixed generator return() so that it correctly handles yields from fin…
dop251 Mar 5, 2026
b4d03c2
Merge remote-tracking branch 'dop251/master' into updateGoja
mstoykov Mar 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
213 changes: 79 additions & 134 deletions compiler_expr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ type compiledExpr interface {
emitSetter(valueExpr compiledExpr, putOnStack bool)
emitRef()
emitUnary(prepare, body func(), postfix, putOnStack bool)
deleteExpr() compiledExpr
emitDelete(putOnStack bool)
constant() bool
addSrcMap()
}
Expand Down Expand Up @@ -79,32 +79,6 @@ type compiledArrayAssignmentPattern struct {
expr *ast.ArrayPattern
}

type deleteGlobalExpr struct {
baseCompiledExpr
name unistring.String
}

type deleteVarExpr struct {
baseCompiledExpr
name unistring.String
}

type deletePropExpr struct {
baseCompiledExpr
left compiledExpr
name unistring.String
}

type deleteElemExpr struct {
baseCompiledExpr
left, member compiledExpr
}

type constantExpr struct {
baseCompiledExpr
val Value
}

type baseCompiledExpr struct {
c *compiler
offset int
Expand Down Expand Up @@ -217,11 +191,6 @@ type compiledEnumGetExpr struct {
baseCompiledExpr
}

type defaultDeleteExpr struct {
baseCompiledExpr
expr compiledExpr
}

type compiledSpreadCallArgument struct {
baseCompiledExpr
expr compiledExpr
Expand All @@ -240,13 +209,6 @@ type compiledDynamicImport struct {
baseCompiledExpr
}

func (e *defaultDeleteExpr) emitGetter(putOnStack bool) {
e.expr.emitGetter(false)
if putOnStack {
e.c.emitLiteralValue(valueTrue)
}
}

func (c *compiler) compileExpression(v ast.Expression) compiledExpr {
// log.Printf("compileExpression: %T", v)
switch v := v.(type) {
Expand Down Expand Up @@ -361,12 +323,11 @@ func (e *baseCompiledExpr) emitRef() {
e.c.assert(false, e.offset, "Cannot emit reference for this type of expression")
}

func (e *baseCompiledExpr) deleteExpr() compiledExpr {
r := &constantExpr{
val: valueTrue,
func (e *baseCompiledExpr) emitDelete(putOnStack bool) {
if putOnStack {
e.addSrcMap()
e.c.emitLiteralValue(valueTrue)
}
r.init(e.c, file.Idx(e.offset+1))
return r
}

func (e *baseCompiledExpr) emitUnary(func(), func(), bool, bool) {
Expand All @@ -379,13 +340,6 @@ func (e *baseCompiledExpr) addSrcMap() {
}
}

func (e *constantExpr) emitGetter(putOnStack bool) {
if putOnStack {
e.addSrcMap()
e.c.emitLiteralValue(e.val)
}
}

func (e *compiledIdentifierExpr) emitGetter(putOnStack bool) {
e.addSrcMap()
if b, noDynamics := e.c.scope.lookupName(e.name); noDynamics {
Expand Down Expand Up @@ -536,33 +490,34 @@ func (e *compiledIdentifierExpr) emitUnary(prepare, body func(), postfix, putOnS
}
}

func (e *compiledIdentifierExpr) deleteExpr() compiledExpr {
func (e *compiledIdentifierExpr) emitDelete(putOnStack bool) {
if e.c.scope.strict {
e.c.throwSyntaxError(e.offset, "Delete of an unqualified identifier in strict mode")
panic("Unreachable")
}
if b, noDynamics := e.c.scope.lookupName(e.name); noDynamics {
if b == nil {
r := &deleteGlobalExpr{
name: e.name,
e.addSrcMap()
e.c.emit(deleteGlobal(e.name))
if !putOnStack {
e.c.emit(pop)
}
r.init(e.c, file.Idx(0))
return r
return
}
} else {
if b == nil {
r := &deleteVarExpr{
name: e.name,
e.addSrcMap()
e.c.emit(deleteVar(e.name))
if !putOnStack {
e.c.emit(pop)
}
r.init(e.c, file.Idx(e.offset+1))
return r
return
}
}
r := &compiledLiteral{
val: valueFalse,
if putOnStack {
e.addSrcMap()
e.c.emitLiteralValue(valueFalse)
}
r.init(e.c, file.Idx(e.offset+1))
return r
}

type compiledSuperDotExpr struct {
Expand Down Expand Up @@ -654,8 +609,13 @@ func (e *compiledSuperDotExpr) emitRef() {
}
}

func (e *compiledSuperDotExpr) deleteExpr() compiledExpr {
return e.c.superDeleteError(e.offset)
func (c *compiler) emitSuperReferenceError() {
c.emit(throwConst{referenceError("Unsupported reference to 'super'")})
}

func (e *compiledSuperDotExpr) emitDelete(_ bool) {
e.addSrcMap()
e.c.emitSuperReferenceError()
}

type compiledDotExpr struct {
Expand Down Expand Up @@ -790,9 +750,8 @@ func (e *compiledPrivateDotExpr) emitUnary(prepare, body func(), postfix, putOnS
}
}

func (e *compiledPrivateDotExpr) deleteExpr() compiledExpr {
func (e *compiledPrivateDotExpr) emitDelete(_ bool) {
e.c.throwSyntaxError(e.offset, "Private fields can not be deleted")
panic("unreachable")
}

func (e *compiledPrivateDotExpr) emitRef() {
Expand Down Expand Up @@ -900,14 +859,9 @@ func (e *compiledSuperBracketExpr) emitRef() {
}
}

func (c *compiler) superDeleteError(offset int) compiledExpr {
return c.compileEmitterExpr(func() {
c.emit(throwConst{referenceError("Unsupported reference to 'super'")})
}, file.Idx(offset+1))
}

func (e *compiledSuperBracketExpr) deleteExpr() compiledExpr {
return e.c.superDeleteError(e.offset)
func (e *compiledSuperBracketExpr) emitDelete(_ bool) {
e.addSrcMap()
e.c.emitSuperReferenceError()
}

func (c *compiler) checkConstantString(expr compiledExpr) (unistring.String, bool) {
Expand Down Expand Up @@ -1043,13 +997,17 @@ func (e *compiledDotExpr) emitUnary(prepare, body func(), postfix, putOnStack bo
}
}

func (e *compiledDotExpr) deleteExpr() compiledExpr {
r := &deletePropExpr{
left: e.left,
name: e.name,
func (e *compiledDotExpr) emitDelete(putOnStack bool) {
e.left.emitGetter(true)
e.addSrcMap()
if e.c.scope.strict {
e.c.emit(deletePropStrict(e.name))
} else {
e.c.emit(deleteProp(e.name))
}
if !putOnStack {
e.c.emit(pop)
}
r.init(e.c, file.Idx(e.offset)+1)
return r
}

func (e *compiledBracketExpr) emitGetter(putOnStack bool) {
Expand Down Expand Up @@ -1139,16 +1097,7 @@ func (e *compiledBracketExpr) emitUnary(prepare, body func(), postfix, putOnStac
}
}

func (e *compiledBracketExpr) deleteExpr() compiledExpr {
r := &deleteElemExpr{
left: e.left,
member: e.member,
}
r.init(e.c, file.Idx(e.offset)+1)
return r
}

func (e *deleteElemExpr) emitGetter(putOnStack bool) {
func (e *compiledBracketExpr) emitDelete(putOnStack bool) {
e.left.emitGetter(true)
e.member.emitGetter(true)
e.addSrcMap()
Expand All @@ -1162,42 +1111,6 @@ func (e *deleteElemExpr) emitGetter(putOnStack bool) {
}
}

func (e *deletePropExpr) emitGetter(putOnStack bool) {
e.left.emitGetter(true)
e.addSrcMap()
if e.c.scope.strict {
e.c.emit(deletePropStrict(e.name))
} else {
e.c.emit(deleteProp(e.name))
}
if !putOnStack {
e.c.emit(pop)
}
}

func (e *deleteVarExpr) emitGetter(putOnStack bool) {
/*if e.c.scope.strict {
e.c.throwSyntaxError(e.offset, "Delete of an unqualified identifier in strict mode")
return
}*/
e.c.emit(deleteVar(e.name))
if !putOnStack {
e.c.emit(pop)
}
}

func (e *deleteGlobalExpr) emitGetter(putOnStack bool) {
/*if e.c.scope.strict {
e.c.throwSyntaxError(e.offset, "Delete of an unqualified identifier in strict mode")
return
}*/

e.c.emit(deleteGlobal(e.name))
if !putOnStack {
e.c.emit(pop)
}
}

func (e *compiledAssignExpr) emitGetter(putOnStack bool) {
switch e.operator {
case token.ASSIGN:
Expand Down Expand Up @@ -2608,7 +2521,7 @@ func (e *compiledUnaryExpr) emitGetter(putOnStack bool) {
e.c.emit(typeof)
goto end
case token.DELETE:
e.operand.deleteExpr().emitGetter(putOnStack)
e.operand.emitDelete(putOnStack)
return
case token.MINUS:
e.c.emitExpr(e.operand, true)
Expand Down Expand Up @@ -3221,12 +3134,12 @@ func (e *compiledCallExpr) emitGetter(putOnStack bool) {
}
}

func (e *compiledCallExpr) deleteExpr() compiledExpr {
r := &defaultDeleteExpr{
expr: e,
func (e *compiledCallExpr) emitDelete(putOnStack bool) {
e.emitGetter(false)
if putOnStack {
e.addSrcMap()
e.c.emitLiteralValue(valueTrue)
}
r.init(e.c, file.Idx(e.offset+1))
return r
}

func (c *compiler) compileSpreadCallArgument(spread *ast.SpreadElement) compiledExpr {
Expand Down Expand Up @@ -3634,6 +3547,28 @@ func (c *compiler) endOptChain() {
c.block = c.block.outer
}

func (c *compiler) endOptChainDelete() {
lbl := len(c.p.code)
for _, item := range c.block.breaks {
c.p.code[item] = joptdel(lbl - item)
}
for _, item := range c.block.conts {
c.p.code[item] = joptdelc(lbl - item)
}
c.block = c.block.outer
}

func (c *compiler) endOptChainDeleteP() {
lbl := len(c.p.code)
for _, item := range c.block.breaks {
c.p.code[item] = joptdelP(lbl - item)
}
for _, item := range c.block.conts {
c.p.code[item] = joptdelcP(lbl - item)
}
c.block = c.block.outer
}

func (e *compiledOptionalChain) emitGetter(putOnStack bool) {
e.c.startOptChain()
e.expr.emitGetter(true)
Expand All @@ -3643,6 +3578,16 @@ func (e *compiledOptionalChain) emitGetter(putOnStack bool) {
}
}

func (e *compiledOptionalChain) emitDelete(putOnStack bool) {
e.c.startOptChain()
e.expr.emitDelete(putOnStack)
if putOnStack {
e.c.endOptChainDelete()
} else {
e.c.endOptChainDeleteP()
}
}

func (e *compiledOptional) emitGetter(putOnStack bool) {
e.expr.emitGetter(putOnStack)
if putOnStack {
Expand Down
43 changes: 43 additions & 0 deletions compiler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4841,6 +4841,49 @@ func TestOptChainCallee(t *testing.T) {
testScriptWithTestLib(SCRIPT, _undefined, t)
}

func TestOptChainDelete(t *testing.T) {
const SCRIPT = `
{
const o = {
a: 1,
}
const a = {
b: {
c: 123,
d: 1,
},
f: () => o,
};
assert(delete a.b?.c);
assert(!('c' in a.b));
assert(delete a.z?.c);
assert(delete a.z?.().c);
assert(delete a.f?.().a);
assert(!('a' in o));
}

{
const o = {
a: 1,
}
const a = {
b: {
c: 123,
d: 1,
},
f: () => o,
};
delete a.b?.c;
assert(!('c' in a.b));
delete a.z?.c;
delete a.z?.().c;
delete a.f?.().a;
assert(!('a' in o));
}
`
testScriptWithTestLib(SCRIPT, _undefined, t)
}

func TestObjectLiteralSuper(t *testing.T) {
const SCRIPT = `
const proto = {
Expand Down
Loading
Loading