Update of /cvsroot/monetdb/sql/src/server
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29475/src/server
Modified Files:
sql_parser.mx sql_symbol.mx
Log Message:
replace "lng ival" by "int i_val" & "lng l_val" also in the parser;
this should (hopefully) solve the reamining down-cast errors with the Microsoft
compiler
U sql_symbol.mx
Index: sql_symbol.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_symbol.mx,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- sql_symbol.mx 6 Sep 2008 20:02:49 -0000 1.34
+++ sql_symbol.mx 7 Sep 2008 10:00:32 -0000 1.35
@@ -60,7 +60,7 @@
extern dlist *dlist_append_string(sql_allocator *sa, dlist *l, char *data);
extern dlist *dlist_append_list(sql_allocator *sa, dlist *l, dlist *data);
-extern dlist *dlist_append_int(sql_allocator *sa, dlist *l, lng data);
+extern dlist *dlist_append_int(sql_allocator *sa, dlist *l, int data);
extern dlist *dlist_append_lng(sql_allocator *sa, dlist *l, lng data);
extern dlist *dlist_append_symbol(sql_allocator *sa, dlist *l, struct symbol
*data);
extern dlist *dlist_append_type(sql_allocator *sa, dlist *l, struct
sql_subtype *data);
@@ -94,7 +94,7 @@
extern symbol *symbol_create(sql_allocator *sa, int token, char *data);
extern symbol *symbol_create_list(sql_allocator *sa, int token, dlist *data);
-extern symbol *symbol_create_int(sql_allocator *sa, int token, lng data);
+extern symbol *symbol_create_int(sql_allocator *sa, int token, int data);
extern symbol *symbol_create_lng(sql_allocator *sa, int token, lng data);
extern symbol *symbol_create_symbol(sql_allocator *sa, int token, symbol
*data);
@@ -151,12 +151,10 @@
}
symbol *
-symbol_create_int(sql_allocator *sa, int token, lng ldata)
+symbol_create_int(sql_allocator *sa, int token, int data)
{
symbol *s = SA_NEW(sa, symbol);
- int data = (int) ldata;
- assert((lng) GDK_int_min <= ldata && ldata <= (lng) GDK_int_max);
if (s) {
symbol_init(s, token, type_int);
s->data.i_val = data;
@@ -327,13 +325,10 @@
}
dlist *
-dlist_append_int(sql_allocator *sa, dlist *l, lng ldata)
+dlist_append_int(sql_allocator *sa, dlist *l, int data)
{
- dnode *n;
- int data = (int) ldata;
+ dnode *n = dnode_create_int(sa, data);
- assert((lng) GDK_int_min <= ldata && ldata <= (lng) GDK_int_max);
- n = dnode_create_int(sa, data);
if (!n)
return NULL;
return dlist_append_default(l, n);
U sql_parser.mx
Index: sql_parser.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/server/sql_parser.mx,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -d -r1.288 -r1.289
--- sql_parser.mx 6 Sep 2008 20:02:45 -0000 1.288
+++ sql_parser.mx 7 Sep 2008 10:00:32 -0000 1.289
@@ -248,7 +248,8 @@
/* reentrant parser */
%pure_parser
%union {
- lng ival,operation,bval;
+ int i_val;
+ lng l_val,operation,bval;
double fval;
char * sval;
symbol* sym;
@@ -538,7 +539,7 @@
XML_default_namespace_declaration_item
XML_value_expression_list
-%type <ival>
+%type <i_val>
any_all_some
opt_port
drop_action
@@ -568,11 +569,6 @@
transaction_mode
transaction_mode_list
_transaction_mode_list
- opt_start
- opt_increment
- opt_min
- opt_max
- opt_cache
opt_cycle
opt_ref_action
ref_on_delete
@@ -585,6 +581,13 @@
XML_content_option
opt_XML_returning_clause
+%type <l_val>
+ opt_start
+ opt_increment
+ opt_min
+ opt_max
+ opt_cache
+
%type <bval>
opt_brackets
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
