fbc: don't allow CONST/ENUM between any SELECT & first CASE

- previously CONST and ENUM were being allowed between SELECT and CASE
- probably because SELECT opens a new SCOPE and ENUM and CONST are symbol additions to the local scope

For example,
SELECT CASE x: CONST y = 1 : CASE ELSE : END SELECT

- this change causes fbc to throw an error if CONST of ENUM are found between SELECT and CASE

Author: jayrm

changelog.txt

@@ -36,7 +36,7 @@ Version 1.09.0
 - rtlib: define fb_AtomicSetThreadFlags() even in the non-multithreaded version of run time library - it is needed by thread_core.c:threadproc() - unusual but not impossible to link the non-multithreaded rtlib and call thread functions
 - darwin: a variety of improvements to allow compiling and linking (TeeEmCee)
 - gfxlib2: fix d2d scaling issues for high dpi (adeyblue)
-- fbc: improve error message on statement between SELECT and first CASE inside a subroutine
+- fbc: improve error message on statement between SELECT and first CASE inside a subroutine and don't allow CONST/ENUM between any SELECT & first CASE.
 
 
 Version 1.08.0

src/compiler/parser-compound.bas

@@ -748,7 +748,7 @@ function cCompStmtIsAllowed( byval allowmask as FB_CMPSTMT_MASK ) as integer
 		end if
 	end if
 
-	errReport( errmsg )
+	errReportEx( errmsg, "" )
 
 	function = FALSE
 end function

src/compiler/parser-decl-const.bas

@@ -1,6 +1,7 @@
 '' constant (CONST) declarations
 ''
 '' chng: sep/2004 written [v1ctor]
+'' chng: jul/2021 don't allow CONST between SELECT and CASE [jeffm]
 
 #include once "fb.bi"
 #include once "fbint.bi"
@@ -43,11 +44,11 @@ private sub cConstAssign _
 		byval attrib as FB_SYMBATTRIB _
 	)
 
-    static as zstring * FB_MAXNAMELEN+1 id
+	static as zstring * FB_MAXNAMELEN+1 id
 	dim as integer doskip = any, suffix = any
-    dim as ASTNODE ptr expr = any
-    dim as FBSYMBOL ptr litsym = any
-    dim as FBVALUE value = any
+	dim as ASTNODE ptr expr = any
+	dim as FBSYMBOL ptr litsym = any
+	dim as FBVALUE value = any
 
 	'' Namespace identifier if it matches the current namespace
 	cCurrentParentId()
@@ -204,7 +205,7 @@ private sub cConstAssign _
 		if( symbReuseOrAddConst( @id, dtype, subtype, astConstGetVal( expr ), attrib ) = NULL ) then
 			errReportEx( FB_ERRMSG_DUPDEFINITION, id )
 		end if
-    end if
+	end if
 
 	astDelNode( expr )
 
@@ -216,10 +217,16 @@ end sub
 
 '' ConstDecl  =  CONST (AS SymbolType)? ConstAssign (DECL_SEPARATOR ConstAssign)* .
 sub cConstDecl( byval attrib as FB_SYMBATTRIB )
-    dim as integer dtype = any
-    dim as FBSYMBOL ptr subtype = any
+	dim as integer dtype = any
+	dim as FBSYMBOL ptr subtype = any
+
+	'' CONST doesn't generate any code, but should not be allowed between SELECT and CASE
+	if( cCompStmtIsAllowed( FB_CMPSTMT_MASK_DECL or FB_CMPSTMT_MASK_CODE ) = FALSE ) then
+		hSkipStmt( )
+		exit sub
+	end if
 
-    '' CONST
+	'' CONST
 	lexSkipToken( LEXCHECK_POST_SUFFIX )
 
 	'' (AS SymbolType)?

src/compiler/parser-decl-enum.bas

@@ -1,6 +1,7 @@
 '' enumerator (ENUM) declarations
 ''
 '' chng: sep/2004 written [v1ctor]
+'' chng: jul/2021 don't allow ENUM between SELECT and CASE [jeffm]
 
 
 #include once "fb.bi"
@@ -144,6 +145,13 @@ sub cEnumDecl( byval attrib as FB_SYMBATTRIB )
 	static as zstring * FB_MAXNAMELEN+1 id
 	dim as FBSYMBOL ptr e = any
 
+	'' ENUM doesn't generate any code, but should not be allowed between SELECT and CASE
+	if( cCompStmtIsAllowed( FB_CMPSTMT_MASK_DECL or FB_CMPSTMT_MASK_CODE ) = FALSE ) then
+		'' error recovery: skip the whole compound stmt
+		hSkipCompound( FB_TK_ENUM )
+		exit sub
+	end if
+
 	'' ENUM
 	lexSkipToken( LEXCHECK_POST_SUFFIX )