diff options
| author | Constantin <jucovschi@gmail.com> | 2010-07-30 12:16:46 +0200 |
|---|---|---|
| committer | www-data <www-data@ubuntu.localdomain> | 2010-08-11 08:59:21 +0200 |
| commit | d8ad4cdd2ae4e27feee34f78ab6ad22162c691c1 (patch) | |
| tree | 5e8871458b541760fac7e67e63d45c96713901dd | |
| parent | 9389da74c997a7bd0b589d4294b2cef85880974c (diff) | |
| download | rasdaman-upstream-d8ad4cdd2ae4e27feee34f78ab6ad22162c691c1.tar.gz rasdaman-upstream-d8ad4cdd2ae4e27feee34f78ab6ad22162c691c1.tar.xz rasdaman-upstream-d8ad4cdd2ae4e27feee34f78ab6ad22162c691c1.zip | |
extended sdom operation to also work on any general expressions. Needed to support GDAL driver.
| -rw-r--r-- | qlparser/oql.yy | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/qlparser/oql.yy b/qlparser/oql.yy index c2c2130..7a5df11 100644 --- a/qlparser/oql.yy +++ b/qlparser/oql.yy @@ -794,16 +794,14 @@ mintervalExp: LEPAR spatialOpList REPAR FREESTACK($1) FREESTACK($3) } - | SDOM LRPAR collectionIterator RRPAR + | SDOM LRPAR generalExp RRPAR { - QtVariable* var = new QtVariable( $3.value ); - var->setParseInfo( *($3.info) ); - $$ = new QtSDom( var ); + $$ = new QtSDom( $3 ); $$->setParseInfo( *($1.info) ); + parseQueryTree->removeDynamicObject( $3 ); parseQueryTree->addDynamicObject( $$ ); FREESTACK($1) FREESTACK($2) - FREESTACK($3) FREESTACK($4) }; |