Skip to content

Fix operator precedence hole in IsCompatibleType #302

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
TetzkatLipHoka wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix operator precedence hole in IsCompatibleType #302

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
5 changes: 4 additions & 1 deletion Source/uPSCompiler.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3287,7 +3287,10 @@ function TPSPascalCompiler.IsCompatibleType(p1, p2: TPSType; Cast: Boolean): Boo
((p1.BaseType = btUnicodeString) and (p2.BaseType = btWideChar)) or
((p1.BaseType = btUnicodeString) and ((p2.BaseType = btString) or (p2.BaseType = btPchar) or (p2.BaseType = btUnicodeString))) or
((p1.BaseType = btUnicodeString) and (p2.BaseType = btWidestring)) or
(((p1.basetype = btPchar) or (p1.BaseType = btString)) and (p2.BaseType = btWideString)or (p2.BaseType = btUnicodeString)) or
(((p1.basetype = btPchar) or (p1.BaseType = btString)) and
// the second/third term used to dangle outside the p1 check, which
// made EVERY destination type compatible with UnicodeString sources
((p2.BaseType = btWideString) or (p2.BaseType = btUnicodeString))) or
(((p1.basetype = btPchar) or (p1.BaseType = btString)) and (p2.BaseType = btWidechar)) or
(((p1.basetype = btPchar) or (p1.BaseType = btString)) and (p2.BaseType = btchar)) or
{$ENDIF}
Expand Down