Implement dynamically-sized arrays.

Author: c-lipka

changes.txt

@@ -49,6 +49,8 @@ Prior to the release of 3.7.1, the following items still need urgent attention:
 New Features
 ------------
 
+- Support for variable-size arrays has been added.
+
 - A new data container, `dictionary`, has been added to support structured
   storage of data.
 

source/base/version.h

@@ -45,7 +45,7 @@
 #define OFFICIAL_VERSION_STRING "3.7.1"
 #define OFFICIAL_VERSION_NUMBER 371
 
-#define POV_RAY_PRERELEASE "x.dictionary.8790989"
+#define POV_RAY_PRERELEASE "x.dictionary.8791118"
 
 #if (POV_RAY_IS_AUTOBUILD == 1) && ((POV_RAY_IS_OFFICIAL == 1) || (POV_RAY_IS_SEMI_OFFICIAL == 1))
 #ifdef POV_RAY_PRERELEASE

source/parser/parser.cpp

@@ -8865,9 +8865,9 @@ void Parser::Parse_Declare(bool is_local, bool after_hash)
             (rvalue->Token_Number != ARRAY_ID_TOKEN))
             Expectation_Error("array RValue");
         POV_ARRAY *a = reinterpret_cast<POV_ARRAY *>(rvalue->Data);
-        if (lvalues.size() > a->Total)
+        if (lvalues.size() > a->DataPtrs.size())
             Error ("array size mismatch");
-        if (a->DataPtrs == NULL)
+        if (a->DataPtrs.empty())
             Error ("cannot assign from uninitialized array");
 
         for (int i = 0; i < lvalues.size(); ++i)
@@ -9542,15 +9542,12 @@ void Parser::Destroy_Ident_Data(void *Data, int Type)
             break;
         case ARRAY_ID_TOKEN:
             a = reinterpret_cast<POV_ARRAY *>(Data);
-            if(a->DataPtrs != NULL)
+            if(!a->DataPtrs.empty())
             {
-                for(i=0; i<a->Total; i++)
-                {
+                for(i=0; i<a->DataPtrs.size(); i++)
                     Destroy_Ident_Data(a->DataPtrs[i], a->Type);
-                }
-                POV_FREE(a->DataPtrs);
             }
-            POV_FREE(a);
+            delete a;
             break;
         case DICTIONARY_ID_TOKEN:
             Destroy_Sym_Table (reinterpret_cast<SYM_TABLE *>(Data));
@@ -10620,11 +10617,17 @@ void *Parser::Copy_Identifier (void *Data, int Type)
             POV_MEMMOVE(reinterpret_cast<void *>(New), reinterpret_cast<void *>(Data), len * sizeof(UCS2));
             break;
         case ARRAY_ID_TOKEN:
-            a=reinterpret_cast<POV_ARRAY *>(Data);
-            na=reinterpret_cast<POV_ARRAY *>(POV_MALLOC(sizeof(POV_ARRAY),"array"));
-            *na=*a;
-            na->DataPtrs = reinterpret_cast<void **>(POV_MALLOC(sizeof(void *)*(a->Total),"array"));
-            for (i=0; i<a->Total; i++)
+            a = reinterpret_cast<POV_ARRAY *>(Data);
+            na = new POV_ARRAY;
+            na->Dims = a->Dims;
+            na->Type = a->Type;
+            for (i = 0; i < 5; ++i)
+            {
+                na->Sizes[i] = a->Sizes[i];
+                na->Mags[i] = a->Mags[i];
+            }
+            na->DataPtrs.resize(a->DataPtrs.size());
+            for (i=0; i<a->DataPtrs.size(); i++)
             {
                 na->DataPtrs[i] = reinterpret_cast<void *>(Copy_Identifier (a->DataPtrs[i],a->Type));
             }

source/parser/parser.h

@@ -273,10 +273,11 @@ class Parser : public SceneTask
 
         struct POV_ARRAY
         {
-            int Dims, Type, Total;
+            int Dims, Type;
             int Sizes[5];
             int Mags[5];
-            void **DataPtrs;
+            vector<void*> DataPtrs;
+            bool resizable;
         };
 
         struct POV_PARAM

source/parser/parser_tokenizer.cpp

@@ -1404,7 +1404,14 @@ void Parser::Read_Symbol()
 
                                     if (k >= a->Sizes[i])
                                     {
-                                        Error("Array subscript out of range");
+                                        if (a->resizable)
+                                        {
+                                            POV_PARSER_ASSERT (a->Dims == 0);
+                                            a->DataPtrs.resize (k+1);
+                                            a->Sizes[0] = a->DataPtrs.size();
+                                        }
+                                        else
+                                            Error("Array subscript out of range");
                                     }
                                     j += k * a->Mags[i];
                                     GET(RIGHT_SQUARE_TOKEN)
