Update dictionary initializer syntax and fix a memory leak.

POV-Ray · Nov 16, 2016 · 03b9654 · 03b9654
1 parent d1a61d6
commit 03b9654
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 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 "x.dictionary.8877181"
+#define POV_RAY_PRERELEASE "x.dictionary.8877243"
 
 #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_tokenizer.cpp b/source/parser/parser_tokenizer.cpp
@@ -1381,7 +1381,8 @@ void Parser::Read_Symbol()
                     {
                         case ARRAY_ID_TOKEN:
                             {
-                                dictIndex = NULL;
+                                if (dictIndex)
+                                    POV_FREE (dictIndex);
 
                                 Skip_Spaces();
                                 c = Echo_getc();
@@ -1442,7 +1443,8 @@ void Parser::Read_Symbol()
 
                         case DICTIONARY_ID_TOKEN:
                             {
-                                dictIndex = NULL;
+                                if (dictIndex)
+                                    POV_FREE (dictIndex);
 
                                 Skip_Spaces();
                                 c = Echo_getc();
@@ -3664,6 +3666,7 @@ Parser::SYM_TABLE *Parser::Parse_Dictionary_Declare()
     SYM_TABLE *newDictionary;
     SYM_ENTRY *newEntry;
     bool oldParseRawIdentifiers;
+    char *dictIndex;
 
     newDictionary = Create_Sym_Table (true);
 
@@ -3682,7 +3685,22 @@ Parser::SYM_TABLE *Parser::Parse_Dictionary_Declare()
                 Expectation_Error ("dictionary element identifier");
             newEntry = Add_Symbol (newDictionary, Token.Token_String, IDENTIFIER_TOKEN);
 
-            GET (EQUALS_TOKEN);
+            GET (COLON_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
+
+        CASE (LEFT_SQUARE_TOKEN)
+            dictIndex = Parse_C_String();
+            newEntry = Add_Symbol (newDictionary, dictIndex, IDENTIFIER_TOKEN);
+            POV_PARSER_ASSERT (newDictionary->namesAreCopies);
+            POV_FREE (dictIndex);
+
+            GET (RIGHT_SQUARE_TOKEN);
+            GET (COLON_TOKEN);
 
             if (!Parse_RValue (IDENTIFIER_TOKEN, &(newEntry->Token_Number), &(newEntry->Data), newEntry, false, false, true, true, false, MAX_NUMBER_OF_TABLES))
                 Expectation_Error("RValue");

diff --git a/unix/VERSION b/unix/VERSION
@@ -1 +1 @@
-3.7.1-x.dictionary.8877181
+3.7.1-x.dictionary.8877243