Author: chromatic
Date: Fri Nov 28 22:17:45 2008
New Revision: 33324
Modified:
trunk/compilers/imcc/imc.h
trunk/compilers/imcc/imcc.l
trunk/compilers/imcc/imclexer.c
trunk/compilers/imcc/parser_util.c
trunk/compilers/imcc/symreg.c
Log:
[IMCC] Changed some memory allocation properties of macros in order to remove a
persistent memory leak. It still leaks a bit of memory, but it doesn't throw
as many assertions. Note the use of parrot_chash_destroy_values(), added in
r33323.
Modified: trunk/compilers/imcc/imc.h
==============================================================================
--- trunk/compilers/imcc/imc.h (original)
+++ trunk/compilers/imcc/imc.h Fri Nov 28 22:17:45 2008
@@ -533,6 +533,20 @@
opcode_t npc;
} imc_info_t;
+/* macro structs */
+#define MAX_PARAM 16
+
+typedef struct params_t {
+ char *name[MAX_PARAM];
+ int num_param;
+} params_t;
+
+typedef struct macro_t {
+ char *expansion;
+ int line;
+ params_t params;
+} macro_t;
+
#define IMCC_INFO(i) (((Parrot_Interp)(i))->imc_info)
#define IMC_TRACE 0
Modified: trunk/compilers/imcc/imcc.l
==============================================================================
--- trunk/compilers/imcc/imcc.l (original)
+++ trunk/compilers/imcc/imcc.l Fri Nov 28 22:17:45 2008
@@ -41,26 +41,12 @@
#include "imc.h"
#include "parser.h"
-#define MAX_PARAM 16
-
typedef struct yyguts_t yyguts_t;
typedef struct parser_state_t parser_state_t;
-typedef struct params_t {
- char *name[MAX_PARAM];
- int num_param;
-} params_t;
-
-typedef struct macro_t {
- char *expansion;
- int line;
- params_t params;
-} macro_t;
-
/* parser state structure
* the first few items are common to struct parser_state, but
- * we AFAIK need this hack as flex doesn't export YY_BUFFER_STATE
- */
+ * we AFAIK need this hack as flex doesn't export YY_BUFFER_STATE */
typedef struct macro_frame_t {
struct parser_state_t s;
@@ -914,8 +900,6 @@
/* See http://rt.perl.org/rt3/Ticket/Display.html?id=50920 for the saga of
this bug. */
/* For some reason, we have to use a dupe of the macro name to pass in to
*/
/* read_params, or we get a segfault. XXX Make it stop. */
- macro_name = str_dup(macro_name);
-
while (c != ')') {
if (YYSTATE == heredoc2)
IMCC_fataly(interp, EXCEPTION_SYNTAX_ERROR,
@@ -1006,12 +990,15 @@
}
while (c != ENDM) {
- int elem_len;
+ char *old_s = valp->s;
+ int elem_len;
- if (c <= 0)
+ if (c <= 0) {
+ mem_sys_free(valp->s);
IMCC_fataly(interp, EXCEPTION_SYNTAX_ERROR,
"File ended before macro '%s' was complete",
IMCC_INFO(interp)->cur_macro_name);
+ }
PARROT_ASSERT(valp->s);
elem_len = strlen(valp->s);
@@ -1032,12 +1019,12 @@
IMCC_INFO(interp)->macro_buffer =
(char *)mem_sys_allocate_zeroed(buffer_size);
}
+
strcat(IMCC_INFO(interp)->macro_buffer, valp->s);
buffer_used += elem_len;
- mem_sys_free(valp->s);
- valp->s = NULL;
c = yylex(valp, yyscanner, interp);
+ mem_sys_free(old_s);
}
mem_sys_free(valp->s);
@@ -1049,7 +1036,7 @@
¶ms, IMCC_INFO(interp)->macro_buffer, start_line);
mem_sys_free(IMCC_INFO(interp)->macro_buffer);
- IMCC_INFO(interp)->macro_buffer = NULL;
+ IMCC_INFO(interp)->macro_buffer = NULL;
IMCC_INFO(interp)->cur_macro_name = NULL;
return MACRO;
Modified: trunk/compilers/imcc/imclexer.c
==============================================================================
--- trunk/compilers/imcc/imclexer.c (original)
+++ trunk/compilers/imcc/imclexer.c Fri Nov 28 22:17:45 2008
@@ -30,7 +30,7 @@
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 35
+#define YY_FLEX_SUBMINOR_VERSION 34
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
@@ -75,6 +75,7 @@
typedef unsigned char flex_uint8_t;
typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
/* Limits of integral types. */
#ifndef INT8_MIN
@@ -105,8 +106,6 @@
#define UINT32_MAX (4294967295U)
#endif
-#endif /* ! C99 */
-
#endif /* ! FLEXINT_H */
#ifdef __cplusplus
@@ -214,6 +213,13 @@
#define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner )
+/* The following is because we cannot portably get our hands on size_t
+ * (without autoconf's help, which isn't available because we want
+ * flex-generated scanners to compile on their own).
+ * Given that the standard has decreed that size_t exists since 1989,
+ * I guess we can afford to depend on it. Manoj.
+ */
+
#ifndef YY_TYPEDEF_YY_SIZE_T
#define YY_TYPEDEF_YY_SIZE_T
typedef size_t yy_size_t;
@@ -2533,26 +2539,12 @@
#include "imc.h"
#include "parser.h"
-#define MAX_PARAM 16
-
typedef struct yyguts_t yyguts_t;
typedef struct parser_state_t parser_state_t;
-typedef struct params_t {
- char *name[MAX_PARAM];
- int num_param;
-} params_t;
-
-typedef struct macro_t {
- char *expansion;
- int line;
- params_t params;
-} macro_t;
-
/* parser state structure
* the first few items are common to struct parser_state, but
- * we AFAIK need this hack as flex doesn't export YY_BUFFER_STATE
- */
+ * we AFAIK need this hack as flex doesn't export YY_BUFFER_STATE */
typedef struct macro_frame_t {
struct parser_state_t s;
@@ -2622,7 +2614,7 @@
-#line 2626 "compilers/imcc/imclexer.c"
+#line 2618 "compilers/imcc/imclexer.c"
#define INITIAL 0
#define emit 1
@@ -2765,7 +2757,7 @@
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
-#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
+#define ECHO fwrite( yytext, yyleng, 1, yyout )
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
@@ -2776,7 +2768,7 @@
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- size_t n; \
+ int n; \
for ( n = 0; n < max_size && \
(c = getc( yyin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@ -2862,7 +2854,7 @@
register int yy_act;
struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
-#line 166 "compilers/imcc/imcc.l"
+#line 152 "compilers/imcc/imcc.l"
/* for emacs "*/
if (IMCC_INFO(interp)->expect_pasm == 1 && !IMCC_INFO(interp)->in_pod)
{
@@ -2881,7 +2873,7 @@
return 0;
}
-#line 2885 "compilers/imcc/imclexer.c"
+#line 2877 "compilers/imcc/imclexer.c"
if ( !yyg->yy_init )
{
@@ -2964,7 +2956,7 @@
case 1:
/* rule 1 can match eol */
YY_RULE_SETUP
-#line 184 "compilers/imcc/imcc.l"
+#line 170 "compilers/imcc/imcc.l"
{
IMCC_INFO(interp)->frames->heredoc_rest = str_dup(yytext);
BEGIN(heredoc2);
@@ -2973,7 +2965,7 @@
case 2:
/* rule 2 can match eol */
YY_RULE_SETUP
-#line 189 "compilers/imcc/imcc.l"
+#line 175 "compilers/imcc/imcc.l"
{
/* heredocs have highest priority
* arrange them befor all wildcard state matches
@@ -2991,7 +2983,7 @@
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 204 "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)) {
@@ -3031,7 +3023,7 @@
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 242 "compilers/imcc/imcc.l"
+#line 228 "compilers/imcc/imcc.l"
{
yy_push_state(cmt2, yyscanner);
IMCC_INFO(interp)->line = atoi(yytext+6);
@@ -3041,7 +3033,7 @@
case 5:
/* rule 5 can match eol */
YY_RULE_SETUP
-#line 248 "compilers/imcc/imcc.l"
+#line 234 "compilers/imcc/imcc.l"
{
yy_pop_state(yyscanner);
yy_push_state(cmt3, yyscanner);
@@ -3055,7 +3047,7 @@
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 259 "compilers/imcc/imcc.l"
+#line 245 "compilers/imcc/imcc.l"
{
yy_pop_state(yyscanner);
yy_push_state(cmt4, yyscanner);
@@ -3063,17 +3055,17 @@
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 264 "compilers/imcc/imcc.l"
+#line 250 "compilers/imcc/imcc.l"
{ yy_push_state(cmt2, yyscanner); }
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 266 "compilers/imcc/imcc.l"
+#line 252 "compilers/imcc/imcc.l"
{ yy_push_state(cmt1, yyscanner); }
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 268 "compilers/imcc/imcc.l"
+#line 254 "compilers/imcc/imcc.l"
{
IMCC_INFO(interp)->line = atoi(yytext);
yy_pop_state(yyscanner);
@@ -3084,7 +3076,7 @@
case 10:
/* rule 10 can match eol */
YY_RULE_SETUP
-#line 275 "compilers/imcc/imcc.l"
+#line 261 "compilers/imcc/imcc.l"
{
yy_pop_state(yyscanner);
IMCC_INFO(interp)->line++;
@@ -3093,7 +3085,7 @@
case 11:
/* rule 11 can match eol */
YY_RULE_SETUP
-#line 280 "compilers/imcc/imcc.l"
+#line 266 "compilers/imcc/imcc.l"
{
if (IMCC_INFO(interp)->expect_pasm == 2)
BEGIN(INITIAL);
@@ -3106,7 +3098,7 @@
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 290 "compilers/imcc/imcc.l"
+#line 276 "compilers/imcc/imcc.l"
{
yy_push_state(cmt5, yyscanner);
}
@@ -3114,7 +3106,7 @@
case 13:
/* rule 13 can match eol */
YY_RULE_SETUP
-#line 294 "compilers/imcc/imcc.l"
+#line 280 "compilers/imcc/imcc.l"
{
if (IMCC_INFO(interp)->expect_pasm == 2)
BEGIN(INITIAL);
@@ -3129,7 +3121,7 @@
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 309 "compilers/imcc/imcc.l"
+#line 295 "compilers/imcc/imcc.l"
{
IMCC_INFO(interp)->in_pod = 1;
yy_push_state(pod, yyscanner);
@@ -3138,7 +3130,7 @@
case 15:
/* rule 15 can match eol */
YY_RULE_SETUP
-#line 314 "compilers/imcc/imcc.l"
+#line 300 "compilers/imcc/imcc.l"
{
IMCC_INFO(interp)->in_pod = 0;
yy_pop_state(yyscanner);
@@ -3147,478 +3139,478 @@
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 320 "compilers/imcc/imcc.l"
+#line 306 "compilers/imcc/imcc.l"
{ /*ignore*/ }
YY_BREAK
case 17:
/* rule 17 can match eol */
YY_RULE_SETUP
-#line 322 "compilers/imcc/imcc.l"
+#line 308 "compilers/imcc/imcc.l"
{ IMCC_INFO(interp)->line++; }
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 324 "compilers/imcc/imcc.l"
+#line 310 "compilers/imcc/imcc.l"
return TK_LINE;
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 325 "compilers/imcc/imcc.l"
+#line 311 "compilers/imcc/imcc.l"
return LEXICAL;
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 326 "compilers/imcc/imcc.l"
+#line 312 "compilers/imcc/imcc.l"
return ARG;
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 327 "compilers/imcc/imcc.l"
+#line 313 "compilers/imcc/imcc.l"
return ARG;
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 328 "compilers/imcc/imcc.l"
+#line 314 "compilers/imcc/imcc.l"
return SUB;
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 329 "compilers/imcc/imcc.l"
+#line 315 "compilers/imcc/imcc.l"
return ESUB;
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 330 "compilers/imcc/imcc.l"
+#line 316 "compilers/imcc/imcc.l"
return PCC_BEGIN;
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 331 "compilers/imcc/imcc.l"
+#line 317 "compilers/imcc/imcc.l"
return PCC_END;
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 332 "compilers/imcc/imcc.l"
+#line 318 "compilers/imcc/imcc.l"
return PCC_CALL;
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 333 "compilers/imcc/imcc.l"
+#line 319 "compilers/imcc/imcc.l"
return NCI_CALL;
YY_BREAK
case 28:
YY_RULE_SETUP
-#line 334 "compilers/imcc/imcc.l"
+#line 320 "compilers/imcc/imcc.l"
return METH_CALL;
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 335 "compilers/imcc/imcc.l"
+#line 321 "compilers/imcc/imcc.l"
return INVOCANT;
YY_BREAK
case 30:
YY_RULE_SETUP
-#line 336 "compilers/imcc/imcc.l"
+#line 322 "compilers/imcc/imcc.l"
return PCC_SUB;
YY_BREAK
case 31:
YY_RULE_SETUP
-#line 337 "compilers/imcc/imcc.l"
+#line 323 "compilers/imcc/imcc.l"
return PCC_BEGIN_RETURN;
YY_BREAK
case 32:
YY_RULE_SETUP
-#line 338 "compilers/imcc/imcc.l"
+#line 324 "compilers/imcc/imcc.l"
return PCC_END_RETURN;
YY_BREAK
case 33:
YY_RULE_SETUP
-#line 339 "compilers/imcc/imcc.l"
+#line 325 "compilers/imcc/imcc.l"
return PCC_BEGIN_YIELD;
YY_BREAK
case 34:
YY_RULE_SETUP
-#line 340 "compilers/imcc/imcc.l"
+#line 326 "compilers/imcc/imcc.l"
return PCC_END_YIELD;
YY_BREAK
case 35:
YY_RULE_SETUP
-#line 342 "compilers/imcc/imcc.l"
+#line 328 "compilers/imcc/imcc.l"
return METHOD;
YY_BREAK
case 36:
YY_RULE_SETUP
-#line 343 "compilers/imcc/imcc.l"
+#line 329 "compilers/imcc/imcc.l"
return MULTI;
YY_BREAK
case 37:
YY_RULE_SETUP
-#line 344 "compilers/imcc/imcc.l"
+#line 330 "compilers/imcc/imcc.l"
return MAIN;
YY_BREAK
case 38:
YY_RULE_SETUP
-#line 345 "compilers/imcc/imcc.l"
+#line 331 "compilers/imcc/imcc.l"
return LOAD;
YY_BREAK
case 39:
YY_RULE_SETUP
-#line 346 "compilers/imcc/imcc.l"
+#line 332 "compilers/imcc/imcc.l"
return INIT;
YY_BREAK
case 40:
YY_RULE_SETUP
-#line 347 "compilers/imcc/imcc.l"
+#line 333 "compilers/imcc/imcc.l"
return IMMEDIATE;
YY_BREAK
case 41:
YY_RULE_SETUP
-#line 348 "compilers/imcc/imcc.l"
+#line 334 "compilers/imcc/imcc.l"
return POSTCOMP;
YY_BREAK
case 42:
YY_RULE_SETUP
-#line 349 "compilers/imcc/imcc.l"
+#line 335 "compilers/imcc/imcc.l"
return ANON;
YY_BREAK
case 43:
YY_RULE_SETUP
-#line 350 "compilers/imcc/imcc.l"
+#line 336 "compilers/imcc/imcc.l"
return OUTER;
YY_BREAK
case 44:
YY_RULE_SETUP
-#line 351 "compilers/imcc/imcc.l"
+#line 337 "compilers/imcc/imcc.l"
return NEED_LEX;
YY_BREAK
case 45:
YY_RULE_SETUP
-#line 352 "compilers/imcc/imcc.l"
+#line 338 "compilers/imcc/imcc.l"
return VTABLE_METHOD;
YY_BREAK
case 46:
YY_RULE_SETUP
-#line 353 "compilers/imcc/imcc.l"
+#line 339 "compilers/imcc/imcc.l"
return UNIQUE_REG;
YY_BREAK
case 47:
YY_RULE_SETUP
-#line 354 "compilers/imcc/imcc.l"
+#line 340 "compilers/imcc/imcc.l"
return SUB_INSTANCE_OF;
YY_BREAK
case 48:
YY_RULE_SETUP
-#line 355 "compilers/imcc/imcc.l"
+#line 341 "compilers/imcc/imcc.l"
return SUB_LEXID;
YY_BREAK
case 49:
YY_RULE_SETUP
-#line 357 "compilers/imcc/imcc.l"
+#line 343 "compilers/imcc/imcc.l"
return RESULT;
YY_BREAK
case 50:
YY_RULE_SETUP
-#line 358 "compilers/imcc/imcc.l"
+#line 344 "compilers/imcc/imcc.l"
return GET_RESULTS;
YY_BREAK
case 51:
YY_RULE_SETUP
-#line 359 "compilers/imcc/imcc.l"
+#line 345 "compilers/imcc/imcc.l"
return YIELDT;
YY_BREAK
case 52:
YY_RULE_SETUP
-#line 360 "compilers/imcc/imcc.l"
+#line 346 "compilers/imcc/imcc.l"
return RETURN;
YY_BREAK
case 53:
YY_RULE_SETUP
-#line 361 "compilers/imcc/imcc.l"
+#line 347 "compilers/imcc/imcc.l"
return TAILCALL;
YY_BREAK
case 54:
YY_RULE_SETUP
-#line 362 "compilers/imcc/imcc.l"
+#line 348 "compilers/imcc/imcc.l"
return LOADLIB;
YY_BREAK
case 55:
YY_RULE_SETUP
-#line 364 "compilers/imcc/imcc.l"
+#line 350 "compilers/imcc/imcc.l"
return ADV_FLAT;
YY_BREAK
case 56:
YY_RULE_SETUP
-#line 365 "compilers/imcc/imcc.l"
+#line 351 "compilers/imcc/imcc.l"
return ADV_SLURPY;
YY_BREAK
case 57:
YY_RULE_SETUP
-#line 366 "compilers/imcc/imcc.l"
+#line 352 "compilers/imcc/imcc.l"
return ADV_OPTIONAL;
YY_BREAK
case 58:
YY_RULE_SETUP
-#line 367 "compilers/imcc/imcc.l"
+#line 353 "compilers/imcc/imcc.l"
return ADV_OPT_FLAG;
YY_BREAK
case 59:
YY_RULE_SETUP
-#line 368 "compilers/imcc/imcc.l"
+#line 354 "compilers/imcc/imcc.l"
return ADV_NAMED;
YY_BREAK
case 60:
YY_RULE_SETUP
-#line 369 "compilers/imcc/imcc.l"
+#line 355 "compilers/imcc/imcc.l"
return ADV_ARROW;
YY_BREAK
case 61:
YY_RULE_SETUP
-#line 370 "compilers/imcc/imcc.l"
+#line 356 "compilers/imcc/imcc.l"
return ADV_INVOCANT;
YY_BREAK
case 62:
YY_RULE_SETUP
-#line 372 "compilers/imcc/imcc.l"
+#line 358 "compilers/imcc/imcc.l"
return NAMESPACE;
YY_BREAK
case 63:
YY_RULE_SETUP
-#line 373 "compilers/imcc/imcc.l"
+#line 359 "compilers/imcc/imcc.l"
return HLL;
YY_BREAK
case 64:
YY_RULE_SETUP
-#line 374 "compilers/imcc/imcc.l"
+#line 360 "compilers/imcc/imcc.l"
return HLL_MAP;
YY_BREAK
case 65:
YY_RULE_SETUP
-#line 375 "compilers/imcc/imcc.l"
+#line 361 "compilers/imcc/imcc.l"
return ENDNAMESPACE;
YY_BREAK
case 66:
YY_RULE_SETUP
-#line 376 "compilers/imcc/imcc.l"
+#line 362 "compilers/imcc/imcc.l"
return LOCAL;
YY_BREAK
case 67:
YY_RULE_SETUP
-#line 377 "compilers/imcc/imcc.l"
+#line 363 "compilers/imcc/imcc.l"
return CONST;
YY_BREAK
case 68:
YY_RULE_SETUP
-#line 378 "compilers/imcc/imcc.l"
+#line 364 "compilers/imcc/imcc.l"
return GLOBAL_CONST;
YY_BREAK
case 69:
YY_RULE_SETUP
-#line 379 "compilers/imcc/imcc.l"
+#line 365 "compilers/imcc/imcc.l"
return PARAM;
YY_BREAK
case 70:
YY_RULE_SETUP
-#line 380 "compilers/imcc/imcc.l"
+#line 366 "compilers/imcc/imcc.l"
return GOTO;
YY_BREAK
case 71:
YY_RULE_SETUP
-#line 381 "compilers/imcc/imcc.l"
+#line 367 "compilers/imcc/imcc.l"
return IF;
YY_BREAK
case 72:
YY_RULE_SETUP
-#line 382 "compilers/imcc/imcc.l"
+#line 368 "compilers/imcc/imcc.l"
return UNLESS;
YY_BREAK
case 73:
YY_RULE_SETUP
-#line 383 "compilers/imcc/imcc.l"
+#line 369 "compilers/imcc/imcc.l"
return PNULL;
YY_BREAK
case 74:
YY_RULE_SETUP
-#line 384 "compilers/imcc/imcc.l"
+#line 370 "compilers/imcc/imcc.l"
return INTV;
YY_BREAK
case 75:
YY_RULE_SETUP
-#line 385 "compilers/imcc/imcc.l"
+#line 371 "compilers/imcc/imcc.l"
return FLOATV;
YY_BREAK
case 76:
YY_RULE_SETUP
-#line 386 "compilers/imcc/imcc.l"
+#line 372 "compilers/imcc/imcc.l"
return NEW;
YY_BREAK
case 77:
YY_RULE_SETUP
-#line 387 "compilers/imcc/imcc.l"
+#line 373 "compilers/imcc/imcc.l"
return GLOBALOP;
YY_BREAK
case 78:
YY_RULE_SETUP
-#line 388 "compilers/imcc/imcc.l"
+#line 374 "compilers/imcc/imcc.l"
return PMCV;
YY_BREAK
case 79:
YY_RULE_SETUP
-#line 389 "compilers/imcc/imcc.l"
+#line 375 "compilers/imcc/imcc.l"
return STRINGV;
YY_BREAK
case 80:
YY_RULE_SETUP
-#line 390 "compilers/imcc/imcc.l"
+#line 376 "compilers/imcc/imcc.l"
return SHIFT_LEFT;
YY_BREAK
case 81:
YY_RULE_SETUP
-#line 391 "compilers/imcc/imcc.l"
+#line 377 "compilers/imcc/imcc.l"
return SHIFT_RIGHT;
YY_BREAK
case 82:
YY_RULE_SETUP
-#line 392 "compilers/imcc/imcc.l"
+#line 378 "compilers/imcc/imcc.l"
return SHIFT_RIGHT_U;
YY_BREAK
case 83:
YY_RULE_SETUP
-#line 393 "compilers/imcc/imcc.l"
+#line 379 "compilers/imcc/imcc.l"
return LOG_AND;
YY_BREAK
case 84:
YY_RULE_SETUP
-#line 394 "compilers/imcc/imcc.l"
+#line 380 "compilers/imcc/imcc.l"
return LOG_OR;
YY_BREAK
case 85:
YY_RULE_SETUP
-#line 395 "compilers/imcc/imcc.l"
+#line 381 "compilers/imcc/imcc.l"
return LOG_XOR;
YY_BREAK
case 86:
YY_RULE_SETUP
-#line 396 "compilers/imcc/imcc.l"
+#line 382 "compilers/imcc/imcc.l"
return RELOP_LT;
YY_BREAK
case 87:
YY_RULE_SETUP
-#line 397 "compilers/imcc/imcc.l"
+#line 383 "compilers/imcc/imcc.l"
return RELOP_LTE;
YY_BREAK
case 88:
YY_RULE_SETUP
-#line 398 "compilers/imcc/imcc.l"
+#line 384 "compilers/imcc/imcc.l"
return RELOP_GT;
YY_BREAK
case 89:
YY_RULE_SETUP
-#line 399 "compilers/imcc/imcc.l"
+#line 385 "compilers/imcc/imcc.l"
return RELOP_GTE;
YY_BREAK
case 90:
YY_RULE_SETUP
-#line 400 "compilers/imcc/imcc.l"
+#line 386 "compilers/imcc/imcc.l"
return RELOP_EQ;
YY_BREAK
case 91:
YY_RULE_SETUP
-#line 401 "compilers/imcc/imcc.l"
+#line 387 "compilers/imcc/imcc.l"
return RELOP_NE;
YY_BREAK
case 92:
YY_RULE_SETUP
-#line 402 "compilers/imcc/imcc.l"
+#line 388 "compilers/imcc/imcc.l"
return POW;
YY_BREAK
case 93:
YY_RULE_SETUP
-#line 404 "compilers/imcc/imcc.l"
+#line 390 "compilers/imcc/imcc.l"
return CONCAT;
YY_BREAK
case 94:
YY_RULE_SETUP
-#line 405 "compilers/imcc/imcc.l"
+#line 391 "compilers/imcc/imcc.l"
return DOT;
YY_BREAK
case 95:
YY_RULE_SETUP
-#line 406 "compilers/imcc/imcc.l"
+#line 392 "compilers/imcc/imcc.l"
return DOTDOT;
YY_BREAK
case 96:
YY_RULE_SETUP
-#line 407 "compilers/imcc/imcc.l"
+#line 393 "compilers/imcc/imcc.l"
return PLUS_ASSIGN;
YY_BREAK
case 97:
YY_RULE_SETUP
-#line 408 "compilers/imcc/imcc.l"
+#line 394 "compilers/imcc/imcc.l"
return MINUS_ASSIGN;
YY_BREAK
case 98:
YY_RULE_SETUP
-#line 409 "compilers/imcc/imcc.l"
+#line 395 "compilers/imcc/imcc.l"
return MUL_ASSIGN;
YY_BREAK
case 99:
YY_RULE_SETUP
-#line 410 "compilers/imcc/imcc.l"
+#line 396 "compilers/imcc/imcc.l"
return DIV_ASSIGN;
YY_BREAK
case 100:
YY_RULE_SETUP
-#line 411 "compilers/imcc/imcc.l"
+#line 397 "compilers/imcc/imcc.l"
return MOD_ASSIGN;
YY_BREAK
case 101:
YY_RULE_SETUP
-#line 412 "compilers/imcc/imcc.l"
+#line 398 "compilers/imcc/imcc.l"
return FDIV;
YY_BREAK
case 102:
YY_RULE_SETUP
-#line 413 "compilers/imcc/imcc.l"
+#line 399 "compilers/imcc/imcc.l"
return FDIV_ASSIGN;
YY_BREAK
case 103:
YY_RULE_SETUP
-#line 414 "compilers/imcc/imcc.l"
+#line 400 "compilers/imcc/imcc.l"
return BAND_ASSIGN;
YY_BREAK
case 104:
YY_RULE_SETUP
-#line 415 "compilers/imcc/imcc.l"
+#line 401 "compilers/imcc/imcc.l"
return BOR_ASSIGN;
YY_BREAK
case 105:
YY_RULE_SETUP
-#line 416 "compilers/imcc/imcc.l"
+#line 402 "compilers/imcc/imcc.l"
return BXOR_ASSIGN;
YY_BREAK
case 106:
YY_RULE_SETUP
-#line 417 "compilers/imcc/imcc.l"
+#line 403 "compilers/imcc/imcc.l"
return SHR_ASSIGN;
YY_BREAK
case 107:
YY_RULE_SETUP
-#line 418 "compilers/imcc/imcc.l"
+#line 404 "compilers/imcc/imcc.l"
return SHL_ASSIGN;
YY_BREAK
case 108:
YY_RULE_SETUP
-#line 419 "compilers/imcc/imcc.l"
+#line 405 "compilers/imcc/imcc.l"
return SHR_U_ASSIGN;
YY_BREAK
case 109:
YY_RULE_SETUP
-#line 420 "compilers/imcc/imcc.l"
+#line 406 "compilers/imcc/imcc.l"
return CONCAT_ASSIGN;
YY_BREAK
case 110:
YY_RULE_SETUP
-#line 422 "compilers/imcc/imcc.l"
+#line 408 "compilers/imcc/imcc.l"
{
int c;
int start_line;
@@ -3651,14 +3643,14 @@
YY_BREAK
case 111:
YY_RULE_SETUP
-#line 452 "compilers/imcc/imcc.l"
+#line 438 "compilers/imcc/imcc.l"
{
return read_macro(valp, interp, yyscanner);
}
YY_BREAK
case 112:
YY_RULE_SETUP
-#line 456 "compilers/imcc/imcc.l"
+#line 442 "compilers/imcc/imcc.l"
{
const int c = yylex(valp,yyscanner,interp);
if (c != STRINGC)
@@ -3670,7 +3662,7 @@
YY_BREAK
case 113:
YY_RULE_SETUP
-#line 465 "compilers/imcc/imcc.l"
+#line 451 "compilers/imcc/imcc.l"
{
if (valp) {
char *label;
@@ -3695,7 +3687,7 @@
YY_BREAK
case 114:
YY_RULE_SETUP
-#line 487 "compilers/imcc/imcc.l"
+#line 473 "compilers/imcc/imcc.l"
{
if (valp) {
@@ -3720,12 +3712,12 @@
YY_BREAK
case 115:
YY_RULE_SETUP
-#line 509 "compilers/imcc/imcc.l"
+#line 495 "compilers/imcc/imcc.l"
return COMMA;
YY_BREAK
case 116:
YY_RULE_SETUP
-#line 511 "compilers/imcc/imcc.l"
+#line 497 "compilers/imcc/imcc.l"
{
/* trim last ':' */
YYCHOP();
@@ -3738,7 +3730,7 @@
YY_BREAK
case 117:
YY_RULE_SETUP
-#line 521 "compilers/imcc/imcc.l"
+#line 507 "compilers/imcc/imcc.l"
{
char * const macro_name = yytext + 1;
@@ -3750,32 +3742,32 @@
YY_BREAK
case 118:
YY_RULE_SETUP
-#line 532 "compilers/imcc/imcc.l"
+#line 518 "compilers/imcc/imcc.l"
DUP_AND_RET(valp, FLOATC);
YY_BREAK
case 119:
YY_RULE_SETUP
-#line 533 "compilers/imcc/imcc.l"
+#line 519 "compilers/imcc/imcc.l"
DUP_AND_RET(valp, INTC);
YY_BREAK
case 120:
YY_RULE_SETUP
-#line 534 "compilers/imcc/imcc.l"
+#line 520 "compilers/imcc/imcc.l"
DUP_AND_RET(valp, INTC);
YY_BREAK
case 121:
YY_RULE_SETUP
-#line 535 "compilers/imcc/imcc.l"
+#line 521 "compilers/imcc/imcc.l"
DUP_AND_RET(valp, INTC);
YY_BREAK
case 122:
YY_RULE_SETUP
-#line 536 "compilers/imcc/imcc.l"
+#line 522 "compilers/imcc/imcc.l"
DUP_AND_RET(valp, INTC);
YY_BREAK
case 123:
YY_RULE_SETUP
-#line 538 "compilers/imcc/imcc.l"
+#line 524 "compilers/imcc/imcc.l"
{
valp->s = str_dup(yytext);
@@ -3788,7 +3780,7 @@
YY_BREAK
case 124:
YY_RULE_SETUP
-#line 548 "compilers/imcc/imcc.l"
+#line 534 "compilers/imcc/imcc.l"
{
valp->s = str_dup(yytext);
@@ -3798,7 +3790,7 @@
YY_BREAK
case 125:
YY_RULE_SETUP
-#line 555 "compilers/imcc/imcc.l"
+#line 541 "compilers/imcc/imcc.l"
{
macro_frame_t *frame;
@@ -3829,7 +3821,7 @@
YY_BREAK
case 126:
YY_RULE_SETUP
-#line 583 "compilers/imcc/imcc.l"
+#line 569 "compilers/imcc/imcc.l"
{
/* charset:"..." */
valp->s = str_dup(yytext);
@@ -3840,7 +3832,7 @@
YY_BREAK
case 127:
YY_RULE_SETUP
-#line 591 "compilers/imcc/imcc.l"
+#line 577 "compilers/imcc/imcc.l"
{
if (valp) (valp)->s = yytext;
if (IMCC_INFO(interp)->state->pasm_file)
@@ -3851,7 +3843,7 @@
YY_BREAK
case 128:
YY_RULE_SETUP
-#line 599 "compilers/imcc/imcc.l"
+#line 585 "compilers/imcc/imcc.l"
{
if (valp) (valp)->s = yytext;
if (IMCC_INFO(interp)->state->pasm_file)
@@ -3862,7 +3854,7 @@
YY_BREAK
case 129:
YY_RULE_SETUP
-#line 607 "compilers/imcc/imcc.l"
+#line 593 "compilers/imcc/imcc.l"
{
if (valp) (valp)->s = yytext;
if (IMCC_INFO(interp)->state->pasm_file)
@@ -3873,7 +3865,7 @@
YY_BREAK
case 130:
YY_RULE_SETUP
-#line 615 "compilers/imcc/imcc.l"
+#line 601 "compilers/imcc/imcc.l"
{
if (valp) (valp)->s = yytext;
if (IMCC_INFO(interp)->state->pasm_file)
@@ -3884,7 +3876,7 @@
YY_BREAK
case 131:
YY_RULE_SETUP
-#line 623 "compilers/imcc/imcc.l"
+#line 609 "compilers/imcc/imcc.l"
{
IMCC_fataly(interp, EXCEPTION_SYNTAX_ERROR,
"'%s' is not a valid register name", yytext);
@@ -3892,7 +3884,7 @@
YY_BREAK
case 132:
YY_RULE_SETUP
-#line 628 "compilers/imcc/imcc.l"
+#line 614 "compilers/imcc/imcc.l"
{
if (IMCC_INFO(interp)->state->pasm_file == 0)
IMCC_fataly(interp, EXCEPTION_SYNTAX_ERROR,
@@ -3906,7 +3898,7 @@
YY_BREAK
case 133:
YY_RULE_SETUP
-#line 639 "compilers/imcc/imcc.l"
+#line 625 "compilers/imcc/imcc.l"
{
if (!is_def) {
SymReg *r = find_sym(interp, yytext);
@@ -3937,19 +3929,19 @@
YY_BREAK
case 134:
YY_RULE_SETUP
-#line 668 "compilers/imcc/imcc.l"
+#line 654 "compilers/imcc/imcc.l"
/* skip */;
YY_BREAK
case 135:
YY_RULE_SETUP
-#line 670 "compilers/imcc/imcc.l"
+#line 656 "compilers/imcc/imcc.l"
{
/* catch all except for state macro */
return yytext[0];
}
YY_BREAK
case YY_STATE_EOF(emit):
-#line 675 "compilers/imcc/imcc.l"
+#line 661 "compilers/imcc/imcc.l"
{
BEGIN(INITIAL);
@@ -3962,18 +3954,18 @@
}
YY_BREAK
case YY_STATE_EOF(INITIAL):
-#line 686 "compilers/imcc/imcc.l"
+#line 672 "compilers/imcc/imcc.l"
yyterminate();
YY_BREAK
case 136:
YY_RULE_SETUP
-#line 688 "compilers/imcc/imcc.l"
+#line 674 "compilers/imcc/imcc.l"
DUP_AND_RET(valp, ENDM);
YY_BREAK
case 137:
/* rule 137 can match eol */
YY_RULE_SETUP
-#line 690 "compilers/imcc/imcc.l"
+#line 676 "compilers/imcc/imcc.l"
{
IMCC_INFO(interp)->line++;
DUP_AND_RET(valp, '\n');
@@ -3981,12 +3973,12 @@
YY_BREAK
case 138:
YY_RULE_SETUP
-#line 695 "compilers/imcc/imcc.l"
+#line 681 "compilers/imcc/imcc.l"
return LABEL;
YY_BREAK
case 139:
YY_RULE_SETUP
-#line 697 "compilers/imcc/imcc.l"
+#line 683 "compilers/imcc/imcc.l"
{
if (yylex(valp,yyscanner,interp) != LABEL)
@@ -4012,7 +4004,7 @@
YY_BREAK
case 140:
YY_RULE_SETUP
-#line 720 "compilers/imcc/imcc.l"
+#line 706 "compilers/imcc/imcc.l"
{
if (valp) {
const size_t len = strlen(IMCC_INFO(interp)->cur_macro_name) +
yyleng + 12;
@@ -4029,49 +4021,49 @@
YY_BREAK
case 141:
YY_RULE_SETUP
-#line 734 "compilers/imcc/imcc.l"
+#line 720 "compilers/imcc/imcc.l"
/* skip leading ws */;
YY_BREAK
case 142:
YY_RULE_SETUP
-#line 735 "compilers/imcc/imcc.l"
+#line 721 "compilers/imcc/imcc.l"
DUP_AND_RET(valp, ' ');
YY_BREAK
case 143:
YY_RULE_SETUP
-#line 736 "compilers/imcc/imcc.l"
+#line 722 "compilers/imcc/imcc.l"
DUP_AND_RET(valp, REG);
YY_BREAK
case 144:
YY_RULE_SETUP
-#line 737 "compilers/imcc/imcc.l"
+#line 723 "compilers/imcc/imcc.l"
DUP_AND_RET(valp, REG);
YY_BREAK
case 145:
YY_RULE_SETUP
-#line 738 "compilers/imcc/imcc.l"
+#line 724 "compilers/imcc/imcc.l"
DUP_AND_RET(valp, IDENTIFIER);
YY_BREAK
case 146:
YY_RULE_SETUP
-#line 739 "compilers/imcc/imcc.l"
+#line 725 "compilers/imcc/imcc.l"
DUP_AND_RET(valp, MACRO);
YY_BREAK
case 147:
YY_RULE_SETUP
-#line 740 "compilers/imcc/imcc.l"
+#line 726 "compilers/imcc/imcc.l"
DUP_AND_RET(valp, yytext[0]);
YY_BREAK
case YY_STATE_EOF(macro):
-#line 741 "compilers/imcc/imcc.l"
+#line 727 "compilers/imcc/imcc.l"
yyterminate();
YY_BREAK
case 148:
YY_RULE_SETUP
-#line 743 "compilers/imcc/imcc.l"
+#line 729 "compilers/imcc/imcc.l"
ECHO;
YY_BREAK
-#line 4075 "compilers/imcc/imclexer.c"
+#line 4067 "compilers/imcc/imclexer.c"
case YY_STATE_EOF(pod):
case YY_STATE_EOF(cmt1):
case YY_STATE_EOF(cmt2):
@@ -5273,7 +5265,7 @@
#define YYTABLES_NAME "yytables"
-#line 743 "compilers/imcc/imcc.l"
+#line 729 "compilers/imcc/imcc.l"
@@ -5449,8 +5441,6 @@
/* See http://rt.perl.org/rt3/Ticket/Display.html?id=50920 for the saga of
this bug. */
/* For some reason, we have to use a dupe of the macro name to pass in to
*/
/* read_params, or we get a segfault. XXX Make it stop. */
- macro_name = str_dup(macro_name);
-
while (c != ')') {
if (YYSTATE == heredoc2)
IMCC_fataly(interp, EXCEPTION_SYNTAX_ERROR,
@@ -5541,12 +5531,15 @@
}
while (c != ENDM) {
- int elem_len;
+ char *old_s = valp->s;
+ int elem_len;
- if (c <= 0)
+ if (c <= 0) {
+ mem_sys_free(valp->s);
IMCC_fataly(interp, EXCEPTION_SYNTAX_ERROR,
"File ended before macro '%s' was complete",
IMCC_INFO(interp)->cur_macro_name);
+ }
PARROT_ASSERT(valp->s);
elem_len = strlen(valp->s);
@@ -5567,12 +5560,12 @@
IMCC_INFO(interp)->macro_buffer =
(char *)mem_sys_allocate_zeroed(buffer_size);
}
+
strcat(IMCC_INFO(interp)->macro_buffer, valp->s);
buffer_used += elem_len;
- mem_sys_free(valp->s);
- valp->s = NULL;
c = yylex(valp,yyscanner,interp);
+ mem_sys_free(old_s);
}
mem_sys_free(valp->s);
@@ -5584,7 +5577,7 @@
¶ms, IMCC_INFO(interp)->macro_buffer, start_line);
mem_sys_free(IMCC_INFO(interp)->macro_buffer);
- IMCC_INFO(interp)->macro_buffer = NULL;
+ IMCC_INFO(interp)->macro_buffer = NULL;
IMCC_INFO(interp)->cur_macro_name = NULL;
return MACRO;
Modified: trunk/compilers/imcc/parser_util.c
==============================================================================
--- trunk/compilers/imcc/parser_util.c (original)
+++ trunk/compilers/imcc/parser_util.c Fri Nov 28 22:17:45 2008
@@ -88,6 +88,10 @@
FUNC_MODIFIES(*unit)
FUNC_MODIFIES(*r);
+static void imcc_destroy_macro_values(ARGIN(void *value))
+ __attribute__nonnull__(1)
+ FUNC_MODIFIES(*value);
+
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will
be lost. */
/* HEADERIZER END: static */
@@ -1469,6 +1473,25 @@
/*
+=imcc C<void imcc_destroy_macro_values(void *)>
+
+A callback for parrot_chash_destroy_values() to free all macro-allocated
memory.
+
+=cut
+
+*/
+
+static void
+imcc_destroy_macro_values(void *value)
+{
+ macro_t *m = (macro_t *)value;
+ mem_sys_free(m->expansion);
+ mem_sys_free(m);
+}
+
+
+/*
+
=item C<void imcc_destroy>
TODO: Needs to be documented!!!
@@ -1484,7 +1507,7 @@
Hash * const macros = IMCC_INFO(interp)->macros;
if (macros)
- parrot_chash_destroy(interp, macros);
+ parrot_chash_destroy_values(interp, macros, imcc_destroy_macro_values);
if (IMCC_INFO(interp)->globals)
mem_sys_free(IMCC_INFO(interp)->globals);
Modified: trunk/compilers/imcc/symreg.c
==============================================================================
--- trunk/compilers/imcc/symreg.c (original)
+++ trunk/compilers/imcc/symreg.c Fri Nov 28 22:17:45 2008
@@ -858,7 +858,7 @@
const char * const sub_name = (uniq == U_add_uniq_sub)
/* remember to free this name; add_ns malloc()s it */
? (aux_name= add_ns(interp, name))
- : name;
+ : (char *)name;
r = _get_sym(hsh, sub_name);
