Fix conversion warnings in dsql and Parser/parse

+ constexpr and misc. changes

Author: mrotteveel

src/dsql/Parser.cpp

@@ -276,7 +276,7 @@ int Parser::yylex()
 
 	// Lets skip spaces before store lastLine/lastColumn. This is necessary to avoid yyReducePosn
 	// produce invalid line/column information - CORE-4381.
-	bool spacesSkipped = yylexSkipSpaces();
+	const bool spacesSkipped = yylexSkipSpaces();
 
 	yyposn.lastLine = lex.lines;
 	yyposn.lastColumn = lex.ptr - lex.line_start;
@@ -399,7 +399,7 @@ int Parser::yylexAux()
 	MemoryPool& pool = *tdbb->getDefaultPool();
 
 	SSHORT c = lex.ptr[-1];
-	UCHAR tok_class = classes(c);
+	const UCHAR tok_class = classes(c);
 	char string[MAX_TOKEN_LEN];
 
 	// Depending on tok_class of token, parse token
@@ -602,7 +602,6 @@ int Parser::yylexAux()
 
 		bool hexerror = false;
 		Firebird::string temp;
-		int leadNibble = -1;
 
 		// Scan over the hex string converting adjacent bytes into nibble values.
 		// Every other nibble, write the saved byte to the temp space.
