From 0787f7aa1eba2d0fb28b00478e01c60284723622 Mon Sep 17 00:00:00 2001
From: juha <juha@lazarus-ide.org>
Date: Mon, 26 Jan 2015 23:40:32 +0000
Subject: [PATCH] JCF2: Add support for CVAR directive in JCF2 parser. Issue
 #27343, patch from Barlone

git-svn-id: trunk@47538 -
---
 components/jcf2/Parse/Tokens.pas | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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