development build v3.7.1-alpha.8004333

c-lipka · Mar 21, 2015 · 8550718 · 8550718
2 parents 733ec23 + 9a56b0d
commit 8550718
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 8 deletions.
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.7981337"
+#define POV_RAY_PRERELEASE "alpha.8004333"
 
 #if POV_RAY_IS_OFFICIAL == 1
 #ifdef POV_RAY_PRERELEASE

diff --git a/source/parser/parser.cpp b/source/parser/parser.cpp
@@ -8215,12 +8215,19 @@ ObjectPtr Parser::Parse_Object_Id ()
 
 void Parser::Parse_Declare(bool is_local, bool after_hash)
 {
-    vector<Token_Struct> lvalues;
+    struct LValue
+    {
+        Token_Struct token;
+        int          previous;
+        SYM_ENTRY*   tempEntry;
+        bool         allowRedefine;
+    };
+    vector<LValue> lvalues;
     bool deprecated = false;
     bool deprecated_once = false;
-    int Previous=-1;
+    int Previous;
     int Local_Index;
-    SYM_ENTRY *Temp_Entry = NULL;
+    SYM_ENTRY *Temp_Entry;
     bool allow_redefine = true;
     UCS2 *deprecation_message;
     bool tupleDeclare = false;
@@ -8273,6 +8280,9 @@ void Parser::Parse_Declare(bool is_local, bool after_hash)
             END_CASE
         END_EXPECT
 
+        Previous = -1;
+        Temp_Entry = NULL;
+
         EXPECT
             CASE (IDENTIFIER_TOKEN)
                 allow_redefine = !Token.is_array_elem;
@@ -8364,7 +8374,12 @@ void Parser::Parse_Declare(bool is_local, bool after_hash)
             END_CASE
         END_EXPECT
 
-        lvalues.push_back(Token);
+        LValue lvalue;
+        lvalue.token = Token;
+        lvalue.tempEntry = Temp_Entry;
+        lvalue.previous = Previous;
+        lvalue.allowRedefine = allow_redefine;
+        lvalues.push_back(lvalue);
 
         if (lvectorDeclare && lvalues.size() >= 5)
             more = false;
@@ -8408,7 +8423,10 @@ void Parser::Parse_Declare(bool is_local, bool after_hash)
         Promote_Express(expr,&terms,lvalues.size());
         for (int i = 0; i < lvalues.size(); ++i)
         {
-            Token_Struct& t = lvalues[i];
+            Token_Struct& t = lvalues[i].token;
+            Previous = lvalues[i].previous;
+            Temp_Entry = lvalues[i].tempEntry;
+            allow_redefine = lvalues[i].allowRedefine;
 
             *t.NumberPtr = FLOAT_ID_TOKEN;
             Test_Redefine(Previous,t.NumberPtr,*t.DataPtr, allow_redefine);
@@ -8424,7 +8442,10 @@ void Parser::Parse_Declare(bool is_local, bool after_hash)
         }
         for (int i = 0; i < lvalues.size(); ++i)
         {
-            Token_Struct& t = lvalues[i];
+            Token_Struct& t = lvalues[i].token;
+            Previous = lvalues[i].previous;
+            Temp_Entry = lvalues[i].tempEntry;
+            allow_redefine = lvalues[i].allowRedefine;
 
             if (i > 0)
             {

diff --git a/unix/VERSION b/unix/VERSION
@@ -1 +1 @@
-3.7.1-alpha.7981337
+3.7.1-alpha.8004333
diff --git a/unix/install.txt b/unix/install.txt
@@ -135,6 +135,13 @@ recommanded to generate a fully-featured POV-Ray executable.
   http://www.libsdl.org
 
 
+2.3 Compatibility issues
+    ====================
+
+- Boost version 1.46 has been reported to be unstable on the Raspberry Pi 2. We recommend using Boost version 1.50 on
+  this platform.
+
+
 ====================================================
 3. Configuring, building, and (un)installing POV-Ray
 ====================================================