Skip to content

[pull] master from GaijinEntertainment:master #644

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 2 commits into from
Nov 12, 2025
Merged

[pull] master from GaijinEntertainment:master #644

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
2a2896e
compile builting module takes const data
borisbat Nov 12, 2025
ed3233c
Merge pull request #1928 from GaijinEntertainment/const-compile-builtin
borisbat Nov 12, 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
2 changes: 1 addition & 1 deletion include/daScript/ast/ast.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1151,7 +1151,7 @@ namespace das
if ( objModule->visibleEverywhere ) return true;
return requireModule.find(objModule) != requireModule.end();
}
bool compileBuiltinModule ( const string & name, unsigned char * str, unsigned int str_len );//will replace last symbol to 0
bool compileBuiltinModule ( const string & name, const unsigned char * const str, unsigned int str_len );//will replace last symbol to 0
static Module * require ( const string & name );
static Module * requireEx ( const string & name, bool allowPromoted );
static void Initialize();
Expand Down
2 changes: 1 addition & 1 deletion src/ast/ast_module.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ namespace das {
return it != callThis.end() ? &it->second : nullptr;
}

bool Module::compileBuiltinModule ( const string & modName, unsigned char * str, unsigned int str_len ) {
bool Module::compileBuiltinModule ( const string & modName, const unsigned char * const str, unsigned int str_len ) {
TextWriter issues;
auto access = make_smart<FileAccess>();
auto fileInfo = make_unique<TextFileInfo>((char *) str, uint32_t(str_len), false);
Expand Down