diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/interpret.c | 14 | ||||
| -rw-r--r-- | src/core/scanner.c | 2 | ||||
| -rw-r--r-- | src/core/token.c | 2 | ||||
| -rw-r--r-- | src/core/token.h | 1 |
4 files changed, 14 insertions, 5 deletions
diff --git a/src/core/interpret.c b/src/core/interpret.c index 7fc9334..38464f8 100644 --- a/src/core/interpret.c +++ b/src/core/interpret.c @@ -267,7 +267,19 @@ _var_assign(Interpret *p_interpret) { p_interpret->p_stack = p_stack; p_token = stack_top(p_interpret->p_stack); - Symbol *p_symbol = symbol_new(SYM_VARIABLE, p_token); + /* For scalar types, own a fresh token so that in-place + * mutations (incr/decr) don't corrupt the function body's + * literal tokens across repeated calls. Arrays and strings + * keep reference semantics as-is. */ + Token *p_own = p_token; + if (token_get_tt(p_token) == TT_INTEGER) { + p_own = token_new_integer(token_get_ival(p_token)); + } else if (token_get_tt(p_token) == TT_DOUBLE) { + p_own = token_new_dummy(); + token_set_tt(p_own, TT_DOUBLE); + token_set_dval(p_own, token_get_dval(p_token)); + } + Symbol *p_symbol = symbol_new(SYM_VARIABLE, p_own); scope_newset(p_interpret->p_scope, c_name, p_symbol); } else { return (0); diff --git a/src/core/scanner.c b/src/core/scanner.c index 87fc624..7eecb01 100644 --- a/src/core/scanner.c +++ b/src/core/scanner.c @@ -287,7 +287,7 @@ scanner_run(List *p_list_token, Tupel *p_tupel_argv, _add_semicolon_to_list(p_scanner); char d = c_token[i_token_len-1]; - if ((!isalpha(d) && !isdigit(d) /*&& d != '-'*/) && + if ((!isalpha(d) && !isdigit(d) && d != '_' /*&& d != '-'*/) && (isalpha(c) || isdigit(c))) { scanner_add_token(p_scanner, &c_token, &i_token_len, diff --git a/src/core/token.c b/src/core/token.c index f7cc745..b31bed9 100644 --- a/src/core/token.c +++ b/src/core/token.c @@ -61,7 +61,6 @@ get_tt(char *c_token) { CHECK("proc") TT_PROC; CHECK("fun") TT_FUNC; CHECK("my") TT_MY; - CHECK("arr") TT_ARR; CHECK("!") TT_NOT; CHECK("!=") TT_NEQ; CHECK("=~") TT_RE; @@ -127,7 +126,6 @@ tt_get_name(TokenType tt_cur) { CASE(TT_PROC,"TT_PROC") CASE(TT_FUNC,"TT_FUNC") CASE(TT_MY,"TT_MY") - CASE(TT_ARR,"TT_ARR") CASE(TT_WHILE,"TT_WHILE") CASE(TT_UNTIL,"TT_UNTIL") CASE(TT_NEXT,"TT_NEXT") diff --git a/src/core/token.h b/src/core/token.h index 497dc78..b7e77a9 100644 --- a/src/core/token.h +++ b/src/core/token.h @@ -101,7 +101,6 @@ typedef enum { TT_PROC, TT_FUNC, TT_MY, - TT_ARR, TT_WHILE, TT_UNTIL, TT_NEXT, |