Re: [Monetdb-developers] [Monetdb-pf-checkins] pathfinder/compiler/semantics typecheck.brg, , 1.73, 1.74
Hi Wouter, thank you very much for porting your StandOff extensions to the Algebra back-end! I took this as a trigger to disable to automatic fall-back to the (deprecated) "milprint_summer" back-end in case the StandOff extensions are enabled (cf., http://monetdb.cwi.nl/Development/Releases/Version4.24/index.html#XQuery). The result: ======== .../pathfinder $ Mtest.py -rq --no-algebra tests/StandOff ................ ======== .../pathfinder $ Mtest.py -rq --algebra tests/StandOff .... * (test2.test.out.FILTERED) significantly .. * (lltest.test.out.FILTERED) significantly ........ * (scenes.test.out.FILTERED) significantly .. * (artists.test.out.FILTERED) significantly !ERROR: Testing FAILED SIGNIFICANTLY ! 4 out of 16 tests produced SIGNIFICANTLY different output ======== .../pathfinder $ Mtest.py -rq tests/StandOff .... * (test2.test.out.FILTERED) significantly .. * (lltest.test.out.FILTERED) significantly ........ * (scenes.test.out.FILTERED) significantly .. * (artists.test.out.FILTERED) significantly !ERROR: Testing FAILED SIGNIFICANTLY ! 4 out of 16 tests produced SIGNIFICANTLY different output ======== ;-) Stefan On Sun, Dec 21, 2008 at 07:33:36PM +0000, Wouter Alink wrote:
Update of /cvsroot/monetdb/pathfinder/compiler/semantics In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv21308/semantics
Modified Files: typecheck.brg Log Message: Step 3 of: - enabling the standoff axes with the algebra backend. - removing the "reject-narrow" and "reject-wide" axes steps
In this commit: - changes to the compiler.
U typecheck.brg Index: typecheck.brg =================================================================== RCS file: /cvsroot/monetdb/pathfinder/compiler/semantics/typecheck.brg,v retrieving revision 1.73 retrieving revision 1.74 diff -u -d -r1.73 -r1.74 --- typecheck.brg 14 Nov 2008 14:39:48 -0000 1.73 +++ typecheck.brg 21 Dec 2008 19:33:33 -0000 1.74 @@ -138,10 +138,8 @@ %term preceding_sibling = 51 /**< all preceding nodes with same parent */ %term self = 52 /**< the context node itself */ /* [STANDOFF] */ -%term select_narrow = 100 /**< regions contained in a context-node */ -%term select_wide = 101 /**< regions overlapping a context-node */ -%term reject_narrow = 102 /**< all regions except the contained regions */ -%term reject_wide = 103 /**< all regions except the overlapping regions */ +%term select_narrow = 53 /**< regions contained in a context-node */ +%term select_wide = 54 /**< regions overlapping a context-node */ /* [/STANDOFF] */
/* Constructor Nodes */ @@ -228,10 +226,8 @@ LocationStep: preceding_sibling (SequenceType) = 36 (10); LocationStep: self (SequenceType) = 37 (10); /* [STANDOFF] */ -LocationStep: select_narrow (SequenceType) = 100 (10); -LocationStep: select_wide (SequenceType) = 101 (10); -LocationStep: reject_narrow (SequenceType) = 102 (10); -LocationStep: reject_wide (SequenceType) = 103 (10); +LocationStep: select_narrow (SequenceType) = 38 (10); +LocationStep: select_wide (SequenceType) = 39 (10); /* [/STANDOFF] */
LocationSteps: locsteps (LocationStep, LocationSteps) = 40 (10); @@ -884,23 +880,13 @@ TY(p) = TY(L(p)); break; /* [STANDOFF] */ - case 100: + case 38: /* LocationStep: select_narrow (SequenceType) */ TY(p) = PFty_star (TY(L(p))); break;
/* LocationStep: select_wide (SequenceType) */ - case 101: - TY(p) = PFty_star (TY(L(p))); - break; - - /* LocationStep: reject_narrow (SequenceType) */ - case 102: - TY(p) = PFty_star (TY(L(p))); - break; - - /* LocationStep: reject_wide (SequenceType) */ - case 103: + case 39: TY(p) = PFty_star (TY(L(p))); break; /* [/STANDOFF] */
------------------------------------------------------------------------------ _______________________________________________ Monetdb-pf-checkins mailing list Monetdb-pf-checkins@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
-- | Dr. Stefan Manegold | mailto:Stefan.Manegold@cwi.nl | | 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 |
participants (1)
-
Stefan Manegold