Skip to content

Feature/support struct type element for other struct #40

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
wf001 merged 2 commits into from
May 10, 2025
Merged

Feature/support struct type element for other struct #40

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
a4406c3
support the struct that have other struct field
wf001 May 10, 2025
996b5e1
add test for the struct
wf001 May 10, 2025
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
9 changes: 7 additions & 2 deletions pkg/codegen/codegen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,11 @@ func newStruct(
v := ctx.gen(value)

if _, ok := v.(*ir.InstBitCast); ok {
ctx.block.NewStore(nullStructPtr, fieldPtr)
ctx.block.NewStore(v, fieldPtr)
if p, ok := structCtx.Field[field.Val].Type.(*types.PointerType); ok {
nullFieldPtr := constant.NewNull(p)
ctx.block.NewStore(nullFieldPtr, fieldPtr)
ctx.block.NewStore(v, fieldPtr)
}
} else {
ctx.block.NewStore(v, fieldPtr)
}
Expand Down Expand Up @@ -345,6 +348,8 @@ func (ctx *Context) genStructTypeDeclare(node *mTypes.Node) {
// need to check others struct
if rootTy == nil && n.IsType(mTypes.TY_EXTENDED) && n.Type.ExtendName == node.Val {
rootTy = structType
} else if rootTy == nil {
rootTy = mTypes.GetExtendedType(ctx.prog.Declare, n).Types
}
f := structField[n.Val]
f.Pos = pos
Expand Down
3 changes: 3 additions & 0 deletions pkg/parser/validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ func findTypeDeclare(n *mTypes.Node, targetType string) *mTypes.Node {
if n.IsKind(mTypes.ND_TYPE_DECLARE) && n.Val == targetType {
return n
}
if result := findTypeDeclare(n.Next, targetType); result != nil {
return result
}
if result := findTypeDeclare(n.Child, targetType); result != nil {
return result
}
Expand Down
1 change: 1 addition & 0 deletions script/test-full.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,7 @@ testexec(){
assertexec '(defschema Person {:name :: string :age :: int :isMale :: bool}) (def f :: Person (fn [] (let [node :: Person {:age 20 :name "richard" :isMale true}] node))) (def main :: int (fn [] (prn (get f :age))))' "20\\\n"
assertexec '(defschema Person {:name :: string :age :: int :isMale :: bool :height :: double :v :: [int]}) (def main :: int (fn [] (let [node :: Person {:age 20 :name "richard" :isMale true :height 5.8 :v [4, 3, 2]}] (prn (get node :name)) (prn (get node :age)) (prn (get node :isMale)) (prn (get node :height)) (prn (get node :v)) )))' "richard\\\n20\\\ntrue\\\n5.8\\\n[4, 3, 2]\\\n"
assertexec '(defschema Person {:name ::string :next ::Person})(def main ::int (fn [] (let [node ::Person {:name "richard" :next {:name "rebecca" :next {:name "andre" :next {:name "bob"}}}}] (prn (get node :name)) (prn (get (get node :next) :name)) (prn (get (get (get node :next) :next) :name)) (prn (get (get (get (get node :next) :next) :next) :name)))))' "richard\\\nrebecca\\\nandre\\\nbob\\\n"
assertexec '(defschema Country {:name ::string})(defschema Person {:name ::string :country ::Country})(def main ::int (fn [] (let [c ::Country {:name "deutsch"} person ::Person {:name "mike" :country c}] (prn (get (get person :country) :name)))))' "deutsch\\\n"

#############
# Prelude functions
Expand Down