parser: Show context-specific error message for Exit <compound>

Author: dkl

changelog.txt

@@ -65,7 +65,7 @@ Version 1.01.0
 - Literal zeroes with [U]Byte or [U]Short type (or the 16bit Integer in -lang qb) can now be passed to pointer parameters of overloaded procedures (now it's possible to call Bsave() with 0 source buffer in -lang qb again -- it also was affected by this bug since FB 0.90)
 - #760: RETURN and FUNCTION= couldn't be used together in byref functions returning an UDT with constructor. This check is now only applied to functions returning byval.
 - #755: If no result is set in byref functions, the compiler will now show an error instead of a warning (because a byref function defaults to returning a null reference, most likely causing a crash at runtime)
-- #754: Better error message for function result assignments outside of the function
+- Better error message for function result assignments outside of the function (#754), and for illegal use of Exit Sub|Function|...
 
 
 Version 1.00.0 (former 0.91.0):

src/compiler/parser-compound.bas

@@ -188,7 +188,8 @@ sub cExitStatement( )
 	lexSkipToken( )
 
 	'' (FOR | DO | WHILE | SELECT | SUB | FUNCTION) (',')*
-	select case as const lexGetToken( )
+	var tk = lexGetToken( )
+	select case as const( tk )
 	case FB_TK_FOR
 		if( parser.stmt.for = NULL ) then
 			hExitError( FB_ERRMSG_ILLEGALOUTSIDEFORSTMT )
@@ -297,7 +298,16 @@ sub cExitStatement( )
 		end if
 
 		if( label = NULL ) then
-			hExitError( FB_ERRMSG_ILLEGALOUTSIDEAPROC )
+			dim errmsg as integer
+			select case as const( tk )
+			case FB_TK_SUB         : errmsg = FB_ERRMSG_ILLEGALOUTSIDEASUB
+			case FB_TK_PROPERTY    : errmsg = FB_ERRMSG_ILLEGALOUTSIDEANPROPERTY
+			case FB_TK_OPERATOR    : errmsg = FB_ERRMSG_ILLEGALOUTSIDEANOPERATOR
+			case FB_TK_CONSTRUCTOR : errmsg = FB_ERRMSG_ILLEGALOUTSIDEACTOR
+			case FB_TK_DESTRUCTOR  : errmsg = FB_ERRMSG_ILLEGALOUTSIDEADTOR
+			case else              : errmsg = FB_ERRMSG_ILLEGALOUTSIDEAFUNCTION
+			end select
+			hExitError( errmsg )
 		end if
 
 		dim as FB_ERRMSG errnum = FB_ERRMSG_OK