Implement dictionary initializers.

Author: c-lipka

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.8790760"
+#define POV_RAY_PRERELEASE "x.dictionary.8790824"
 
 #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

@@ -9425,7 +9425,7 @@ bool Parser::Parse_RValue (int Previous, int *NumberPtr, void **DataPtr, SYM_ENT
         END_CASE
 
         CASE (DICTIONARY_TOKEN)
-            Temp_Data  = reinterpret_cast<void *>(Create_Sym_Table (true));
+            Temp_Data  = reinterpret_cast<void *>(Parse_Dictionary_Declare());
             *NumberPtr = DICTIONARY_ID_TOKEN;
             Test_Redefine (Previous,NumberPtr,*DataPtr, allow_redefine);
             *DataPtr   = Temp_Data;

source/parser/parser.h

@@ -377,6 +377,7 @@ class Parser : public SceneTask
         SYM_ENTRY *Add_Symbol (SYM_TABLE *table, const char *Name,TOKEN Number);
         SYM_ENTRY *Add_Symbol (int Index,const char *Name,TOKEN Number);
         POV_ARRAY *Parse_Array_Declare (void);
+        SYM_TABLE *Parse_Dictionary_Declare();
         SYM_ENTRY *Create_Entry (const char *Name, TOKEN Number, bool copyName);
         SYM_ENTRY *Copy_Entry (const SYM_ENTRY *);
         void Acquire_Entry_Reference (SYM_ENTRY *Entry);

source/parser/parser_tokenizer.cpp

@@ -3579,6 +3579,50 @@ Parser::POV_ARRAY *Parser::Parse_Array_Declare (void)
 
 };
 
+
+Parser::SYM_TABLE *Parser::Parse_Dictionary_Declare()
+{
+    SYM_TABLE *newDictionary;
+    SYM_ENTRY *newEntry;
+    bool oldParseRawIdentifiers;
+
+    newDictionary = Create_Sym_Table (true);
+
+    // TODO REVIEW - maybe we need `Ok_To_Declare = false`?
+
+    if (!Parse_Begin (false))
+        return newDictionary;
+
+    EXPECT
+        CASE (PERIOD_TOKEN)
+            oldParseRawIdentifiers = parseRawIdentifiers;
+            parseRawIdentifiers = true;
+            Get_Token();
+            parseRawIdentifiers = oldParseRawIdentifiers;
+            if (Token.Token_Id != IDENTIFIER_TOKEN)
+                Expectation_Error ("dictionary element identifier");
+            newEntry = Add_Symbol (newDictionary, Token.Token_String, IDENTIFIER_TOKEN);
+
+            GET (EQUALS_TOKEN);
+
+            if (!Parse_RValue (IDENTIFIER_TOKEN, &(newEntry->Token_Number), &(newEntry->Data), newEntry, false, false, true, true, false, MAX_NUMBER_OF_TABLES))
+                Expectation_Error("RValue");
+
+            Parse_Comma();
+        END_CASE
+
+        OTHERWISE
+            UNGET
+            EXIT
+        END_CASE
+    END_EXPECT
+
+    Parse_End();
+
+    return newDictionary;
+
+};
+
 void Parser::Parse_Initalizer (int Sub, int Base, POV_ARRAY *a)
 {
     int i;

unix/VERSION

@@ -1 +1 @@
-3.7.1-x.dictionary.8790760
+3.7.1-x.dictionary.8790824