diff options
| author | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 1997-12-30 17:08:23 -0200 |
|---|---|---|
| committer | Roberto Ierusalimschy <roberto@inf.puc-rio.br> | 1997-12-30 17:08:23 -0200 |
| commit | f76bca23ef1f45d3533f16285e223408346ddcaa (patch) | |
| tree | d6babf7187ebb648e63748f0c14431a64e8300a9 | |
| parent | a5fd7d722c2c15ca954ecd69bfe72b8fe5c4c384 (diff) | |
| download | lua-f76bca23ef1f45d3533f16285e223408346ddcaa.tar.gz lua-f76bca23ef1f45d3533f16285e223408346ddcaa.tar.bz2 lua-f76bca23ef1f45d3533f16285e223408346ddcaa.zip | |
variants for "ARGS".
| -rw-r--r-- | lopcodes.h | 6 | ||||
| -rw-r--r-- | lua.stx | 4 | ||||
| -rw-r--r-- | lvm.c | 9 |
3 files changed, 14 insertions, 5 deletions
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** $Id: lopcodes.h,v 1.12 1997/10/24 18:40:29 roberto Exp roberto $ | 2 | ** $Id: lopcodes.h,v 1.13 1997/12/29 17:35:46 roberto Exp roberto $ |
| 3 | ** Opcodes for Lua virtual machine | 3 | ** Opcodes for Lua virtual machine |
| 4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
| 5 | */ | 5 | */ |
| @@ -172,6 +172,10 @@ POP0,/* - - - TOP-=1 */ | |||
| 172 | POP1,/* - - - TOP-=2 */ | 172 | POP1,/* - - - TOP-=2 */ |
| 173 | 173 | ||
| 174 | ARGS,/* b - - TOP=BASE+b */ | 174 | ARGS,/* b - - TOP=BASE+b */ |
| 175 | ARGS0,/* - - - TOP=BASE+0 */ | ||
| 176 | ARGS1,/* - - - TOP=BASE+1 */ | ||
| 177 | ARGS2,/* - - - TOP=BASE+2 */ | ||
| 178 | ARGS3,/* - - - TOP=BASE+3 */ | ||
| 175 | VARARGS/* b v_x...v_1 {v_1...v_x;n=x} TOP=BASE+b+1 */ | 179 | VARARGS/* b v_x...v_1 {v_1...v_x;n=x} TOP=BASE+b+1 */ |
| 176 | } OpCode; | 180 | } OpCode; |
| 177 | 181 | ||
| @@ -1,6 +1,6 @@ | |||
| 1 | %{ | 1 | %{ |
| 2 | /* | 2 | /* |
| 3 | ** $Id: lua.stx,v 1.29 1997/12/29 17:28:45 roberto Exp roberto $ | 3 | ** $Id: lua.stx,v 1.30 1997/12/29 17:35:46 roberto Exp roberto $ |
| 4 | ** Syntax analizer and code generator | 4 | ** Syntax analizer and code generator |
| 5 | ** See Copyright Notice in lua.h | 5 | ** See Copyright Notice in lua.h |
| 6 | */ | 6 | */ |
| @@ -450,7 +450,7 @@ static void code_args (int nparams, int dots) | |||
| 450 | { | 450 | { |
| 451 | L->currState->nlocalvar += nparams; | 451 | L->currState->nlocalvar += nparams; |
| 452 | if (!dots) | 452 | if (!dots) |
| 453 | code_oparg(ARGS, 0, L->currState->nlocalvar, L->currState->nlocalvar); | 453 | code_oparg(ARGS, 4, L->currState->nlocalvar, L->currState->nlocalvar); |
| 454 | else { | 454 | else { |
| 455 | code_oparg(VARARGS, 0, L->currState->nlocalvar, L->currState->nlocalvar+1); | 455 | code_oparg(VARARGS, 0, L->currState->nlocalvar, L->currState->nlocalvar+1); |
| 456 | add_localvar(luaS_new("arg")); | 456 | add_localvar(luaS_new("arg")); |
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** $Id: lvm.c,v 1.19 1997/12/23 19:24:19 roberto Exp roberto $ | 2 | ** $Id: lvm.c,v 1.20 1997/12/29 17:35:46 roberto Exp roberto $ |
| 3 | ** Lua virtual machine | 3 | ** Lua virtual machine |
| 4 | ** See Copyright Notice in lua.h | 4 | ** See Copyright Notice in lua.h |
| 5 | */ | 5 | */ |
| @@ -474,7 +474,12 @@ StkId luaV_execute (Closure *cl, TProtoFunc *tf, StkId base) | |||
| 474 | break; | 474 | break; |
| 475 | 475 | ||
| 476 | case ARGS: | 476 | case ARGS: |
| 477 | luaD_adjusttop(base+(*pc++)); | 477 | aux = *pc++; goto args; |
| 478 | |||
| 479 | case ARGS0: case ARGS1: case ARGS2: case ARGS3: | ||
| 480 | aux -= ARGS0; | ||
| 481 | args: | ||
| 482 | luaD_adjusttop(base+aux); | ||
| 478 | break; | 483 | break; |
| 479 | 484 | ||
| 480 | case VARARGS: | 485 | case VARARGS: |