Skip to content

[pull] master from GaijinEntertainment:master #631

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
pull merged 3 commits into from
Oct 28, 2025
Merged

[pull] master from GaijinEntertainment:master #631

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3002dcf
better bitmap locations, also alias types
borisbat Oct 28, 2025
fa6b62e
upsie
borisbat Oct 28, 2025
a75a984
Merge pull request #1913 from GaijinEntertainment/bitmap-locations
borisbat Oct 28, 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
30 changes: 25 additions & 5 deletions src/ast/ast_infer_type.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5817,6 +5817,13 @@ namespace das {
return nullptr;
}

LineInfo makeConstAt ( ExprField * expr ) const {
LineInfo constAt = expr->value->at;
constAt.last_column = expr->atField.last_column;
constAt.last_line = expr->atField.last_line;
return constAt;
}

virtual ExpressionPtr visit ( ExprField * expr ) override {
if ( expr->value->rtti_isVar() && !expr->value->type ) { // if its a var expression, but it did not infer
auto var = static_cast<ExprVar *>(expr->value.get());
Expand Down Expand Up @@ -5847,7 +5854,7 @@ namespace das {
reportAstChanged();
auto td = make_smart<TypeDecl>(possibleEnums.back());
td->constant = true;
auto res = make_smart<ExprConstEnumeration>(expr->at, expr->name, td);
auto res = make_smart<ExprConstEnumeration>(makeConstAt(expr), expr->name, td);
bool infE = false;
res->value = getEnumerationValue(res.get(), infE);
if ( infE ) res->type = td;
Expand All @@ -5859,7 +5866,7 @@ namespace das {
reportAstChanged();
auto td = make_smart<TypeDecl>(*alias);
td->ref = false;
auto bitConst = new ExprConstBitfield(expr->at, 1ull << uint64_t(bit));
auto bitConst = new ExprConstBitfield(makeConstAt(expr), 1ull << uint64_t(bit));
bitConst->bitfieldType = make_smart<TypeDecl>(*alias);
bitConst->type = td;
return bitConst;
Expand Down Expand Up @@ -6358,6 +6365,12 @@ namespace das {
return Visitor::visit(expr);
}
// ExprOp1
bool isBitfieldOp ( const Function * fnc ) const {
if ( fnc->module->name=="$" && fnc->arguments[0]->type->isBitfield() ) {
return true;
}
return false;
}
virtual ExpressionPtr visit ( ExprOp1 * expr ) override {
if ( !expr->subexpr->type || expr->subexpr->type->isAliasOrExpr() ) return Visitor::visit(expr); // failed to infer
// pointer arithmetics
Expand Down Expand Up @@ -6414,8 +6427,8 @@ namespace das {
return opCall;
}
if ( expr->func ) {
if ( expr->func->firstArgReturnType ) {
TypeDecl::clone(expr->type,expr->arguments[0]->type);
if ( expr->func->firstArgReturnType || isBitfieldOp(expr->func) ) {
TypeDecl::clone(expr->type,expr->subexpr->type);
expr->type->ref = false;
} else {
TypeDecl::clone(expr->type,expr->func->result);
Expand Down Expand Up @@ -6630,8 +6643,15 @@ namespace das {
}
if ( expr->func ) {
if ( expr->func->firstArgReturnType ) {
TypeDecl::clone(expr->type,expr->arguments[0]->type);
TypeDecl::clone(expr->type,expr->left->type);
expr->type->ref = false;
} else if ( isBitfieldOp(expr->func) ) {
TypeDecl::clone(expr->type,expr->func->result);
if ( !expr->left->type->alias.empty() ) {
expr->type->alias = expr->left->type->alias;
} else if ( !expr->right->type->alias.empty() ) {
expr->type->alias = expr->right->type->alias;
}
} else {
TypeDecl::clone(expr->type,expr->func->result);
}
Expand Down