[svn:parrot] r40345 - trunk/compilers/imcc
NotFound at svn.parrot.org
NotFound at svn.parrot.org
Thu Jul 30 18:29:26 UTC 2009
Author: NotFound
Date: Thu Jul 30 18:29:24 2009
New Revision: 40345
URL: https://trac.parrot.org/parrot/changeset/40345
Log:
[cage] get rid of one imcc global, RT #39714
Modified:
trunk/compilers/imcc/imc.h
trunk/compilers/imcc/imcc.l
trunk/compilers/imcc/imcc.y
trunk/compilers/imcc/imclexer.c
trunk/compilers/imcc/imcparser.c
trunk/compilers/imcc/parser.h
Modified: trunk/compilers/imcc/imc.h
==============================================================================
--- trunk/compilers/imcc/imc.h Thu Jul 30 15:16:53 2009 (r40344)
+++ trunk/compilers/imcc/imc.h Thu Jul 30 18:29:24 2009 (r40345)
@@ -603,6 +603,7 @@
char *heredoc_end;
char *heredoc_content;
char *cur_macro_name;
+ int is_def;
struct macro_frame_t *frames;
imcc_globals *globals;
Modified: trunk/compilers/imcc/imcc.l
==============================================================================
--- trunk/compilers/imcc/imcc.l Thu Jul 30 15:16:53 2009 (r40344)
+++ trunk/compilers/imcc/imcc.l Thu Jul 30 18:29:24 2009 (r40345)
@@ -60,9 +60,6 @@
YY_BUFFER_STATE buffer;
} macro_frame_t;
-/* short ranged globals for lexer state */
-int pesky_global__is_def = 0;
-
/* static function declarations */
static void pop_parser_state(PARROT_INTERP, ARGMOD(void *yyscanner));
@@ -640,7 +637,7 @@
}
<emit,INITIAL>{ID} {
- if (!pesky_global__is_def) {
+ if (!IMCC_INFO(interp)->is_def) {
SymReg *r = find_sym(interp, yytext);
if (r && (r->type & (VTIDENTIFIER|VT_CONSTP))) {
@@ -664,7 +661,7 @@
}
valp->s = mem_sys_strdup(yytext);
- return (!pesky_global__is_def && is_op(interp, valp->s) ? PARROT_OP : IDENTIFIER);
+ return (!IMCC_INFO(interp)->is_def && is_op(interp, valp->s) ? PARROT_OP : IDENTIFIER);
}
Modified: trunk/compilers/imcc/imcc.y
==============================================================================
--- trunk/compilers/imcc/imcc.y Thu Jul 30 15:16:53 2009 (r40344)
+++ trunk/compilers/imcc/imcc.y Thu Jul 30 18:29:24 2009 (r40345)
@@ -1220,28 +1220,28 @@
;
constdef:
- CONST { pesky_global__is_def = 1; } type IDENTIFIER '=' const
+ CONST { IMCC_INFO(interp)->is_def = 1; } type IDENTIFIER '=' const
{
mk_const_ident(interp, $4, $3, $6, 1);
mem_sys_free($4);
- pesky_global__is_def = 0;
+ IMCC_INFO(interp)->is_def = 0;
}
;
pmc_const:
- CONST { pesky_global__is_def=1; } INTC var_or_i '=' any_string
+ CONST { IMCC_INFO(interp)->is_def = 1; } INTC var_or_i '=' any_string
{
$$ = mk_pmc_const(interp, IMCC_INFO(interp)->cur_unit, $3, $4, $6);
mem_sys_free($6);
- pesky_global__is_def = 0;
+ IMCC_INFO(interp)->is_def = 0;
}
- | CONST { pesky_global__is_def=1; } STRINGC var_or_i '=' any_string
+ | CONST { IMCC_INFO(interp)->is_def = 1; } STRINGC var_or_i '=' any_string
{
$$ = mk_pmc_const_named(interp, IMCC_INFO(interp)->cur_unit, $3, $4, $6);
mem_sys_free($3);
mem_sys_free($6);
- pesky_global__is_def = 0;
+ IMCC_INFO(interp)->is_def = 0;
}
;
any_string:
@@ -1391,7 +1391,7 @@
;
sub_param:
- PARAM { pesky_global__is_def=1; } sub_param_type_def { $$ = $3; pesky_global__is_def=0; }
+ PARAM { IMCC_INFO(interp)->is_def = 1; } sub_param_type_def { $$ = $3; IMCC_INFO(interp)->is_def = 0; }
;
sub_param_type_def:
@@ -1674,7 +1674,7 @@
pcc_result:
RESULT target paramtype_list { $$ = $2; $$->type |= $3; }
- | LOCAL { pesky_global__is_def=1; } type id_list_id
+ | LOCAL { IMCC_INFO(interp)->is_def = 1; } type id_list_id
{
IdList * const l = $4;
SymReg *ignored;
@@ -1683,8 +1683,8 @@
else
ignored = mk_ident(interp, l->id, $3);
UNUSED(ignored);
- pesky_global__is_def=0;
- $$=0;
+ IMCC_INFO(interp)->is_def = 0;
+ $$ = 0;
}
;
@@ -1905,7 +1905,7 @@
labeled_inst:
assignment
| conditional_statement
- | LOCAL { pesky_global__is_def=1; } type id_list
+ | LOCAL { IMCC_INFO(interp)->is_def = 1; } type id_list
{
IdList *l = $4;
while (l) {
@@ -1919,7 +1919,7 @@
mem_sys_free(l1->id);
mem_sys_free(l1);
}
- pesky_global__is_def=0; $$=0;
+ IMCC_INFO(interp)->is_def = 0; $$ = 0;
}
| LEXICAL STRINGC COMMA target
{
@@ -1937,18 +1937,18 @@
set_lexical(interp, $4, n); $$ = 0;
mem_sys_free($2);
}
- | CONST { pesky_global__is_def=1; } type IDENTIFIER '=' const
+ | CONST { IMCC_INFO(interp)->is_def = 1; } type IDENTIFIER '=' const
{
mk_const_ident(interp, $4, $3, $6, 0);
- pesky_global__is_def=0;
+ IMCC_INFO(interp)->is_def = 0;
mem_sys_free($4);
}
| pmc_const
- | GLOBAL_CONST { pesky_global__is_def=1; } type IDENTIFIER '=' const
+ | GLOBAL_CONST { IMCC_INFO(interp)->is_def = 1; } type IDENTIFIER '=' const
{
mk_const_ident(interp, $4, $3, $6, 1);
- pesky_global__is_def=0;
+ IMCC_INFO(interp)->is_def = 0;
mem_sys_free($4);
}
| TAILCALL sub_call
Modified: trunk/compilers/imcc/imclexer.c
==============================================================================
--- trunk/compilers/imcc/imclexer.c Thu Jul 30 15:16:53 2009 (r40344)
+++ trunk/compilers/imcc/imclexer.c Thu Jul 30 18:29:24 2009 (r40345)
@@ -2428,9 +2428,6 @@
YY_BUFFER_STATE buffer;
} macro_frame_t;
-/* short ranged globals for lexer state */
-int pesky_global__is_def = 0;
-
/* static function declarations */
static void pop_parser_state(PARROT_INTERP, ARGMOD(void *yyscanner));
@@ -2487,7 +2484,7 @@
-#line 2491 "compilers/imcc/imclexer.c"
+#line 2488 "compilers/imcc/imclexer.c"
#define INITIAL 0
#define emit 1
@@ -2732,7 +2729,7 @@
register int yy_act;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-#line 155 "compilers/imcc/imcc.l"
+#line 152 "compilers/imcc/imcc.l"
/* for emacs "*/
if (IMCC_INFO(interp)->expect_pasm == 1 && !IMCC_INFO(interp)->in_pod) {
@@ -2751,7 +2748,7 @@
return 0;
}
-#line 2755 "compilers/imcc/imclexer.c"
+#line 2752 "compilers/imcc/imclexer.c"
if ( !yyg->yy_init )
{
@@ -2834,7 +2831,7 @@
case 1:
/* rule 1 can match eol */
YY_RULE_SETUP
-#line 173 "compilers/imcc/imcc.l"
+#line 170 "compilers/imcc/imcc.l"
{
IMCC_INFO(interp)->frames->heredoc_rest = mem_sys_strdup(yytext);
BEGIN(heredoc2);
@@ -2843,7 +2840,7 @@
case 2:
/* rule 2 can match eol */
YY_RULE_SETUP
-#line 178 "compilers/imcc/imcc.l"
+#line 175 "compilers/imcc/imcc.l"
{
/* heredocs have highest priority
* arrange them before all wildcard state matches
@@ -2861,7 +2858,7 @@
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 193 "compilers/imcc/imcc.l"
+#line 190 "compilers/imcc/imcc.l"
{
/* Are we at the end of the heredoc? */
if (STREQ(IMCC_INFO(interp)->heredoc_end, yytext)) {
@@ -2902,7 +2899,7 @@
case 4:
/* rule 4 can match eol */
YY_RULE_SETUP
-#line 230 "compilers/imcc/imcc.l"
+#line 227 "compilers/imcc/imcc.l"
{
yy_pop_state(yyscanner);
yy_push_state(cmt3, yyscanner);
@@ -2915,7 +2912,7 @@
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 240 "compilers/imcc/imcc.l"
+#line 237 "compilers/imcc/imcc.l"
{
yy_pop_state(yyscanner);
yy_push_state(cmt4, yyscanner);
@@ -2923,17 +2920,17 @@
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 245 "compilers/imcc/imcc.l"
+#line 242 "compilers/imcc/imcc.l"
{ yy_push_state(cmt2, yyscanner); }
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 247 "compilers/imcc/imcc.l"
+#line 244 "compilers/imcc/imcc.l"
{ yy_push_state(cmt1, yyscanner); }
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 249 "compilers/imcc/imcc.l"
+#line 246 "compilers/imcc/imcc.l"
{
IMCC_INFO(interp)->line = atoi(yytext);
yy_pop_state(yyscanner);
@@ -2944,7 +2941,7 @@
case 9:
/* rule 9 can match eol */
YY_RULE_SETUP
-#line 256 "compilers/imcc/imcc.l"
+#line 253 "compilers/imcc/imcc.l"
{
yy_pop_state(yyscanner);
IMCC_INFO(interp)->line++;
@@ -2953,7 +2950,7 @@
case 10:
/* rule 10 can match eol */
YY_RULE_SETUP
-#line 261 "compilers/imcc/imcc.l"
+#line 258 "compilers/imcc/imcc.l"
{
if (IMCC_INFO(interp)->expect_pasm == 2)
BEGIN(INITIAL);
@@ -2966,7 +2963,7 @@
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 271 "compilers/imcc/imcc.l"
+#line 268 "compilers/imcc/imcc.l"
{
yy_push_state(cmt5, yyscanner);
}
@@ -2974,7 +2971,7 @@
case 12:
/* rule 12 can match eol */
YY_RULE_SETUP
-#line 275 "compilers/imcc/imcc.l"
+#line 272 "compilers/imcc/imcc.l"
{
if (IMCC_INFO(interp)->expect_pasm == 2)
BEGIN(INITIAL);
@@ -2990,7 +2987,7 @@
case 13:
/* rule 13 can match eol */
YY_RULE_SETUP
-#line 288 "compilers/imcc/imcc.l"
+#line 285 "compilers/imcc/imcc.l"
{
/* this is a stand-alone =cut, but we're
* not in POD mode, so just ignore.
@@ -2999,7 +2996,7 @@
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 294 "compilers/imcc/imcc.l"
+#line 291 "compilers/imcc/imcc.l"
{
IMCC_INFO(interp)->in_pod = 1;
yy_push_state(pod, yyscanner);
@@ -3008,7 +3005,7 @@
case 15:
/* rule 15 can match eol */
YY_RULE_SETUP
-#line 299 "compilers/imcc/imcc.l"
+#line 296 "compilers/imcc/imcc.l"
{
IMCC_INFO(interp)->in_pod = 0;
yy_pop_state(yyscanner);
@@ -3017,473 +3014,473 @@
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 305 "compilers/imcc/imcc.l"
+#line 302 "compilers/imcc/imcc.l"
{ /*ignore*/ }
YY_BREAK
case 17:
/* rule 17 can match eol */
YY_RULE_SETUP
-#line 307 "compilers/imcc/imcc.l"
+#line 304 "compilers/imcc/imcc.l"
{ IMCC_INFO(interp)->line++; }
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 309 "compilers/imcc/imcc.l"
+#line 306 "compilers/imcc/imcc.l"
return TK_LINE;
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 310 "compilers/imcc/imcc.l"
+#line 307 "compilers/imcc/imcc.l"
return TK_FILE;
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 311 "compilers/imcc/imcc.l"
+#line 308 "compilers/imcc/imcc.l"
return ANNOTATE;
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 312 "compilers/imcc/imcc.l"
+#line 309 "compilers/imcc/imcc.l"
return LEXICAL;
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 313 "compilers/imcc/imcc.l"
+#line 310 "compilers/imcc/imcc.l"
return ARG;
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 314 "compilers/imcc/imcc.l"
+#line 311 "compilers/imcc/imcc.l"
return SUB;
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 315 "compilers/imcc/imcc.l"
+#line 312 "compilers/imcc/imcc.l"
return ESUB;
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 316 "compilers/imcc/imcc.l"
+#line 313 "compilers/imcc/imcc.l"
return PCC_BEGIN;
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 317 "compilers/imcc/imcc.l"
+#line 314 "compilers/imcc/imcc.l"
return PCC_END;
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 318 "compilers/imcc/imcc.l"
+#line 315 "compilers/imcc/imcc.l"
return PCC_CALL;
YY_BREAK
case 28:
YY_RULE_SETUP
-#line 319 "compilers/imcc/imcc.l"
+#line 316 "compilers/imcc/imcc.l"
return NCI_CALL;
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 320 "compilers/imcc/imcc.l"
+#line 317 "compilers/imcc/imcc.l"
return METH_CALL;
YY_BREAK
case 30:
YY_RULE_SETUP
-#line 321 "compilers/imcc/imcc.l"
+#line 318 "compilers/imcc/imcc.l"
return INVOCANT;
YY_BREAK
case 31:
YY_RULE_SETUP
-#line 322 "compilers/imcc/imcc.l"
+#line 319 "compilers/imcc/imcc.l"
return PCC_SUB;
YY_BREAK
case 32:
YY_RULE_SETUP
-#line 323 "compilers/imcc/imcc.l"
+#line 320 "compilers/imcc/imcc.l"
return PCC_BEGIN_RETURN;
YY_BREAK
case 33:
YY_RULE_SETUP
-#line 324 "compilers/imcc/imcc.l"
+#line 321 "compilers/imcc/imcc.l"
return PCC_END_RETURN;
YY_BREAK
case 34:
YY_RULE_SETUP
-#line 325 "compilers/imcc/imcc.l"
+#line 322 "compilers/imcc/imcc.l"
return PCC_BEGIN_YIELD;
YY_BREAK
case 35:
YY_RULE_SETUP
-#line 326 "compilers/imcc/imcc.l"
+#line 323 "compilers/imcc/imcc.l"
return PCC_END_YIELD;
YY_BREAK
case 36:
YY_RULE_SETUP
-#line 328 "compilers/imcc/imcc.l"
+#line 325 "compilers/imcc/imcc.l"
return METHOD;
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 329 "compilers/imcc/imcc.l"
+#line 326 "compilers/imcc/imcc.l"
return MULTI;
YY_BREAK
case 38:
YY_RULE_SETUP
-#line 330 "compilers/imcc/imcc.l"
+#line 327 "compilers/imcc/imcc.l"
return MAIN;
YY_BREAK
case 39:
YY_RULE_SETUP
-#line 331 "compilers/imcc/imcc.l"
+#line 328 "compilers/imcc/imcc.l"
return LOAD;
YY_BREAK
case 40:
YY_RULE_SETUP
-#line 332 "compilers/imcc/imcc.l"
+#line 329 "compilers/imcc/imcc.l"
return INIT;
YY_BREAK
case 41:
YY_RULE_SETUP
-#line 333 "compilers/imcc/imcc.l"
+#line 330 "compilers/imcc/imcc.l"
return IMMEDIATE;
YY_BREAK
case 42:
YY_RULE_SETUP
-#line 334 "compilers/imcc/imcc.l"
+#line 331 "compilers/imcc/imcc.l"
return POSTCOMP;
YY_BREAK
case 43:
YY_RULE_SETUP
-#line 335 "compilers/imcc/imcc.l"
+#line 332 "compilers/imcc/imcc.l"
return ANON;
YY_BREAK
case 44:
YY_RULE_SETUP
-#line 336 "compilers/imcc/imcc.l"
+#line 333 "compilers/imcc/imcc.l"
return OUTER;
YY_BREAK
case 45:
YY_RULE_SETUP
-#line 337 "compilers/imcc/imcc.l"
+#line 334 "compilers/imcc/imcc.l"
return NEED_LEX;
YY_BREAK
case 46:
YY_RULE_SETUP
-#line 338 "compilers/imcc/imcc.l"
+#line 335 "compilers/imcc/imcc.l"
return VTABLE_METHOD;
YY_BREAK
case 47:
YY_RULE_SETUP
-#line 339 "compilers/imcc/imcc.l"
+#line 336 "compilers/imcc/imcc.l"
return NS_ENTRY;
YY_BREAK
case 48:
YY_RULE_SETUP
-#line 340 "compilers/imcc/imcc.l"
+#line 337 "compilers/imcc/imcc.l"
return UNIQUE_REG;
YY_BREAK
case 49:
YY_RULE_SETUP
-#line 341 "compilers/imcc/imcc.l"
+#line 338 "compilers/imcc/imcc.l"
return SUB_INSTANCE_OF;
YY_BREAK
case 50:
YY_RULE_SETUP
-#line 342 "compilers/imcc/imcc.l"
+#line 339 "compilers/imcc/imcc.l"
return SUBID;
YY_BREAK
case 51:
YY_RULE_SETUP
-#line 344 "compilers/imcc/imcc.l"
+#line 341 "compilers/imcc/imcc.l"
return RESULT;
YY_BREAK
case 52:
YY_RULE_SETUP
-#line 345 "compilers/imcc/imcc.l"
+#line 342 "compilers/imcc/imcc.l"
return GET_RESULTS;
YY_BREAK
case 53:
YY_RULE_SETUP
-#line 346 "compilers/imcc/imcc.l"
+#line 343 "compilers/imcc/imcc.l"
return YIELDT;
YY_BREAK
case 54:
YY_RULE_SETUP
-#line 347 "compilers/imcc/imcc.l"
+#line 344 "compilers/imcc/imcc.l"
return SET_YIELD;
YY_BREAK
case 55:
YY_RULE_SETUP
-#line 348 "compilers/imcc/imcc.l"
+#line 345 "compilers/imcc/imcc.l"
return RETURN;
YY_BREAK
case 56:
YY_RULE_SETUP
-#line 349 "compilers/imcc/imcc.l"
+#line 346 "compilers/imcc/imcc.l"
return SET_RETURN;
YY_BREAK
case 57:
YY_RULE_SETUP
-#line 350 "compilers/imcc/imcc.l"
+#line 347 "compilers/imcc/imcc.l"
return TAILCALL;
YY_BREAK
case 58:
YY_RULE_SETUP
-#line 351 "compilers/imcc/imcc.l"
+#line 348 "compilers/imcc/imcc.l"
return LOADLIB;
YY_BREAK
case 59:
YY_RULE_SETUP
-#line 353 "compilers/imcc/imcc.l"
+#line 350 "compilers/imcc/imcc.l"
return ADV_FLAT;
YY_BREAK
case 60:
YY_RULE_SETUP
-#line 354 "compilers/imcc/imcc.l"
+#line 351 "compilers/imcc/imcc.l"
return ADV_SLURPY;
YY_BREAK
case 61:
YY_RULE_SETUP
-#line 355 "compilers/imcc/imcc.l"
+#line 352 "compilers/imcc/imcc.l"
return ADV_OPTIONAL;
YY_BREAK
case 62:
YY_RULE_SETUP
-#line 356 "compilers/imcc/imcc.l"
+#line 353 "compilers/imcc/imcc.l"
return ADV_OPT_FLAG;
YY_BREAK
case 63:
YY_RULE_SETUP
-#line 357 "compilers/imcc/imcc.l"
+#line 354 "compilers/imcc/imcc.l"
return ADV_NAMED;
YY_BREAK
case 64:
YY_RULE_SETUP
-#line 358 "compilers/imcc/imcc.l"
+#line 355 "compilers/imcc/imcc.l"
return ADV_ARROW;
YY_BREAK
case 65:
YY_RULE_SETUP
-#line 359 "compilers/imcc/imcc.l"
+#line 356 "compilers/imcc/imcc.l"
return ADV_INVOCANT;
YY_BREAK
case 66:
YY_RULE_SETUP
-#line 361 "compilers/imcc/imcc.l"
+#line 358 "compilers/imcc/imcc.l"
return NAMESPACE;
YY_BREAK
case 67:
YY_RULE_SETUP
-#line 362 "compilers/imcc/imcc.l"
+#line 359 "compilers/imcc/imcc.l"
return HLL;
YY_BREAK
case 68:
YY_RULE_SETUP
-#line 364 "compilers/imcc/imcc.l"
+#line 361 "compilers/imcc/imcc.l"
return LOCAL;
YY_BREAK
case 69:
YY_RULE_SETUP
-#line 365 "compilers/imcc/imcc.l"
+#line 362 "compilers/imcc/imcc.l"
return CONST;
YY_BREAK
case 70:
YY_RULE_SETUP
-#line 366 "compilers/imcc/imcc.l"
+#line 363 "compilers/imcc/imcc.l"
return GLOBAL_CONST;
YY_BREAK
case 71:
YY_RULE_SETUP
-#line 367 "compilers/imcc/imcc.l"
+#line 364 "compilers/imcc/imcc.l"
return PARAM;
YY_BREAK
case 72:
YY_RULE_SETUP
-#line 368 "compilers/imcc/imcc.l"
+#line 365 "compilers/imcc/imcc.l"
return GOTO;
YY_BREAK
case 73:
YY_RULE_SETUP
-#line 369 "compilers/imcc/imcc.l"
+#line 366 "compilers/imcc/imcc.l"
return IF;
YY_BREAK
case 74:
YY_RULE_SETUP
-#line 370 "compilers/imcc/imcc.l"
+#line 367 "compilers/imcc/imcc.l"
return UNLESS;
YY_BREAK
case 75:
YY_RULE_SETUP
-#line 371 "compilers/imcc/imcc.l"
+#line 368 "compilers/imcc/imcc.l"
return PNULL;
YY_BREAK
case 76:
YY_RULE_SETUP
-#line 372 "compilers/imcc/imcc.l"
+#line 369 "compilers/imcc/imcc.l"
return INTV;
YY_BREAK
case 77:
YY_RULE_SETUP
-#line 373 "compilers/imcc/imcc.l"
+#line 370 "compilers/imcc/imcc.l"
return FLOATV;
YY_BREAK
case 78:
YY_RULE_SETUP
-#line 375 "compilers/imcc/imcc.l"
+#line 372 "compilers/imcc/imcc.l"
return PMCV;
YY_BREAK
case 79:
YY_RULE_SETUP
-#line 376 "compilers/imcc/imcc.l"
+#line 373 "compilers/imcc/imcc.l"
return STRINGV;
YY_BREAK
case 80:
YY_RULE_SETUP
-#line 377 "compilers/imcc/imcc.l"
+#line 374 "compilers/imcc/imcc.l"
return SHIFT_LEFT;
YY_BREAK
case 81:
YY_RULE_SETUP
-#line 378 "compilers/imcc/imcc.l"
+#line 375 "compilers/imcc/imcc.l"
return SHIFT_RIGHT;
YY_BREAK
case 82:
YY_RULE_SETUP
-#line 379 "compilers/imcc/imcc.l"
+#line 376 "compilers/imcc/imcc.l"
return SHIFT_RIGHT_U;
YY_BREAK
case 83:
YY_RULE_SETUP
-#line 380 "compilers/imcc/imcc.l"
+#line 377 "compilers/imcc/imcc.l"
return LOG_AND;
YY_BREAK
case 84:
YY_RULE_SETUP
-#line 381 "compilers/imcc/imcc.l"
+#line 378 "compilers/imcc/imcc.l"
return LOG_OR;
YY_BREAK
case 85:
YY_RULE_SETUP
-#line 382 "compilers/imcc/imcc.l"
+#line 379 "compilers/imcc/imcc.l"
return LOG_XOR;
YY_BREAK
case 86:
YY_RULE_SETUP
-#line 383 "compilers/imcc/imcc.l"
+#line 380 "compilers/imcc/imcc.l"
return RELOP_LT;
YY_BREAK
case 87:
YY_RULE_SETUP
-#line 384 "compilers/imcc/imcc.l"
+#line 381 "compilers/imcc/imcc.l"
return RELOP_LTE;
YY_BREAK
case 88:
YY_RULE_SETUP
-#line 385 "compilers/imcc/imcc.l"
+#line 382 "compilers/imcc/imcc.l"
return RELOP_GT;
YY_BREAK
case 89:
YY_RULE_SETUP
-#line 386 "compilers/imcc/imcc.l"
+#line 383 "compilers/imcc/imcc.l"
return RELOP_GTE;
YY_BREAK
case 90:
YY_RULE_SETUP
-#line 387 "compilers/imcc/imcc.l"
+#line 384 "compilers/imcc/imcc.l"
return RELOP_EQ;
YY_BREAK
case 91:
YY_RULE_SETUP
-#line 388 "compilers/imcc/imcc.l"
+#line 385 "compilers/imcc/imcc.l"
return RELOP_NE;
YY_BREAK
case 92:
YY_RULE_SETUP
-#line 389 "compilers/imcc/imcc.l"
+#line 386 "compilers/imcc/imcc.l"
return POW;
YY_BREAK
case 93:
YY_RULE_SETUP
-#line 391 "compilers/imcc/imcc.l"
+#line 388 "compilers/imcc/imcc.l"
return CONCAT;
YY_BREAK
case 94:
YY_RULE_SETUP
-#line 392 "compilers/imcc/imcc.l"
+#line 389 "compilers/imcc/imcc.l"
return DOT;
YY_BREAK
case 95:
YY_RULE_SETUP
-#line 394 "compilers/imcc/imcc.l"
+#line 391 "compilers/imcc/imcc.l"
return PLUS_ASSIGN;
YY_BREAK
case 96:
YY_RULE_SETUP
-#line 395 "compilers/imcc/imcc.l"
+#line 392 "compilers/imcc/imcc.l"
return MINUS_ASSIGN;
YY_BREAK
case 97:
YY_RULE_SETUP
-#line 396 "compilers/imcc/imcc.l"
+#line 393 "compilers/imcc/imcc.l"
return MUL_ASSIGN;
YY_BREAK
case 98:
YY_RULE_SETUP
-#line 397 "compilers/imcc/imcc.l"
+#line 394 "compilers/imcc/imcc.l"
return DIV_ASSIGN;
YY_BREAK
case 99:
YY_RULE_SETUP
-#line 398 "compilers/imcc/imcc.l"
+#line 395 "compilers/imcc/imcc.l"
return MOD_ASSIGN;
YY_BREAK
case 100:
YY_RULE_SETUP
-#line 399 "compilers/imcc/imcc.l"
+#line 396 "compilers/imcc/imcc.l"
return FDIV;
YY_BREAK
case 101:
YY_RULE_SETUP
-#line 400 "compilers/imcc/imcc.l"
+#line 397 "compilers/imcc/imcc.l"
return FDIV_ASSIGN;
YY_BREAK
case 102:
YY_RULE_SETUP
-#line 401 "compilers/imcc/imcc.l"
+#line 398 "compilers/imcc/imcc.l"
return BAND_ASSIGN;
YY_BREAK
case 103:
YY_RULE_SETUP
-#line 402 "compilers/imcc/imcc.l"
+#line 399 "compilers/imcc/imcc.l"
return BOR_ASSIGN;
YY_BREAK
case 104:
YY_RULE_SETUP
-#line 403 "compilers/imcc/imcc.l"
+#line 400 "compilers/imcc/imcc.l"
return BXOR_ASSIGN;
YY_BREAK
case 105:
YY_RULE_SETUP
-#line 404 "compilers/imcc/imcc.l"
+#line 401 "compilers/imcc/imcc.l"
return SHR_ASSIGN;
YY_BREAK
case 106:
YY_RULE_SETUP
-#line 405 "compilers/imcc/imcc.l"
+#line 402 "compilers/imcc/imcc.l"
return SHL_ASSIGN;
YY_BREAK
case 107:
YY_RULE_SETUP
-#line 406 "compilers/imcc/imcc.l"
+#line 403 "compilers/imcc/imcc.l"
return SHR_U_ASSIGN;
YY_BREAK
case 108:
YY_RULE_SETUP
-#line 407 "compilers/imcc/imcc.l"
+#line 404 "compilers/imcc/imcc.l"
return CONCAT_ASSIGN;
YY_BREAK
case 109:
YY_RULE_SETUP
-#line 409 "compilers/imcc/imcc.l"
+#line 406 "compilers/imcc/imcc.l"
{
char *macro_name = NULL;
int start_cond = YY_START;
@@ -3529,14 +3526,14 @@
YY_BREAK
case 110:
YY_RULE_SETUP
-#line 452 "compilers/imcc/imcc.l"
+#line 449 "compilers/imcc/imcc.l"
{
return read_macro(valp, interp, yyscanner);
}
YY_BREAK
case 111:
YY_RULE_SETUP
-#line 456 "compilers/imcc/imcc.l"
+#line 453 "compilers/imcc/imcc.l"
{
const int c = yylex(valp,yyscanner,interp);
@@ -3551,7 +3548,7 @@
YY_BREAK
case 112:
YY_RULE_SETUP
-#line 468 "compilers/imcc/imcc.l"
+#line 465 "compilers/imcc/imcc.l"
{
if (valp) {
char *label;
@@ -3576,7 +3573,7 @@
YY_BREAK
case 113:
YY_RULE_SETUP
-#line 490 "compilers/imcc/imcc.l"
+#line 487 "compilers/imcc/imcc.l"
{
if (valp) {
@@ -3601,12 +3598,12 @@
YY_BREAK
case 114:
YY_RULE_SETUP
-#line 512 "compilers/imcc/imcc.l"
+#line 509 "compilers/imcc/imcc.l"
return COMMA;
YY_BREAK
case 115:
YY_RULE_SETUP
-#line 514 "compilers/imcc/imcc.l"
+#line 511 "compilers/imcc/imcc.l"
{
/* trim last ':' */
YYCHOP();
@@ -3619,7 +3616,7 @@
YY_BREAK
case 116:
YY_RULE_SETUP
-#line 524 "compilers/imcc/imcc.l"
+#line 521 "compilers/imcc/imcc.l"
{
char * const macro_name = yytext + 1;
@@ -3631,32 +3628,32 @@
YY_BREAK
case 117:
YY_RULE_SETUP
-#line 535 "compilers/imcc/imcc.l"
+#line 532 "compilers/imcc/imcc.l"
DUP_AND_RET(valp, FLOATC);
YY_BREAK
case 118:
YY_RULE_SETUP
-#line 536 "compilers/imcc/imcc.l"
+#line 533 "compilers/imcc/imcc.l"
DUP_AND_RET(valp, INTC);
YY_BREAK
case 119:
YY_RULE_SETUP
-#line 537 "compilers/imcc/imcc.l"
+#line 534 "compilers/imcc/imcc.l"
DUP_AND_RET(valp, INTC);
YY_BREAK
case 120:
YY_RULE_SETUP
-#line 538 "compilers/imcc/imcc.l"
+#line 535 "compilers/imcc/imcc.l"
DUP_AND_RET(valp, INTC);
YY_BREAK
case 121:
YY_RULE_SETUP
-#line 539 "compilers/imcc/imcc.l"
+#line 536 "compilers/imcc/imcc.l"
DUP_AND_RET(valp, INTC);
YY_BREAK
case 122:
YY_RULE_SETUP
-#line 541 "compilers/imcc/imcc.l"
+#line 538 "compilers/imcc/imcc.l"
{
valp->s = mem_sys_strdup(yytext);
@@ -3669,7 +3666,7 @@
YY_BREAK
case 123:
YY_RULE_SETUP
-#line 551 "compilers/imcc/imcc.l"
+#line 548 "compilers/imcc/imcc.l"
{
valp->s = mem_sys_strdup(yytext);
@@ -3679,7 +3676,7 @@
YY_BREAK
case 124:
YY_RULE_SETUP
-#line 558 "compilers/imcc/imcc.l"
+#line 555 "compilers/imcc/imcc.l"
{
macro_frame_t *frame;
@@ -3710,7 +3707,7 @@
YY_BREAK
case 125:
YY_RULE_SETUP
-#line 586 "compilers/imcc/imcc.l"
+#line 583 "compilers/imcc/imcc.l"
{
/* charset:"..." */
valp->s = mem_sys_strdup(yytext);
@@ -3721,7 +3718,7 @@
YY_BREAK
case 126:
YY_RULE_SETUP
-#line 594 "compilers/imcc/imcc.l"
+#line 591 "compilers/imcc/imcc.l"
{
if (valp) (valp)->s = yytext;
if (IMCC_INFO(interp)->state->pasm_file)
@@ -3732,7 +3729,7 @@
YY_BREAK
case 127:
YY_RULE_SETUP
-#line 602 "compilers/imcc/imcc.l"
+#line 599 "compilers/imcc/imcc.l"
{
if (valp) (valp)->s = yytext;
if (IMCC_INFO(interp)->state->pasm_file)
@@ -3743,7 +3740,7 @@
YY_BREAK
case 128:
YY_RULE_SETUP
-#line 610 "compilers/imcc/imcc.l"
+#line 607 "compilers/imcc/imcc.l"
{
if (valp) (valp)->s = yytext;
if (IMCC_INFO(interp)->state->pasm_file)
@@ -3754,7 +3751,7 @@
YY_BREAK
case 129:
YY_RULE_SETUP
-#line 618 "compilers/imcc/imcc.l"
+#line 615 "compilers/imcc/imcc.l"
{
if (valp) (valp)->s = yytext;
if (IMCC_INFO(interp)->state->pasm_file)
@@ -3765,7 +3762,7 @@
YY_BREAK
case 130:
YY_RULE_SETUP
-#line 626 "compilers/imcc/imcc.l"
+#line 623 "compilers/imcc/imcc.l"
{
IMCC_fataly(interp, EXCEPTION_SYNTAX_ERROR,
"'%s' is not a valid register name", yytext);
@@ -3773,7 +3770,7 @@
YY_BREAK
case 131:
YY_RULE_SETUP
-#line 631 "compilers/imcc/imcc.l"
+#line 628 "compilers/imcc/imcc.l"
{
if (IMCC_INFO(interp)->state->pasm_file == 0)
IMCC_fataly(interp, EXCEPTION_SYNTAX_ERROR,
@@ -3787,9 +3784,9 @@
YY_BREAK
case 132:
YY_RULE_SETUP
-#line 642 "compilers/imcc/imcc.l"
+#line 639 "compilers/imcc/imcc.l"
{
- if (!pesky_global__is_def) {
+ if (!IMCC_INFO(interp)->is_def) {
SymReg *r = find_sym(interp, yytext);
if (r && (r->type & (VTIDENTIFIER|VT_CONSTP))) {
@@ -3813,24 +3810,24 @@
}
valp->s = mem_sys_strdup(yytext);
- return (!pesky_global__is_def && is_op(interp, valp->s) ? PARROT_OP : IDENTIFIER);
+ return (!IMCC_INFO(interp)->is_def && is_op(interp, valp->s) ? PARROT_OP : IDENTIFIER);
}
YY_BREAK
case 133:
YY_RULE_SETUP
-#line 671 "compilers/imcc/imcc.l"
+#line 668 "compilers/imcc/imcc.l"
/* skip */;
YY_BREAK
case 134:
YY_RULE_SETUP
-#line 673 "compilers/imcc/imcc.l"
+#line 670 "compilers/imcc/imcc.l"
{
/* catch all except for state macro */
return yytext[0];
}
YY_BREAK
case YY_STATE_EOF(emit):
-#line 678 "compilers/imcc/imcc.l"
+#line 675 "compilers/imcc/imcc.l"
{
BEGIN(INITIAL);
@@ -3843,18 +3840,18 @@
}
YY_BREAK
case YY_STATE_EOF(INITIAL):
-#line 689 "compilers/imcc/imcc.l"
+#line 686 "compilers/imcc/imcc.l"
yyterminate();
YY_BREAK
case 135:
YY_RULE_SETUP
-#line 691 "compilers/imcc/imcc.l"
+#line 688 "compilers/imcc/imcc.l"
DUP_AND_RET(valp, ENDM);
YY_BREAK
case 136:
/* rule 136 can match eol */
YY_RULE_SETUP
-#line 693 "compilers/imcc/imcc.l"
+#line 690 "compilers/imcc/imcc.l"
{
IMCC_INFO(interp)->line++;
DUP_AND_RET(valp, '\n');
@@ -3862,12 +3859,12 @@
YY_BREAK
case 137:
YY_RULE_SETUP
-#line 698 "compilers/imcc/imcc.l"
+#line 695 "compilers/imcc/imcc.l"
return LABEL;
YY_BREAK
case 138:
YY_RULE_SETUP
-#line 700 "compilers/imcc/imcc.l"
+#line 697 "compilers/imcc/imcc.l"
{
if (yylex(valp,yyscanner,interp) != LABEL)
@@ -3894,7 +3891,7 @@
YY_BREAK
case 139:
YY_RULE_SETUP
-#line 724 "compilers/imcc/imcc.l"
+#line 721 "compilers/imcc/imcc.l"
{
if (valp) {
const size_t len = strlen(IMCC_INFO(interp)->cur_macro_name) + yyleng + 12;
@@ -3913,49 +3910,49 @@
YY_BREAK
case 140:
YY_RULE_SETUP
-#line 740 "compilers/imcc/imcc.l"
+#line 737 "compilers/imcc/imcc.l"
/* skip leading ws */;
YY_BREAK
case 141:
YY_RULE_SETUP
-#line 741 "compilers/imcc/imcc.l"
+#line 738 "compilers/imcc/imcc.l"
DUP_AND_RET(valp, ' ');
YY_BREAK
case 142:
YY_RULE_SETUP
-#line 742 "compilers/imcc/imcc.l"
+#line 739 "compilers/imcc/imcc.l"
DUP_AND_RET(valp, REG);
YY_BREAK
case 143:
YY_RULE_SETUP
-#line 743 "compilers/imcc/imcc.l"
+#line 740 "compilers/imcc/imcc.l"
DUP_AND_RET(valp, REG);
YY_BREAK
case 144:
YY_RULE_SETUP
-#line 744 "compilers/imcc/imcc.l"
+#line 741 "compilers/imcc/imcc.l"
DUP_AND_RET(valp, IDENTIFIER);
YY_BREAK
case 145:
YY_RULE_SETUP
-#line 745 "compilers/imcc/imcc.l"
+#line 742 "compilers/imcc/imcc.l"
DUP_AND_RET(valp, MACRO);
YY_BREAK
case 146:
YY_RULE_SETUP
-#line 746 "compilers/imcc/imcc.l"
+#line 743 "compilers/imcc/imcc.l"
DUP_AND_RET(valp, yytext[0]);
YY_BREAK
case YY_STATE_EOF(macro):
-#line 747 "compilers/imcc/imcc.l"
+#line 744 "compilers/imcc/imcc.l"
yyterminate();
YY_BREAK
case 147:
YY_RULE_SETUP
-#line 749 "compilers/imcc/imcc.l"
+#line 746 "compilers/imcc/imcc.l"
ECHO;
YY_BREAK
-#line 3959 "compilers/imcc/imclexer.c"
+#line 3956 "compilers/imcc/imclexer.c"
case YY_STATE_EOF(pod):
case YY_STATE_EOF(cmt1):
case YY_STATE_EOF(cmt2):
@@ -5157,7 +5154,7 @@
#define YYTABLES_NAME "yytables"
-#line 749 "compilers/imcc/imcc.l"
+#line 746 "compilers/imcc/imcc.l"
Modified: trunk/compilers/imcc/imcparser.c
==============================================================================
--- trunk/compilers/imcc/imcparser.c Thu Jul 30 15:16:53 2009 (r40344)
+++ trunk/compilers/imcc/imcparser.c Thu Jul 30 18:29:24 2009 (r40345)
@@ -3329,7 +3329,7 @@
case 19:
#line 1223 "compilers/imcc/imcc.y"
- { pesky_global__is_def = 1; }
+ { IMCC_INFO(interp)->is_def = 1; }
break;
case 20:
@@ -3337,13 +3337,13 @@
{
mk_const_ident(interp, (yyvsp[(4) - (6)].s), (yyvsp[(3) - (6)].t), (yyvsp[(6) - (6)].sr), 1);
mem_sys_free((yyvsp[(4) - (6)].s));
- pesky_global__is_def = 0;
+ IMCC_INFO(interp)->is_def = 0;
}
break;
case 21:
#line 1232 "compilers/imcc/imcc.y"
- { pesky_global__is_def=1; }
+ { IMCC_INFO(interp)->is_def = 1; }
break;
case 22:
@@ -3351,13 +3351,13 @@
{
(yyval.i) = mk_pmc_const(interp, IMCC_INFO(interp)->cur_unit, (yyvsp[(3) - (6)].s), (yyvsp[(4) - (6)].sr), (yyvsp[(6) - (6)].s));
mem_sys_free((yyvsp[(6) - (6)].s));
- pesky_global__is_def = 0;
+ IMCC_INFO(interp)->is_def = 0;
}
break;
case 23:
#line 1239 "compilers/imcc/imcc.y"
- { pesky_global__is_def=1; }
+ { IMCC_INFO(interp)->is_def = 1; }
break;
case 24:
@@ -3366,7 +3366,7 @@
(yyval.i) = mk_pmc_const_named(interp, IMCC_INFO(interp)->cur_unit, (yyvsp[(3) - (6)].s), (yyvsp[(4) - (6)].sr), (yyvsp[(6) - (6)].s));
mem_sys_free((yyvsp[(3) - (6)].s));
mem_sys_free((yyvsp[(6) - (6)].s));
- pesky_global__is_def = 0;
+ IMCC_INFO(interp)->is_def = 0;
}
break;
@@ -3559,12 +3559,12 @@
case 58:
#line 1394 "compilers/imcc/imcc.y"
- { pesky_global__is_def=1; }
+ { IMCC_INFO(interp)->is_def = 1; }
break;
case 59:
#line 1394 "compilers/imcc/imcc.y"
- { (yyval.sr) = (yyvsp[(3) - (3)].sr); pesky_global__is_def=0; }
+ { (yyval.sr) = (yyvsp[(3) - (3)].sr); IMCC_INFO(interp)->is_def = 0; }
break;
case 60:
@@ -3948,7 +3948,7 @@
case 122:
#line 1677 "compilers/imcc/imcc.y"
- { pesky_global__is_def=1; }
+ { IMCC_INFO(interp)->is_def = 1; }
break;
case 123:
@@ -3961,8 +3961,8 @@
else
ignored = mk_ident(interp, l->id, (yyvsp[(3) - (4)].t));
UNUSED(ignored);
- pesky_global__is_def=0;
- (yyval.sr)=0;
+ IMCC_INFO(interp)->is_def = 0;
+ (yyval.sr) = 0;
}
break;
@@ -4269,7 +4269,7 @@
case 178:
#line 1908 "compilers/imcc/imcc.y"
- { pesky_global__is_def=1; }
+ { IMCC_INFO(interp)->is_def = 1; }
break;
case 179:
@@ -4287,7 +4287,7 @@
mem_sys_free(l1->id);
mem_sys_free(l1);
}
- pesky_global__is_def=0; (yyval.i)=0;
+ IMCC_INFO(interp)->is_def = 0; (yyval.i) = 0;
}
break;
@@ -4315,28 +4315,28 @@
case 182:
#line 1940 "compilers/imcc/imcc.y"
- { pesky_global__is_def=1; }
+ { IMCC_INFO(interp)->is_def = 1; }
break;
case 183:
#line 1941 "compilers/imcc/imcc.y"
{
mk_const_ident(interp, (yyvsp[(4) - (6)].s), (yyvsp[(3) - (6)].t), (yyvsp[(6) - (6)].sr), 0);
- pesky_global__is_def=0;
+ IMCC_INFO(interp)->is_def = 0;
mem_sys_free((yyvsp[(4) - (6)].s));
}
break;
case 185:
#line 1948 "compilers/imcc/imcc.y"
- { pesky_global__is_def=1; }
+ { IMCC_INFO(interp)->is_def = 1; }
break;
case 186:
#line 1949 "compilers/imcc/imcc.y"
{
mk_const_ident(interp, (yyvsp[(4) - (6)].s), (yyvsp[(3) - (6)].t), (yyvsp[(6) - (6)].sr), 1);
- pesky_global__is_def=0;
+ IMCC_INFO(interp)->is_def = 0;
mem_sys_free((yyvsp[(4) - (6)].s));
}
break;
Modified: trunk/compilers/imcc/parser.h
==============================================================================
--- trunk/compilers/imcc/parser.h Thu Jul 30 15:16:53 2009 (r40344)
+++ trunk/compilers/imcc/parser.h Thu Jul 30 18:29:24 2009 (r40345)
@@ -14,9 +14,6 @@
#include "imcparser.h"
-/* short ranged globals for lexer state */
-extern int pesky_global__is_def;
-
#define KEY_BIT(argnum) (1 << (argnum))
/* An opaque pointer. */
More information about the parrot-commits
mailing list