@@ -753,7 +752,7 @@ int Parser::yylexAux()
 				memcmp(lex.ptr, endChar, endCharSize) == 0 &&
 				lex.ptr[endCharSize] == '\'')
 			{
-				size_t len = lex.ptr - start;
+				const FB_SIZE_T len = lex.ptr - start;
 
 				if (len > MAX_STR_SIZE)
 				{
@@ -966,7 +965,7 @@ int Parser::yylexAux()
 		FB_UINT64 number = 0;
 		Int128 num128;
 		int expVal = 0;
-		FB_UINT64 limit_by_10 = MAX_SINT64 / 10;
+		constexpr FB_UINT64 limit_by_10 = MAX_SINT64 / 10;
 		int scale = 0;
 		int expSign = 1;
 

src/dsql/Parser.h

@@ -128,7 +128,7 @@ class Parser : public Firebird::PermanentStorage
 	};
 
 public:
-	static const int MAX_TOKEN_LEN = 256;
+	static inline constexpr int MAX_TOKEN_LEN = 256;
 
 public:
 	Parser(thread_db* tdbb, MemoryPool& pool, MemoryPool* aStatementPool, DsqlCompilerScratch* aScratch,
@@ -380,14 +380,14 @@ class Parser : public Firebird::PermanentStorage
 	USHORT client_dialect;
 	USHORT db_dialect;
 	const bool requireSemicolon;
-	USHORT parser_version;
+	USHORT parser_version = 0;
 	Firebird::CharSet* charSet;
 
 	Firebird::CharSet* metadataCharSet;
 	Firebird::string transformedString;
 	Firebird::GenericMap<Firebird::NonPooled<IntlString*, StrMark> > strMarks;
 	bool stmt_ambiguous;
-	DsqlStatement* parsedStatement;
+	DsqlStatement* parsedStatement = nullptr;
 
 	// Parser feedback for lexer
 	QualifiedName* introducerCharSetName = nullptr;
@@ -398,10 +398,10 @@ class Parser : public Firebird::PermanentStorage
 
 	// These value/posn of the root non-terminal are returned to the caller
 	YYSTYPE yyretlval;
-	Position yyretposn;
+	Position yyretposn{};
 
-	int yynerrs;
-	int yym;	// ASF: moved from local variable of Parser::parseAux()
+	int yynerrs = 0;
+	int yym = 0;	// ASF: moved from local variable of Parser::parseAux()
 
 	// Current parser state
 	yyparsestate* yyps;

src/dsql/chars.h

@@ -21,17 +21,17 @@
  * Contributor(s): ______________________________________.
  */
 
-const SCHAR CHR_LETTER		= 1;
-const SCHAR CHR_DIGIT		= 2;
-const SCHAR CHR_IDENT		= 4;
-const SCHAR CHR_QUOTE		= 8;
-const SCHAR CHR_WHITE		= 16;
-const SCHAR CHR_HEX			= 32;
-const SCHAR CHR_INTRODUCER	= 64;
+inline constexpr SCHAR CHR_LETTER		= 1;
+inline constexpr SCHAR CHR_DIGIT		= 2;
+inline constexpr SCHAR CHR_IDENT		= 4;
+inline constexpr SCHAR CHR_QUOTE		= 8;
+inline constexpr SCHAR CHR_WHITE		= 16;
+inline constexpr SCHAR CHR_HEX			= 32;
+inline constexpr SCHAR CHR_INTRODUCER	= 64;
 
 // Use the functions at the end of this file; do not reference the array directly.
 
-static const SCHAR classes_array[] = {
+static inline constexpr SCHAR classes_array[] = {
 /* 000     */ 0,
 /* 001     */ 0,
 /* 002     */ 0,
@@ -290,12 +290,12 @@ static const SCHAR classes_array[] = {
 /* 255     */ 0
 };
 
-inline SCHAR classes(int idx)
+inline SCHAR classes(int idx) noexcept
 {
 	return classes_array[(UCHAR) idx];
 }
 
-inline SCHAR classes(UCHAR idx)
+inline SCHAR classes(UCHAR idx) noexcept
 {
 	return classes_array[idx];
 }

src/dsql/dsql.cpp

@@ -100,7 +100,7 @@ unsigned DSQL_debug = 0;
 
 namespace
 {
-	const UCHAR record_info[] =
+	inline constexpr UCHAR record_info[] =
 	{
 		isc_info_req_update_count, isc_info_req_delete_count,
 		isc_info_req_select_count, isc_info_req_insert_count
@@ -1029,7 +1029,7 @@ static void sql_info(thread_db* tdbb,
 								[](void* arg, SSHORT offset, const char* line)
 								{
 									auto& localPath = *static_cast<decltype(path)*>(arg);
-									auto lineLen = strlen(line);
+									auto lineLen = fb_strlen(line);
 
 									// Trim trailing spaces.
 									while (lineLen > 0 && line[lineLen - 1] == ' ')
@@ -1097,7 +1097,7 @@ static void sql_info(thread_db* tdbb,
 					items++;
 				break;
 			}
-			// else fall into
+			[[fallthrough]];
 
 		default:
 			buffer[0] = item;

src/dsql/dsql.h

@@ -67,11 +67,11 @@ DEFINE_TRACE_ROUTINE(dsql_trace);
 #include "../dsql/sym.h"
 
 // Context aliases used in triggers
-const char* const OLD_CONTEXT_NAME = "OLD";
-const char* const NEW_CONTEXT_NAME = "NEW";
+inline constexpr const char* OLD_CONTEXT_NAME = "OLD";
+inline constexpr const char* NEW_CONTEXT_NAME = "NEW";
 
-const int OLD_CONTEXT_VALUE = 0;
-const int NEW_CONTEXT_VALUE = 1;
+inline constexpr int OLD_CONTEXT_VALUE = 0;
+inline constexpr int NEW_CONTEXT_VALUE = 1;
 
 namespace Jrd
 {
@@ -126,11 +126,11 @@ class dsql_dbb : public pool_alloc<dsql_type_dbb>
 	Firebird::LeftPooledMap<Firebird::string, DsqlDmlRequest*> dbb_cursors;	// known cursors in database
 	Firebird::AutoPtr<DsqlStatementCache> dbb_statement_cache;
 
-	MemoryPool&		dbb_pool;			// The current pool for the dbb
-	Attachment*		dbb_attachment;
+	MemoryPool& dbb_pool;			// The current pool for the dbb
+	Attachment* dbb_attachment;
 	Firebird::FullPooledMap<MetaName, QualifiedName> dbb_schemas_dfl_charset;
 	QualifiedName dbb_dfl_charset;
-	bool			dbb_no_charset;
+	bool dbb_no_charset = false;
 
 	dsql_dbb(MemoryPool& p, Attachment* attachment);
 	~dsql_dbb();
@@ -156,13 +156,13 @@ class dsql_rel : public pool_alloc<dsql_type_rel>
 	{
 	}
 
-	dsql_fld* rel_fields;			// Field block
+	dsql_fld* rel_fields = nullptr;	// Field block
 	//dsql_rel* rel_base_relation;	// base relation for an updatable view
-	QualifiedName rel_name;		// Name of relation
+	QualifiedName rel_name;			// Name of relation
 	MetaName rel_owner;				// Owner of relation
-	USHORT rel_id;					// Relation id
-	USHORT rel_dbkey_length;
-	USHORT rel_flags;
+	USHORT rel_id = 0;				// Relation id
+	USHORT rel_dbkey_length = 0;
+	USHORT rel_flags = 0;
 };
 
 // rel_flags bits
@@ -542,16 +542,16 @@ class dsql_ctx : public pool_alloc<dsql_type_ctx>
 
 // Flag values for ctx_flags
 
-const USHORT CTX_outer_join 			= 0x01;		// reference is part of an outer join
-const USHORT CTX_system					= 0x02;		// Context generated by system (NEW/OLD in triggers, check-constraint, RETURNING)
-const USHORT CTX_null					= 0x04;		// Fields of the context should be resolved to NULL constant
-const USHORT CTX_returning				= 0x08;		// Context generated by RETURNING
-const USHORT CTX_recursive				= 0x10;		// Context has secondary number (ctx_recursive) generated for recursive UNION
-const USHORT CTX_view_with_check_store	= 0x20;		// Context of WITH CHECK OPTION view's store trigger
-const USHORT CTX_view_with_check_modify	= 0x40;		// Context of WITH CHECK OPTION view's modify trigger
-const USHORT CTX_cursor					= 0x80;		// Context is a cursor
-const USHORT CTX_lateral				= 0x100;	// Context is a lateral derived table
-const USHORT CTX_blr_fields				= 0x200;	// Fields of the context are defined inside BLR
+inline constexpr USHORT CTX_outer_join 				= 0x01;		// reference is part of an outer join
+inline constexpr USHORT CTX_system					= 0x02;		// Context generated by system (NEW/OLD in triggers, check-constraint, RETURNING)
+inline constexpr USHORT CTX_null					= 0x04;		// Fields of the context should be resolved to NULL constant
+inline constexpr USHORT CTX_returning				= 0x08;		// Context generated by RETURNING
+inline constexpr USHORT CTX_recursive				= 0x10;		// Context has secondary number (ctx_recursive) generated for recursive UNION
+inline constexpr USHORT CTX_view_with_check_store	= 0x20;		// Context of WITH CHECK OPTION view's store trigger
+inline constexpr USHORT CTX_view_with_check_modify	= 0x40;		// Context of WITH CHECK OPTION view's modify trigger
+inline constexpr USHORT CTX_cursor					= 0x80;		// Context is a cursor
+inline constexpr USHORT CTX_lateral					= 0x100;	// Context is a lateral derived table
+inline constexpr USHORT CTX_blr_fields				= 0x200;	// Fields of the context are defined inside BLR
 
 //! Aggregate/union map block to map virtual fields to their base
 //! TMN: NOTE! This datatype should definitely be renamed!
@@ -652,7 +652,7 @@ class IntlString
 
 	Firebird::string toUtf8(jrd_tra* transaction) const;
 
-	const QualifiedName& getCharSet() const
+	const QualifiedName& getCharSet() const noexcept
 	{
 		return charset;
 	}
@@ -662,7 +662,7 @@ class IntlString
 		charset = value;
 	}
 
-	const Firebird::string& getString() const
+	const Firebird::string& getString() const noexcept
 	{
 		return s;
 	}
@@ -690,7 +690,7 @@ class Lim64String : public Firebird::string
 		  scale(sc)
 	{ }
 
-	int getScale()
+	int getScale() noexcept
 	{
 		return scale;
 	}
@@ -782,7 +782,7 @@ struct SignatureParameter
 	std::optional<SSHORT> fieldCharSetId;
 	std::optional<SSHORT> fieldPrecision;
 
-	bool operator >(const SignatureParameter& o) const
+	bool operator >(const SignatureParameter& o) const noexcept
 	{
 		return type > o.type || (type == o.type && number > o.number);
 	}

src/dsql/parse.y

@@ -101,12 +101,12 @@
 // since UNIX isn't standard, we have to define
 // stuff which is in <limits.h> (which isn't available on all UNIXes...
 
-const long SHRT_POS_MAX			= 32767;
-const long SHRT_UNSIGNED_MAX	= 65535;
-const long SHRT_NEG_MAX			= 32768;
-const int POSITIVE	= 0;
-const int NEGATIVE	= 1;
-const int UNSIGNED	= 2;
+inline constexpr long SHRT_POS_MAX		= 32767;
+inline constexpr long SHRT_UNSIGNED_MAX	= 65535;
+inline constexpr long SHRT_NEG_MAX		= 32768;
+inline constexpr int POSITIVE	= 0;
+inline constexpr int NEGATIVE	= 1;
+inline constexpr int UNSIGNED	= 2;
 
 //const int MIN_CACHE_BUFFERS	= 250;
 //const int DEF_CACHE_BUFFERS	= 1000;