JCF2: Add support for CVAR directive in JCF2 parser. Issue #27343, patch from Barlone

git-svn-id: trunk@47538 -
This commit is contained in:
juha 2015-01-26 23:40:32 +00:00
parent b2216a884b
commit 0787f7aa1e

View File

@ -188,7 +188,7 @@ type
ttImplements, ttImplements,
ttReintroduce, ttReintroduce,
ttGeneric, ttGeneric,
ttCVar,
// used in asm // used in asm
ttOffset, ttOffset,
ttPtr, ttPtr,
@ -349,7 +349,7 @@ const
ExportDirectives: TTokenTypeSet = [ttIndex, ttName]; ExportDirectives: TTokenTypeSet = [ttIndex, ttName];
VariableDirectives: TTokenTypeSet = [ttAbsolute, ttDeprecated, ttLibrary, ttPlatform, VariableDirectives: TTokenTypeSet = [ttAbsolute, ttDeprecated, ttLibrary, ttPlatform,
ttExperimental, ttUnimplemented]; ttExperimental, ttUnimplemented, ttCVar];
ClassVisibility: TTokenTypeSet = ClassVisibility: TTokenTypeSet =
[ttPrivate, ttProtected, ttPublic, ttPublished, ttAutomated]; [ttPrivate, ttProtected, ttPublic, ttPublished, ttAutomated];
@ -376,7 +376,7 @@ const
ttNear, ttReadOnly, ttDynamic, ttNoDefault, ttRegister, ttNear, ttReadOnly, ttDynamic, ttNoDefault, ttRegister,
ttExport, ttOverride, ttOverload, ttResident, ttLocal, ttExport, ttOverride, ttOverload, ttResident, ttLocal,
ttImplements, ttReintroduce, ttImplements, ttReintroduce,
ttLibrary, ttPlatform, ttStatic, ttFinal, ttVarArgs]; ttLibrary, ttPlatform, ttStatic, ttFinal, ttVarArgs, ttCVar];
ProcedureWords: TTokenTypeSet = [ttProcedure, ttFunction, ttConstructor, ttDestructor, ttOperator]; ProcedureWords: TTokenTypeSet = [ttProcedure, ttFunction, ttConstructor, ttDestructor, ttOperator];
@ -681,6 +681,8 @@ begin
AddKeyword('implements', wtReservedWordDirective, ttImplements); AddKeyword('implements', wtReservedWordDirective, ttImplements);
AddKeyword('reintroduce', wtReservedWordDirective, ttReintroduce); AddKeyword('reintroduce', wtReservedWordDirective, ttReintroduce);
AddKeyword('cvar', wtReservedWordDirective, ttCVar);
// asm // asm
AddKeyword('offset', wtReservedWordDirective, ttOffset); AddKeyword('offset', wtReservedWordDirective, ttOffset);
AddKeyword('ptr', wtReservedWordDirective, ttPtr); AddKeyword('ptr', wtReservedWordDirective, ttPtr);