Simply deleting the else statement is *not* the correct solution, that is why I never checked in that. But, since this is in the pftijah code and since Riham does not use pftijah for PFROX it was an easy quick solution for her so whe could compile and continue with her work.
The correct solution is to fix the brackets of the if-else statements. On Sun, May 25, 2008 at 12:58 PM, Stefan Manegold <[EMAIL PROTECTED]> wrote: > Dear all, > > simply removing the "else" is IMHO not the correct fix. > After prpopagating all changes from the development trunk to the PF_ROX > branch, the problem persisted. > I just checked in a fix, that basically re-applies some (local) changes in > milprint_summer.c from the development trunk to the PF_ROX branch --- > hopefully not messing up any changes intentionally made on the PF_ROX > branch. > > Some simple initial analysis --- simply undoing all changes from the > development trunk since the creation of the PF_ROX branch via > `cvs up -jCurrent_PF_ROX_sync -jPF_ROX_base` > triggers conflicts in 13 files: > ======== > compiler/algebra/opt/opt_algebra_cse.c > compiler/compile.c > compiler/debug/abssynprint.c > compiler/debug/coreprint.c > compiler/include/pathfinder.h > compiler/mil/milgen.brg > compiler/mil/milprint_summer.c > compiler/semantics/heuristic.c > compiler/sql/lalg2sql.brg > compiler/utils/string_utils.c > runtime/pathfinder.mx > runtime/pf_support.mx > src/sqlhelpers/serializer/pfserialize.pl > ======= > > While some of these might be due to conflicting but intended changes on the > PF_ROX branch, other might also be due to "lost" and/or failed propagations > from the development trunk to the PF_ROX branch. > > > Conclusions: > > 1) > We need to crefully check, whether all changes on the development trunk > since the creation of the PF_ROX branch have been properly propagated to the > latter. > > 2) > We should consider adding the PF_ROX branh tot he nightly yetsing --- at > least testing the compilation. > > > Stefan > > > On Wed, May 21, 2008 at 01:22:02PM +0300, Lefteris wrote: >> Yeap, just delete that else statement:) or you can merge the diff from >> the development branch. >> >> On Wed, May 21, 2008 at 1:18 PM, Riham Abdel Kader >> <[EMAIL PROTECTED]> wrote: >> > Hi all, >> > >> > I'm getting the following error while compiling PF-ROX: >> > >> > make[5]: Entering directory >> > `/local/kader/home/workspace_pathfinder/MonetDB_XQuery/pathfinder/compiler/mil' >> > /bin/sh ../../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. >> > -I. -I../.. -I. -I../include -I./../include >> > -I/local/kader/home/workspace_pathfinder/MonetDB_XQuery/include/MonetDB >> > -I/local/kader/home/workspace_pathfinder/MonetDB_XQuery/include/MonetDB/common >> > -I/local/kader/home/workspace_pathfinder/MonetDB_XQuery/include/MonetDB/gdk >> > -DLIBMIL -g -O2 -Wall -Wextra -std=c99 >> > -Werror-implicit-function-declaration -Werror -Wpointer-arith >> > -Wdeclaration-after-statement -Wundef -Wp,-D_FORTIFY_SOURCE=2 >> > -Wno-declaration-after-statement -c -o libmil_la-milprint_summer.lo >> > `test -f 'milprint_summer.c' || echo './'`milprint_summer.c >> > gcc -DHAVE_CONFIG_H -I. -I. -I../.. -I. -I../include -I./../include >> > -I/local/kader/home/workspace_pathfinder/MonetDB_XQuery/include/MonetDB >> > -I/local/kader/home/workspace_pathfinder/MonetDB_XQuery/include/MonetDB/common >> > -I/local/kader/home/workspace_pathfinder/MonetDB_XQuery/include/MonetDB/gdk >> > -DLIBMIL -g -O2 -Wall -Wextra -std=c99 >> > -Werror-implicit-function-declaration -Werror -Wpointer-arith >> > -Wdeclaration-after-statement -Wundef -Wp,-D_FORTIFY_SOURCE=2 >> > -Wno-declaration-after-statement -c milprint_summer.c -fPIC -DPIC -o >> > .libs/libmil_la-milprint_summer.o >> > milprint_summer.c: In function 'translateFunction': >> > milprint_summer.c:8518: error: expected expression before 'else' >> > make[5]: *** [libmil_la-milprint_summer.lo] Error 1 >> > make[5]: Leaving directory >> > `/local/kader/home/workspace_pathfinder/MonetDB_XQuery/pathfinder/compiler/mil' >> > make[4]: *** [install] Error 2 >> > make[4]: Leaving directory >> > `/local/kader/home/workspace_pathfinder/MonetDB_XQuery/pathfinder/compiler/mil' >> > make[3]: *** [install-recursive] Error 1 >> > make[3]: Leaving directory >> > `/local/kader/home/workspace_pathfinder/MonetDB_XQuery/pathfinder/compiler' >> > make[2]: *** [install] Error 2 >> > make[2]: Leaving directory >> > `/local/kader/home/workspace_pathfinder/MonetDB_XQuery/pathfinder/compiler' >> > make[1]: *** [install-recursive] Error 1 >> > make[1]: Leaving directory >> > `/local/kader/home/workspace_pathfinder/MonetDB_XQuery/pathfinder' >> > make: *** [install] Error 2 >> > >> > I checked out all needed modules yesterday night. >> > >> > Best regards, >> > Riham >> > >> > >> > -- >> > Address: Database Group, Dept of EEMCS, University of Twente, POBox 217, >> > 7500 AE Enschede, The Netherlands >> > Phone: +31 (0)53 489 4628 >> > Fax: +31 (0)53 489 2927 >> > Email: [EMAIL PROTECTED] >> > >> > >> > ------------------------------------------------------------------------- >> > 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-developers mailing list >> > [email protected] >> > https://lists.sourceforge.net/lists/listinfo/monetdb-developers >> > >> >> ------------------------------------------------------------------------- >> 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-developers mailing list >> [email protected] >> https://lists.sourceforge.net/lists/listinfo/monetdb-developers > > -- > | Dr. Stefan Manegold | mailto:[EMAIL PROTECTED] | > | CWI, P.O.Box 94079 | http://www.cwi.nl/~manegold/ | > | 1090 GB Amsterdam | Tel.: +31 (20) 592-4212 | > | The Netherlands | Fax : +31 (20) 592-4312 | > ------------------------------------------------------------------------- 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-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/monetdb-developers
