Skip to content

refactor: improve repr of account interp #134

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
ascandone merged 1 commit into from
May 13, 2026
Merged

refactor: improve repr of account interp #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion internal/interpreter/evaluate_expr.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func (st *programState) evaluateExpr(expr parser.ValueExpr) (Value, InterpreterE
parts = append(parts, strValue)
}
}
name := strings.Join(parts, ":")
name := strings.Join(parts, "")
return NewAccountAddress(name)

case *parser.StringLiteral:
Expand Down
3 changes: 3 additions & 0 deletions internal/parser/__snapshots__/parser_test.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2246,6 +2246,7 @@ parser.Program{
},
Parts: {
parser.AccountTextPart{Name:"player"},
parser.AccountTextPart{Name:":"},
parser.AccountTextPart{Name:"1"},
},
},
Expand Down Expand Up @@ -3243,7 +3244,9 @@ parser.Program{
},
Parts: {
parser.AccountTextPart{Name:"abc"},
parser.AccountTextPart{Name:":"},
parser.AccountTextPart{Name:"cde"},
parser.AccountTextPart{Name:":"},
&parser.Variable{
Range: parser.Range{
Start: parser.Position{Character:21, Line:0},
Expand Down
2 changes: 1 addition & 1 deletion internal/parser/ast.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ func (expr AccountInterpLiteral) String() string {
parts = append(parts, "$"+part.Name)
}
}
return strings.Join(parts, ":")
return strings.Join(parts, "")
}

// Source exprs
Expand Down
10 changes: 8 additions & 2 deletions internal/parser/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,15 +341,21 @@ func parseValueExpr(valueExprCtx antlrParser.IValueExprContext) ValueExpr {
litRng := ctxToRange(valueExprCtx)

var parts []AccountNamePart
for _, accLit := range valueExprCtx.AllAccountLiteralPart() {
varPartText := accLit.GetText()
for _, accLit := range valueExprCtx.GetChildren() {
switch accLit := accLit.(type) {
case *antlrParser.AccountTextPartContext:
varPartText := accLit.GetText()
parts = append(parts, AccountTextPart{Name: varPartText})
case *antlrParser.AccountVarPartContext:
v := parseVarLiteral(accLit.VARIABLE_NAME_ACC().GetSymbol())
parts = append(parts, v)

case antlr.TerminalNode:
if accLit.GetSymbol().GetTokenType() == antlrParser.NumscriptParserCOLON {
parts = append(parts, AccountTextPart{Name: ":"})
}
}

}

return &AccountInterpLiteral{
Expand Down