+ allow defining classrefdefs for objcclasses. Note, this happens using the

    "class" keyword like for regular Object Pascal classes, not using the
    "objcclass" keyword. E.g.: NSObjectClass = class of NSObject;
  * modified tobjc18 to test this functionality

git-svn-id: branches/objc@13701 -

compiler/ptype.pas

@@ -113,7 +113,8 @@ implementation
                         inc(ttypesym(srsym).refs);
                         { we need a class type for classrefdef }
                         if (def.typ=classrefdef) and
-                           not(is_class(ttypesym(srsym).typedef)) then
+                           not(is_class(ttypesym(srsym).typedef)) and
+                           not(is_objcclass(ttypesym(srsym).typedef)) then
                           MessagePos1(def.typesym.fileinfo,type_e_class_type_expected,ttypesym(srsym).typedef.typename);
                       end
                      else
@@ -971,7 +972,8 @@ implementation
                   begin
                     consume(_OF);
                     single_type(hdef,(block_type=bt_type),false);
-                    if is_class(hdef) then
+                    if is_class(hdef) or
+                       is_objcclass(hdef) then
                       def:=tclassrefdef.create(hdef)
                     else
                       if hdef.typ=forwarddef then
@@ -980,7 +982,7 @@ implementation
                           current_module.checkforwarddefs.add(def);
                         end
                     else
-                      Message1(type_e_class_type_expected,hdef.typename);
+                      Message1(type_e_class_or_objcclass_type_expected,hdef.typename);
                   end
                 else
                   def:=object_dec(odt_class,name,genericdef,genericlist,nil);

tests/test/tobjc18.pp

@@ -14,8 +14,11 @@ type
     procedure release; override;
     class procedure testClassOverride; override;
   end;
+  tmyoverrideclass = class of myoverride;
 
 var
+  selfshouldbe: tmyoverrideclass;
+  selfshouldbetestinlinetypedefinition: class of myoverride2;
   overridescalled: longint;
 
 procedure MyOverride.release;
@@ -29,6 +32,9 @@ end;
 
 class procedure MyOverride.testClassOverride;
 begin
+  if (self<>selfshouldbe) then
+    halt(20);
+
   writeln('MyOverride.testClassOverride');
   if (overridescalled<>1) then
     halt(3);
@@ -47,6 +53,9 @@ end;
 
 class procedure MyOverride2.testClassOverride;
 begin
+  if (self<>selfshouldbe) then
+    halt(21);
+
   if (overridescalled<>0) then
     halt(5);
   writeln('MyOverride2.testClassOverride');
@@ -59,14 +68,17 @@ var
 begin
   a:=MyOverride2.alloc;
   a:=a.init;
+  selfshouldbe:=MyOverride2;
   MyOverride2.testClassOverride;
   if (overridescalled<>2) then
     halt(6);
   dec(overridescalled);
+  selfshouldbe:=MyOverride;
   MyOverride.testClassOverride;
   if (overridescalled<>2) then
     halt(7);
   overridescalled:=0;
+  selfshouldbe:=MyOverride2;
   a.testClassOverride;
   overridescalled:=1;
   a.release;