Ditched the #version auto syntax again.

c-lipka · c-lipka · commit 9a3567b222df · 2016-01-26T08:12:58.000+01:00
For compatibility reasons, `#version auto` is no reasonable alternative to `#version version`, so it has been removed and the use of `version` inside a `#version` statement un-deprecated again.
diff --git a/source/base/version.h b/source/base/version.h
@@ -45,7 +45,7 @@
 #define OFFICIAL_VERSION_STRING "3.7.1"
 #define OFFICIAL_VERSION_NUMBER 371
 
-#define POV_RAY_PRERELEASE "alpha.8449793"
+#define POV_RAY_PRERELEASE "alpha.8451792"
 
 #if (POV_RAY_IS_AUTOBUILD == 1) && ((POV_RAY_IS_OFFICIAL == 1) || (POV_RAY_IS_SEMI_OFFICIAL == 1))
 #ifdef POV_RAY_PRERELEASE
diff --git a/source/parser/parser_expressions.cpp b/source/parser/parser_expressions.cpp
@@ -1036,18 +1036,15 @@ void Parser::Parse_Num_Factor (EXPRESS& Express,int *Terms)
                     if (!parsingVersionDirective)
                     {
                         // Normally, the `version` pseudo-variable needs to return the effective language version
-                        // (which is now fixed to 3.6.2 if not specified otherwise) so that include files can properly
-                        // switch back after temporarily overriding the `#version` setting.
+                        // (which now defaults to 3.6.2) so that include files can properly switch back after
+                        // temporarily overriding the `#version` setting.
                         Val = sceneData->EffectiveLanguageVersion() / 100.0;
                     }
                     else
                     {
-                        // When used inside a `#version` statement, special handling is needed to support the (now
-                        // deprecated) `#version version` idiom used in some 3.7.0 scenes to set the effective language
-                        // version to whatever version of POV-Ray is actually used.
-                        Warning("Use of the 'version' pseudo-variable in a '#version' directive is deprecated; "
-                                "to specify that your scene is compatible with POV-Ray 3.7.1 or later but provides its "
-                                "own mechanism of managing version compatibility, use '#version auto' instead.");
+                        // When used inside a `#version` statement, special handling is needed to support the
+                        // `#version version` idiom to set the effective language version to whatever version
+                        // of POV-Ray is actually used.
                         Val = sceneData->languageVersion / 100.0;
                     }
                     break;
diff --git a/source/parser/parser_tokenizer.cpp b/source/parser/parser_tokenizer.cpp
@@ -1686,7 +1686,6 @@ void Parser::Parse_Directive(int After_Hash)
     Macro *PMac=NULL;
     COND_TYPE Curr_Type = Cond_Stack[CS_Index].Cond_Type;
     POV_LONG Hash_Loc = Input_File->In_File->tellg().offset;
-    bool expectVersionNumber;
 
     if (Curr_Type == INVOKING_MACRO_COND)
     {
@@ -2212,11 +2211,7 @@ void Parser::Parse_Directive(int After_Hash)
                             Ok_To_Declare = false;
                             bool wasParsingVersionDirective = parsingVersionDirective;
                             parsingVersionDirective = true;
-                            expectVersionNumber = true;
                             EXPECT_ONE
-                                CASE (AUTO_TOKEN)
-                                    expectVersionNumber = false;
-                                END_CASE
                                 CASE (UNOFFICIAL_TOKEN)
 #if POV_RAY_IS_OFFICIAL == 1
                                     Get_Token();
@@ -2231,8 +2226,7 @@ void Parser::Parse_Directive(int After_Hash)
                                 END_CASE
                             END_EXPECT
 
-                            if (expectVersionNumber)
-                                sceneData->languageVersion = (int)(Parse_Float() * 100 + 0.5);
+                            sceneData->languageVersion = (int)(Parse_Float() * 100 + 0.5);
 
                             if ((sceneData->languageVersionLate) && sceneData->languageVersion >= 370)
                             {
diff --git a/source/parser/reservedwords.cpp b/source/parser/reservedwords.cpp
@@ -90,7 +90,6 @@ const RESERVED_WORD Reserved_Words[LAST_TOKEN] = {
     {ATAN_TOKEN, "atan"},
     {AT_TOKEN, "@"},
     {AUTOSTOP_TOKEN, "autostop"},
-    {AUTO_TOKEN, "auto"},
     {AVERAGE_TOKEN, "average"},
     {BACKGROUND_TOKEN, "background"},
     {BACK_QUOTE_TOKEN, "`"},
diff --git a/source/parser/reservedwords.h b/source/parser/reservedwords.h
@@ -167,7 +167,6 @@ enum TOKEN_IDS
     ANISOTROPY_TOKEN,
     AREA_LIGHT_TOKEN,
     AT_TOKEN,
-    AUTO_TOKEN,
     BACK_QUOTE_TOKEN,
     BACK_SLASH_TOKEN,
     BAR_TOKEN,
diff --git a/unix/VERSION b/unix/VERSION
@@ -1 +1 @@
-3.7.1-alpha.8449793
+3.7.1-alpha.8451792

Original file line number	Diff line number	Diff line change
`@@ -1036,18 +1036,15 @@ void Parser::Parse_Num_Factor (EXPRESS& Express,int *Terms)`
`1036`	`1036`	`if (!parsingVersionDirective)`
`1037`	`1037`	`{`
`1038`	`1038`	// Normally, the `version` pseudo-variable needs to return the effective language version
`1039`		`- // (which is now fixed to 3.6.2 if not specified otherwise) so that include files can properly`
`1040`		- // switch back after temporarily overriding the `#version` setting.
	`1039`	`+ // (which now defaults to 3.6.2) so that include files can properly switch back after`
	`1040`	+ // temporarily overriding the `#version` setting.
`1041`	`1041`	`Val = sceneData->EffectiveLanguageVersion() / 100.0;`
`1042`	`1042`	`}`
`1043`	`1043`	`else`
`1044`	`1044`	`{`
`1045`		- // When used inside a `#version` statement, special handling is needed to support the (now
`1046`		- // deprecated) `#version version` idiom used in some 3.7.0 scenes to set the effective language
`1047`		`- // version to whatever version of POV-Ray is actually used.`
`1048`		`- Warning("Use of the 'version' pseudo-variable in a '#version' directive is deprecated; "`
`1049`		`- "to specify that your scene is compatible with POV-Ray 3.7.1 or later but provides its "`
`1050`		`- "own mechanism of managing version compatibility, use '#version auto' instead.");`
	`1045`	+ // When used inside a `#version` statement, special handling is needed to support the
	`1046`	+ // `#version version` idiom to set the effective language version to whatever version
	`1047`	`+ // of POV-Ray is actually used.`
`1051`	`1048`	`Val = sceneData->languageVersion / 100.0;`
`1052`	`1049`	`}`
`1053`	`1050`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-3.7.1-alpha.8449793`
	`1`	`+3.7.1-alpha.8451792`