3232
3333
3434/* (note that expressions VJMP also have jumps.) */
35- inline bool hasjumps (const expdesc& e ) noexcept {
36- return e .getTrueList () != e .getFalseList ();
35+ inline bool hasjumps (const expdesc& expr ) noexcept {
36+ return expr .getTrueList () != expr .getFalseList ();
3737}
3838
3939/* semantic error */
@@ -49,15 +49,15 @@ l_noret LexState::semerror(const char *fmt, ...) {
4949** If expression is a numeric constant, fills 'v' with its value
5050** and returns 1. Otherwise, returns 0.
5151*/
52- static int tonumeral (const expdesc& e , TValue *v ) {
53- if (hasjumps (e ))
52+ static int tonumeral (const expdesc& expr , TValue *value ) {
53+ if (hasjumps (expr ))
5454 return 0 ; /* not a numeral */
55- switch (e .getKind ()) {
55+ switch (expr .getKind ()) {
5656 case VKINT:
57- if (v) v ->setInt (e .getIntValue ());
57+ if (value) value ->setInt (expr .getIntValue ());
5858 return 1 ;
5959 case VKFLT:
60- if (v) v ->setFloat (e .getFloatValue ());
60+ if (value) value ->setFloat (expr .getFloatValue ());
6161 return 1 ;
6262 default : return 0 ;
6363 }
@@ -66,9 +66,9 @@ static int tonumeral (const expdesc& e, TValue *v) {
6666/*
6767** Get the constant value from a constant expression
6868*/
69- TValue *FuncState::const2val (const expdesc& e ) {
70- lua_assert (e .getKind () == VCONST);
71- return &getLexState ().getDyndata ()->actvar ()[e .getInfo ()].k ;
69+ TValue *FuncState::const2val (const expdesc& expr ) {
70+ lua_assert (expr .getKind () == VCONST);
71+ return &getLexState ().getDyndata ()->actvar ()[expr .getInfo ()].k ;
7272}
7373
7474/*
@@ -465,25 +465,25 @@ void FuncState::floatCode(int reg, lua_Number flt) {
465465/*
466466** Convert a constant in 'v' into an expression description 'e'
467467*/
468- static void const2exp (TValue *v , expdesc& e ) {
469- switch (ttypetag (v )) {
468+ static void const2exp (TValue *value , expdesc& expr ) {
469+ switch (ttypetag (value )) {
470470 case LuaT::NUMINT:
471- e .setKind (VKINT); e .setIntValue (ivalue (v ));
471+ expr .setKind (VKINT); expr .setIntValue (ivalue (value ));
472472 break ;
473473 case LuaT::NUMFLT:
474- e .setKind (VKFLT); e .setFloatValue (fltvalue (v ));
474+ expr .setKind (VKFLT); expr .setFloatValue (fltvalue (value ));
475475 break ;
476476 case LuaT::VFALSE:
477- e .setKind (VFALSE);
477+ expr .setKind (VFALSE);
478478 break ;
479479 case LuaT::VTRUE:
480- e .setKind (VTRUE);
480+ expr .setKind (VTRUE);
481481 break ;
482482 case LuaT::NIL:
483- e .setKind (VNIL);
483+ expr .setKind (VNIL);
484484 break ;
485485 case LuaT::SHRSTR: case LuaT::LNGSTR:
486- e .setKind (VKSTR); e .setStringValue (tsvalue (v ));
486+ expr .setKind (VKSTR); expr .setStringValue (tsvalue (value ));
487487 break ;
488488 default : lua_assert (0 );
489489 }
@@ -726,48 +726,48 @@ void FuncState::codenot(expdesc& expr) {
726726/*
727727** Check whether expression 'e' is a short literal string
728728*/
729- int FuncState::isKstr (expdesc& e ) {
730- return (e .getKind () == VK && !hasjumps (e ) && e .getInfo () <= MAXARG_B &&
731- ttisshrstring (&getProto ().getConstants ()[e .getInfo ()]));
729+ int FuncState::isKstr (expdesc& expr ) {
730+ return (expr .getKind () == VK && !hasjumps (expr ) && expr .getInfo () <= MAXARG_B &&
731+ ttisshrstring (&getProto ().getConstants ()[expr .getInfo ()]));
732732}
733733
734734/*
735- ** Check whether expression 'e ' is a literal integer.
735+ ** Check whether expression 'expr ' is a literal integer.
736736*/
737- static bool isKint (expdesc& e ) {
738- return (e .getKind () == VKINT && !hasjumps (e ));
737+ static bool isKint (expdesc& expr ) {
738+ return (expr .getKind () == VKINT && !hasjumps (expr ));
739739}
740740
741741/*
742- ** Check whether expression 'e ' is a literal integer in
742+ ** Check whether expression 'expr ' is a literal integer in
743743** proper range to fit in register C
744744*/
745- static bool isCint (expdesc& e ) {
746- return isKint (e ) && (l_castS2U (e .getIntValue ()) <= l_castS2U (MAXARG_C));
745+ static bool isCint (expdesc& expr ) {
746+ return isKint (expr ) && (l_castS2U (expr .getIntValue ()) <= l_castS2U (MAXARG_C));
747747}
748748
749749/*
750- ** Check whether expression 'e ' is a literal integer in
750+ ** Check whether expression 'expr ' is a literal integer in
751751** proper range to fit in register sC
752752*/
753- static bool isSCint (expdesc& e ) {
754- return isKint (e ) && fitsC (e .getIntValue ());
753+ static bool isSCint (expdesc& expr ) {
754+ return isKint (expr ) && fitsC (expr .getIntValue ());
755755}
756756
757757/*
758758** Check whether expression 'e' is a literal integer or float in
759759** proper range to fit in a register (sB or sC).
760760*/
761- static bool isSCnumber (expdesc& e , int *pi , int *isfloat ) {
762- lua_Integer i ;
763- if (e .getKind () == VKINT)
764- i = e .getIntValue ();
765- else if (e .getKind () == VKFLT && VirtualMachine::flttointeger (e .getFloatValue (), &i , F2Imod::F2Ieq))
766- *isfloat = 1 ;
761+ static bool isSCnumber (expdesc& expr , int *intResult , int *isFloat ) {
762+ lua_Integer intValue ;
763+ if (expr .getKind () == VKINT)
764+ intValue = expr .getIntValue ();
765+ else if (expr .getKind () == VKFLT && VirtualMachine::flttointeger (expr .getFloatValue (), &intValue , F2Imod::F2Ieq))
766+ *isFloat = 1 ;
767767 else
768768 return false ; /* not a number */
769- if (!hasjumps (e ) && fitsC (i )) {
770- *pi = int2sC (cast_int (i ));
769+ if (!hasjumps (expr ) && fitsC (intValue )) {
770+ *intResult = int2sC (cast_int (intValue ));
771771 return true ;
772772 }
773773 else
@@ -1130,28 +1130,28 @@ int FuncState::codesJ(int o, int sj, int k) {
11301130 return code (CREATE_sJ (static_cast <OpCode>(o), j, k));
11311131}
11321132
1133- int FuncState::exp2const (const expdesc& e , TValue *v ) {
1134- if (hasjumps (e ))
1133+ int FuncState::exp2const (const expdesc& expr , TValue *value ) {
1134+ if (hasjumps (expr ))
11351135 return 0 ; /* not a constant */
1136- switch (e .getKind ()) {
1136+ switch (expr .getKind ()) {
11371137 case VFALSE:
1138- setbfvalue (v );
1138+ setbfvalue (value );
11391139 return 1 ;
11401140 case VTRUE:
1141- setbtvalue (v );
1141+ setbtvalue (value );
11421142 return 1 ;
11431143 case VNIL:
1144- setnilvalue (v );
1144+ setnilvalue (value );
11451145 return 1 ;
11461146 case VKSTR: {
1147- setsvalue (getLexState ().getLuaState (), v, e .getStringValue ());
1147+ setsvalue (getLexState ().getLuaState (), value, expr .getStringValue ());
11481148 return 1 ;
11491149 }
11501150 case VCONST: {
1151- *v = *const2val (e );
1151+ *value = *const2val (expr );
11521152 return 1 ;
11531153 }
1154- default : return tonumeral (e, v );
1154+ default : return tonumeral (expr, value );
11551155 }
11561156}
11571157
0 commit comments