Update of /cvsroot/monetdb/pathfinder/compiler
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23023/compiler
Modified Files:
Tag: PF_ROX
compile.c main.c
Log Message:
propagated changes of Wednesday Jan 30 2008 - Saturday Feb 09 2008
from the development trunk to the PF_ROX branch
Index: compile.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/compile.c,v
retrieving revision 1.132.2.1
retrieving revision 1.132.2.2
diff -u -d -r1.132.2.1 -r1.132.2.2
--- compile.c 30 Jan 2008 12:35:06 -0000 1.132.2.1
+++ compile.c 9 Feb 2008 08:40:03 -0000 1.132.2.2
@@ -152,16 +152,14 @@
"}IM__{_[J]OKVCG"
"}IMTS{_[J]OKVCGCG"
"}IMTS{_[J]OKVCG"
- "}IMTS{_[J]OKVCGCGP",
- /*"}IMTS{_[J]OKVCGE[]CGP",*/
+ "}IMTS{_[J]OKVCGE[]CGP",
.opt_sql = "OIKDCG_VGO_[J]OKVCG"
"}IM__{_[J]OKVCG"
"}IM__{_[J]OKVCGCG"
"}IM__{_[J]OKVCG"
"}IMTS{_[J]OKVCGUCG"
"}IMTS{_[J]OKVCGU"
- "}IMTS{_[J]OKVCGUCGP"
- /*"}IMTS{_[J]OKVCGUE[]CGP"*/
+ "}IMTS{_[J]OKVCGUE[]CGP"
"}IQ[J]}IQ[J]IOKVCGQUCGP",
.format = NULL,
@@ -329,8 +327,6 @@
/* setup sementation fault signal handler */
signal (SIGSEGV, segfault_handler);
#endif
- PFerrbuf = malloc(OOPS_SIZE);
- PFerrbuf[0] = 0;
/*******************************************/
/* Split Point: Logical Algebra XML Import */
/*******************************************/
@@ -343,6 +339,12 @@
XML2LALGContext *ctx = PFxml2la_xml2lalgContext();
PFla_op_t *rootOp;
+ /* Initialize data structures in the Namespace department */
+ PFns_init ();
+
+ /* Initialize data structures in the QName department */
+ PFqname_init ();
+
if (status->import_xml_filename) {
/**
* If the input is explicitely specified with an filename,
@@ -429,6 +431,9 @@
STOP_POINT(3);
+ /* Initialize data structures in the Namespace department */
+ PFns_init ();
+
/* Initialize data structures in the QName department */
PFqname_init ();
@@ -806,7 +811,9 @@
if (status->print_dot)
PFpa_dot (pfout, paroot);
if (status->print_xml)
- PFpa_xml (pfout, paroot);
+ PFinfo (OOPS_WARNING,
+ "No xml representation for physical algebra tree."
+ " Sorry.");
}
else
PFinfo (OOPS_NOTICE,
@@ -878,6 +885,7 @@
/* algebra MIL/MAL generation could/should also use it.. */
proot = PFheuristic_index (proot);
}
+ PFns_init ();
PFqname_init ();
PFns_resolve (proot);
PFextract_options (proot);
Index: main.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/compiler/main.c,v
retrieving revision 1.97
retrieving revision 1.97.4.1
diff -u -d -r1.97 -r1.97.4.1
--- main.c 11 Jan 2008 10:46:56 -0000 1.97
+++ main.c 9 Feb 2008 08:40:08 -0000 1.97.4.1
@@ -627,6 +627,9 @@
/* URL of query file (if present) */
char *url = "-";
+ PFerrbuf = malloc(OOPS_SIZE);
+ PFerrbuf[0] = 0;
+
PFmem_init ();
/*
* Determine basename(argv[0]) and dirname(argv[0]) on *copies*
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
