use FLEX/BISON FILES_PREFIX

qgis · Aug 11, 2019 · 799aafb · 799aafb
1 parent 03c0d69
commit 799aafb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -608,8 +608,10 @@ IF (QT_MOBILITY_LOCATION_FOUND OR Qt5Positioning_FOUND)
   )
 ENDIF (QT_MOBILITY_LOCATION_FOUND OR Qt5Positioning_FOUND)
 
-ADD_FLEX_FILES(QGIS_CORE_SRCS qgsexpressionlexer.ll qgssqlstatementlexer.ll)
-ADD_BISON_FILES(QGIS_CORE_SRCS qgsexpressionparser.yy qgssqlstatementparser.yy)
+ADD_FLEX_FILES_PREFIX(QGIS_CORE_SRCS exp_ qgsexpressionlexer.ll)
+ADD_FLEX_FILES_PREFIX(QGIS_CORE_SRCS sqlstatement_ qgssqlstatementlexer.ll)
+ADD_BISON_FILES_PREFIX(QGIS_CORE_SRCS exp_ qgsexpressionparser.yy)
+ADD_BISON_FILES_PREFIX(QGIS_CORE_SRCS sqlstatement_ qgssqlstatementparser.yy)
 
 IF(NOT MSVC)
   SET_SOURCE_FILES_PROPERTIES(qgsexpressionparser.cpp qgssqlstatementparser.cpp PROPERTIES COMPILE_FLAGS -w)
@@ -1020,7 +1022,7 @@ SET(QGIS_CORE_HDRS
   qgstilecache.h
   qgstracer.h
   qgstranslationcontext.h
-  qobjectuniqueptr.h 
+  qobjectuniqueptr.h
 
   qgsvectordataprovider.h
   qgsvectorlayercache.h

diff --git a/src/core/qgsexpressionparser.yy b/src/core/qgsexpressionparser.yy
@@ -90,8 +90,6 @@ void addParserLocation(YYLTYPE* yyloc, QgsExpressionNode *node)
 %lex-param {void * scanner}
 %parse-param {expression_parser_context* parser_ctx}
 
-%define api.prefix {exp_}
-
 %union
 {
   QgsExpressionNode* node;

diff --git a/src/core/qgssqlstatementparser.yy b/src/core/qgssqlstatementparser.yy
@@ -87,8 +87,6 @@ struct sqlstatement_parser_context
 %lex-param {void * scanner}
 %parse-param {sqlstatement_parser_context* parser_ctx}
 
-%define api.prefix {sqlstatement_}
-
 %union
 {
   QgsSQLStatement::Node* node;
@@ -376,7 +374,7 @@ selected_column:
             delete $1;
             QgsSQLStatement::NodeList* nodeList = new QgsSQLStatement::NodeList();
             nodeList->append( new QgsSQLStatement::NodeColumnRef("*", true) );
-            $$ = new QgsSQLStatement::NodeSelectedColumn( 
+            $$ = new QgsSQLStatement::NodeSelectedColumn(
                     new QgsSQLStatement::NodeFunction( "COUNT", nodeList) );
         }
 
@@ -393,7 +391,7 @@ selected_column:
             delete $1;
             QgsSQLStatement::NodeList* nodeList = new QgsSQLStatement::NodeList();
             nodeList->append( new QgsSQLStatement::NodeColumnRef("*", true) );
-            $$ = new QgsSQLStatement::NodeSelectedColumn( 
+            $$ = new QgsSQLStatement::NodeSelectedColumn(
                     new QgsSQLStatement::NodeFunction( "COUNT", nodeList) );
             $$->setAlias(*$5);
             delete $5;
@@ -414,7 +412,7 @@ selected_column:
             QgsSQLStatement::NodeList* nodeList = new QgsSQLStatement::NodeList();
             $4->setDistinct();
             nodeList->append( $4 );
-            $$ = new QgsSQLStatement::NodeSelectedColumn( 
+            $$ = new QgsSQLStatement::NodeSelectedColumn(
                     new QgsSQLStatement::NodeFunction( "COUNT", nodeList) );
         }
 
@@ -434,7 +432,7 @@ selected_column:
             QgsSQLStatement::NodeList* nodeList = new QgsSQLStatement::NodeList();
             $4->setDistinct();
             nodeList->append( $4 );
-            $$ = new QgsSQLStatement::NodeSelectedColumn( 
+            $$ = new QgsSQLStatement::NodeSelectedColumn(
                     new QgsSQLStatement::NodeFunction( "COUNT", nodeList) );
             $$->setAlias(*$6);
             delete $6;