HeeroYui-deprecated/rabbit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #94 from mfxmfx/normalize-whitespace

Browse Source 
Normalize whitespace.
This commit is contained in:
Alberto Demichelis 2017-06-19 23:25:55 +08:00 committed by GitHub
commit 5dcf698a91
18 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
squirrel/sqapi.cpp
View File

@ -776,8 +776,8 @@ SQRESULT sq_getobjtypetag(const HSQOBJECT *o,SQUserPointer * typetag)
SQRESULT sq_gettypetag(HSQUIRRELVM v,SQInteger idx,SQUserPointer *typetag) SQRESULT sq_gettypetag(HSQUIRRELVM v,SQInteger idx,SQUserPointer *typetag)
{ {
SQObjectPtr &o = stack_get(v,idx); SQObjectPtr &o = stack_get(v,idx);
if (SQ_FAILED(sq_getobjtypetag(&o, typetag))) if (SQ_FAILED(sq_getobjtypetag(&o, typetag)))
return SQ_ERROR;// this is not an error it should be a bool but would break backward compatibility return SQ_ERROR;// this is not an error it should be a bool but would break backward compatibility
return SQ_OK; return SQ_OK;
} }

6
squirrel/sqcompiler.cpp
View File

@ -466,7 +466,7 @@ public:
INVOKE_EXP(f); INVOKE_EXP(f);
SQInteger op1 = _fs->PopTarget();SQInteger op2 = _fs->PopTarget(); SQInteger op1 = _fs->PopTarget();SQInteger op2 = _fs->PopTarget();
_fs->AddInstruction(op, _fs->PushTarget(), op1, op2, op3); _fs->AddInstruction(op, _fs->PushTarget(), op1, op2, op3);
_es.etype = EXPR; _es.etype = EXPR;
} }
void LogicalOrExp() void LogicalOrExp()
{ {
@ -483,7 +483,7 @@ public:
if(trg != second_exp) _fs->AddInstruction(_OP_MOVE, trg, second_exp); if(trg != second_exp) _fs->AddInstruction(_OP_MOVE, trg, second_exp);
_fs->SnoozeOpt(); _fs->SnoozeOpt();
_fs->SetIntructionParam(jpos, 1, (_fs->GetCurrentPos() - jpos)); _fs->SetIntructionParam(jpos, 1, (_fs->GetCurrentPos() - jpos));
_es.etype = EXPR; _es.etype = EXPR;
break; break;
}else return; }else return;
} }
@ -503,7 +503,7 @@ public:
if(trg != second_exp) _fs->AddInstruction(_OP_MOVE, trg, second_exp); if(trg != second_exp) _fs->AddInstruction(_OP_MOVE, trg, second_exp);
_fs->SnoozeOpt(); _fs->SnoozeOpt();
_fs->SetIntructionParam(jpos, 1, (_fs->GetCurrentPos() - jpos)); _fs->SetIntructionParam(jpos, 1, (_fs->GetCurrentPos() - jpos));
_es.etype = EXPR; _es.etype = EXPR;
break; break;
} }

10
squirrel/sqvm.cpp
View File

@ -726,13 +726,13 @@ exception_restore:
if (type(t) == OT_CLOSURE if (type(t) == OT_CLOSURE
&& (!_closure(t)->_function->_bgenerator)){ && (!_closure(t)->_function->_bgenerator)){
SQObjectPtr clo = t; SQObjectPtr clo = t;
SQInteger last_top = _top; SQInteger last_top = _top;
if(_openouters) CloseOuters(&(_stack._vals[_stackbase])); if(_openouters) CloseOuters(&(_stack._vals[_stackbase]));
for (SQInteger i = 0; i < arg3; i++) STK(i) = STK(arg2 + i); for (SQInteger i = 0; i < arg3; i++) STK(i) = STK(arg2 + i);
_GUARD(StartCall(_closure(clo), ci->_target, arg3, _stackbase, true)); _GUARD(StartCall(_closure(clo), ci->_target, arg3, _stackbase, true));
if (last_top >= _top) { if (last_top >= _top) {
_top = last_top; _top = last_top;
} }
continue; continue;
} }
} }
@ -1334,7 +1334,7 @@ bool SQVM::Set(const SQObjectPtr &self,const SQObjectPtr &key,const SQObjectPtr
return false; return false;
} }
return true; return true;
case OT_USERDATA: break; // must fall back case OT_USERDATA: break; // must fall back
default: default:
Raise_Error(_SC("trying to set '%s'"),GetTypeName(self)); Raise_Error(_SC("trying to set '%s'"),GetTypeName(self));
return false; return false;