[parser] Eliminate loop from Parse_Directive().

Author: c-lipka

source/parser/parser.cpp

@@ -7073,27 +7073,24 @@ void Parser::Parse_Frame ()
         END_CASE
 
         CASE (DECLARE_TOKEN)
-            UNGET
             VersionWarning(295,"Should have '#' before 'declare'.");
             POV_EXPERIMENTAL_ASSERT(IsOkToDeclare());
-            Parse_Directive (false);
+            Parse_Declare(false, false);
         END_CASE
 
         CASE (INCLUDE_TOKEN)
-            UNGET
             VersionWarning(295,"Should have '#' before 'include'.");
             POV_EXPERIMENTAL_ASSERT(IsOkToDeclare());
-            Parse_Directive (false);
+            Open_Include();
         END_CASE
 
         CASE (FLOAT_FUNCT_TOKEN)
             switch(CurrentTokenFunctionId())
             {
                 case VERSION_TOKEN:
-                    UNGET
                     VersionWarning(295,"Should have '#' before 'version'.");
                     POV_EXPERIMENTAL_ASSERT(IsOkToDeclare());
-                    Parse_Directive (false);
+                    Parse_Version();
                     break;
 
                 default:
@@ -9220,8 +9217,12 @@ bool Parser::Parse_RValue (TokenId Previous, TokenId *NumberPtr, void **DataPtr,
             Terms = Parse_Unknown_Vector (Local_Express, true, &had_callable_identifier);
 
             // if in a #declare force a semicolon at the end
+            // (but don't "eat" it yet, `Parse_Declare` will take care of that)
             if (SemiFlag)
+            {
                 Parse_Semi_Colon(true);
+                UNGET
+            }
 
             // get the number of tokens found
             Temp_Count = mTokenCount - Temp_Count;

source/parser/parser.h

@@ -240,7 +240,8 @@ class Parser
             TokenId *NumberPtr;
             void **DataPtr;
             SymbolTable* table;                             ///< table or dictionary the token references an element of
-            bool Unget_Token            : 1;                ///< `true` if @ref Get_Token() must re-issue this token.
+            bool Unget_Token            : 1;                ///< `true` if @ref Get_Token() must re-issue this token as-is.
+            bool ungetRaw               : 1;                ///< `true` if @ref Get_Token() must re-evaluate this token from raw.
             bool End_Of_File            : 1;
             bool is_array_elem          : 1;                ///< true if token is actually an array element reference
             bool is_mixed_array_elem    : 1;                ///< true if token is actually a mixed-type array element reference
@@ -475,10 +476,11 @@ class Parser
         bool GoToBookmark(const RawTokenizer::HotBookmark& bookmark);
 
         bool IsEndOfInvokedMacro() const;
-        void Parse_Directive (int After_Hash);
+        void Parse_Directive();
 #if POV_DEBUG
         void Parse_Breakpoint();
 #endif
+        void Parse_Version();
         void Open_Include (void);
         void IncludeHeader(const UCS2String& temp);
         void pre_init_tokenizer (void);