Skip to content

Scope storage vars only to fns within the utxo block #114

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

Open
SpaceManiac wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Scope storage vars only to fns within the utxo block #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1e322df
Move dummy_span handling into Identifier helper methods
SpaceManiac Feb 12, 2026
041540f
Make Identifier's span non-Option
SpaceManiac Feb 13, 2026
fe8d38c
Update snapshots for Identifier change
SpaceManiac Feb 19, 2026
19faa41
Scope Utxo storage vars to fns in that Utxo
SpaceManiac Feb 19, 2026
e5823a9
Compile synthetic get-storage and set-storage in the correct scope
SpaceManiac Feb 19, 2026
131db90
Merge branch 'main' into tad/compiler-internals
SpaceManiac Feb 19, 2026
aa5e10e
Prepend Utxo name to get-storage and set-storage fns
SpaceManiac Feb 19, 2026
b476343
Merge branch 'main' into tad/compiler-internals
SpaceManiac Feb 19, 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
6 changes: 3 additions & 3 deletions starstream-compiler/src/formatter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ fn struct_definition_to_doc<'a>(
) -> RcDoc<'a, ()> {
// Use struct name's end position as body_start to avoid picking up
// comments that belong to the struct definition itself
let body_start = definition.name.span.map(|s| s.end).unwrap_or(0);
let body_start = definition.name.span().end;

RcDoc::text("struct")
.append(RcDoc::space())
Expand Down Expand Up @@ -304,7 +304,7 @@ fn enum_definition_to_doc<'a>(
) -> RcDoc<'a, ()> {
// Use enum name's end position as body_start to avoid picking up
// comments that belong to the enum definition itself
let body_start = definition.name.span.map(|s| s.end).unwrap_or(0);
let body_start = definition.name.span().end;

