Skip to content

Fix dispatch ambiguities by restricting aud to audgz (d>0:shp) #255

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
sbscholz merged 2 commits into from
Apr 26, 2026
Merged

Fix dispatch ambiguities by restricting aud to audgz (d>0:shp) #255

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
532947f
Fix dispatch ambiguities by restricting aud to audgz (d>0:shp)
rubenhensen Apr 12, 2026
e21ccfb
Address Sven's PR #255 review comments
rubenhensen Apr 25, 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
16 changes: 12 additions & 4 deletions src/structures/ArrayTransform.xsac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,23 +56,23 @@ BUILT_IN(TRANSPOSE)

#define WHERE_AxA(typ, _postfix, _fmt, _zval, _oval) \
inline \
typ[d:shp] where(bool[d:shp] p, typ[d:shp] A, typ[d:shp] B) \
typ[d>0:shp] where(bool[d>0:shp] p, typ[d>0:shp] A, typ[d>0:shp] B) \
Comment thread
rubenhensen marked this conversation as resolved.
{ \
return { iv -> _sel_VxA_(iv, p) ? _sel_VxA_(iv, A) : _sel_VxA_(iv, B); \
iv -> _zval | iv < shp }; \
}

#define WHERE_AxS(typ, _postfix, _fmt, _zval, _oval) \
inline \
typ[d:shp] where(bool[d:shp] p, typ[d:shp] A, typ B) \
typ[d>0:shp] where(bool[d>0:shp] p, typ[d>0:shp] A, typ B) \
{ \
return { iv -> _sel_VxA_(iv, p) ? _sel_VxA_(iv, A) : B; \
iv -> _zval | iv < shp }; \
}

#define WHERE_SxA(typ, _postfix, _fmt, _zval, _oval) \
inline \
typ[d:shp] where(bool[d:shp] p, typ A, typ[d:shp] B) \
typ[d>0:shp] where(bool[d>0:shp] p, typ A, typ[d>0:shp] B) \
{ \
return { iv -> _sel_VxA_(iv, p) ? A : _sel_VxA_(iv, B); \
iv -> _zval | iv < shp }; \
Expand All @@ -86,11 +86,19 @@ typ[b:shp] where(bool[b:shp] p, typ A, typ B) \
iv -> _zval | iv < shp }; \
}

#define WHERE_SSS(typ, _postfix, _fmt, _zval, _oval) \
inline \
typ where(bool p, typ A, typ B) \
{ \
return p ? A : B; \
}

#define WHERE(typ, postfix, fmt, zval, oval) \
WHERE_AxA(typ, postfix, fmt, zval, oval) \
WHERE_AxS(typ, postfix, fmt, zval, oval) \
WHERE_SxA(typ, postfix, fmt, zval, oval) \
WHERE_SxS(typ, postfix, fmt, zval, oval)
WHERE_SxS(typ, postfix, fmt, zval, oval) \
WHERE_SSS(typ, postfix, fmt, zval, oval)

BUILT_IN(WHERE)

Expand Down
8 changes: 4 additions & 4 deletions src/structures/ComplexArrayArith.xsac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,23 @@ export all;

#define MAP_BIN_AxA(name, op, a, b, adef, bdef) \
inline \
b[d:shp] name(a[d:shp] A, a[d:shp] B) \
b[d>0:shp] name(a[d>0:shp] A, a[d>0:shp] B) \
{ \
return { iv -> name(A[iv], B[iv]) | iv < shp; \
iv -> bdef | iv < shp }; \
}

#define MAP_BIN_AxS(name, op, a, b, adef, bdef) \
inline \
b[d:shp] name(a[d:shp] A, a B) \
b[d>0:shp] name(a[d>0:shp] A, a B) \
{ \
return { iv -> name(A[iv], B) | iv < shp; \
iv -> bdef | iv < shp }; \
}

#define MAP_BIN_SxA(name, op, a, b, adef, bdef) \
inline \
b[d:shp] name(a A, a[d:shp] B) \
b[d>0:shp] name(a A, a[d>0:shp] B) \
{ \
return { iv -> name(A, B[iv]) | iv < shp; \
iv -> bdef | iv < shp }; \
Expand All @@ -54,7 +54,7 @@ b[d:shp] name(a A, a[d:shp] B) \

#define MAP_MON_AxA(name, op, a, b, adef, bdef) \
inline \
b[d:shp] name(a[d:shp] A) \
b[d>0:shp] name(a[d>0:shp] A) \
{ \
return { iv -> name(A[iv]) | iv < shp; \
iv -> bdef | iv < shp }; \
Expand Down
12 changes: 6 additions & 6 deletions src/structures/Quaternion.xsac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,20 +83,20 @@ inline struct Quaternion *(struct Quaternion a, struct Quaternion b)
};
}

inline struct Quaternion[d:shp] *(struct Quaternion a,
struct Quaternion[d:shp] b)
inline struct Quaternion[d>0:shp] *(struct Quaternion a,
struct Quaternion[d>0:shp] b)
{
return { iv -> a * b[iv] | iv < shp };
}

inline struct Quaternion[d:shp] *(struct Quaternion[d:shp] a,
struct Quaternion b)
inline struct Quaternion[d>0:shp] *(struct Quaternion[d>0:shp] a,
struct Quaternion b)
{
return { iv -> a[iv] * b | iv < shp };
}

inline struct Quaternion[d:shp] *(struct Quaternion[d:shp] a,
struct Quaternion[d:shp] b)
inline struct Quaternion[d>0:shp] *(struct Quaternion[d>0:shp] a,
struct Quaternion[d>0:shp] b)
{
return { iv -> a[iv] * b[iv] | iv < shp };
}
Loading