MonetDB: geo - fixed parser to detect types like pointzmf

[Foteini Alvanaki]

Changeset: 16916a2bfa22 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=16916a2bfa22
Modified Files:
        sql/server/sql_parser.y
Branch: geo
Log Message:

fixed parser to detect types like pointzmf


diffs (57 lines):

diff --git a/sql/server/sql_parser.y b/sql/server/sql_parser.y
--- a/sql/server/sql_parser.y
+++ b/sql/server/sql_parser.y
@@ -4680,13 +4680,12 @@ data_type:
                        _DELETE(msg);
                        $$.type = NULL;
                        YYABORT;
-               } else {
-                       if(geoSubType == 0) {
+               } else if(geoSubType == 0) {
                                $$.type = NULL;
                                YYABORT;
-                       }       
+               } else
                        sql_init_subtype(&$$, t, geoSubType, srid);
-               }
+               
        }
 | GEOMETRY '(' subgeometry_type ',' nonzero ')' {
                int geoSubType = $3; 
@@ -4699,13 +4698,11 @@ data_type:
                        _DELETE(msg);
                        $$.type = NULL;
                        YYABORT;
-               } else {
-                       if(geoSubType == 0) {
+               } else if(geoSubType == 0) {
                                $$.type = NULL;
                                YYABORT;
-                       }       
+               } else  
                        sql_init_subtype(&$$, t, geoSubType, srid);
-               }
        }
  ;
 
@@ -5481,13 +5478,15 @@ int find_subgeometry_type(char* geoSubTy
                        
                        memcpy(typeSubStr, geoSubType, strLength-1);
                        typeSubStr[strLength-1]='\0';
-                       subType = find_subgeometry_type(typeSubStr);
+                       if(flag == 'z' || flag == 'm' ) {
+                               subType = find_subgeometry_type(typeSubStr);
                        
                        
-                       if(flag == 'z')
-                               SET_Z(subType);
-                       if(flag == 'm')
-                               SET_M(subType);
+                               if(flag == 'z')
+                                       SET_Z(subType);
+                               if(flag == 'm')
+                                       SET_M(subType);
+                       }
                }
 
        }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list