RcDoc::text("enum")
.append(RcDoc::space())
Expand Down Expand Up @@ -383,7 +383,7 @@ fn enum_variant_to_doc<'a>(
}
EnumVariantPayload::Struct(fields) => {
// Use variant name's end as body_start for struct fields
let body_start = variant.name.span.map(|s| s.end).unwrap_or(0);
let body_start = variant.name.span().end;
let body = if fields.len() < 3 {
inline_struct_fields_to_doc(fields, source)
} else {
Expand Down
4 changes: 1 addition & 3 deletions .../definition/snapshots/starstream_compiler__parser__definition__abi__tests__abi_empty.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@ description: "Code:\n\nabi Events {}"
AbiDef {
name: Identifier {
name: "Events",
span: Some(
4..10,
),
span: 4..10,
},
parts: [],
}
8 changes: 2 additions & 6 deletions ...n/snapshots/starstream_compiler__parser__definition__abi__tests__abi_event_no_params.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,14 @@ description: "Code:\n\nabi Events {\n event Ping();\n}\n"
AbiDef {
name: Identifier {
name: "Events",
span: Some(
4..10,
),
span: 4..10,
},
parts: [
Event(
EventDef {
name: Identifier {
name: "Ping",
span: Some(
23..27,
),
span: 23..27,
},
params: [],
},
Expand Down
44 changes: 11 additions & 33 deletions ...n/snapshots/starstream_compiler__parser__definition__abi__tests__abi_multiple_events.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,67 +5,51 @@ description: "Code:\n\nabi Events {\n event Transfer(sender: i64, to: i64, am
AbiDef {
name: Identifier {
name: "Events",
span: Some(
4..10,
),
span: 4..10,
},
parts: [
Event(
EventDef {
name: Identifier {
name: "Transfer",
span: Some(
23..31,
),
span: 23..31,
},
params: [
FunctionParam {
name: Identifier {
name: "sender",
span: Some(
32..38,
),
span: 32..38,
},
ty: TypeAnnotation {
name: Identifier {
name: "i64",
span: Some(
40..43,
),
span: 40..43,
},
generics: [],
},
},
FunctionParam {
name: Identifier {
name: "to",
span: Some(
45..47,
),
span: 45..47,
},
ty: TypeAnnotation {
name: Identifier {
name: "i64",
span: Some(
49..52,
),
span: 49..52,
},
generics: [],
},
},
FunctionParam {
name: Identifier {
name: "amount",
span: Some(
54..60,
),
span: 54..60,
},
ty: TypeAnnotation {
name: Identifier {
name: "i64",
span: Some(
62..65,
),
span: 62..65,
},
generics: [],
},
Expand All @@ -77,24 +61,18 @@ AbiDef {
EventDef {
name: Identifier {
name: "Log",
span: Some(
78..81,
),
span: 78..81,
},
params: [
FunctionParam {
name: Identifier {
name: "message",
span: Some(
82..89,
),
span: 82..89,
},
ty: TypeAnnotation {
name: Identifier {
name: "i64",
span: Some(
91..94,
),
span: 91..94,
},
generics: [],
},
Expand Down
24 changes: 6 additions & 18 deletions ...tion/snapshots/starstream_compiler__parser__definition__abi__tests__abi_single_event.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,50 +5,38 @@ description: "Code:\n\nabi Events {\n event Transfer(sender: i64, to: i64);\n
AbiDef {
name: Identifier {
name: "Events",
span: Some(
4..10,
),
span: 4..10,
},
parts: [
Event(
EventDef {
name: Identifier {
name: "Transfer",
span: Some(
23..31,
),
span: 23..31,
},
params: [
FunctionParam {
name: Identifier {
name: "sender",
span: Some(
32..38,
),
span: 32..38,
},
ty: TypeAnnotation {
name: Identifier {
name: "i64",
span: Some(
40..43,
),
span: 40..43,
},
generics: [],
},
},
FunctionParam {
name: Identifier {
name: "to",
span: Some(
45..47,
),
span: 45..47,
},
ty: TypeAnnotation {
name: Identifier {
name: "i64",
span: Some(
49..52,
),
span: 49..52,
},
generics: [],
},
Expand Down
28 changes: 7 additions & 21 deletions ...shots/starstream_compiler__parser__definition__enum_def__tests__enum_struct_variants.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,25 @@ description: "Code:\n\nenum Result { Ok { value: i64 }, Err { msg: i64 } }"
EnumDef {
name: Identifier {
name: "Result",
span: Some(
5..11,
),
span: 5..11,
},
variants: [
EnumVariant {
name: Identifier {
name: "Ok",
span: Some(
14..16,
),
span: 14..16,
},
payload: Struct(
[
StructField {
name: Identifier {
name: "value",
span: Some(
19..24,
),
span: 19..24,
},
ty: TypeAnnotation {
name: Identifier {
name: "i64",
span: Some(
26..29,
),
span: 26..29,
},
generics: [],
},
Expand All @@ -44,25 +36,19 @@ EnumDef {
EnumVariant {
name: Identifier {
name: "Err",
span: Some(
33..36,
),
span: 33..36,
},
payload: Struct(
[
StructField {
name: Identifier {
name: "msg",
span: Some(
39..42,
),
span: 39..42,
},
ty: TypeAnnotation {
name: Identifier {
name: "i64",
span: Some(
44..47,
),
span: 44..47,
},
generics: [],
},
Expand Down
16 changes: 4 additions & 12 deletions ...pshots/starstream_compiler__parser__definition__enum_def__tests__enum_tuple_variants.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,20 @@ description: "Code:\n\nenum Option { Some(i64), None }"
EnumDef {
name: Identifier {
name: "Option",
span: Some(
5..11,
),
span: 5..11,
},
variants: [
EnumVariant {
name: Identifier {
name: "Some",
span: Some(
14..18,
),
span: 14..18,
},
payload: Tuple(
[
TypeAnnotation {
name: Identifier {
name: "i64",
span: Some(
19..22,
),
span: 19..22,
},
generics: [],
},
Expand All @@ -35,9 +29,7 @@ EnumDef {
EnumVariant {
name: Identifier {
name: "None",
span: Some(
25..29,
),
span: 25..29,
},
payload: Unit,
span: 25..30,
Expand Down
16 changes: 4 additions & 12 deletions ...apshots/starstream_compiler__parser__definition__enum_def__tests__enum_unit_variants.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,37 +5,29 @@ description: "Code:\n\nenum Color { Red, Green, Blue }"
EnumDef {
name: Identifier {
name: "Color",
span: Some(
5..10,
),
span: 5..10,
},
variants: [
EnumVariant {
name: Identifier {
name: "Red",
span: Some(
13..16,
),
span: 13..16,
},
payload: Unit,
span: 13..16,
},
EnumVariant {
name: Identifier {
name: "Green",
span: Some(
18..23,
),
span: 18..23,
},
payload: Unit,
span: 18..23,
},
EnumVariant {
name: Identifier {
name: "Blue",
span: Some(
25..29,
),
span: 25..29,
},
payload: Unit,
span: 25..30,
Expand Down
4 changes: 1 addition & 3 deletions ...ots/starstream_compiler__parser__definition__function__tests__function_script_export.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ FunctionDef {
),
name: Identifier {
name: "main",
span: Some(
10..14,
),
span: 10..14,
},
params: [],
return_type: None,
Expand Down
4 changes: 1 addition & 3 deletions .../snapshots/starstream_compiler__parser__definition__function__tests__function_simple.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ FunctionDef {
export: None,
name: Identifier {
name: "foo",
span: Some(
3..6,
),
span: 3..6,
},
params: [],
return_type: None,
Expand Down
Loading