Miroirs/aocla
1
0
Fork 0
mirror of https://github.com/antirez/aocla synced 2025-01-13 20:01:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Quoted tuples.

Browse source
This commit is contained in:
antirez 2022-12-23 12:02:09 +01:00
parent 430dee9961
commit f8d8a629ab
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
aocla.c
View file

@ -31,9 +31,11 @@ typedef struct obj {
union { union {
int i; /* Integer. Literal: 1234 */ int i; /* Integer. Literal: 1234 */
int istrue; /* Boolean. */ int istrue; /* Boolean. */
struct { /* List: Literal: [1,2,3,4] or [1 2 3 4] */ struct { /* List or Tuple: Literal: [1 2 3 4] or (a b c) */
struct obj **ele; struct obj **ele;
size_t len; size_t len;
int quoted; /* Used for quoted tuples. Don't capture vars if true.
Just push the tuple on stack. */
} l; } l;
struct { /* Mutable string & unmutable symbol. */ struct { /* Mutable string & unmutable symbol. */
char *ptr; char *ptr;
@ -206,7 +208,16 @@ obj *parseObject(aoclactx *ctx, const char *s, const char **next, int *line) {
o->type = OBJ_TYPE_INT; o->type = OBJ_TYPE_INT;
o->i = atoi(buf); o->i = atoi(buf);
if (next) *next = s; if (next) *next = s;
} else if (s[0] == '[' || s[0] == '(') { /* List or Tuple. */ } else if (s[0] == '[' || /* List, tuple or quoted tuple. */
s[0] == '(' ||
(s[0] == '\'' && s[1] == '('))
{
if (s[0] == '\'') {
o->l.quoted = 1;
s++;
} else {
o->l.quoted = 0;
}
o->type = s[0] == '[' ? OBJ_TYPE_LIST : OBJ_TYPE_TUPLE; o->type = s[0] == '[' ? OBJ_TYPE_LIST : OBJ_TYPE_TUPLE;
o->l.len = 0; o->l.len = 0;
o->l.ele = NULL; o->l.ele = NULL;
@ -600,6 +611,15 @@ int eval(aoclactx *ctx, obj *l) {
switch(o->type) { switch(o->type) {
case OBJ_TYPE_TUPLE: /* Capture variables. */ case OBJ_TYPE_TUPLE: /* Capture variables. */
/* Quoted tuples just get pushed on the stack, losing
* their quoted status. */
if (o->l.quoted) {
obj *notq = deepCopy(o);
notq->l.quoted = 0;
stackPush(ctx,notq);
break;
}
if (ctx->stacklen < o->l.len) { if (ctx->stacklen < o->l.len) {
setError(ctx,o->l.ele[ctx->stacklen]->str.ptr, setError(ctx,o->l.ele[ctx->stacklen]->str.ptr,
"Out of stack while capturing local"); "Out of stack while capturing local");