Alexandre Julliard : msi:
Change the prefix on bison-generated names to avoid the name-prefix
directive .
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Sep 12 07:30:06 CDT 2006
Module: wine
Branch: master
Commit: 2d1b6182aff44a1ba3a4cc4acb939e54b73975a7
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2d1b6182aff44a1ba3a4cc4acb939e54b73975a7
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Sep 11 21:53:04 2006 +0200
msi: Change the prefix on bison-generated names to avoid the name-prefix directive.
---
dlls/msi/cond.y | 11 +++++------
dlls/msi/sql.y | 11 +++++------
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/dlls/msi/cond.y b/dlls/msi/cond.y
index 26d0ecb..dd8252a 100644
--- a/dlls/msi/cond.y
+++ b/dlls/msi/cond.y
@@ -40,7 +40,7 @@ #include "action.h"
#define YYLEX_PARAM info
#define YYPARSE_PARAM info
-static int COND_error(const char *str);
+static int cond_error(const char *str);
WINE_DEFAULT_DEBUG_CHANNEL(msi);
@@ -59,7 +59,7 @@ struct cond_str {
static LPWSTR COND_GetString( struct cond_str *str );
static LPWSTR COND_GetLiteral( struct cond_str *str );
-static int COND_lex( void *COND_lval, COND_input *info);
+static int cond_lex( void *COND_lval, COND_input *info);
static const WCHAR szEmpty[] = { 0 };
static INT compare_int( INT a, INT operator, INT b );
@@ -102,7 +102,6 @@ static BOOL num_from_prop( LPCWSTR p, IN
%}
%pure-parser
-%name-prefix="COND_"
%union
{
@@ -668,7 +667,7 @@ static int COND_GetOne( struct cond_str
return rc;
}
-static int COND_lex( void *COND_lval, COND_input *cond )
+static int cond_lex( void *COND_lval, COND_input *cond )
{
int rc;
struct cond_str *str = COND_lval;
@@ -708,7 +707,7 @@ static LPWSTR COND_GetLiteral( struct co
return ret;
}
-static int COND_error(const char *str)
+static int cond_error(const char *str)
{
TRACE("%s\n", str );
return 0;
@@ -729,7 +728,7 @@ MSICONDITION MSI_EvaluateConditionW( MSI
cond.n = 0;
cond.result = MSICONDITION_ERROR;
- if ( !COND_parse( &cond ) )
+ if ( !cond_parse( &cond ) )
r = cond.result;
else
r = MSICONDITION_ERROR;
diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y
index 5d5a904..abffb2f 100644
--- a/dlls/msi/sql.y
+++ b/dlls/msi/sql.y
@@ -36,7 +36,7 @@ #include "wine/debug.h"
#define YYLEX_PARAM info
#define YYPARSE_PARAM info
-extern int SQL_error(const char *str);
+static int sql_error(const char *str);
WINE_DEFAULT_DEBUG_CHANNEL(msi);
@@ -51,7 +51,7 @@ typedef struct tag_SQL_input
static LPWSTR SQL_getstring( void *info, struct sql_str *str );
static INT SQL_getint( void *info );
-static int SQL_lex( void *SQL_lval, SQL_input *info );
+static int sql_lex( void *SQL_lval, SQL_input *info );
static void *parser_alloc( void *info, unsigned int sz );
static column_info *parser_alloc_column( void *info, LPCWSTR table, LPCWSTR column );
@@ -67,7 +67,6 @@ static struct expr * EXPR_wildcard( void
%}
%pure-parser
-%name-prefix="SQL_"
%union
{
@@ -687,7 +686,7 @@ static column_info *parser_alloc_column(
return col;
}
-int SQL_lex( void *SQL_lval, SQL_input *sql )
+static int sql_lex( void *SQL_lval, SQL_input *sql )
{
int token;
struct sql_str * str = SQL_lval;
@@ -753,7 +752,7 @@ INT SQL_getint( void *info )
return r;
}
-int SQL_error( const char *str )
+static int sql_error( const char *str )
{
return 0;
}
@@ -852,7 +851,7 @@ UINT MSI_ParseSQL( MSIDATABASE *db, LPCW
sql.view = phview;
sql.mem = mem;
- r = SQL_parse(&sql);
+ r = sql_parse(&sql);
TRACE("Parse returned %d\n", r);
if( r )
More information about the wine-cvs
mailing list