--- parser3/src/include/pa_symbols.h 2016/05/24 14:28:24 1.2 +++ parser3/src/include/pa_symbols.h 2016/11/21 19:31:56 1.6 @@ -8,7 +8,7 @@ #ifndef PA_SYMBOLS_H #define PA_SYMBOLS_H -#define IDENT_PA_SYMBOLS_H "$Id: pa_symbols.h,v 1.2 2016/05/24 14:28:24 moko Exp $" +#define IDENT_PA_SYMBOLS_H "$Id: pa_symbols.h,v 1.6 2016/11/21 19:31:56 moko Exp $" #include "pa_common.h" @@ -16,17 +16,33 @@ #define SYMBOLS_CACHING #ifdef SYMBOLS_CACHING -#define SYMBOLS_EQ(a,b) (&(a)==&(b)) // pointer comparation +#define SYMBOLS_EQ(a,b) (&(a)==&(Symbols::b)) // pointer comparation #else -#define SYMBOLS_EQ(a,b) ((a)==(b)) // string comparation +#define SYMBOLS_EQ(a,b) ((a)==(Symbols::b)) // string comparation #endif class Symbols: public HashStringValue{ public: -static const String result; -static const String caller; -static const String self; +static const String SELF_SYMBOL; +static const String CALLER_SYMBOL; +static const String RESULT_SYMBOL; + +static const String CLASS_SYMBOL; +static const String CLASS_NAME_SYMBOL; + +static const String METHOD_SYMBOL; + +static const String STATIC_SYMBOL; +static const String DYNAMIC_SYMBOL; + +static const String LOCALS_SYMBOL; +static const String PARTIAL_SYMBOL; + +static const String REM_SYMBOL; + +static const String FIELDS_SYMBOL; +static const String _DEFAULT_SYMBOL; #ifdef SYMBOLS_CACHING void add(const String &astring);