Replaced local()/global() pseudo-functions with local/global pseudo-dictionaries.

Author: c-lipka

changes.txt

@@ -56,6 +56,9 @@ New Features
 - A new data container, `dictionary`, has been added to support structured
   storage of data.
 
+- Pseudo-dictionaries `local` and `global` have been added, allowing to
+  specifically access local or global identifiers, respectively.
+
 - A new pattern, `potential`, has been added to define a pattern based on the
   potential field of a blob or isosurface object.
 
@@ -93,9 +96,6 @@ New Features
   assignments. The main purpose is to allow macros to return a set of values
   rather than just a single one.
 
-- `local()` and `global()` pseudo-functions have been added to specifically
-  refer to a local or global identifier, respectively.
-
 - The macro syntax has been extended to allow for optional parameters.
 
 - Light sources' distance-based fading can now be set to obey an inverse-power

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

@@ -198,12 +198,12 @@ void Parser::Run()
                 if(i->second[0] == '\"')
                 {
                     string tmp(i->second, 1, i->second.length() - 2);
-                    Temp_Entry = Add_Symbol(1, const_cast<char *>(i->first.c_str()), STRING_ID_TOKEN);
+                    Temp_Entry = Add_Symbol(SYM_TABLE_GLOBAL, const_cast<char *>(i->first.c_str()), STRING_ID_TOKEN);
                     Temp_Entry->Data = String_Literal_To_UCS2(const_cast<char *>(tmp.c_str()), false);
                 }
                 else
                 {
-                    Temp_Entry = Add_Symbol(1, const_cast<char *>(i->first.c_str()), FLOAT_ID_TOKEN);
+                    Temp_Entry = Add_Symbol(SYM_TABLE_GLOBAL, const_cast<char *>(i->first.c_str()), FLOAT_ID_TOKEN);
                     Temp_Entry->Data = Create_Float();
                     *(reinterpret_cast<DBL *>(Temp_Entry->Data)) = atof(i->second.c_str());
                 }
@@ -8611,7 +8611,7 @@ void Parser::Parse_Declare(bool is_local, bool after_hash)
     }
     else
     {
-        Local_Index=1;
+        Local_Index = SYM_TABLE_GLOBAL;
     }
 
     LValue_Ok = true;

source/parser/parser.h

@@ -86,6 +86,12 @@ const int SYM_TABLE_SIZE = 257;
 typedef struct Sym_Table_Entry SYM_ENTRY;
 typedef unsigned short SymTableEntryRefCount;
 
+// Special symbol tables
+enum {
+    SYM_TABLE_RESERVED = 0,        // reserved words
+    SYM_TABLE_GLOBAL,              // identifiers declared using #declare (or #local in top-level file), #function, #macro, etc.
+};
+
 /// Structure holding information about a symbol
 struct Sym_Table_Entry
 {
@@ -296,13 +302,6 @@ class Parser : public SceneTask
             bool R_Flag         : 1;
         };
 
-        enum IdentifierMode
-        {
-            kIdentifierModeUndefined,
-            kIdentifierModeLocal,
-            kIdentifierModeGlobal,
-        };
-
         // constructor
         Parser(shared_ptr<BackendSceneData> sd, bool useclock, DBL clock);
 
@@ -592,7 +591,6 @@ class Parser : public SceneTask
         CS_ENTRY *Cond_Stack;
         int CS_Index;
         bool Skipping, Inside_Ifdef, Inside_MacroDef, Parsing_Directive, parseRawIdentifiers;
-        IdentifierMode Inside_IdentFn;
 
         int Got_EOF; // WARNING: Changes to the use of this variable are very dangerous as it is used in many places assuming certain non-obvious side effects! [trf]