@@ -34,6 +34,7 @@ obj SYM2OBJ (char * s){ /* Find a symbol, or save it if it's the first time */ syms[nsyms] = malloc (sizeof(symbol)); /* Symbols never go away, then can be malloc-ed */ syms[nsyms]->type = T_SYM; syms[nsyms]->value = (char *) malloc (strlen (s) + 1); + syms[nsyms]->global = NULL; //let eval handle this strcpy (syms[nsyms]->value, s); return (obj) syms[nsyms++]; a2c.c @@ -30,6 +30,7 @@ typedef struct { typedef struct { long type; /* T_SYM */ char * value; /* UTF-8 chars */ + obj * global; /*value assigned to global*/ } symbol; typedef struct { @@ -91,6 +92,10 @@ int AFN(obj o){ obj DBL2OBJ (double d); obj SYM2OBJ (char * s); /* Find a symbol, or save it if it's the first time */ +#define SYMEVAL()\ + {obj y = TOS();\ + TOS() = ((symbol*) y)->global ? *(((symbol*) y)->global) : NILOBJ; } + #define GLOBAL(i) global[i] #define LOCAL(i) stack[i] #define CLOSURE_REF(self,i) ((obj *)(self))[i+2] a2c.h @@ -15,7 +15,8 @@ (++ constant-count)] code-gen nil compile-all-lambdas nil - compile-constants nil) + compile-constants nil + is-symeval-used nil) ; make sure global-vars includes call* (unless (some [is _!id _!uid 'call*] @@ -73,6 +74,9 @@ (aprim ast) (let args ast!subx (if + (is ast!op '%symeval) + (do (assert is-symeval-used) + (list (cg-args args stack-env) " SYMEVAL();")) (is ast!op '%apply) (list (cg-args args stack-env) " APPLY();") (is ast!op '%string-ref) @@ -209,6 +213,18 @@ "}\n") ; no constants; dummy initialize "\n#define init_constants()\n") + (if is-symeval-used + (list "void init_symeval(void){\nstruct symbol* symp;\n" + (let i -1 + (mapeach var global-vars + (++ i) + (list + "symp = (struct symbol*) SYM2OBJ(" + (tostring:write (coerce var!uid 'string)) ");\n" + "symp->global = &GLOBAL(" i ");\n"))) + "}\n") + ; no symeval; dummy initialize + "\n#define init_symeval()\n") code-prefix* code-execute* code codegen.arc a5d645abcf32468e63e64ef9feeb3a32f6d2abd8 Alan Manuel K. Gloria almkglor@gmail.com http://github.com/sacado/arc2c/commit/0588c7649571c61f62cec1afc5f90d314d23aa31 0588c7649571c61f62cec1afc5f90d314d23aa31 2008-07-31T04:20:55-07:00 2008-07-31T04:20:55-07:00 a2c.h, a2c.c, codegen: added support in the target for 'symeval bd7125042fe29aad8813c2c1aa112abb18cd7cce Alan Manuel K. Gloria almkglor@gmail.com