--- parser3/src/main/pa_symbols.C	2016/05/24 12:36:57	1.2
+++ parser3/src/main/pa_symbols.C	2026/04/25 13:38:46	1.14
@@ -1,28 +1,85 @@
 /** @file
 	Parser: static symbols cache implementation.
-	Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)
+	Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com)
+	Authors: Konstantin Morshnev <moko@design.ru>
 */
 
 #include "pa_symbols.h"
 #include "pa_vstring.h"
 
-volatile const char * IDENT_PA_SYMBOLS_C="$Id: pa_symbols.C,v 1.2 2016/05/24 12:36:57 moko Exp $" IDENT_PA_SYMBOLS_H;
+volatile const char * IDENT_PA_SYMBOLS_C="$Id: pa_symbols.C,v 1.14 2026/04/25 13:38:46 moko Exp $" IDENT_PA_SYMBOLS_H;
 
-const String *Symbols::result=Symbols::instance().add("result");
-const String *Symbols::caller=Symbols::instance().add("caller");
-const String *Symbols::self=Symbols::instance().add("self");
+const String Symbols::SELF_SYMBOL("self");
+const String Symbols::CALLER_SYMBOL("caller");
+const String Symbols::RESULT_SYMBOL("result");
+
+const String Symbols::CLASS_SYMBOL("CLASS");
+const String Symbols::CLASS_NAME_SYMBOL("CLASS_NAME");
+
+const String Symbols::METHOD_SYMBOL("method");
+const String Symbols::NAME_SYMBOL("name");
+
+const String Symbols::STATIC_SYMBOL("static");
+const String Symbols::DYNAMIC_SYMBOL("dynamic");
+
+const String Symbols::LOCALS_SYMBOL("locals");
+const String Symbols::PARTIAL_SYMBOL("partial");
+
+const String Symbols::REM_SYMBOL("rem");
+
+const String Symbols::FIELDS_SYMBOL("fields");
+const String Symbols::_DEFAULT_SYMBOL("_default");
+
+const String Symbols::TABLES_SYMBOL("tables");
+const String Symbols::FILES_SYMBOL("files");
+const String Symbols::IMAP_SYMBOL("imap");
+const String Symbols::ELEMENTS_SYMBOL("elements");
+
+#ifdef SYMBOLS_CACHING
+
+Symbols *symbols=0;
 
 void Symbols::add(const String &astring){
 	put_dont_replace(astring,new VString(astring));
 }
 
-const String *Symbols::add(const char *astring){
-	const String *result=new String(astring);
-	put(*result,new VString(*result));
-	return result;
+void Symbols::set(const String &astring){
+	put(astring,new VString(astring));
 }
 
 Symbols &Symbols::instance(){
-    static Symbols singleton;
-    return singleton;
+	static Symbols singleton;
+	return singleton;
+}
+
+void Symbols::init(){
+	symbols=&instance();
+
+	symbols->set(SELF_SYMBOL);
+	symbols->set(CALLER_SYMBOL);
+	symbols->set(RESULT_SYMBOL);
+
+	symbols->set(CLASS_SYMBOL);
+	symbols->set(CLASS_NAME_SYMBOL);
+
+	symbols->set(METHOD_SYMBOL);
+	symbols->set(NAME_SYMBOL);
+
+	symbols->set(STATIC_SYMBOL);
+	symbols->set(DYNAMIC_SYMBOL);
+
+	symbols->set(LOCALS_SYMBOL);
+	symbols->set(PARTIAL_SYMBOL);
+
+	symbols->set(REM_SYMBOL);
+
+	symbols->set(FIELDS_SYMBOL);
+	symbols->set(_DEFAULT_SYMBOL);
+
+	symbols->set(TABLES_SYMBOL);
+	symbols->set(FILES_SYMBOL);
+	symbols->set(IMAP_SYMBOL);
+	symbols->set(ELEMENTS_SYMBOL);
 }
+
+#endif // SYMBOLS_CACHING