Skip to content
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

Adds check for local variable in scope operator check #2227

Merged
merged 8 commits into from
Feb 24, 2025
Merged

Adds check for local variable in scope operator check #2227

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
54de75b
Adds check for local variable in scope operator check
Ruzihm Feb 23, 2025
0582e24
flow fix, unit tests, reword error
Ruzihm Feb 23, 2025
490d771
Merge remote-tracking branch 'upstream/master' into rwvanta-localcheck
Ruzihm Feb 23, 2025
fd1b6a7
test reformat, remove unintentional sln commit
Ruzihm Feb 23, 2025
e0a8351
marks ExpressionContext.DMProc as nullable as DMMParser.ParseCellDefi…
Ruzihm Feb 23, 2025
f0a290c
unit test fixes
Ruzihm Feb 23, 2025
cef6c73
adds warning to scope weirdness, removes nullability marker from Expr…
Ruzihm Feb 24, 2025
edf0a46
new test cases, new warning
Ruzihm Feb 24, 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 DMCompiler/DM/Builders/DMExpressionBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,8 +645,13 @@
// This is the same behaviour as in BYOND, but BYOND simply raises an undefined var error.
// We want to give end users an explanation at least.
if (scopeMode is Normal && ctx.Proc != null)
return BadExpression(WarningCode.BadExpression, identifier.Location,
"Use of \"type::\" and \"parent_type::\" outside of a context is forbidden");
if (ctx.Proc.GetLocalVariable(identifier.Identifier) != null) {
// actually - it's referring to a local variable named "type" or "parent_type"... just do the usual thing
expression = BuildExpression(scopeIdentifier.Expression, inferredPath);
} else {
return BadExpression(WarningCode.BadExpression, identifier.Location,
"Use of \"type::\" and \"parent_type::\" outside of a context is forbidden");
}

if (identifier.Identifier == "parent_type") {
if (ctx.Type.Parent == null)
Expand Down
Loading