OctaForge
/
libcubescript
1
0
Fork 1
Code Issues 1 Pull Requests Releases Wiki Activity

reduce the amount of direct idents accesses

master
Daniel Kolesa 2016-08-17 21:03:11 +01:00
parent 52c6889332
commit 32335049fa
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cs_gen.cc
View File

@ -1147,7 +1147,7 @@ noid:
}
gs.code.push(CODE_CALLU | (numargs << 8));
} else {
Ident *id = gs.cs.idents.at(idname.get());
Ident *id = gs.cs.get_ident(idname.get());
if (!id) {
if (!cs_check_num(idname.get())) {
gs.gen_str(idname.get(), true);

4
cs_vm.cc
View File

@ -494,7 +494,7 @@ static inline int cs_get_lookupu_type(
) {
return -2; /* default case */
}
id = cs.idents.at(arg.s);
id = cs.get_ident(arg.s);
if (id) {
switch(id->type) {
case ID_ALIAS:
@ -1382,7 +1382,7 @@ litval:
}
continue;
}
Ident *id = cs.idents.at(idarg.s);
Ident *id = cs.get_ident(idarg.s);
if (!id) {
noid:
if (cs_check_num(idarg.s)) {

30
cubescript.cc
View File

@ -177,7 +177,7 @@ void CsState::clear_overrides() {
}
Ident *CsState::new_ident(ostd::ConstCharRange name, int flags) {
Ident *id = idents.at(name);
Ident *id = get_ident(name);
if (!id) {
if (cs_check_num(name)) {
cs_debug_code(
@ -213,7 +213,7 @@ Ident *CsState::force_ident(TaggedValue &v) {
}
bool CsState::reset_var(ostd::ConstCharRange name) {
Ident *id = idents.at(name);
Ident *id = get_ident(name);
if (!id) {
return false;
}
@ -226,14 +226,14 @@ bool CsState::reset_var(ostd::ConstCharRange name) {
}
void CsState::touch_var(ostd::ConstCharRange name) {
Ident *id = idents.at(name);
Ident *id = get_ident(name);
if (id && id->is_var()) {
id->changed();
}
}
void CsState::set_alias(ostd::ConstCharRange name, TaggedValue &v) {
Ident *id = idents.at(name);
Ident *id = get_ident(name);
if (id) {
switch (id->type) {
case ID_ALIAS:
@ -733,7 +733,7 @@ bool cs_override_var(CsState &cs, Ident *id, SF sf, RF rf, CF cf) {
void CsState::set_var_int(
ostd::ConstCharRange name, CsInt v, bool dofunc, bool doclamp
) {
Ident *id = idents.at(name);
Ident *id = get_ident(name);
if (!id || id->is_ivar()) {
return;
}
@ -758,7 +758,7 @@ void CsState::set_var_int(
void CsState::set_var_float(
ostd::ConstCharRange name, CsFloat v, bool dofunc, bool doclamp
) {
Ident *id = idents.at(name);
Ident *id = get_ident(name);
if (!id || id->is_fvar()) {
return;
}
@ -783,7 +783,7 @@ void CsState::set_var_float(
void CsState::set_var_str(
ostd::ConstCharRange name, ostd::ConstCharRange v, bool dofunc
) {
Ident *id = idents.at(name);
Ident *id = get_ident(name);
if (!id || id->is_svar()) {
return;
}
@ -803,7 +803,7 @@ void CsState::set_var_str(
}
ostd::Maybe<CsInt> CsState::get_var_int(ostd::ConstCharRange name) {
Ident *id = idents.at(name);
Ident *id = get_ident(name);
if (!id || id->is_ivar()) {
return ostd::nothing;
}
@ -811,7 +811,7 @@ ostd::Maybe<CsInt> CsState::get_var_int(ostd::ConstCharRange name) {
}
ostd::Maybe<CsFloat> CsState::get_var_float(ostd::ConstCharRange name) {
Ident *id = idents.at(name);
Ident *id = get_ident(name);
if (!id || id->is_fvar()) {
return ostd::nothing;
}
@ -819,7 +819,7 @@ ostd::Maybe<CsFloat> CsState::get_var_float(ostd::ConstCharRange name) {
}
ostd::Maybe<ostd::String> CsState::get_var_str(ostd::ConstCharRange name) {
Ident *id = idents.at(name);
Ident *id = get_ident(name);
if (!id || id->is_svar()) {
return ostd::nothing;
}
@ -827,7 +827,7 @@ ostd::Maybe<ostd::String> CsState::get_var_str(ostd::ConstCharRange name) {
}
ostd::Maybe<CsInt> CsState::get_var_min_int(ostd::ConstCharRange name) {
Ident *id = idents.at(name);
Ident *id = get_ident(name);
if (!id || id->is_ivar()) {
return ostd::nothing;
}
@ -835,7 +835,7 @@ ostd::Maybe<CsInt> CsState::get_var_min_int(ostd::ConstCharRange name) {
}
ostd::Maybe<CsInt> CsState::get_var_max_int(ostd::ConstCharRange name) {
Ident *id = idents.at(name);
Ident *id = get_ident(name);
if (!id || id->is_ivar()) {
return ostd::nothing;
}
@ -843,7 +843,7 @@ ostd::Maybe<CsInt> CsState::get_var_max_int(ostd::ConstCharRange name) {
}
ostd::Maybe<CsFloat> CsState::get_var_min_float(ostd::ConstCharRange name) {
Ident *id = idents.at(name);
Ident *id = get_ident(name);
if (!id || id->is_fvar()) {
return ostd::nothing;
}
@ -851,7 +851,7 @@ ostd::Maybe<CsFloat> CsState::get_var_min_float(ostd::ConstCharRange name) {
}
ostd::Maybe<CsFloat> CsState::get_var_max_float(ostd::ConstCharRange name) {
Ident *id = idents.at(name);
Ident *id = get_ident(name);
if (!id || id->is_fvar()) {
return ostd::nothing;
}
@ -860,7 +860,7 @@ ostd::Maybe<CsFloat> CsState::get_var_max_float(ostd::ConstCharRange name) {
ostd::Maybe<ostd::String>
CsState::get_alias(ostd::ConstCharRange name) {
Ident *id = idents.at(name);
Ident *id = get_ident(name);
if (!id || id->is_alias()) {
return ostd::nothing;
}