@@ -1434,6 +1441,12 @@ void Parser::Read_Symbol()
 
                                 if (c =='.')
                                 {
+                                    if (table == NULL)
+                                    {
+                                        POV_PARSER_ASSERT (Token.is_array_elem);
+                                        Error ("Attempt to access uninitialized array element.");
+                                    }
+
                                     GET (PERIOD_TOKEN)
                                     bool oldParseRawIdentifiers = parseRawIdentifiers;
                                     parseRawIdentifiers = true;
@@ -1447,6 +1460,12 @@ void Parser::Read_Symbol()
                                 }
                                 else if (c == '[')
                                 {
+                                    if (table == NULL)
+                                    {
+                                        POV_PARSER_ASSERT (Token.is_array_elem);
+                                        Error ("Attempt to access uninitialized array element.");
+                                    }
+
                                     GET(LEFT_SQUARE_TOKEN)
                                     dictIndex = Parse_C_String();
                                     GET (RIGHT_SQUARE_TOKEN);
@@ -3534,7 +3553,8 @@ Parser::POV_ARRAY *Parser::Parse_Array_Declare (void)
     POV_ARRAY *New;
     int i,j;
 
-    New=reinterpret_cast<POV_ARRAY *>(POV_MALLOC(sizeof(POV_ARRAY),"array"));
+    New = new POV_ARRAY;
+    New->resizable = false;
 
     i=0;
     j=1;
@@ -3562,14 +3582,16 @@ Parser::POV_ARRAY *Parser::Parse_Array_Declare (void)
         END_CASE
     END_EXPECT
 
-    if ( i < 1 ) {
-        Error( "An array declaration must have at least one dimension");
+    if (i == 0) {
+        // new syntax: Dynamically sized one-dimensional array
+        i = 1;
+        New->Sizes[0] = 0;
+        New->resizable = true;
     }
 
     New->Dims     = i-1;
-    New->Total    = j;
     New->Type     = EMPTY_ARRAY_TOKEN;
-    New->DataPtrs = reinterpret_cast<void **>(POV_MALLOC(sizeof(void *)*j,"array"));
+    New->DataPtrs.resize (j);
 
     j = 1;
 
@@ -3579,9 +3601,9 @@ Parser::POV_ARRAY *Parser::Parse_Array_Declare (void)
         j *= New->Sizes[i];
     }
 
-    for (i=0; i<New->Total; i++)
+    for (i=0; i<New->DataPtrs.size(); i++)
     {
-        New->DataPtrs[i] = NULL;
+        POV_PARSER_ASSERT (New->DataPtrs[i] == NULL);
     }
 
     EXPECT
@@ -3672,9 +3694,17 @@ void Parser::Parse_Initalizer (int Sub, int Base, POV_ARRAY *a)
     else
     {
         bool properlyDelimited = true;
-        for(i=0; i < a->Sizes[Sub]; i++)
+        bool finalParameter = (!a->resizable && (a->Sizes[Sub] == 0));
+        for(i=0; !finalParameter; i++)
         {
-            bool finalParameter = (i == a->Sizes[Sub]-1);
+            if (a->resizable)
+            {
+                a->DataPtrs.push_back (NULL);
+                a->Sizes[Sub] = a->DataPtrs.size();
+            }
+            else
+                finalParameter = (i == (a->Sizes[Sub]-1));
+
             if (!Parse_RValue (a->Type, &(a->Type), &(a->DataPtrs[Base+i]), NULL, false, false, true, false, true, MAX_NUMBER_OF_TABLES))
             {
                 EXPECT_ONE
@@ -3685,12 +3715,17 @@ void Parser::Parse_Initalizer (int Sub, int Base, POV_ARRAY *a)
                     END_CASE
 
                     CASE (RIGHT_CURLY_TOKEN)
-                        if (!(finalParameter && properlyDelimited))
-                            // the parameter list was closed prematurely
-                            Error("Expected %d initializers but only %d found.",a->Sizes[Sub],i);
-                        // the parameter was left empty
-                        if(!optional)
-                            Error("Cannot omit elements of non-optional array initializer.");
+                        if (a->resizable)
+                            finalParameter = true;
+                        else
+                        {
+                            if (!(finalParameter && properlyDelimited))
+                                // the parameter list was closed prematurely
+                                Error("Expected %d initializers but only %d found.",a->Sizes[Sub],i);
+                            // the parameter was left empty
+                            if(!optional)
+                                Error("Cannot omit elements of non-optional array initializer.");
+                        }
                         UNGET
                     END_CASE
 

unix/VERSION

@@ -1 +1 @@
-3.7.1-x.dictionary.8790989
+3.7.1-x.dictionary.8791118