Merge pull request #3102 from richardkchapman/dictionary-warning

gh-3101 Give warning when DICTIONARY used as an identifier

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>

ecl/hql/hqlerrors.hpp

@@ -73,6 +73,7 @@
 #define WRN_FILENAMEIGNORED         1047
 #define WRN_EXPORT_IGNORED          1048
 #define WRN_RECORDMANYFIELDS        1049
+#define WRN_RESERVED_FUTURE         1050 /* Identifier likely to be reserved in future versions */
 //#define ECL_WARN_END          1100
 
 ///////////////////////////////////////////////////////////////////////////////

ecl/hql/hqllex.l

@@ -659,6 +659,11 @@ DENORMALIZE         { RETURNSYM(DENORMALIZE); }
 DEPRECATED          { RETURNSYM(DEPRECATED); }
 DESC                { RETURNSYM(DESC); }
 DESCEND             { RETURNSYM(DESC); }
+DICTIONARY          {
+                        lexer->reportWarning(returnToken, WRN_RESERVED_FUTURE, "%s", "DICTIONARY will be a reserved word from release 3.10");
+                        setupdatepos;
+                        return lookupIdentifierToken(returnToken, lexer, lookup, activeState, CUR_TOKEN_TEXT);
+                    }
 DISTRIBUTE          { RETURNSYM(DISTRIBUTE); }
 DISTRIBUTED         { RETURNSYM(DISTRIBUTED); }
 DISTRIBUTION        { RETURNSYM(DISTRIBUTION); }