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

Jump to bottom

Compiler int fixes #273

Merged
merged 10 commits into from Sep 16, 2015
Merged

Compiler int fixes #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a5e1d47
Compiler: refactor integer parsing, with overflow checks
sonneveld Sep 7, 2015
4e8a64d
Compiler: store default parameter values as ints.
sonneveld Sep 5, 2015
5d58e75
Compiler: store default values as ints
sonneveld Sep 5, 2015
97d72d3
Compiler: support negative enums
sonneveld Sep 5, 2015
dc80204
Compiler: add tests
sonneveld Sep 8, 2015
d7b4495
Compiler: don't truncate imported default parameters.
sonneveld Sep 9, 2015
5ef0cbb
Compiler: use friendly name in error messages
sonneveld Sep 11, 2015
ffb40d4
Compiler: remove dummy test.
sonneveld Sep 11, 2015
c46220c
Compiler: report negative symbol on error.
sonneveld Sep 13, 2015
d93492a
Compiler: tidy up tests. refactor common code.
sonneveld Sep 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions Compiler/script/cc_compiledscript.cpp
View file
Open in desktop
Expand Up @@ -149,6 +149,7 @@ int ccCompiledScript::remove_any_import (const char*namm, SymbolDef *oldSym) {
for (i = 0; i <= sym.get_num_args(sidx); i++) {
oldSym->funcparamtypes[i] = sym.funcparamtypes[sidx][i];
oldSym->funcParamDefaultValues[i] = sym.funcParamDefaultValues[sidx][i];
oldSym->funcParamHasDefaultValues[i] = sym.funcParamHasDefaultValues[sidx][i];
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion Compiler/script/cc_symboldef.h
View file
Open in desktop
Expand Up @@ -16,7 +16,8 @@ struct SymbolDef {
short sscope; // or num arguments for function
long arrsize;
unsigned long funcparamtypes[MAX_FUNCTION_PARAMETERS+1];
short funcParamDefaultValues[MAX_FUNCTION_PARAMETERS+1];
int funcParamDefaultValues[MAX_FUNCTION_PARAMETERS+1];
bool funcParamHasDefaultValues[MAX_FUNCTION_PARAMETERS+1];
};

#endif // __CC_SYMBOLDEF_H
4 changes: 3 additions & 1 deletion Compiler/script/cc_symboltable.cpp
View file
Open in desktop
Expand Up @@ -63,6 +63,7 @@ void symbolTable::reset() {
extends.resize(0);
funcparamtypes.resize(0);
funcParamDefaultValues.resize(0);
funcParamHasDefaultValues.resize(0);

numsymbols=0;
currentscope=0;
Expand Down Expand Up @@ -225,7 +226,8 @@ int symbolTable::add_ex(const char*nta,int typo,char sizee) {
arrsize.push_back(0);
extends.push_back(0);
funcparamtypes.push_back(std::vector<unsigned long>(MAX_FUNCTION_PARAMETERS + 1));
funcParamDefaultValues.push_back(std::vector<short>(MAX_FUNCTION_PARAMETERS + 1));
funcParamDefaultValues.push_back(std::vector<int>(MAX_FUNCTION_PARAMETERS + 1));
funcParamHasDefaultValues.push_back(std::vector<bool>(MAX_FUNCTION_PARAMETERS + 1));
symbolTree.addEntry(fullname, numsymbols);
numsymbols++;
return numsymbols-1;
Expand Down
3 changes: 2 additions & 1 deletion Compiler/script/cc_symboltable.h
View file
Open in desktop
Expand Up @@ -27,7 +27,8 @@ struct symbolTable {
std::vector<short> extends; // inherits another class (classes) / owning class (member vars)
// functions only, save types of return value and all parameters
std::vector<std::vector<unsigned long> > funcparamtypes;
std::vector<std::vector<short> > funcParamDefaultValues;
std::vector< std::vector<int> > funcParamDefaultValues;
std::vector< std::vector<bool> > funcParamHasDefaultValues;

ccTreeMap symbolTree;

Expand Down