[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdelibs/solid
From: Kevin Ottens <ervin () kde ! org>
Date: 2009-02-27 15:03:19
Message-ID: 1235746999.633431.26322.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 932881 by ervin:
Slightly rework the parser to be more careful about what we consider as
the result predicate (if the former result is used in a compound
predicate it's not the result anymore). It avoid the double freeing.
And since we're at it also plug some memory leaks in there by forcing
the lexer to cleanup its memory when the parsing is over and by
providing %destructor sections to the bison parser to clean memory
correctly on parse errors.
BUGS: 184751
M +72 -16 solid/predicate_lexer.c
M +46 -24 solid/predicate_parser.c
M +1 -1 solid/predicate_parser.h
M +7 -0 solid/predicate_parser.y
M +17 -1 solid/predicateparse.cpp
M +1 -0 solid/predicateparse.h
M +3 -0 tests/solidhwtest.cpp
--- trunk/KDE/kdelibs/solid/solid/predicate_lexer.c #932880:932881
@@ -6,10 +6,29 @@
/* A lexical scanner generated by flex */
+#define yy_create_buffer Solid_create_buffer
+#define yy_delete_buffer Solid_delete_buffer
+#define yy_flex_debug Solid_flex_debug
+#define yy_init_buffer Solid_init_buffer
+#define yy_flush_buffer Solid_flush_buffer
+#define yy_load_buffer_state Solid_load_buffer_state
+#define yy_switch_to_buffer Solid_switch_to_buffer
+#define yyin Solidin
+#define yyleng Solidleng
+#define yylex Solidlex
+#define yylineno Solidlineno
+#define yyout Solidout
+#define yyrestart Solidrestart
+#define yytext Solidtext
+#define yywrap Solidwrap
+#define yyalloc Solidalloc
+#define yyrealloc Solidrealloc
+#define yyfree Solidfree
+
#define FLEX_SCANNER
#define YY_FLEX_MAJOR_VERSION 2
#define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 33
+#define YY_FLEX_SUBMINOR_VERSION 35
#if YY_FLEX_SUBMINOR_VERSION > 0
#define FLEX_BETA
#endif
@@ -31,7 +50,7 @@
/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-#if __STDC_VERSION__ >= 199901L
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
* if you want the limit (max/min) macros for int types.
@@ -94,11 +113,12 @@
#else /* ! __cplusplus */
-#if __STDC__
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
#define YY_USE_CONST
-#endif /* __STDC__ */
+#endif /* defined (__STDC__) */
#endif /* ! __cplusplus */
#ifdef YY_USE_CONST
@@ -178,14 +198,9 @@
#define unput(c) yyunput( c, (yytext_ptr) )
-/* 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).
- */
-
#ifndef YY_TYPEDEF_YY_SIZE_T
#define YY_TYPEDEF_YY_SIZE_T
-typedef unsigned int yy_size_t;
+typedef size_t yy_size_t;
#endif
#ifndef YY_STRUCT_YY_BUFFER_STATE
@@ -490,7 +505,7 @@
char *PredicateParse_putSymbol( char *_name );
char *PredicateParse_putString( char *_str );
-#line 494 "predicate_lexer.c"
+#line 509 "predicate_lexer.c"
#define INITIAL 0
@@ -508,6 +523,35 @@
static int yy_init_globals (void );
+/* Accessor methods to globals.
+ These are made visible to non-reentrant scanners for convenience. */
+
+int Solidlex_destroy (void );
+
+int Solidget_debug (void );
+
+void Solidset_debug (int debug_flag );
+
+YY_EXTRA_TYPE Solidget_extra (void );
+
+void Solidset_extra (YY_EXTRA_TYPE user_defined );
+
+FILE *Solidget_in (void );
+
+void Solidset_in (FILE * in_str );
+
+FILE *Solidget_out (void );
+
+void Solidset_out (FILE * out_str );
+
+int Solidget_leng (void );
+
+char *Solidget_text (void );
+
+int Solidget_lineno (void );
+
+void Solidset_lineno (int line_number );
+
/* Macros after this point can all be overridden by user definitions in
* section 1.
*/
@@ -550,7 +594,7 @@
/* This used to be an fputs(), but since the string might contain NUL's,
* we now use fwrite().
*/
-#define ECHO (void) fwrite( Solidtext, Solidleng, 1, Solidout )
+#define ECHO fwrite( Solidtext, Solidleng, 1, Solidout )
#endif
/* Gets input and stuffs it into "buf". number of characters read, or YY_NULL,
@@ -561,7 +605,7 @@
if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
{ \
int c = '*'; \
- size_t n; \
+ int n; \
for ( n = 0; n < max_size && \
(c = getc( Solidin )) != EOF && c != '\n'; ++n ) \
buf[n] = (char) c; \
@@ -646,7 +690,7 @@
#line 16 "predicate_lexer.l"
-#line 650 "predicate_lexer.c"
+#line 694 "predicate_lexer.c"
if ( !(yy_init) )
{
@@ -811,7 +855,7 @@
#line 43 "predicate_lexer.l"
ECHO;
YY_BREAK
-#line 815 "predicate_lexer.c"
+#line 859 "predicate_lexer.c"
case YY_STATE_EOF(INITIAL):
yyterminate();
@@ -1066,6 +1110,14 @@
else
ret_val = EOB_ACT_CONTINUE_SCAN;
+ if ((yy_size_t) ((yy_n_chars) + number_to_move) > \
YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { + /* Extend the array by 50%, plus the \
number we really need. */ + yy_size_t new_size = (yy_n_chars) + number_to_move + \
((yy_n_chars) >> 1); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) \
Solidrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); + if ( ! \
YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) + YY_FATAL_ERROR( "out of dynamic memory in \
yy_get_next_buffer()" ); + }
+
(yy_n_chars) += number_to_move;
YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
@@ -1481,7 +1533,9 @@
(yy_buffer_stack) = (struct yy_buffer_state**)Solidalloc
(num_to_alloc * sizeof(struct yy_buffer_state*)
);
-
+ if ( ! (yy_buffer_stack) )
+ YY_FATAL_ERROR( "out of dynamic memory in Solidensure_buffer_stack()" );
+
memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
(yy_buffer_stack_max) = num_to_alloc;
@@ -1499,6 +1553,8 @@
((yy_buffer_stack),
num_to_alloc * sizeof(struct yy_buffer_state*)
);
+ if ( ! (yy_buffer_stack) )
+ YY_FATAL_ERROR( "out of dynamic memory in Solidensure_buffer_stack()" );
/* zero only the new slots.*/
memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct \
yy_buffer_state*));
--- trunk/KDE/kdelibs/solid/solid/predicate_parser.c #932880:932881
@@ -110,6 +110,7 @@
void Soliderror(const char *s);
int Solidlex();
+int Solidlex_destroy();
void PredicateParse_initLexer( const char *s );
void PredicateParse_mainParse( const char *_code );
@@ -135,7 +136,7 @@
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-#line 14 "predicate_parser.y"
+#line 15 "predicate_parser.y"
{
char valb;
int vali;
@@ -144,7 +145,7 @@
void *ptr;
}
/* Line 187 of yacc.c. */
-#line 148 "predicate_parser.tab.c"
+#line 149 "predicate_parser.tab.c"
YYSTYPE;
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
@@ -157,7 +158,7 @@
/* Line 216 of yacc.c. */
-#line 161 "predicate_parser.tab.c"
+#line 162 "predicate_parser.tab.c"
#ifdef short
# undef short
@@ -445,8 +446,8 @@
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint8 yyrline[] =
{
- 0, 45, 45, 46, 47, 49, 50, 51, 53, 55,
- 57, 58, 59, 60, 61, 63, 65, 66, 67
+ 0, 51, 51, 52, 53, 55, 56, 57, 59, 61,
+ 63, 64, 65, 66, 67, 69, 71, 72, 73
};
#endif
@@ -1055,6 +1056,26 @@
switch (yytype)
{
+ case 20: /* "predicate" */
+#line 44 "predicate_parser.y"
+ { PredicateParse_destroy( (yyvaluep->ptr) ); };
+#line 1063 "predicate_parser.tab.c"
+ break;
+ case 21: /* "predicate_atom" */
+#line 45 "predicate_parser.y"
+ { PredicateParse_destroy( (yyvaluep->ptr) ); };
+#line 1068 "predicate_parser.tab.c"
+ break;
+ case 22: /* "predicate_or" */
+#line 46 "predicate_parser.y"
+ { PredicateParse_destroy( (yyvaluep->ptr) ); };
+#line 1073 "predicate_parser.tab.c"
+ break;
+ case 23: /* "predicate_and" */
+#line 47 "predicate_parser.y"
+ { PredicateParse_destroy( (yyvaluep->ptr) ); };
+#line 1078 "predicate_parser.tab.c"
+ break;
default:
break;
@@ -1362,93 +1383,93 @@
switch (yyn)
{
case 2:
-#line 45 "predicate_parser.y"
+#line 51 "predicate_parser.y"
{ PredicateParse_setResult( (yyvsp[(1) - (1)].ptr) ); (yyval.ptr) = (yyvsp[(1) - \
(1)].ptr); ;} break;
case 3:
-#line 46 "predicate_parser.y"
+#line 52 "predicate_parser.y"
{ PredicateParse_setResult( (yyvsp[(2) - (3)].ptr) ); (yyval.ptr) = (yyvsp[(2) - \
(3)].ptr); ;} break;
case 4:
-#line 47 "predicate_parser.y"
+#line 53 "predicate_parser.y"
{ PredicateParse_setResult( (yyvsp[(2) - (3)].ptr) ); (yyval.ptr) = (yyvsp[(2) - \
(3)].ptr); ;} break;
case 5:
-#line 49 "predicate_parser.y"
+#line 55 "predicate_parser.y"
{ (yyval.ptr) = PredicateParse_newAtom( (yyvsp[(1) - (5)].name), (yyvsp[(3) - \
(5)].name), (yyvsp[(5) - (5)].ptr) ); ;} break;
case 6:
-#line 50 "predicate_parser.y"
+#line 56 "predicate_parser.y"
{ (yyval.ptr) = PredicateParse_newMaskAtom( (yyvsp[(1) - (5)].name), (yyvsp[(3) \
- (5)].name), (yyvsp[(5) - (5)].ptr) ); ;} break;
case 7:
-#line 51 "predicate_parser.y"
+#line 57 "predicate_parser.y"
{ (yyval.ptr) = PredicateParse_newIsAtom( (yyvsp[(2) - (2)].name) ); ;}
break;
case 8:
-#line 53 "predicate_parser.y"
+#line 59 "predicate_parser.y"
{ (yyval.ptr) = PredicateParse_newOr( (yyvsp[(1) - (3)].ptr), (yyvsp[(3) - \
(3)].ptr) ); ;} break;
case 9:
-#line 55 "predicate_parser.y"
+#line 61 "predicate_parser.y"
{ (yyval.ptr) = PredicateParse_newAnd( (yyvsp[(1) - (3)].ptr), (yyvsp[(3) - \
(3)].ptr) ); ;} break;
case 10:
-#line 57 "predicate_parser.y"
+#line 63 "predicate_parser.y"
{ (yyval.ptr) = PredicateParse_newStringValue( (yyvsp[(1) - (1)].name) ); ;}
break;
case 11:
-#line 58 "predicate_parser.y"
+#line 64 "predicate_parser.y"
{ (yyval.ptr) = PredicateParse_newBoolValue( (yyvsp[(1) - (1)].valb) ); ;}
break;
case 12:
-#line 59 "predicate_parser.y"
+#line 65 "predicate_parser.y"
{ (yyval.ptr) = PredicateParse_newNumValue( (yyvsp[(1) - (1)].vali) ); ;}
break;
case 13:
-#line 60 "predicate_parser.y"
+#line 66 "predicate_parser.y"
{ (yyval.ptr) = PredicateParse_newDoubleValue( (yyvsp[(1) - (1)].vald) ); ;}
break;
case 14:
-#line 61 "predicate_parser.y"
+#line 67 "predicate_parser.y"
{ (yyval.ptr) = (yyvsp[(1) - (1)].ptr); ;}
break;
case 15:
-#line 63 "predicate_parser.y"
+#line 69 "predicate_parser.y"
{ (yyval.ptr) = (yyvsp[(1) - (3)].ptr); ;}
break;
case 16:
-#line 65 "predicate_parser.y"
+#line 71 "predicate_parser.y"
{ (yyval.ptr) = PredicateParse_newEmptyStringListValue(); ;}
break;
case 17:
-#line 66 "predicate_parser.y"
+#line 72 "predicate_parser.y"
{ (yyval.ptr) = PredicateParse_newStringListValue( (yyvsp[(1) - (1)].ptr) ); ;}
break;
case 18:
-#line 67 "predicate_parser.y"
+#line 73 "predicate_parser.y"
{ (yyval.ptr) = PredicateParse_appendStringListValue( (yyvsp[(1) - (3)].name), \
(yyvsp[(3) - (3)].ptr) ); ;} break;
/* Line 1267 of yacc.c. */
-#line 1452 "predicate_parser.tab.c"
+#line 1473 "predicate_parser.tab.c"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -1662,7 +1683,7 @@
}
-#line 69 "predicate_parser.y"
+#line 75 "predicate_parser.y"
void Soliderror ( const char *s ) /* Called by Solidparse on error */
@@ -1675,6 +1696,7 @@
{
PredicateParse_initLexer( _code );
Solidparse();
+ Solidlex_destroy();
}
--- trunk/KDE/kdelibs/solid/solid/predicate_parser.h #932880:932881
@@ -68,7 +68,7 @@
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-#line 14 "predicate_parser.y"
+#line 15 "predicate_parser.y"
{
char valb;
int vali;
--- trunk/KDE/kdelibs/solid/solid/predicate_parser.y #932880:932881
@@ -5,6 +5,7 @@
void Soliderror(const char *s);
int Solidlex();
+int Solidlex_destroy();
void PredicateParse_initLexer( const char *s );
void PredicateParse_mainParse( const char *_code );
@@ -40,6 +41,11 @@
%type <ptr> string_list_rec
%type <ptr> value
+%destructor { PredicateParse_destroy( $$ ); } predicate
+%destructor { PredicateParse_destroy( $$ ); } predicate_atom
+%destructor { PredicateParse_destroy( $$ ); } predicate_or
+%destructor { PredicateParse_destroy( $$ ); } predicate_and
+
%%
predicate: predicate_atom { PredicateParse_setResult( $<ptr>1 ); $$ = $<ptr>1; }
@@ -78,5 +84,6 @@
{
PredicateParse_initLexer( _code );
Solidparse();
+ Solidlex_destroy();
}
--- trunk/KDE/kdelibs/solid/solid/predicateparse.cpp #932880:932881
@@ -64,6 +64,14 @@
}
}
+void PredicateParse_destroy(void *pred)
+{
+ Solid::Predicate *p = (Solid::Predicate *) pred;
+ if (p!=s_result) {
+ delete p;
+ }
+}
+
void *PredicateParse_newAtom(char *interface, char *property, void *value)
{
QString iface(interface);
@@ -114,8 +122,12 @@
Solid::Predicate *p1 = (Solid::Predicate *)pred1;
Solid::Predicate *p2 = (Solid::Predicate *)pred2;
- *result = *p1 & *p2;
+ if (p1==s_result || p2==s_result) {
+ s_result = 0;
+ }
+ *result = *p1 & *p2;
+
delete p1;
delete p2;
@@ -130,6 +142,10 @@
Solid::Predicate *p1 = (Solid::Predicate *)pred1;
Solid::Predicate *p2 = (Solid::Predicate *)pred2;
+ if (p1==s_result || p2==s_result) {
+ s_result = 0;
+ }
+
*result = *p1 | *p2;
delete p1;
--- trunk/KDE/kdelibs/solid/solid/predicateparse.h #932880:932881
@@ -22,6 +22,7 @@
void PredicateParse_setResult(void *result);
void PredicateParse_errorDetected();
+void PredicateParse_destroy(void *pred);
void *PredicateParse_newAtom(char *interface, char *property, void *value);
void *PredicateParse_newMaskAtom(char *interface, char *property, void *value);
--- trunk/KDE/kdelibs/solid/tests/solidhwtest.cpp #932880:932881
@@ -359,6 +359,9 @@
// Since str_pred is canonicalized, fromString().toString() should be invariant
QCOMPARE(Solid::Predicate::fromString(str_pred).toString(), str_pred);
+ // Invalid predicate
+ str_pred = "[StorageVolume.ignored == false AND OpticalDisc.isBlank == true AND \
OpticalDisc.discType & 'CdRecordable|CdRewritable']"; + \
QVERIFY(!Solid::Predicate::fromString(str_pred).isValid());
QString parentUdi = "/org/kde/solid/fakehw/storage_model_solid_reader";
Solid::DeviceInterface::Type ifaceType = Solid::DeviceInterface::Unknown;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic