The Ecere SDK - sdk/blob - compiler/libec/src/pass15.ec

   1 import "ecdefs"
   2
   3 #define uint _uint
   4 #include <stdlib.h>  // For strtoll
   5 #undef uint
   6
   7 // UNTIL IMPLEMENTED IN GRAMMAR
   8 #define ACCESS_CLASSDATA(_class, baseClass) \
   9    (_class ? ((void *)(((char *)_class.data) + baseClass.offsetClass)) : null)
  10
  11 #define YYLTYPE Location
  12 #include "grammar.h"
  13
  14 extern OldList * ast;
  15 extern int returnCode;
  16 extern Expression parsedExpression;
  17 extern bool yydebug;
  18 public void SetYydebug(bool b) { yydebug = b; }
  19 extern bool echoOn;
  20
  21 void resetScanner();
  22
  23 // TODO: Reset this to 0 on reinitialization
  24 int propWatcherID;
  25
  26 int expression_yyparse();
  27 static Statement curCompound;
  28 External curExternal, afterExternal;
  29 static Type curSwitchType;
  30 static Class currentClass;
  31 Class thisClass;
  32 public void SetThisClass(Class c) { thisClass = c; } public Class GetThisClass() { return thisClass; }
  33 static char * thisNameSpace;
  34 /*static */Class containerClass;
  35 bool thisClassParams = true;
  36
  37 uint internalValueCounter;
  38
  39 #ifdef _DEBUG
  40 Time findSymbolTotalTime;
  41 #endif
  42
  43 // WARNING: PrintExpression CONCATENATES to string. Please initialize.
  44 /*static */public void PrintExpression(Expression exp, char * string)
  45 {
  46    //if(inCompiler)
  47    {
  48       TempFile f { };
  49       int count;
  50
  51       if(exp)
  52          OutputExpression(exp, f);
  53       f.Seek(0, start);
  54       count = strlen(string);
  55       count += f.Read(string + count, 1, 1023);
  56       string[count] = '\0';
  57       delete f;
  58    }
  59 }
  60
  61 Type ProcessTemplateParameterType(TemplateParameter param)
  62 {
  63    if(param && param.type == TemplateParameterType::type && (param.dataType || param.dataTypeString))
  64    {
  65       // TOFIX: Will need to free this Type
  66       if(!param.baseType)
  67       {
  68          if(param.dataTypeString)
  69             param.baseType = ProcessTypeString(param.dataTypeString, false);
  70          else
  71             param.baseType = ProcessType(param.dataType.specifiers, param.dataType.decl);
  72       }
  73       return param.baseType;
  74    }
  75    return null;
  76 }
  77
  78 bool NeedCast(Type type1, Type type2)
  79 {
  80    if(!type1 || !type2 || type1.keepCast || type2.keepCast) return true;
  81
  82    if(type1.kind == templateType && type2.kind == int64Type && type2.passAsTemplate == false)
  83    {
  84       return false;
  85    }
  86
  87    if(type1.kind == type2.kind)
  88    {
  89       switch(type1.kind)
  90       {
  91          case charType:
  92          case shortType:
  93          case intType:
  94          case int64Type:
  95          case intPtrType:
  96          case intSizeType:
  97             if(type1.passAsTemplate && !type2.passAsTemplate)
  98                return true;
  99             return type1.isSigned != type2.isSigned;
 100          case classType:
 101             return type1._class != type2._class;
 102          case pointerType:
 103             return NeedCast(type1.type, type2.type);
 104          default:
 105             return true; //false; ????
 106       }
 107    }
 108    return true;
 109 }
 110
 111 static void ReplaceClassMembers(Expression exp, Class _class)
 112 {
 113    if(exp.type == identifierExp && exp.identifier)
 114    {
 115       Identifier id = exp.identifier;
 116       Context ctx;
 117       Symbol symbol = null;
 118       if(!id._class || !id._class.name || strcmp(id._class.name, "property"))
 119       {
 120          // First, check if the identifier is declared inside the function
 121          for(ctx = curContext; ctx != topContext.parent && !symbol; ctx = ctx.parent)
 122          {
 123             symbol = (Symbol)ctx.symbols.FindString(id.string);
 124             if(symbol) break;
 125          }
 126       }
 127
 128       // If it is not, check if it is a member of the _class
 129       if(!symbol && ((!id._class || (id._class.name && !strcmp(id._class.name, "property"))) || (id.classSym && eClass_IsDerived(_class, id.classSym.registered))))
 130       {
 131          Property prop = eClass_FindProperty(_class, id.string, privateModule);
 132          Method method = null;
 133          DataMember member = null;
 134          ClassProperty classProp = null;
 135          if(!prop)
 136          {
 137             method = eClass_FindMethod(_class, id.string, privateModule);
 138          }
 139          if(!prop && !method)
 140             member = eClass_FindDataMember(_class, id.string, privateModule, null, null);
 141          if(!prop && !method && !member)
 142          {
 143             classProp = eClass_FindClassProperty(_class, id.string);
 144          }
 145          if(prop || method || member || classProp)
 146          {
 147             // Replace by this.[member]
 148             exp.type = memberExp;
 149             exp.member.member = id;
 150             exp.member.memberType = unresolvedMember;
 151             exp.member.exp = QMkExpId("this");
 152             //exp.member.exp.loc = exp.loc;
 153             exp.addedThis = true;
 154          }
 155          else if(_class && _class.templateParams.first)
 156          {
 157             Class sClass;
 158             for(sClass = _class; sClass; sClass = sClass.base)
 159             {
 160                if(sClass.templateParams.first)
 161                {
 162                   ClassTemplateParameter param;
 163                   for(param = sClass.templateParams.first; param; param = param.next)
 164                   {
 165                      if(param.type == expression && !strcmp(param.name, id.string))
 166                      {
 167                         Expression argExp = GetTemplateArgExpByName(param.name, _class, TemplateParameterType::expression);
 168
 169                         if(argExp)
 170                         {
 171                            Declarator decl;
 172                            OldList * specs = MkList();
 173
 174                            FreeIdentifier(exp.member.member);
 175
 176                            ProcessExpressionType(argExp);
 177
 178                            decl = SpecDeclFromString(param.dataTypeString, specs, null);
 179
 180                            exp.expType = ProcessType(specs, decl);
 181
 182                            // *[expType] *[argExp]
 183                            exp.type = bracketsExp;
 184                            exp.list = MkListOne(MkExpOp(null, '*',
 185                               MkExpCast(MkTypeName(specs, MkDeclaratorPointer(MkPointer(null, null), decl)), MkExpOp(null, '&', argExp))));
 186                         }
 187                      }
 188                   }
 189                }
 190             }
 191          }
 192       }
 193    }
 194 }
 195
 196 ////////////////////////////////////////////////////////////////////////
 197 // PRINTING ////////////////////////////////////////////////////////////
 198 ////////////////////////////////////////////////////////////////////////
 199
 200 public char * PrintInt(int64 result)
 201 {
 202    char temp[100];
 203    if(result > MAXINT64)
 204       sprintf(temp, FORMAT64HEXLL /*"0x%I64XLL"*/, result);
 205    else
 206       sprintf(temp, FORMAT64DLL /*"%I64d"*/, result);
 207    return CopyString(temp);
 208 }
 209
 210 public char * PrintUInt(uint64 result)
 211 {
 212    char temp[100];
 213    if(result > MAXDWORD)
 214       sprintf(temp, FORMAT64HEXLL /*"0x%I64XLL"*/, result);
 215    else if(result > MAXINT)
 216       sprintf(temp, FORMAT64HEX /*"0x%I64X"*/, result);
 217    else
 218       sprintf(temp, FORMAT64D /*"%I64d"*/, result);
 219    return CopyString(temp);
 220 }
 221
 222 public char * PrintInt64(int64 result)
 223 {
 224    char temp[100];
 225    sprintf(temp, FORMAT64DLL /*"%I64d"*/, result);
 226    return CopyString(temp);
 227 }
 228
 229 public char * PrintUInt64(uint64 result)
 230 {
 231    char temp[100];
 232    if(result > MAXINT64)
 233       sprintf(temp, FORMAT64HEXLL /*"0x%I64XLL"*/, result);
 234    else
 235       sprintf(temp, FORMAT64DLL /*"%I64d"*/, result);
 236    return CopyString(temp);
 237 }
 238
 239 public char * PrintHexUInt(uint64 result)
 240 {
 241    char temp[100];
 242    if(result > MAXDWORD)
 243       sprintf(temp, FORMAT64HEXLL /*"0x%I64xLL"*/, result);
 244    else
 245       sprintf(temp, FORMAT64HEX /*"0x%I64x"*/, result);
 246    return CopyString(temp);
 247 }
 248
 249 public char * PrintHexUInt64(uint64 result)
 250 {
 251    char temp[100];
 252    if(result > MAXDWORD)
 253       sprintf(temp, FORMAT64HEXLL /*"0x%I64xLL"*/, result);
 254    else
 255       sprintf(temp, FORMAT64HEX /*"0x%I64x"*/, result);
 256    return CopyString(temp);
 257 }
 258
 259 public char * PrintShort(short result)
 260 {
 261    char temp[100];
 262    sprintf(temp, "%d", (unsigned short)result);
 263    return CopyString(temp);
 264 }
 265
 266 public char * PrintUShort(unsigned short result)
 267 {
 268    char temp[100];
 269    if(result > 32767)
 270       sprintf(temp, "0x%X", (int)result);
 271    else
 272       sprintf(temp, "%d", (int)result);
 273    return CopyString(temp);
 274 }
 275
 276 public char * PrintChar(char result)
 277 {
 278    char temp[100];
 279    if(result > 0 && isprint(result))
 280       sprintf(temp, "'%c'", result);
 281    else if(result < 0)
 282       sprintf(temp, "%d", (int)result);
 283    else
 284       //sprintf(temp, "%#X", result);
 285       sprintf(temp, "0x%X", (unsigned char)result);
 286    return CopyString(temp);
 287 }
 288
 289 public char * PrintUChar(unsigned char result)
 290 {
 291    char temp[100];
 292    sprintf(temp, "0x%X", result);
 293    return CopyString(temp);
 294 }
 295
 296 public char * PrintFloat(float result)
 297 {
 298    char temp[350];
 299    sprintf(temp, "%.16ff", result);
 300    return CopyString(temp);
 301 }
 302
 303 public char * PrintDouble(double result)
 304 {
 305    char temp[350];
 306    sprintf(temp, "%.16f", result);
 307    return CopyString(temp);
 308 }
 309
 310 ////////////////////////////////////////////////////////////////////////
 311 ////////////////////////////////////////////////////////////////////////
 312
 313 //public Operand GetOperand(Expression exp);
 314
 315 #define GETVALUE(name, t) \
 316    public bool Get##name(Expression exp, t * value2) \
 317    {                                                        \
 318       Operand op2 = GetOperand(exp);                        \
 319       if(op2.kind == intType && op2.type.isSigned) *value2 = (t) op2.i; \
 320       else if(op2.kind == intType) *value2 = (t) op2.ui;                 \
 321       else if(op2.kind == int64Type && op2.type.isSigned) *value2 = (t) op2.i64; \
 322       else if(op2.kind == int64Type) *value2 = (t) op2.ui64;                 \
 323       else if(op2.kind == intSizeType && op2.type.isSigned) *value2 = (t) op2.i64; \
 324       else if(op2.kind == intSizeType) *value2 = (t) op2.ui64; \
 325       else if(op2.kind == intPtrType && op2.type.isSigned) *value2 = (t) op2.i64; \
 326       else if(op2.kind == intPtrType) *value2 = (t) op2.ui64;                 \
 327       else if(op2.kind == shortType && op2.type.isSigned) *value2 = (t) op2.s;   \
 328       else if(op2.kind == shortType) *value2 = (t) op2.us;                        \
 329       else if(op2.kind == charType && op2.type.isSigned) *value2 = (t) op2.c;    \
 330       else if(op2.kind == charType) *value2 = (t) op2.uc;                         \
 331       else if(op2.kind == floatType) *value2 = (t) op2.f;                         \
 332       else if(op2.kind == doubleType) *value2 = (t) op2.d;                        \
 333       else if(op2.kind == pointerType) *value2 = (t) op2.ui64;                    \
 334       else                                                                          \
 335          return false;                                                              \
 336       return true;                                                                  \
 337    }
 338
 339 // To help the deubugger currently not preprocessing...
 340 #define HELP(x) x
 341
 342 GETVALUE(Int, HELP(int));
 343 GETVALUE(UInt, HELP(unsigned int));
 344 GETVALUE(Int64, HELP(int64));
 345 GETVALUE(UInt64, HELP(uint64));
 346 GETVALUE(IntPtr, HELP(intptr));
 347 GETVALUE(UIntPtr, HELP(uintptr));
 348 GETVALUE(IntSize, HELP(intsize));
 349 GETVALUE(UIntSize, HELP(uintsize));
 350 GETVALUE(Short, HELP(short));
 351 GETVALUE(UShort, HELP(unsigned short));
 352 GETVALUE(Char, HELP(char));
 353 GETVALUE(UChar, HELP(unsigned char));
 354 GETVALUE(Float, HELP(float));
 355 GETVALUE(Double, HELP(double));
 356
 357 void ComputeExpression(Expression exp);
 358
 359 void ComputeClassMembers(Class _class, bool isMember)
 360 {
 361    DataMember member = isMember ? (DataMember) _class : null;
 362    Context context = isMember ? null : SetupTemplatesContext(_class);
 363    if(member || ((_class.type == bitClass || _class.type == normalClass || _class.type == structClass || _class.type == noHeadClass) &&
 364                  (_class.type == bitClass || (!_class.structSize || _class.structSize == _class.offset)) && _class.computeSize))
 365    {
 366       int c;
 367       int unionMemberOffset = 0;
 368       int bitFields = 0;
 369
 370       /*
 371       if(!member && (_class.type == structClass || _class.type == normalClass || _class.type == noHeadClass) && _class.memberOffset && _class.memberOffset > _class.base.structSize)
 372          _class.memberOffset = (_class.base && _class.base.type != systemClass) ? _class.base.structSize : 0;
 373       */
 374
 375       if(member)
 376       {
 377          member.memberOffset = 0;
 378          if(targetBits < sizeof(void *) * 8)
 379             member.structAlignment = 0;
 380       }
 381       else if(targetBits < sizeof(void *) * 8)
 382          _class.structAlignment = 0;
 383
 384       // Confusion here: non struct classes seem to have their memberOffset restart at 0 at each hierarchy level
 385       if(!member && ((_class.type == normalClass || _class.type == noHeadClass) || (_class.type == structClass && _class.memberOffset && _class.memberOffset > _class.base.structSize)))
 386          _class.memberOffset = (_class.base && _class.type == structClass) ? _class.base.structSize : 0;
 387
 388       if(!member && _class.destructionWatchOffset)
 389          _class.memberOffset += sizeof(OldList);
 390
 391       // To avoid reentrancy...
 392       //_class.structSize = -1;
 393
 394       {
 395          DataMember dataMember;
 396          for(dataMember = member ? member.members.first : _class.membersAndProperties.first; dataMember; dataMember = dataMember.next)
 397          {
 398             if(!dataMember.isProperty)
 399             {
 400                if(dataMember.type == normalMember && dataMember.dataTypeString && !dataMember.dataType)
 401                {
 402                   dataMember.dataType = ProcessTypeString(dataMember.dataTypeString, false);
 403                   /*if(!dataMember.dataType)
 404                      dataMember.dataType = ProcessTypeString(dataMember.dataTypeString, false);
 405                      */
 406                }
 407             }
 408          }
 409       }
 410
 411       {
 412          DataMember dataMember;
 413          for(dataMember = member ? member.members.first : _class.membersAndProperties.first; dataMember; dataMember = dataMember.next)
 414          {
 415             if(!dataMember.isProperty && (dataMember.type != normalMember || dataMember.dataTypeString))
 416             {
 417                if(!isMember && _class.type == bitClass && dataMember.dataType)
 418                {
 419                   BitMember bitMember = (BitMember) dataMember;
 420                   uint64 mask = 0;
 421                   int d;
 422
 423                   ComputeTypeSize(dataMember.dataType);
 424
 425                   if(bitMember.pos == -1) bitMember.pos = _class.memberOffset;
 426                   if(!bitMember.size) bitMember.size = dataMember.dataType.size * 8;
 427
 428                   _class.memberOffset = bitMember.pos + bitMember.size;
 429                   for(d = 0; d<bitMember.size; d++)
 430                   {
 431                      if(d)
 432                         mask <<= 1;
 433                      mask |= 1;
 434                   }
 435                   bitMember.mask = mask << bitMember.pos;
 436                }
 437                else if(dataMember.type == normalMember && dataMember.dataType)
 438                {
 439                   int size;
 440                   int alignment = 0;
 441
 442                   // Prevent infinite recursion
 443                   if(dataMember.dataType.kind != classType ||
 444                      ((!dataMember.dataType._class || !dataMember.dataType._class.registered || dataMember.dataType._class.registered != _class ||
 445                      _class.type != structClass)))
 446                      ComputeTypeSize(dataMember.dataType);
 447
 448                   if(dataMember.dataType.bitFieldCount)
 449                   {
 450                      bitFields += dataMember.dataType.bitFieldCount;
 451                      size = 0;
 452                   }
 453                   else
 454                   {
 455                      if(bitFields)
 456                      {
 457                         int size = (bitFields + 7) / 8;
 458
 459                         if(isMember)
 460                         {
 461                            // TESTING THIS PADDING CODE
 462                            if(alignment)
 463                            {
 464                               member.structAlignment = Max(member.structAlignment, alignment);
 465
 466                               if(member.memberOffset % alignment)
 467                                  member.memberOffset += alignment - (member.memberOffset % alignment);
 468                            }
 469
 470                            dataMember.offset = member.memberOffset;
 471                            if(member.type == unionMember)
 472                               unionMemberOffset = Max(unionMemberOffset, dataMember.dataType.size);
 473                            else
 474                            {
 475                               member.memberOffset += size;
 476                            }
 477                         }
 478                         else
 479                         {
 480                            // TESTING THIS PADDING CODE
 481                            if(alignment)
 482                            {
 483                               _class.structAlignment = Max(_class.structAlignment, alignment);
 484
 485                               if(_class.memberOffset % alignment)
 486                                  _class.memberOffset += alignment - (_class.memberOffset % alignment);
 487                            }
 488
 489                            dataMember.offset = _class.memberOffset;
 490                            _class.memberOffset += size;
 491                         }
 492                         bitFields = 0;
 493                      }
 494                      size = dataMember.dataType.size;
 495                      alignment = dataMember.dataType.alignment;
 496                   }
 497
 498                   if(isMember)
 499                   {
 500                      // TESTING THIS PADDING CODE
 501                      if(alignment)
 502                      {
 503                         member.structAlignment = Max(member.structAlignment, alignment);
 504
 505                         if(member.memberOffset % alignment)
 506                            member.memberOffset += alignment - (member.memberOffset % alignment);
 507                      }
 508
 509                      dataMember.offset = member.memberOffset;
 510                      if(member.type == unionMember)
 511                         unionMemberOffset = Max(unionMemberOffset, dataMember.dataType.size);
 512                      else
 513                      {
 514                         member.memberOffset += size;
 515                      }
 516                   }
 517                   else
 518                   {
 519                      // TESTING THIS PADDING CODE
 520                      if(alignment)
 521                      {
 522                         _class.structAlignment = Max(_class.structAlignment, alignment);
 523
 524                         if(_class.memberOffset % alignment)
 525                            _class.memberOffset += alignment - (_class.memberOffset % alignment);
 526                      }
 527
 528                      dataMember.offset = _class.memberOffset;
 529                      _class.memberOffset += size;
 530                   }
 531                }
 532                else
 533                {
 534                   int alignment;
 535
 536                   ComputeClassMembers((Class)dataMember, true);
 537                   alignment = dataMember.structAlignment;
 538
 539                   if(isMember)
 540                   {
 541                      if(alignment)
 542                      {
 543                         if(member.memberOffset % alignment)
 544                            member.memberOffset += alignment - (member.memberOffset % alignment);
 545
 546                         member.structAlignment = Max(member.structAlignment, alignment);
 547                      }
 548                      dataMember.offset = member.memberOffset;
 549                      if(member.type == unionMember)
 550                         unionMemberOffset = Max(unionMemberOffset, dataMember.memberOffset);
 551                      else
 552                         member.memberOffset += dataMember.memberOffset;
 553                   }
 554                   else
 555                   {
 556                      if(alignment)
 557                      {
 558                         if(_class.memberOffset % alignment)
 559                            _class.memberOffset += alignment - (_class.memberOffset % alignment);
 560                         _class.structAlignment = Max(_class.structAlignment, alignment);
 561                      }
 562                      dataMember.offset = _class.memberOffset;
 563                      _class.memberOffset += dataMember.memberOffset;
 564                   }
 565                }
 566             }
 567          }
 568          if(bitFields)
 569          {
 570             int alignment = 0;
 571             int size = (bitFields + 7) / 8;
 572
 573             if(isMember)
 574             {
 575                // TESTING THIS PADDING CODE
 576                if(alignment)
 577                {
 578                   member.structAlignment = Max(member.structAlignment, alignment);
 579
 580                   if(member.memberOffset % alignment)
 581                      member.memberOffset += alignment - (member.memberOffset % alignment);
 582                }
 583
 584                if(member.type == unionMember)
 585                   unionMemberOffset = Max(unionMemberOffset, dataMember.dataType.size);
 586                else
 587                {
 588                   member.memberOffset += size;
 589                }
 590             }
 591             else
 592             {
 593                // TESTING THIS PADDING CODE
 594                if(alignment)
 595                {
 596                   _class.structAlignment = Max(_class.structAlignment, alignment);
 597
 598                   if(_class.memberOffset % alignment)
 599                      _class.memberOffset += alignment - (_class.memberOffset % alignment);
 600                }
 601                _class.memberOffset += size;
 602             }
 603             bitFields = 0;
 604          }
 605       }
 606       if(member && member.type == unionMember)
 607       {
 608          member.memberOffset = unionMemberOffset;
 609       }
 610
 611       if(!isMember)
 612       {
 613          /*if(_class.type == structClass)
 614             _class.size = _class.memberOffset;
 615          else
 616          */
 617
 618          if(_class.type != bitClass)
 619          {
 620             int extra = 0;
 621             if(_class.structAlignment)
 622             {
 623                if(_class.memberOffset % _class.structAlignment)
 624                   extra += _class.structAlignment - (_class.memberOffset % _class.structAlignment);
 625             }
 626             _class.structSize = (_class.base ? (_class.base.templateClass ? _class.base.templateClass.structSize : _class.base.structSize) : 0) + _class.memberOffset + extra;
 627             if(!member)
 628             {
 629                Property prop;
 630                for(prop = _class.membersAndProperties.first; prop; prop = prop.next)
 631                {
 632                   if(prop.isProperty && prop.isWatchable)
 633                   {
 634                      prop.watcherOffset = _class.structSize;
 635                      _class.structSize += sizeof(OldList);
 636                   }
 637                }
 638             }
 639
 640             // Fix Derivatives
 641             {
 642                OldLink derivative;
 643                for(derivative = _class.derivatives.first; derivative; derivative = derivative.next)
 644                {
 645                   Class deriv = derivative.data;
 646
 647                   if(deriv.computeSize)
 648                   {
 649                      // TESTING THIS NEW CODE HERE... TRYING TO FIX ScrollBar MEMBERS DEBUGGING
 650                      deriv.offset = /*_class.offset + */_class.structSize;
 651                      deriv.memberOffset = 0;
 652                      // ----------------------
 653
 654                      deriv.structSize = deriv.offset;
 655
 656                      ComputeClassMembers(deriv, false);
 657                   }
 658                }
 659             }
 660          }
 661       }
 662    }
 663    if(context)
 664       FinishTemplatesContext(context);
 665 }
 666
 667 public void ComputeModuleClasses(Module module)
 668 {
 669    Class _class;
 670    OldLink subModule;
 671
 672    for(subModule = module.modules.first; subModule; subModule = subModule.next)
 673       ComputeModuleClasses(subModule.data);
 674    for(_class = module.classes.first; _class; _class = _class.next)
 675       ComputeClassMembers(_class, false);
 676 }
 677
 678
 679 public int ComputeTypeSize(Type type)
 680 {
 681    uint size = type ? type.size : 0;
 682    if(!size && type && !type.computing)
 683    {
 684       type.computing = true;
 685       switch(type.kind)
 686       {
 687          case charType: type.alignment = size = sizeof(char); break;
 688          case intType: type.alignment = size = sizeof(int); break;
 689          case int64Type: type.alignment = size = sizeof(int64); break;
 690          case intPtrType: type.alignment = size = targetBits / 8; break;
 691          case intSizeType: type.alignment = size = targetBits / 8; break;
 692          case longType: type.alignment = size = sizeof(long); break;
 693          case shortType: type.alignment = size = sizeof(short); break;
 694          case floatType: type.alignment = size = sizeof(float); break;
 695          case doubleType: type.alignment = size = sizeof(double); break;
 696          case classType:
 697          {
 698             Class _class = type._class ? type._class.registered : null;
 699
 700             if(_class && _class.type == structClass)
 701             {
 702                // Ensure all members are properly registered
 703                ComputeClassMembers(_class, false);
 704                type.alignment = _class.structAlignment;
 705                size = _class.structSize;
 706                if(type.alignment && size % type.alignment)
 707                   size += type.alignment - (size % type.alignment);
 708
 709             }
 710             else if(_class && (_class.type == unitClass ||
 711                    _class.type == enumClass ||
 712                    _class.type == bitClass))
 713             {
 714                if(!_class.dataType)
 715                   _class.dataType = ProcessTypeString(_class.dataTypeString, false);
 716                size = type.alignment = ComputeTypeSize(_class.dataType);
 717             }
 718             else
 719                size = type.alignment = targetBits / 8; // sizeof(Instance *);
 720             break;
 721          }
 722          case pointerType: case subClassType: size = type.alignment = targetBits / 8; /*sizeof(void *); */break;
 723          case arrayType:
 724             if(type.arraySizeExp)
 725             {
 726                ProcessExpressionType(type.arraySizeExp);
 727                ComputeExpression(type.arraySizeExp);
 728                if(!type.arraySizeExp.isConstant || (type.arraySizeExp.expType.kind != intType && type.arraySizeExp.expType.kind != enumType &&
 729                   (type.arraySizeExp.expType.kind != classType || !type.arraySizeExp.expType._class.registered || type.arraySizeExp.expType._class.registered.type != enumClass)))
 730                {
 731                   Location oldLoc = yylloc;
 732                   // bool isConstant = type.arraySizeExp.isConstant;
 733                   char expression[10240];
 734                   expression[0] = '\0';
 735                   type.arraySizeExp.expType = null;
 736                   yylloc = type.arraySizeExp.loc;
 737                   if(inCompiler)
 738                      PrintExpression(type.arraySizeExp, expression);
 739                   Compiler_Error($"Array size not constant int (%s)\n", expression);
 740                   yylloc = oldLoc;
 741                }
 742                GetInt(type.arraySizeExp, &type.arraySize);
 743             }
 744             else if(type.enumClass)
 745             {
 746                if(type.enumClass && type.enumClass.registered && type.enumClass.registered.type == enumClass)
 747                {
 748                   type.arraySize = (int)eClass_GetProperty(type.enumClass.registered, "enumSize");
 749                }
 750                else
 751                   type.arraySize = 0;
 752             }
 753             else
 754             {
 755                // Unimplemented auto size
 756                type.arraySize = 0;
 757             }
 758
 759             size = ComputeTypeSize(type.type) * type.arraySize;
 760             if(type.type)
 761                type.alignment = type.type.alignment;
 762
 763             break;
 764          case structType:
 765          {
 766             Type member;
 767             for(member = type.members.first; member; member = member.next)
 768             {
 769                uint addSize = ComputeTypeSize(member);
 770
 771                member.offset = size;
 772                if(member.alignment && size % member.alignment)
 773                   member.offset += member.alignment - (size % member.alignment);
 774                size = member.offset;
 775
 776                type.alignment = Max(type.alignment, member.alignment);
 777                size += addSize;
 778             }
 779             if(type.alignment && size % type.alignment)
 780                size += type.alignment - (size % type.alignment);
 781             break;
 782          }
 783          case unionType:
 784          {
 785             Type member;
 786             for(member = type.members.first; member; member = member.next)
 787             {
 788                uint addSize = ComputeTypeSize(member);
 789
 790                member.offset = size;
 791                if(member.alignment && size % member.alignment)
 792                   member.offset += member.alignment - (size % member.alignment);
 793                size = member.offset;
 794
 795                type.alignment = Max(type.alignment, member.alignment);
 796                size = Max(size, addSize);
 797             }
 798             if(type.alignment && size % type.alignment)
 799                size += type.alignment - (size % type.alignment);
 800             break;
 801          }
 802          case templateType:
 803          {
 804             TemplateParameter param = type.templateParameter;
 805             Type baseType = ProcessTemplateParameterType(param);
 806             if(baseType)
 807             {
 808                size = ComputeTypeSize(baseType);
 809                type.alignment = baseType.alignment;
 810             }
 811             else
 812                type.alignment = size = sizeof(uint64);
 813             break;
 814          }
 815          case enumType:
 816          {
 817             type.alignment = size = sizeof(enum { test });
 818             break;
 819          }
 820          case thisClassType:
 821          {
 822             type.alignment = size = targetBits / 8; //sizeof(void *);
 823             break;
 824          }
 825       }
 826       type.size = size;
 827       type.computing = false;
 828    }
 829    return size;
 830 }
 831
 832
 833 /*static */int AddMembers(OldList * declarations, Class _class, bool isMember, uint * retSize, Class topClass, bool *addedPadding)
 834 {
 835    // This function is in need of a major review when implementing private members etc.
 836    DataMember topMember = isMember ? (DataMember) _class : null;
 837    uint totalSize = 0;
 838    uint maxSize = 0;
 839    int alignment, size;
 840    DataMember member;
 841    Context context = isMember ? null : SetupTemplatesContext(_class);
 842    if(addedPadding)
 843       *addedPadding = false;
 844
 845    if(!isMember && _class.base)
 846    {
 847       maxSize = _class.structSize;
 848       //if(_class.base.type != systemClass) // Commented out with new Instance _class
 849       {
 850          // DANGER: Testing this noHeadClass here...
 851          if(_class.type == structClass || _class.type == noHeadClass)
 852             /*totalSize = */AddMembers(declarations, _class.base, false, &totalSize, topClass, null);
 853          else
 854          {
 855             uint baseSize = _class.base.templateClass ? _class.base.templateClass.structSize : _class.base.structSize;
 856             if(maxSize > baseSize)
 857                maxSize -= baseSize;
 858             else
 859                maxSize = 0;
 860          }
 861       }
 862    }
 863
 864    for(member = isMember ? topMember.members.first : _class.membersAndProperties.first; member; member = member.next)
 865    {
 866       if(!member.isProperty)
 867       {
 868          switch(member.type)
 869          {
 870             case normalMember:
 871             {
 872                if(member.dataTypeString)
 873                {
 874                   OldList * specs = MkList(), * decls = MkList();
 875                   Declarator decl;
 876
 877                   decl = SpecDeclFromString(member.dataTypeString, specs,
 878                      MkDeclaratorIdentifier(MkIdentifier(member.name)));
 879                   ListAdd(decls, MkStructDeclarator(decl, null));
 880                   ListAdd(declarations, MkClassDefDeclaration(MkStructDeclaration(specs, decls, null)));
 881
 882                   if(!member.dataType)
 883                      member.dataType = ProcessType(specs, decl);
 884
 885                   ReplaceThisClassSpecifiers(specs, topClass /*member._class*/);
 886
 887                   {
 888                      Type type = ProcessType(specs, decl);
 889                      DeclareType(member.dataType, false, false);
 890                      FreeType(type);
 891                   }
 892                   /*
 893                   if(member.dataType && member.dataType.kind == classType && member.dataType._class &&
 894                      member.dataType._class.registered && member.dataType._class.registered.type == structClass)
 895                      DeclareStruct(member.dataType._class.string, false);
 896                   */
 897
 898                   ComputeTypeSize(member.dataType);
 899                   size = member.dataType.size;
 900                   alignment = member.dataType.alignment;
 901
 902                   if(alignment)
 903                   {
 904                      if(totalSize % alignment)
 905                         totalSize += alignment - (totalSize % alignment);
 906                   }
 907                   totalSize += size;
 908                }
 909                break;
 910             }
 911             case unionMember:
 912             case structMember:
 913             {
 914                OldList * specs = MkList(), * list = MkList();
 915
 916                size = 0;
 917                AddMembers(list, (Class)member, true, &size, topClass, null);
 918                ListAdd(specs,
 919                   MkStructOrUnion((member.type == unionMember)?unionSpecifier:structSpecifier, null, list));
 920                ListAdd(declarations, MkClassDefDeclaration(MkStructDeclaration(specs, null, null)));
 921                alignment = member.structAlignment;
 922
 923                if(alignment)
 924                {
 925                   if(totalSize % alignment)
 926                      totalSize += alignment - (totalSize % alignment);
 927                }
 928                totalSize += size;
 929                break;
 930             }
 931          }
 932       }
 933    }
 934    if(retSize)
 935    {
 936       if(topMember && topMember.type == unionMember)
 937          *retSize = Max(*retSize, totalSize);
 938       else
 939          *retSize += totalSize;
 940    }
 941    else if(totalSize < maxSize && _class.type != systemClass)
 942    {
 943       int autoPadding = 0;
 944       if(!isMember && _class.structAlignment && totalSize % _class.structAlignment)
 945          autoPadding = _class.structAlignment - (totalSize % _class.structAlignment);
 946       if(totalSize + autoPadding < maxSize)
 947       {
 948          char sizeString[50];
 949          sprintf(sizeString, "%d", maxSize - totalSize);
 950          ListAdd(declarations,
 951             MkClassDefDeclaration(MkStructDeclaration(MkListOne(MkSpecifier(CHAR)),
 952             MkListOne(MkDeclaratorArray(MkDeclaratorIdentifier(MkIdentifier("__ecere_padding")), MkExpConstant(sizeString))), null)));
 953          if(addedPadding)
 954             *addedPadding = true;
 955       }
 956    }
 957    if(context)
 958       FinishTemplatesContext(context);
 959    return topMember ? topMember.memberID : _class.memberID;
 960 }
 961
 962 static int DeclareMembers(Class _class, bool isMember)
 963 {
 964    DataMember topMember = isMember ? (DataMember) _class : null;
 965    uint totalSize = 0;
 966    DataMember member;
 967    Context context = isMember ? null : SetupTemplatesContext(_class);
 968
 969    if(!isMember && (_class.type == structClass || _class.type == noHeadClass) && _class.base.type != systemClass)
 970       DeclareMembers(_class.base, false);
 971
 972    for(member = isMember ? topMember.members.first : _class.membersAndProperties.first; member; member = member.next)
 973    {
 974       if(!member.isProperty)
 975       {
 976          switch(member.type)
 977          {
 978             case normalMember:
 979             {
 980                /*
 981                if(member.dataType && member.dataType.kind == classType && member.dataType._class &&
 982                   member.dataType._class.registered && member.dataType._class.registered.type == structClass)
 983                   DeclareStruct(member.dataType._class.string, false);
 984                   */
 985                if(!member.dataType && member.dataTypeString)
 986                   member.dataType = ProcessTypeString(member.dataTypeString, false);
 987                if(member.dataType)
 988                   DeclareType(member.dataType, false, false);
 989                break;
 990             }
 991             case unionMember:
 992             case structMember:
 993             {
 994                DeclareMembers((Class)member, true);
 995                break;
 996             }
 997          }
 998       }
 999    }
1000    if(context)
1001       FinishTemplatesContext(context);
1002
1003    return topMember ? topMember.memberID : _class.memberID;
1004 }
1005
1006 void DeclareStruct(char * name, bool skipNoHead)
1007 {
1008    External external = null;
1009    Symbol classSym = FindClass(name);
1010
1011    if(!inCompiler || !classSym) return;
1012
1013    // We don't need any declaration for bit classes...
1014    if(classSym.registered &&
1015       (classSym.registered.type == bitClass || classSym.registered.type == unitClass || classSym.registered.type == enumClass))
1016       return;
1017
1018    /*if(classSym.registered.templateClass)
1019       return DeclareStruct(classSym.registered.templateClass.fullName, skipNoHead);
1020    */
1021
1022    if(classSym.registered && classSym.imported && !classSym.declaredStructSym)
1023    {
1024       // Add typedef struct
1025       Declaration decl;
1026       OldList * specifiers, * declarators;
1027       OldList * declarations = null;
1028       char structName[1024];
1029       external = (classSym.registered && classSym.registered.type == structClass) ?
1030          classSym.pointerExternal : classSym.structExternal;
1031
1032       // TEMPORARY HACK: Pass 3 will move up struct declarations without moving members
1033       // Moved this one up because DeclareClass done later will need it
1034
1035       classSym.declaring++;
1036
1037       if(strchr(classSym.string, '<'))
1038       {
1039          if(classSym.registered.templateClass)
1040          {
1041             DeclareStruct(classSym.registered.templateClass.fullName, skipNoHead);
1042             classSym.declaring--;
1043          }
1044          return;
1045       }
1046
1047       //if(!skipNoHead)
1048          DeclareMembers(classSym.registered, false);
1049
1050       structName[0] = 0;
1051       FullClassNameCat(structName, name, false);
1052
1053       /*if(!external)
1054          external = MkExternalDeclaration(null);*/
1055
1056       if(!skipNoHead)
1057       {
1058          bool addedPadding = false;
1059          classSym.declaredStructSym = true;
1060
1061          declarations = MkList();
1062
1063          AddMembers(declarations, classSym.registered, false, null, classSym.registered, &addedPadding);
1064
1065          //ListAdd(specifiers, MkSpecifier(TYPEDEF));
1066          //ListAdd(specifiers, MkStructOrUnion(structSpecifier, null, declarations));
1067
1068          if(!declarations->count || (declarations->count == 1 && addedPadding))
1069          {
1070             FreeList(declarations, FreeClassDef);
1071             declarations = null;
1072          }
1073       }
1074       if(skipNoHead || declarations)
1075       {
1076          if(external && external.declaration)
1077          {
1078             ((Specifier)external.declaration.specifiers->first).definitions = declarations;
1079
1080             if(curExternal && curExternal.symbol && curExternal.symbol.idCode < classSym.id)
1081             {
1082                // TODO: Fix this
1083                //ast->Move(classSym.structExternal ? classSym.structExternal : classSym.pointerExternal, curExternal.prev);
1084
1085                // DANGER
1086                if(classSym.structExternal)
1087                   ast->Move(classSym.structExternal, curExternal.prev);
1088                ast->Move(classSym.pointerExternal, curExternal.prev);
1089
1090                classSym.id = curExternal.symbol.idCode;
1091                classSym.idCode = curExternal.symbol.idCode;
1092                // external = classSym.pointerExternal;
1093                //external = classSym.structExternal ? classSym.structExternal : classSym.pointerExternal;
1094             }
1095          }
1096          else
1097          {
1098             if(!external)
1099                external = MkExternalDeclaration(null);
1100
1101             specifiers = MkList();
1102             declarators = MkList();
1103             ListAdd(specifiers, MkStructOrUnion(structSpecifier, MkIdentifier(structName), declarations));
1104
1105             /*
1106             d = MkDeclaratorIdentifier(MkIdentifier(structName));
1107             ListAdd(declarators, MkInitDeclarator(d, null));
1108             */
1109             external.declaration = decl = MkDeclaration(specifiers, declarators);
1110             if(decl.symbol && !decl.symbol.pointerExternal)
1111                decl.symbol.pointerExternal = external;
1112
1113             // For simple classes, keep the declaration as the external to move around
1114             if(classSym.registered && classSym.registered.type == structClass)
1115             {
1116                char className[1024];
1117                strcpy(className, "__ecereClass_");
1118                FullClassNameCat(className, classSym.string, true);
1119                MangleClassName(className);
1120
1121                // Testing This
1122                DeclareClass(classSym, className);
1123
1124                external.symbol = classSym;
1125                classSym.pointerExternal = external;
1126                classSym.id = (curExternal && curExternal.symbol) ? curExternal.symbol.idCode : 0;
1127                classSym.idCode = (curExternal && curExternal.symbol) ? curExternal.symbol.idCode : 0;
1128             }
1129             else
1130             {
1131                char className[1024];
1132                strcpy(className, "__ecereClass_");
1133                FullClassNameCat(className, classSym.string, true);
1134                MangleClassName(className);
1135
1136                // TOFIX: TESTING THIS...
1137                classSym.structExternal = external;
1138                DeclareClass(classSym, className);
1139                external.symbol = classSym;
1140             }
1141
1142             //if(curExternal)
1143                ast->Insert(curExternal ? curExternal.prev : null, external);
1144          }
1145       }
1146
1147       classSym.declaring--;
1148    }
1149    else if(curExternal && curExternal.symbol && curExternal.symbol.idCode < classSym.id)
1150    {
1151       // TEMPORARY HACK: Pass 3 will move up struct declarations without moving members
1152       // Moved this one up because DeclareClass done later will need it
1153
1154       // TESTING THIS:
1155       classSym.declaring++;
1156
1157       //if(!skipNoHead)
1158       {
1159          if(classSym.registered)
1160             DeclareMembers(classSym.registered, false);
1161       }
1162
1163       if(classSym.registered && (classSym.registered.type == structClass || classSym.registered.type == noHeadClass))
1164       {
1165          // TODO: Fix this
1166          //ast->Move(classSym.structExternal ? classSym.structExternal : classSym.pointerExternal, curExternal.prev);
1167
1168          // DANGER
1169          if(classSym.structExternal)
1170             ast->Move(classSym.structExternal, curExternal.prev);
1171          ast->Move(classSym.pointerExternal, curExternal.prev);
1172
1173          classSym.id = curExternal.symbol.idCode;
1174          classSym.idCode = curExternal.symbol.idCode;
1175          // external = classSym.pointerExternal;
1176          // external = classSym.structExternal ? classSym.structExternal : classSym.pointerExternal;
1177       }
1178
1179       classSym.declaring--;
1180    }
1181    //return external;
1182 }
1183
1184 void DeclareProperty(Property prop, char * setName, char * getName)
1185 {
1186    Symbol symbol = prop.symbol;
1187    char propName[1024];
1188
1189    strcpy(setName, "__ecereProp_");
1190    FullClassNameCat(setName, prop._class.fullName, false);
1191    strcat(setName, "_Set_");
1192    // strcat(setName, prop.name);
1193    FullClassNameCat(setName, prop.name, true);
1194
1195    strcpy(getName, "__ecereProp_");
1196    FullClassNameCat(getName, prop._class.fullName, false);
1197    strcat(getName, "_Get_");
1198    FullClassNameCat(getName, prop.name, true);
1199    // strcat(getName, prop.name);
1200
1201    strcpy(propName, "__ecereProp_");
1202    FullClassNameCat(propName, prop._class.fullName, false);
1203    strcat(propName, "_");
1204    FullClassNameCat(propName, prop.name, true);
1205    // strcat(propName, prop.name);
1206
1207    // To support "char *" property
1208    MangleClassName(getName);
1209    MangleClassName(setName);
1210    MangleClassName(propName);
1211
1212    if(prop._class.type == structClass)
1213       DeclareStruct(prop._class.fullName, false);
1214
1215    if(!symbol || curExternal.symbol.idCode < symbol.id)
1216    {
1217       bool imported = false;
1218       bool dllImport = false;
1219       if(!symbol || symbol._import)
1220       {
1221          if(!symbol)
1222          {
1223             Symbol classSym;
1224             if(!prop._class.symbol)
1225                prop._class.symbol = FindClass(prop._class.fullName);
1226             classSym = prop._class.symbol;
1227             if(classSym && !classSym._import)
1228             {
1229                ModuleImport module;
1230
1231                if(prop._class.module)
1232                   module = FindModule(prop._class.module);
1233                else
1234                   module = mainModule;
1235
1236                classSym._import = ClassImport
1237                {
1238                   name = CopyString(prop._class.fullName);
1239                   isRemote = prop._class.isRemote;
1240                };
1241                module.classes.Add(classSym._import);
1242             }
1243             symbol = prop.symbol = Symbol { };
1244             symbol._import = (ClassImport)PropertyImport
1245             {
1246                name = CopyString(prop.name);
1247                isVirtual = false; //prop.isVirtual;
1248                hasSet = prop.Set ? true : false;
1249                hasGet = prop.Get ? true : false;
1250             };
1251             if(classSym)
1252                classSym._import.properties.Add(symbol._import);
1253          }
1254          imported = true;
1255          if(prop._class.module != privateModule && prop._class.module.importType != staticImport)
1256             dllImport = true;
1257       }
1258
1259       if(!symbol.type)
1260       {
1261          Context context = SetupTemplatesContext(prop._class);
1262          symbol.type = ProcessTypeString(prop.dataTypeString, false);
1263          FinishTemplatesContext(context);
1264       }
1265
1266       // Get
1267       if(prop.Get)
1268       {
1269          if(!symbol.externalGet || symbol.externalGet.type == functionExternal)
1270          {
1271             Declaration decl;
1272             OldList * specifiers, * declarators;
1273             Declarator d;
1274             OldList * params;
1275             Specifier spec;
1276             External external;
1277             Declarator typeDecl;
1278             bool simple = false;
1279
1280             specifiers = MkList();
1281             declarators = MkList();
1282             params = MkList();
1283
1284             ListAdd(params, MkTypeName(MkListOne(MkSpecifierName /*MkClassName*/(prop._class.fullName)),
1285                MkDeclaratorIdentifier(MkIdentifier("this"))));
1286
1287             d = MkDeclaratorIdentifier(MkIdentifier(getName));
1288             //if(imported)
1289             if(dllImport)
1290                d = MkDeclaratorBrackets(MkDeclaratorPointer(MkPointer(null, null), d));
1291
1292             {
1293                Context context = SetupTemplatesContext(prop._class);
1294                typeDecl = SpecDeclFromString(prop.dataTypeString, specifiers, null);
1295                FinishTemplatesContext(context);
1296             }
1297
1298             // Make sure the simple _class's type is declared
1299             for(spec = specifiers->first; spec; spec = spec.next)
1300             {
1301                if(spec.type == nameSpecifier /*SpecifierClass*/)
1302                {
1303                   if((!typeDecl || typeDecl.type == identifierDeclarator))
1304                   {
1305                      Symbol classSym = spec.symbol; // FindClass(spec.name);
1306                      symbol._class = classSym.registered;
1307                      if(classSym.registered && classSym.registered.type == structClass)
1308                      {
1309                         DeclareStruct(spec.name, false);
1310                         simple = true;
1311                      }
1312                   }
1313                }
1314             }
1315
1316             if(!simple)
1317                d = PlugDeclarator(typeDecl, d);
1318             else
1319             {
1320                ListAdd(params, MkTypeName(specifiers,
1321                   PlugDeclarator(typeDecl, MkDeclaratorIdentifier(MkIdentifier("value")))));
1322                specifiers = MkList();
1323             }
1324
1325             d = MkDeclaratorFunction(d, params);
1326
1327             //if(imported)
1328             if(dllImport)
1329                specifiers->Insert(null, MkSpecifier(EXTERN));
1330             else if(prop._class.symbol && ((Symbol)prop._class.symbol).isStatic)
1331                specifiers->Insert(null, MkSpecifier(STATIC));
1332             if(simple)
1333                ListAdd(specifiers, MkSpecifier(VOID));
1334
1335             ListAdd(declarators, MkInitDeclarator(d, null));
1336
1337             decl = MkDeclaration(specifiers, declarators);
1338
1339             external = MkExternalDeclaration(decl);
1340             ast->Insert(curExternal.prev, external);
1341             external.symbol = symbol;
1342             symbol.externalGet = external;
1343
1344             ReplaceThisClassSpecifiers(specifiers, prop._class);
1345
1346             if(typeDecl)
1347                FreeDeclarator(typeDecl);
1348          }
1349          else
1350          {
1351             // Move declaration higher...
1352             ast->Move(symbol.externalGet, curExternal.prev);
1353          }
1354       }
1355
1356       // Set
1357       if(prop.Set)
1358       {
1359          if(!symbol.externalSet || symbol.externalSet.type == functionExternal)
1360          {
1361             Declaration decl;
1362             OldList * specifiers, * declarators;
1363             Declarator d;
1364             OldList * params;
1365             Specifier spec;
1366             External external;
1367             Declarator typeDecl;
1368
1369             declarators = MkList();
1370             params = MkList();
1371
1372             // TESTING COMMENTING THIS FIRST LINE OUT, what was the problem? Trying to add noHeadClass here ...
1373             if(!prop.conversion || prop._class.type == structClass)
1374             {
1375                ListAdd(params, MkTypeName(MkListOne(MkSpecifierName/*MkClassName*/(prop._class.fullName)),
1376                   MkDeclaratorIdentifier(MkIdentifier("this"))));
1377             }
1378
1379             specifiers = MkList();
1380
1381             {
1382                Context context = SetupTemplatesContext(prop._class);
1383                typeDecl = d = SpecDeclFromString(prop.dataTypeString, specifiers,
1384                   MkDeclaratorIdentifier(MkIdentifier("value")));
1385                FinishTemplatesContext(context);
1386             }
1387             ListAdd(params, MkTypeName(specifiers, d));
1388
1389             d = MkDeclaratorIdentifier(MkIdentifier(setName));
1390             //if(imported)
1391             if(dllImport)
1392                d = MkDeclaratorBrackets(MkDeclaratorPointer(MkPointer(null, null), d));
1393             d = MkDeclaratorFunction(d, params);
1394
1395             // Make sure the simple _class's type is declared
1396             for(spec = specifiers->first; spec; spec = spec.next)
1397             {
1398                if(spec.type == nameSpecifier /*SpecifierClass*/)
1399                {
1400                   if((!typeDecl || typeDecl.type == identifierDeclarator))
1401                   {
1402                      Symbol classSym = spec.symbol; // FindClass(spec.name);
1403                      symbol._class = classSym.registered;
1404                      if(classSym.registered && classSym.registered.type == structClass)
1405                         DeclareStruct(spec.name, false);
1406                   }
1407                }
1408             }
1409
1410             ListAdd(declarators, MkInitDeclarator(d, null));
1411
1412             specifiers = MkList();
1413             //if(imported)
1414             if(dllImport)
1415                specifiers->Insert(null, MkSpecifier(EXTERN));
1416             else if(prop._class.symbol && ((Symbol)prop._class.symbol).isStatic)
1417                specifiers->Insert(null, MkSpecifier(STATIC));
1418
1419             // TESTING COMMENTING THIS FIRST LINE OUT, what was the problem? Trying to add noHeadClass here ...
1420             if(!prop.conversion || prop._class.type == structClass)
1421                ListAdd(specifiers, MkSpecifier(VOID));
1422             else
1423                ListAdd(specifiers, MkSpecifierName/*MkClassName*/(prop._class.fullName));
1424
1425             decl = MkDeclaration(specifiers, declarators);
1426
1427             external = MkExternalDeclaration(decl);
1428             ast->Insert(curExternal.prev, external);
1429             external.symbol = symbol;
1430             symbol.externalSet = external;
1431
1432             ReplaceThisClassSpecifiers(specifiers, prop._class);
1433          }
1434          else
1435          {
1436             // Move declaration higher...
1437             ast->Move(symbol.externalSet, curExternal.prev);
1438          }
1439       }
1440
1441       // Property (for Watchers)
1442       if(!symbol.externalPtr)
1443       {
1444          Declaration decl;
1445          External external;
1446          OldList * specifiers = MkList();
1447
1448          if(imported)
1449             specifiers->Insert(null, MkSpecifier(EXTERN));
1450          else
1451             specifiers->Insert(null, MkSpecifier(STATIC));
1452
1453          ListAdd(specifiers, MkSpecifierName("Property"));
1454
1455          {
1456             OldList * list = MkList();
1457             ListAdd(list, MkInitDeclarator(MkDeclaratorPointer(MkPointer(null, null),
1458                   MkDeclaratorIdentifier(MkIdentifier(propName))), null));
1459
1460             if(!imported)
1461             {
1462                strcpy(propName, "__ecerePropM_");
1463                FullClassNameCat(propName, prop._class.fullName, false);
1464                strcat(propName, "_");
1465                // strcat(propName, prop.name);
1466                FullClassNameCat(propName, prop.name, true);
1467
1468                MangleClassName(propName);
1469
1470                ListAdd(list, MkInitDeclarator(MkDeclaratorPointer(MkPointer(null, null),
1471                      MkDeclaratorIdentifier(MkIdentifier(propName))), null));
1472             }
1473             decl = MkDeclaration(specifiers, list);
1474          }
1475
1476          external = MkExternalDeclaration(decl);
1477          ast->Insert(curExternal.prev, external);
1478          external.symbol = symbol;
1479          symbol.externalPtr = external;
1480       }
1481       else
1482       {
1483          // Move declaration higher...
1484          ast->Move(symbol.externalPtr, curExternal.prev);
1485       }
1486
1487       symbol.id = curExternal.symbol.idCode;
1488    }
1489 }
1490
1491 // ***************** EXPRESSION PROCESSING ***************************
1492 public Type Dereference(Type source)
1493 {
1494    Type type = null;
1495    if(source)
1496    {
1497       if(source.kind == pointerType || source.kind == arrayType)
1498       {
1499          type = source.type;
1500          source.type.refCount++;
1501       }
1502       else if(source.kind == classType && !strcmp(source._class.string, "String"))
1503       {
1504          type = Type
1505          {
1506             kind = charType;
1507             refCount = 1;
1508          };
1509       }
1510       // Support dereferencing of no head classes for now...
1511       else if(source.kind == classType && source._class && source._class.registered && source._class.registered.type == noHeadClass)
1512       {
1513          type = source;
1514          source.refCount++;
1515       }
1516       else
1517          Compiler_Error($"cannot dereference type\n");
1518    }
1519    return type;
1520 }
1521
1522 static Type Reference(Type source)
1523 {
1524    Type type = null;
1525    if(source)
1526    {
1527       type = Type
1528       {
1529          kind = pointerType;
1530          type = source;
1531          refCount = 1;
1532       };
1533       source.refCount++;
1534    }
1535    return type;
1536 }
1537
1538 void ProcessMemberInitData(MemberInit member, Class _class, Class * curClass, DataMember * curMember, DataMember * subMemberStack, int * subMemberStackPos)
1539 {
1540    Identifier ident = member.identifiers ? member.identifiers->first : null;
1541    bool found = false;
1542    DataMember dataMember = null;
1543    Method method = null;
1544    bool freeType = false;
1545
1546    yylloc = member.loc;
1547
1548    if(!ident)
1549    {
1550       if(curMember)
1551       {
1552          eClass_FindNextMember(_class, curClass, curMember, subMemberStack, subMemberStackPos);
1553          if(*curMember)
1554          {
1555             found = true;
1556             dataMember = *curMember;
1557          }
1558       }
1559    }
1560    else
1561    {
1562       DataMember thisMember = (DataMember)eClass_FindProperty(_class, ident.string, privateModule);
1563       DataMember _subMemberStack[256];
1564       int _subMemberStackPos = 0;
1565
1566       // FILL MEMBER STACK
1567       if(!thisMember)
1568          thisMember = eClass_FindDataMember(_class, ident.string, privateModule, _subMemberStack, &_subMemberStackPos);
1569       if(thisMember)
1570       {
1571          dataMember = thisMember;
1572          if(curMember && thisMember.memberAccess == publicAccess)
1573          {
1574             *curMember = thisMember;
1575             *curClass = thisMember._class;
1576             memcpy(subMemberStack, _subMemberStack, sizeof(DataMember) * _subMemberStackPos);
1577             *subMemberStackPos = _subMemberStackPos;
1578          }
1579          found = true;
1580       }
1581       else
1582       {
1583          // Setting a method
1584          method = eClass_FindMethod(_class, ident.string, privateModule);
1585          if(method && method.type == virtualMethod)
1586             found = true;
1587          else
1588             method = null;
1589       }
1590    }
1591
1592    if(found)
1593    {
1594       Type type = null;
1595       if(dataMember)
1596       {
1597          if(!dataMember.dataType && dataMember.dataTypeString)
1598          {
1599             //Context context = SetupTemplatesContext(dataMember._class);
1600             Context context = SetupTemplatesContext(_class);
1601             dataMember.dataType = ProcessTypeString(dataMember.dataTypeString, false);
1602             FinishTemplatesContext(context);
1603          }
1604          type = dataMember.dataType;
1605       }
1606       else if(method)
1607       {
1608          // This is for destination type...
1609          if(!method.dataType)
1610             ProcessMethodType(method);
1611          //DeclareMethod(method);
1612          // method.dataType = ((Symbol)method.symbol)->type;
1613          type = method.dataType;
1614       }
1615
1616       if(ident && ident.next)
1617       {
1618          for(ident = ident.next; ident && type; ident = ident.next)
1619          {
1620             if(type.kind == classType)
1621             {
1622                dataMember = (DataMember)eClass_FindProperty(type._class.registered, ident.string, privateModule);
1623                if(!dataMember)
1624                   dataMember = eClass_FindDataMember(type._class.registered, ident.string, privateModule, null, null);
1625                if(dataMember)
1626                   type = dataMember.dataType;
1627             }
1628             else if(type.kind == structType || type.kind == unionType)
1629             {
1630                Type memberType;
1631                for(memberType = type.members.first; memberType; memberType = memberType.next)
1632                {
1633                   if(!strcmp(memberType.name, ident.string))
1634                   {
1635                      type = memberType;
1636                      break;
1637                   }
1638                }
1639             }
1640          }
1641       }
1642
1643       // *** WORKING CODE: TESTING THIS HERE FOR TEMPLATES ***
1644       if(type && type.kind == templateType && type.templateParameter.type == TemplateParameterType::type && _class.templateArgs /* TODO: Watch out for these _class.templateClass*/)
1645       {
1646          int id = 0;
1647          ClassTemplateParameter curParam = null;
1648          Class sClass;
1649          for(sClass = _class; sClass; sClass = sClass.base)
1650          {
1651             id = 0;
1652             if(sClass.templateClass) sClass = sClass.templateClass;
1653             for(curParam = sClass.templateParams.first; curParam; curParam = curParam.next)
1654             {
1655                if(curParam.type == TemplateParameterType::type && !strcmp(type.templateParameter.identifier.string, curParam.name))
1656                {
1657                   for(sClass = sClass.base; sClass; sClass = sClass.base)
1658                   {
1659                      if(sClass.templateClass) sClass = sClass.templateClass;
1660                      id += sClass.templateParams.count;
1661                   }
1662                   break;
1663                }
1664                id++;
1665             }
1666             if(curParam) break;
1667          }
1668
1669          if(curParam)
1670          {
1671             ClassTemplateArgument arg = _class.templateArgs[id];
1672             if(arg.dataTypeString)
1673             {
1674                // FreeType(type);
1675                type = ProcessTypeString(arg.dataTypeString, false);
1676                freeType = true;
1677                if(type && _class.templateClass)
1678                   type.passAsTemplate = true;
1679                if(type)
1680                {
1681                   // type.refCount++;
1682                   /*if(!exp.destType)
1683                   {
1684                      exp.destType = ProcessTypeString(arg.dataTypeString, false);
1685                      exp.destType.refCount++;
1686                   }*/
1687                }
1688             }
1689          }
1690       }
1691       if(type && type.kind == classType && type._class && type._class.registered && strchr(type._class.registered.fullName, '<'))
1692       {
1693          Class expClass = type._class.registered;
1694          Class cClass = null;
1695          int c;
1696          int paramCount = 0;
1697          int lastParam = -1;
1698
1699          char templateString[1024];
1700          ClassTemplateParameter param;
1701          sprintf(templateString, "%s<", expClass.templateClass.fullName);
1702          for(cClass = expClass; cClass; cClass = cClass.base)
1703          {
1704             int p = 0;
1705             if(cClass.templateClass) cClass = cClass.templateClass;
1706             for(param = cClass.templateParams.first; param; param = param.next)
1707             {
1708                int id = p;
1709                Class sClass;
1710                ClassTemplateArgument arg;
1711                for(sClass = cClass.base; sClass; sClass = sClass.base)
1712                {
1713                   if(sClass.templateClass) sClass = sClass.templateClass;
1714                   id += sClass.templateParams.count;
1715                }
1716                arg = expClass.templateArgs[id];
1717
1718                for(sClass = _class /*expClass*/; sClass; sClass = sClass.base)
1719                {
1720                   ClassTemplateParameter cParam;
1721                   //int p = numParams - sClass.templateParams.count;
1722                   int p = 0;
1723                   Class nextClass;
1724                   if(sClass.templateClass) sClass = sClass.templateClass;
1725
1726                   for(nextClass = sClass.base; nextClass; nextClass = nextClass.base)
1727                   {
1728                      if(nextClass.templateClass) nextClass = nextClass.templateClass;
1729                      p += nextClass.templateParams.count;
1730                   }
1731
1732                   for(cParam = sClass.templateParams.first; cParam; cParam = cParam.next, p++)
1733                   {
1734                      if(cParam.type == TemplateParameterType::type && arg.dataTypeString && !strcmp(cParam.name, arg.dataTypeString))
1735                      {
1736                         if(_class.templateArgs && arg.dataTypeString && (!param.defaultArg.dataTypeString || strcmp(arg.dataTypeString, param.defaultArg.dataTypeString)))
1737                         {
1738                            arg.dataTypeString = _class.templateArgs[p].dataTypeString;
1739                            arg.dataTypeClass = _class.templateArgs[p].dataTypeClass;
1740                            break;
1741                         }
1742                      }
1743                   }
1744                }
1745
1746                {
1747                   char argument[256];
1748                   argument[0] = '\0';
1749                   /*if(arg.name)
1750                   {
1751                      strcat(argument, arg.name.string);
1752                      strcat(argument, " = ");
1753                   }*/
1754                   switch(param.type)
1755                   {
1756                      case expression:
1757                      {
1758                         // THIS WHOLE THING IS A WILD GUESS... FIX IT UP
1759                         char expString[1024];
1760                         OldList * specs = MkList();
1761                         Declarator decl = SpecDeclFromString(param.dataTypeString, specs, null);
1762                         Expression exp;
1763                         char * string = PrintHexUInt64(arg.expression.ui64);
1764                         exp = MkExpCast(MkTypeName(specs, decl), MkExpConstant(string));
1765
1766                         ProcessExpressionType(exp);
1767                         ComputeExpression(exp);
1768                         expString[0] = '\0';
1769                         PrintExpression(exp, expString);
1770                         strcat(argument, expString);
1771                         //delete exp;
1772                         FreeExpression(exp);
1773                         break;
1774                      }
1775                      case identifier:
1776                      {
1777                         strcat(argument, arg.member.name);
1778                         break;
1779                      }
1780                      case TemplateParameterType::type:
1781                      {
1782                         if(arg.dataTypeString && (!param.defaultArg.dataTypeString || strcmp(arg.dataTypeString, param.defaultArg.dataTypeString)))
1783                            strcat(argument, arg.dataTypeString);
1784                         break;
1785                      }
1786                   }
1787                   if(argument[0])
1788                   {
1789                      if(paramCount) strcat(templateString, ", ");
1790                      if(lastParam != p - 1)
1791                      {
1792                         strcat(templateString, param.name);
1793                         strcat(templateString, " = ");
1794                      }
1795                      strcat(templateString, argument);
1796                      paramCount++;
1797                      lastParam = p;
1798                   }
1799                   p++;
1800                }
1801             }
1802          }
1803          {
1804             int len = strlen(templateString);
1805             if(templateString[len-1] == '<')
1806                len--;
1807             else
1808             {
1809                if(templateString[len-1] == '>')
1810                   templateString[len++] = ' ';
1811                templateString[len++] = '>';
1812             }
1813             templateString[len++] = '\0';
1814          }
1815          {
1816             Context context = SetupTemplatesContext(_class);
1817             if(freeType) FreeType(type);
1818             type = ProcessTypeString(templateString, false);
1819             freeType = true;
1820             FinishTemplatesContext(context);
1821          }
1822       }
1823
1824       if(method && member.initializer && member.initializer.type == expInitializer && member.initializer.exp)
1825       {
1826          ProcessExpressionType(member.initializer.exp);
1827          if(!member.initializer.exp.expType)
1828          {
1829             if(inCompiler)
1830             {
1831                char expString[10240];
1832                expString[0] = '\0';
1833                PrintExpression(member.initializer.exp, expString);
1834                ChangeCh(expString, '\n', ' ');
1835                Compiler_Error($"unresolved symbol used as an instance method %s\n", expString);
1836             }
1837          }
1838          //else if(!MatchTypes(member.exp.expType, type, null, _class, null, true, true, false, false))
1839          else if(!MatchTypes(member.initializer.exp.expType, type, null, null, _class, true, true, false, false))
1840          {
1841             Compiler_Error($"incompatible instance method %s\n", ident.string);
1842          }
1843       }
1844       else if(member.initializer)
1845       {
1846          /*
1847          FreeType(member.exp.destType);
1848          member.exp.destType = type;
1849          if(member.exp.destType)
1850             member.exp.destType.refCount++;
1851          ProcessExpressionType(member.exp);
1852          */
1853
1854          ProcessInitializer(member.initializer, type);
1855       }
1856       if(freeType) FreeType(type);
1857    }
1858    else
1859    {
1860       if(_class && _class.type == unitClass)
1861       {
1862          if(member.initializer)
1863          {
1864             /*
1865             FreeType(member.exp.destType);
1866             member.exp.destType = MkClassType(_class.fullName);
1867             ProcessExpressionType(member.initializer, type);
1868             */
1869             Type type = MkClassType(_class.fullName);
1870             ProcessInitializer(member.initializer, type);
1871             FreeType(type);
1872          }
1873       }
1874       else
1875       {
1876          if(member.initializer)
1877          {
1878             //ProcessExpressionType(member.exp);
1879             ProcessInitializer(member.initializer, null);
1880          }
1881          if(ident)
1882          {
1883             if(method)
1884             {
1885                Compiler_Error($"couldn't find virtual method %s in class %s\n", ident.string, _class.fullName);
1886             }
1887             else if(_class)
1888             {
1889                Compiler_Error($"couldn't find member %s in class %s\n", ident.string, _class.fullName);
1890                if(inCompiler)
1891                   eClass_AddDataMember(_class, ident.string, "int", 0, 0, publicAccess);
1892             }
1893          }
1894          else if(_class)
1895             Compiler_Error($"too many initializers for instantiation of class %s\n", _class.fullName);
1896       }
1897    }
1898 }
1899
1900 void ProcessInstantiationType(Instantiation inst)
1901 {
1902    yylloc = inst.loc;
1903    if(inst._class)
1904    {
1905       MembersInit members;
1906       Symbol classSym; // = inst._class.symbol; // FindClass(inst._class.name);
1907       Class _class;
1908
1909       /*if(!inst._class.symbol)
1910          inst._class.symbol = FindClass(inst._class.name);*/
1911       classSym = inst._class.symbol;
1912       _class = classSym ? classSym.registered : null;
1913
1914       // DANGER: Patch for mutex not declaring its struct when not needed
1915       if(!_class || _class.type != noHeadClass)
1916          DeclareStruct(inst._class.name, false); //_class && _class.type == noHeadClass);
1917
1918       afterExternal = afterExternal ? afterExternal : curExternal;
1919
1920       if(inst.exp)
1921          ProcessExpressionType(inst.exp);
1922
1923       inst.isConstant = true;
1924       if(inst.members)
1925       {
1926          DataMember curMember = null;
1927          Class curClass = null;
1928          DataMember subMemberStack[256];
1929          int subMemberStackPos = 0;
1930
1931          for(members = inst.members->first; members; members = members.next)
1932          {
1933             switch(members.type)
1934             {
1935                case methodMembersInit:
1936                {
1937                   char name[1024];
1938                   static uint instMethodID = 0;
1939                   External external = curExternal;
1940                   Context context = curContext;
1941                   Declarator declarator = members.function.declarator;
1942                   Identifier nameID = GetDeclId(declarator);
1943                   char * unmangled = nameID ? nameID.string : null;
1944                   Expression exp;
1945                   External createdExternal = null;
1946
1947                   if(inCompiler)
1948                   {
1949                      char number[16];
1950                      //members.function.dontMangle = true;
1951                      strcpy(name, "__ecereInstMeth_");
1952                      FullClassNameCat(name, _class ? _class.fullName : "_UNKNOWNCLASS", false);
1953                      strcat(name, "_");
1954                      strcat(name, nameID.string);
1955                      strcat(name, "_");
1956                      sprintf(number, "_%08d", instMethodID++);
1957                      strcat(name, number);
1958                      nameID.string = CopyString(name);
1959                   }
1960
1961                   // Do modifications here...
1962                   if(declarator)
1963                   {
1964                      Symbol symbol = declarator.symbol;
1965                      Method method = eClass_FindMethod(_class, unmangled, privateModule);
1966
1967                      if(method && method.type == virtualMethod)
1968                      {
1969                         symbol.method = method;
1970                         ProcessMethodType(method);
1971
1972                         if(!symbol.type.thisClass)
1973                         {
1974                            if(method.dataType.thisClass && currentClass &&
1975                               eClass_IsDerived(currentClass, method.dataType.thisClass.registered))
1976                            {
1977                               if(!currentClass.symbol)
1978                                  currentClass.symbol = FindClass(currentClass.fullName);
1979                               symbol.type.thisClass = currentClass.symbol;
1980                            }
1981                            else
1982                            {
1983                               if(!_class.symbol)
1984                                  _class.symbol = FindClass(_class.fullName);
1985                               symbol.type.thisClass = _class.symbol;
1986                            }
1987                         }
1988                         // TESTING THIS HERE:
1989                         DeclareType(symbol.type, true, true);
1990
1991                      }
1992                      else if(classSym)
1993                      {
1994                         Compiler_Error($"couldn't find virtual method %s in class %s\n",
1995                            unmangled, classSym.string);
1996                      }
1997                   }
1998
1999                   //declarator.symbol.id = declarator.symbol.idCode = curExternal.symbol.idCode;
2000                   createdExternal = ProcessClassFunction(classSym ? classSym.registered : null, members.function, ast, afterExternal, true);
2001
2002                   if(nameID)
2003                   {
2004                      FreeSpecifier(nameID._class);
2005                      nameID._class = null;
2006                   }
2007
2008                   if(inCompiler)
2009                   {
2010
2011                      Type type = declarator.symbol.type;
2012                      External oldExternal = curExternal;
2013
2014                      // *** Commented this out... Any negative impact? Yes: makes double prototypes declarations... Why was it commented out?
2015                      // *** It was commented out for problems such as
2016                      /*
2017                            class VirtualDesktop : Window
2018                            {
2019                               clientSize = Size { };
2020                               Timer timer
2021                               {
2022                                  bool DelayExpired()
2023                                  {
2024                                     clientSize.w;
2025                                     return true;
2026                                  }
2027                               };
2028                            }
2029                      */
2030                      // Commented Out: Good for bet.ec in Poker (Otherwise: obj\bet.c:187: error: `currentBet' undeclared (first use in this function))
2031
2032                      declarator.symbol.id = declarator.symbol.idCode = curExternal.symbol.idCode;
2033
2034                      /*
2035                      if(strcmp(declarator.symbol.string, name))
2036                      {
2037                         printf("TOCHECK: Look out for this\n");
2038                         delete declarator.symbol.string;
2039                         declarator.symbol.string = CopyString(name);
2040                      }
2041
2042                      if(!declarator.symbol.parent && globalContext.symbols.root != (BTNode)declarator.symbol)
2043                      {
2044                         printf("TOCHECK: Will this ever be in a list? Yes.\n");
2045                         excludedSymbols->Remove(declarator.symbol);
2046                         globalContext.symbols.Add((BTNode)declarator.symbol);
2047                         if(strstr(declarator.symbol.string), "::")
2048                            globalContext.hasNameSpace = true;
2049
2050                      }
2051                      */
2052
2053                      //curExternal = curExternal.prev;
2054                      //afterExternal = afterExternal->next;
2055
2056                      //ProcessFunction(afterExternal->function);
2057
2058                      //curExternal = afterExternal;
2059                      {
2060                         External externalDecl;
2061                         externalDecl = MkExternalDeclaration(null);
2062                         ast->Insert(oldExternal.prev, externalDecl);
2063
2064                         // Which function does this process?
2065                         if(createdExternal.function)
2066                         {
2067                            ProcessFunction(createdExternal.function);
2068
2069                            //curExternal = oldExternal;
2070
2071                            {
2072                               //Declaration decl = MkDeclaration(members.function.specifiers, MkListOne(MkInitDeclarator(CopyDeclarator(declarator), null)));
2073
2074                               Declaration decl = MkDeclaration(CopyList(createdExternal.function.specifiers, CopySpecifier),
2075                                  MkListOne(MkInitDeclarator(CopyDeclarator(declarator), null)));
2076
2077                               //externalDecl = MkExternalDeclaration(decl);
2078
2079                               //***** ast->Insert(external.prev, externalDecl);
2080                               //ast->Insert(curExternal.prev, externalDecl);
2081                               externalDecl.declaration = decl;
2082                               if(decl.symbol && !decl.symbol.pointerExternal)
2083                                  decl.symbol.pointerExternal = externalDecl;
2084
2085                               // Trying this out...
2086                               declarator.symbol.pointerExternal = externalDecl;
2087                            }
2088                         }
2089                      }
2090                   }
2091                   else if(declarator)
2092                   {
2093                      curExternal = declarator.symbol.pointerExternal;
2094                      ProcessFunction((FunctionDefinition)members.function);
2095                   }
2096                   curExternal = external;
2097                   curContext = context;
2098
2099                   if(inCompiler)
2100                   {
2101                      FreeClassFunction(members.function);
2102
2103                      // In this pass, turn this into a MemberInitData
2104                      exp = QMkExpId(name);
2105                      members.type = dataMembersInit;
2106                      members.dataMembers = MkListOne(MkMemberInit(MkListOne(MkIdentifier(unmangled)), MkInitializerAssignment(exp)));
2107
2108                      delete unmangled;
2109                   }
2110                   break;
2111                }
2112                case dataMembersInit:
2113                {
2114                   if(members.dataMembers && classSym)
2115                   {
2116                      MemberInit member;
2117                      Location oldyyloc = yylloc;
2118                      for(member = members.dataMembers->first; member; member = member.next)
2119                      {
2120                         ProcessMemberInitData(member, classSym.registered, &curClass, &curMember, subMemberStack, &subMemberStackPos);
2121                         if(member.initializer && !member.initializer.isConstant)
2122                            inst.isConstant = false;
2123                      }
2124                      yylloc = oldyyloc;
2125                   }
2126                   break;
2127                }
2128             }
2129          }
2130       }
2131    }
2132 }
2133
2134 static void DeclareType(Type type, bool declarePointers, bool declareParams)
2135 {
2136    // OPTIMIZATIONS: TESTING THIS...
2137    if(inCompiler)
2138    {
2139       if(type.kind == functionType)
2140       {
2141          Type param;
2142          if(declareParams)
2143          {
2144             for(param = type.params.first; param; param = param.next)
2145                DeclareType(param, declarePointers, true);
2146          }
2147          DeclareType(type.returnType, declarePointers, true);
2148       }
2149       else if(type.kind == pointerType && declarePointers)
2150          DeclareType(type.type, declarePointers, false);
2151       else if(type.kind == classType)
2152       {
2153          if(type._class.registered && (type._class.registered.type == structClass || type._class.registered.type == noHeadClass) && !type._class.declaring)
2154             DeclareStruct(type._class.registered.fullName, type._class.registered.type == noHeadClass);
2155       }
2156       else if(type.kind == structType || type.kind == unionType)
2157       {
2158          Type member;
2159          for(member = type.members.first; member; member = member.next)
2160             DeclareType(member, false, false);
2161       }
2162       else if(type.kind == arrayType)
2163          DeclareType(type.arrayType, declarePointers, false);
2164    }
2165 }
2166
2167 ClassTemplateArgument * FindTemplateArg(Class _class, TemplateParameter param)
2168 {
2169    ClassTemplateArgument * arg = null;
2170    int id = 0;
2171    ClassTemplateParameter curParam = null;
2172    Class sClass;
2173    for(sClass = _class; sClass; sClass = sClass.base)
2174    {
2175       id = 0;
2176       if(sClass.templateClass) sClass = sClass.templateClass;
2177       for(curParam = sClass.templateParams.first; curParam; curParam = curParam.next)
2178       {
2179          if(curParam.type == TemplateParameterType::type && !strcmp(param.identifier.string, curParam.name))
2180          {
2181             for(sClass = sClass.base; sClass; sClass = sClass.base)
2182             {
2183                if(sClass.templateClass) sClass = sClass.templateClass;
2184                id += sClass.templateParams.count;
2185             }
2186             break;
2187          }
2188          id++;
2189       }
2190       if(curParam) break;
2191    }
2192    if(curParam)
2193    {
2194       arg = &_class.templateArgs[id];
2195       if(arg && param.type == type)
2196          arg->dataTypeClass = eSystem_FindClass(_class.module, arg->dataTypeString);
2197    }
2198    return arg;
2199 }
2200
2201 public Context SetupTemplatesContext(Class _class)
2202 {
2203    Context context = PushContext();
2204    context.templateTypesOnly = true;
2205    if(_class.symbol && ((Symbol)_class.symbol).templateParams)
2206    {
2207       TemplateParameter param = ((Symbol)_class.symbol).templateParams->first;
2208       for(; param; param = param.next)
2209       {
2210          if(param.type == type && param.identifier)
2211          {
2212             TemplatedType type { key = (uintptr)param.identifier.string, param = param };
2213             curContext.templateTypes.Add((BTNode)type);
2214          }
2215       }
2216    }
2217    else if(_class)
2218    {
2219       Class sClass;
2220       for(sClass = _class; sClass; sClass = sClass.base)
2221       {
2222          ClassTemplateParameter p;
2223          for(p = sClass.templateParams.first; p; p = p.next)
2224          {
2225             //OldList * specs = MkList();
2226             //Declarator decl = null;
2227             //decl = SpecDeclFromString(p.dataTypeString, specs, null);
2228             if(p.type == type)
2229             {
2230                TemplateParameter param = p.param;
2231                TemplatedType type;
2232                if(!param)
2233                {
2234                   // ADD DATA TYPE HERE...
2235                   p.param = param = TemplateParameter
2236                   {
2237                      identifier = MkIdentifier(p.name), type = p.type,
2238                      dataTypeString = p.dataTypeString /*, dataType = { specs, decl }*/
2239                   };
2240                }
2241                type = TemplatedType { key = (uintptr)p.name, param = param };
2242                curContext.templateTypes.Add((BTNode)type);
2243             }
2244          }
2245       }
2246    }
2247    return context;
2248 }
2249
2250 public void FinishTemplatesContext(Context context)
2251 {
2252    PopContext(context);
2253    FreeContext(context);
2254    delete context;
2255 }
2256
2257 public void ProcessMethodType(Method method)
2258 {
2259    if(!method.dataType)
2260    {
2261       Context context = SetupTemplatesContext(method._class);
2262
2263       method.dataType = ProcessTypeString(method.dataTypeString, false);
2264
2265       FinishTemplatesContext(context);
2266
2267       if(method.type != virtualMethod && method.dataType)
2268       {
2269          if(!method.dataType.thisClass && !method.dataType.staticMethod)
2270          {
2271             if(!method._class.symbol)
2272                method._class.symbol = FindClass(method._class.fullName);
2273             method.dataType.thisClass = method._class.symbol;
2274          }
2275       }
2276
2277       // Why was this commented out? Working fine without now...
2278
2279       /*
2280       if(method.dataType.kind == functionType && !method.dataType.staticMethod && !method.dataType.thisClass)
2281          method.dataType.thisClass = method._class.symbol; // FindClass(method._class.fullName);
2282          */
2283    }
2284
2285    /*
2286    if(type)
2287    {
2288       char * par = strstr(type, "(");
2289       char * classOp = null;
2290       int classOpLen = 0;
2291       if(par)
2292       {
2293          int c;
2294          for(c = par-type-1; c >= 0; c++)
2295          {
2296             if(type[c] == ':' && type[c+1] == ':')
2297             {
2298                classOp = type + c - 1;
2299                for(c = c-1; c >=0 && !isspace(type[c]); c--)
2300                {
2301                   classOp--;
2302                   classOpLen++;
2303                }
2304                break;
2305             }
2306             else if(!isspace(type[c]))
2307                break;
2308          }
2309       }
2310       if(classOp)
2311       {
2312          char temp[1024];
2313          int typeLen = strlen(type);
2314          memcpy(temp, classOp, classOpLen);
2315          temp[classOpLen] = '\0';
2316          if(temp[0])
2317             _class = eSystem_FindClass(module, temp);
2318          else
2319             _class = null;
2320          method.dataTypeString = new char[typeLen - classOpLen + 1];
2321          memcpy(method.dataTypeString, type, classOp - type);
2322          memcpy(method.dataTypeString + (classOp - type), classOp + classOpLen, typeLen - (classOp - type + classOpLen));
2323       }
2324       else
2325          method.dataTypeString = type;
2326    }
2327    */
2328 }
2329
2330
2331 public void ProcessPropertyType(Property prop)
2332 {
2333    if(!prop.dataType)
2334    {
2335       Context context = SetupTemplatesContext(prop._class);
2336       prop.dataType = ProcessTypeString(prop.dataTypeString, false);
2337       FinishTemplatesContext(context);
2338    }
2339 }
2340
2341 public void DeclareMethod(Method method, char * name)
2342 {
2343    Symbol symbol = method.symbol;
2344    if(!symbol || (!symbol.pointerExternal && method.type == virtualMethod) || symbol.id > (curExternal ? curExternal.symbol.idCode : -1))
2345    {
2346       bool imported = false;
2347       bool dllImport = false;
2348
2349       if(!method.dataType)
2350          method.dataType = ProcessTypeString(method.dataTypeString, false);
2351
2352       if(!symbol || symbol._import || method.type == virtualMethod)
2353       {
2354          if(!symbol || method.type == virtualMethod)
2355          {
2356             Symbol classSym;
2357             if(!method._class.symbol)
2358                method._class.symbol = FindClass(method._class.fullName);
2359             classSym = method._class.symbol;
2360             if(!classSym._import)
2361             {
2362                ModuleImport module;
2363
2364                if(method._class.module && method._class.module.name)
2365                   module = FindModule(method._class.module);
2366                else
2367                   module = mainModule;
2368                classSym._import = ClassImport
2369                {
2370                   name = CopyString(method._class.fullName);
2371                   isRemote = method._class.isRemote;
2372                };
2373                module.classes.Add(classSym._import);
2374             }
2375             if(!symbol)
2376             {
2377                symbol = method.symbol = Symbol { };
2378             }
2379             if(!symbol._import)
2380             {
2381                symbol._import = (ClassImport)MethodImport
2382                {
2383                   name = CopyString(method.name);
2384                   isVirtual = method.type == virtualMethod;
2385                };
2386                classSym._import.methods.Add(symbol._import);
2387             }
2388             if(!symbol)
2389             {
2390                // Set the symbol type
2391                /*
2392                if(!type.thisClass)
2393                {
2394                   type.thisClass = method._class.symbol; // FindClass(method._class.fullName);
2395                }
2396                else if(type.thisClass == (void *)-1)
2397                {
2398                   type.thisClass = null;
2399                }
2400                */
2401                // symbol.type = ProcessTypeString(method.dataTypeString, false);
2402                symbol.type = method.dataType;
2403                if(symbol.type) symbol.type.refCount++;
2404             }
2405             /*
2406             if(!method.thisClass || strcmp(method.thisClass, "void"))
2407                symbol.type.params.Insert(null,
2408                   MkClassType(method.thisClass ? method.thisClass : method._class.fullName));
2409             */
2410          }
2411          if(!method.dataType.dllExport)
2412          {
2413             imported = true;
2414             if(method._class.module != privateModule && method._class.module.importType != staticImport)
2415                dllImport = true;
2416          }
2417       }
2418
2419       /* MOVING THIS UP
2420       if(!method.dataType)
2421          method.dataType = ((Symbol)method.symbol).type;
2422          //ProcessMethodType(method);
2423       */
2424
2425       if(method.type != virtualMethod && method.dataType)
2426          DeclareType(method.dataType, true, true);
2427
2428       if(!symbol.pointerExternal || symbol.pointerExternal.type == functionExternal)
2429       {
2430          // We need a declaration here :)
2431          Declaration decl;
2432          OldList * specifiers, * declarators;
2433          Declarator d;
2434          Declarator funcDecl;
2435          External external;
2436
2437          specifiers = MkList();
2438          declarators = MkList();
2439
2440          //if(imported)
2441          if(dllImport)
2442             ListAdd(specifiers, MkSpecifier(EXTERN));
2443          else if(method._class.symbol && ((Symbol)method._class.symbol).isStatic)
2444             ListAdd(specifiers, MkSpecifier(STATIC));
2445
2446          if(method.type == virtualMethod)
2447          {
2448             ListAdd(specifiers, MkSpecifier(INT));
2449             d = MkDeclaratorIdentifier(MkIdentifier(name));
2450          }
2451          else
2452          {
2453             d = MkDeclaratorIdentifier(MkIdentifier(name));
2454             //if(imported)
2455             if(dllImport)
2456                d = MkDeclaratorBrackets(MkDeclaratorPointer(MkPointer(null, null), d));
2457             {
2458                Context context = SetupTemplatesContext(method._class);
2459                d = SpecDeclFromString(method.dataTypeString, specifiers, d);
2460                FinishTemplatesContext(context);
2461             }
2462             funcDecl = GetFuncDecl(d);
2463
2464             if(dllImport)
2465             {
2466                Specifier spec, next;
2467                for(spec = specifiers->first; spec; spec = next)
2468                {
2469                   next = spec.next;
2470                   if(spec.type == extendedSpecifier)
2471                   {
2472                      specifiers->Remove(spec);
2473                      FreeSpecifier(spec);
2474                   }
2475                }
2476             }
2477
2478             // Add this parameter if not a static method
2479             if(method.dataType && !method.dataType.staticMethod)
2480             {
2481                if(funcDecl && funcDecl.function.parameters && funcDecl.function.parameters->count)
2482                {
2483                   Class _class = method.dataType.thisClass ? method.dataType.thisClass.registered : method._class;
2484                   TypeName thisParam = MkTypeName(MkListOne(
2485                      MkSpecifierName/*MkClassName*/(method.dataType.thisClass ? method.dataType.thisClass.string : method._class.fullName)),
2486                      (_class && _class.type == systemClass) ? MkDeclaratorPointer(MkPointer(null,null), MkDeclaratorIdentifier(MkIdentifier("this"))) : MkDeclaratorIdentifier(MkIdentifier("this")));
2487                   TypeName firstParam = ((TypeName)funcDecl.function.parameters->first);
2488                   Specifier firstSpec = firstParam.qualifiers ? firstParam.qualifiers->first : null;
2489
2490                   if(firstSpec && firstSpec.type == baseSpecifier && firstSpec.specifier == VOID && !firstParam.declarator)
2491                   {
2492                      TypeName param = funcDecl.function.parameters->first;
2493                      funcDecl.function.parameters->Remove(param);
2494                      FreeTypeName(param);
2495                   }
2496
2497                   if(!funcDecl.function.parameters)
2498                      funcDecl.function.parameters = MkList();
2499                   funcDecl.function.parameters->Insert(null, thisParam);
2500                }
2501             }
2502             // Make sure we don't have empty parameter declarations for static methods...
2503             /*
2504             else if(!funcDecl.function.parameters)
2505             {
2506                funcDecl.function.parameters = MkList();
2507                funcDecl.function.parameters->Insert(null,
2508                   MkTypeName(MkListOne(MkSpecifier(VOID)),null));
2509             }*/
2510          }
2511          // TESTING THIS:
2512          ProcessDeclarator(d);
2513
2514          ListAdd(declarators, MkInitDeclarator(d, null));
2515
2516          decl = MkDeclaration(specifiers, declarators);
2517
2518          ReplaceThisClassSpecifiers(specifiers, method._class);
2519
2520          // Keep a different symbol for the function definition than the declaration...
2521          if(symbol.pointerExternal)
2522          {
2523             Symbol functionSymbol { };
2524
2525             // Copy symbol
2526             {
2527                *functionSymbol = *symbol;
2528                functionSymbol.string = CopyString(symbol.string);
2529                if(functionSymbol.type)
2530                   functionSymbol.type.refCount++;
2531             }
2532
2533             excludedSymbols->Add(functionSymbol);
2534             symbol.pointerExternal.symbol = functionSymbol;
2535          }
2536          external = MkExternalDeclaration(decl);
2537          if(curExternal)
2538             ast->Insert(curExternal ? curExternal.prev : null, external);
2539          external.symbol = symbol;
2540          symbol.pointerExternal = external;
2541       }
2542       else if(ast)
2543       {
2544          // Move declaration higher...
2545          ast->Move(symbol.pointerExternal, curExternal.prev);
2546       }
2547
2548       symbol.id = curExternal ? curExternal.symbol.idCode : MAXINT;
2549    }
2550 }
2551
2552 char * ReplaceThisClass(Class _class)
2553 {
2554    if(thisClassParams && _class.templateParams.count && !_class.templateClass)
2555    {
2556       bool first = true;
2557       int p = 0;
2558       ClassTemplateParameter param;
2559       int lastParam = -1;
2560
2561       char className[1024];
2562       strcpy(className, _class.fullName);
2563       for(param = _class.templateParams.first; param; param = param.next)
2564       {
2565          // if((!param.defaultArg.dataTypeString && !param.defaultArg.expression.ui64))
2566          {
2567             if(first) strcat(className, "<");
2568             if(!first) strcat(className, ", ");
2569             if(lastParam + 1 != p)
2570             {
2571                strcat(className, param.name);
2572                strcat(className, " = ");
2573             }
2574             strcat(className, param.name);
2575             first = false;
2576             lastParam = p;
2577          }
2578          p++;
2579       }
2580       if(!first)
2581       {
2582          int len = strlen(className);
2583          if(className[len-1] == '>') className[len++] = ' ';
2584          className[len++] = '>';
2585          className[len++] = '\0';
2586       }
2587       return CopyString(className);
2588    }
2589    else
2590       return CopyString(_class.fullName);
2591 }
2592
2593 Type ReplaceThisClassType(Class _class)
2594 {
2595    if(thisClassParams && _class.templateParams.count && !_class.templateClass)
2596    {
2597       bool first = true;
2598       int p = 0;
2599       ClassTemplateParameter param;
2600       int lastParam = -1;
2601       char className[1024];
2602       strcpy(className, _class.fullName);
2603
2604       for(param = _class.templateParams.first; param; param = param.next)
2605       {
2606          // if((!param.defaultArg.dataTypeString && !param.defaultArg.expression.ui64))
2607          {
2608             if(first) strcat(className, "<");
2609             if(!first) strcat(className, ", ");
2610             if(lastParam + 1 != p)
2611             {
2612                strcat(className, param.name);
2613                strcat(className, " = ");
2614             }
2615             strcat(className, param.name);
2616             first = false;
2617             lastParam = p;
2618          }
2619          p++;
2620       }
2621       if(!first)
2622       {
2623          int len = strlen(className);
2624          if(className[len-1] == '>') className[len++] = ' ';
2625          className[len++] = '>';
2626          className[len++] = '\0';
2627       }
2628       return MkClassType(className);
2629       //return ProcessTypeString(className, false);
2630    }
2631    else
2632    {
2633       return MkClassType(_class.fullName);
2634       //return ProcessTypeString(_class.fullName, false);
2635    }
2636 }
2637
2638 void ReplaceThisClassSpecifiers(OldList specs, Class _class)
2639 {
2640    if(specs != null && _class)
2641    {
2642       Specifier spec;
2643       for(spec = specs.first; spec; spec = spec.next)
2644       {
2645          if(spec.type == baseSpecifier && spec.specifier == THISCLASS)
2646          {
2647             spec.type = nameSpecifier;
2648             spec.name = ReplaceThisClass(_class);
2649             spec.symbol = FindClass(spec.name); //_class.symbol;
2650          }
2651       }
2652    }
2653 }
2654
2655 // Returns imported or not
2656 bool DeclareFunction(GlobalFunction function, char * name)
2657 {
2658    Symbol symbol = function.symbol;
2659    if(curExternal && (!symbol || symbol.id > curExternal.symbol.idCode))
2660    {
2661       bool imported = false;
2662       bool dllImport = false;
2663
2664       if(!function.dataType)
2665       {
2666          function.dataType = ProcessTypeString(function.dataTypeString, false);
2667          if(!function.dataType.thisClass)
2668             function.dataType.staticMethod = true;
2669       }
2670
2671       if(inCompiler)
2672       {
2673          if(!symbol)
2674          {
2675             ModuleImport module = FindModule(function.module);
2676             // WARNING: This is not added anywhere...
2677             symbol = function.symbol = Symbol {  };
2678
2679             if(module.name)
2680             {
2681                if(!function.dataType.dllExport)
2682                {
2683                   symbol._import = (ClassImport)FunctionImport { name = CopyString(function.name) };
2684                   module.functions.Add(symbol._import);
2685                }
2686             }
2687             // Set the symbol type
2688             {
2689                symbol.type = ProcessTypeString(function.dataTypeString, false);
2690                if(!symbol.type.thisClass)
2691                   symbol.type.staticMethod = true;
2692             }
2693          }
2694          imported = symbol._import ? true : false;
2695          if(imported && function.module != privateModule && function.module.importType != staticImport)
2696             dllImport = true;
2697       }
2698
2699       DeclareType(function.dataType, true, true);
2700
2701       if(inCompiler)
2702       {
2703          if(!symbol.pointerExternal || symbol.pointerExternal.type == functionExternal)
2704          {
2705             // We need a declaration here :)
2706             Declaration decl;
2707             OldList * specifiers, * declarators;
2708             Declarator d;
2709             Declarator funcDecl;
2710             External external;
2711
2712             specifiers = MkList();
2713             declarators = MkList();
2714
2715             //if(imported)
2716                ListAdd(specifiers, MkSpecifier(EXTERN));
2717             /*
2718             else
2719                ListAdd(specifiers, MkSpecifier(STATIC));
2720             */
2721
2722             d = MkDeclaratorIdentifier(MkIdentifier(imported ? name : function.name));
2723             //if(imported)
2724             if(dllImport)
2725                d = MkDeclaratorBrackets(MkDeclaratorPointer(MkPointer(null, null), d));
2726
2727             d = SpecDeclFromString(function.dataTypeString, specifiers, d);
2728             // TAKE OUT THE DLL EXPORT IF STATICALLY IMPORTED:
2729             if(function.module.importType == staticImport)
2730             {
2731                Specifier spec;
2732                for(spec = specifiers->first; spec; spec = spec.next)
2733                   if(spec.type == extendedSpecifier && spec.extDecl && spec.extDecl.type == extDeclString && !strcmp(spec.extDecl.s, "dllexport"))
2734                   {
2735                      specifiers->Remove(spec);
2736                      FreeSpecifier(spec);
2737                      break;
2738                   }
2739             }
2740
2741             funcDecl = GetFuncDecl(d);
2742
2743             // Make sure we don't have empty parameter declarations for static methods...
2744             if(funcDecl && !funcDecl.function.parameters)
2745             {
2746                funcDecl.function.parameters = MkList();
2747                funcDecl.function.parameters->Insert(null,
2748                   MkTypeName(MkListOne(MkSpecifier(VOID)),null));
2749             }
2750
2751             ListAdd(declarators, MkInitDeclarator(d, null));
2752
2753             {
2754                Context oldCtx = curContext;
2755                curContext = globalContext;
2756                decl = MkDeclaration(specifiers, declarators);
2757                curContext = oldCtx;
2758             }
2759
2760             // Keep a different symbol for the function definition than the declaration...
2761             if(symbol.pointerExternal)
2762             {
2763                Symbol functionSymbol { };
2764                // Copy symbol
2765                {
2766                   *functionSymbol = *symbol;
2767                   functionSymbol.string = CopyString(symbol.string);
2768                   if(functionSymbol.type)
2769                      functionSymbol.type.refCount++;
2770                }
2771
2772                excludedSymbols->Add(functionSymbol);
2773
2774                symbol.pointerExternal.symbol = functionSymbol;
2775             }
2776             external = MkExternalDeclaration(decl);
2777             if(curExternal)
2778                ast->Insert(curExternal.prev, external);
2779             external.symbol = symbol;
2780             symbol.pointerExternal = external;
2781          }
2782          else
2783          {
2784             // Move declaration higher...
2785             ast->Move(symbol.pointerExternal, curExternal.prev);
2786          }
2787
2788          if(curExternal)
2789             symbol.id = curExternal.symbol.idCode;
2790       }
2791    }
2792    return (symbol && symbol._import && function.module != privateModule && function.module.importType != staticImport) ? true : false;
2793 }
2794
2795 void DeclareGlobalData(GlobalData data)
2796 {
2797    Symbol symbol = data.symbol;
2798    if(curExternal && (!symbol || symbol.id > curExternal.symbol.idCode))
2799    {
2800       if(inCompiler)
2801       {
2802          if(!symbol)
2803             symbol = data.symbol = Symbol { };
2804       }
2805       if(!data.dataType)
2806          data.dataType = ProcessTypeString(data.dataTypeString, false);
2807       DeclareType(data.dataType, true, true);
2808       if(inCompiler)
2809       {
2810          if(!symbol.pointerExternal)
2811          {
2812             // We need a declaration here :)
2813             Declaration decl;
2814             OldList * specifiers, * declarators;
2815             Declarator d;
2816             External external;
2817
2818             specifiers = MkList();
2819             declarators = MkList();
2820
2821             ListAdd(specifiers, MkSpecifier(EXTERN));
2822             d = MkDeclaratorIdentifier(MkIdentifier(data.fullName));
2823             d = SpecDeclFromString(data.dataTypeString, specifiers, d);
2824
2825             ListAdd(declarators, MkInitDeclarator(d, null));
2826
2827             decl = MkDeclaration(specifiers, declarators);
2828             external = MkExternalDeclaration(decl);
2829             if(curExternal)
2830                ast->Insert(curExternal.prev, external);
2831             external.symbol = symbol;
2832             symbol.pointerExternal = external;
2833          }
2834          else
2835          {
2836             // Move declaration higher...
2837             ast->Move(symbol.pointerExternal, curExternal.prev);
2838          }
2839
2840          if(curExternal)
2841             symbol.id = curExternal.symbol.idCode;
2842       }
2843    }
2844 }
2845
2846 class Conversion : struct
2847 {
2848    Conversion prev, next;
2849    Property convert;
2850    bool isGet;
2851    Type resultType;
2852 };
2853
2854 public bool MatchTypes(Type source, Type dest, OldList conversions, Class owningClassSource, Class owningClassDest, bool doConversion, bool enumBaseType, bool acceptReversedParams, bool isConversionExploration)
2855 {
2856    if(source && dest)
2857    {
2858       // Property convert;
2859
2860       if(source.kind == templateType && dest.kind != templateType)
2861       {
2862          Type type = ProcessTemplateParameterType(source.templateParameter);
2863          if(type) source = type;
2864       }
2865
2866       if(dest.kind == templateType && source.kind != templateType)
2867       {
2868          Type type = ProcessTemplateParameterType(dest.templateParameter);
2869          if(type) dest = type;
2870       }
2871
2872       if(dest.classObjectType == typedObject)
2873       {
2874          if(source.classObjectType != anyObject)
2875             return true;
2876          else
2877          {
2878             // If either the source or the destination defines the class, accepts any_object as compatible for a typed_object
2879             if((dest._class && strcmp(dest._class.string, "class")) || (source._class && strcmp(source._class.string, "class")))
2880             {
2881                return true;
2882             }
2883          }
2884       }
2885       else
2886       {
2887          if(source.classObjectType == anyObject)
2888             return true;
2889          if(dest.classObjectType == anyObject && source.classObjectType != typedObject)
2890             return true;
2891       }
2892
2893       if((dest.kind == structType && source.kind == structType) ||
2894          (dest.kind == unionType && source.kind == unionType))
2895       {
2896          if((dest.enumName && source.enumName && !strcmp(dest.enumName, source.enumName)) ||
2897              (source.members.first && source.members.first == dest.members.first))
2898             return true;
2899       }
2900
2901       if(dest.kind == ellipsisType && source.kind != voidType)
2902          return true;
2903
2904       if(dest.kind == pointerType && dest.type.kind == voidType &&
2905          ((source.kind == classType && (!source._class || !source._class.registered || source._class.registered.type == structClass || source._class.registered.type == normalClass || source._class.registered.type == noHeadClass || source._class.registered.type == systemClass))
2906          || source.kind == subClassType || source.kind == pointerType || source.kind == arrayType || source.kind == functionType || source.kind == thisClassType)
2907
2908          /*source.kind != voidType && source.kind != structType && source.kind != unionType  */
2909
2910          /*&& (source.kind != classType /-*|| source._class.registered.type != structClass)*/)
2911          return true;
2912       if(!isConversionExploration && source.kind == pointerType && source.type.kind == voidType &&
2913          ((dest.kind == classType && (!dest._class || !dest._class.registered || dest._class.registered.type == structClass || dest._class.registered.type == normalClass || dest._class.registered.type == noHeadClass || dest._class.registered.type == systemClass))
2914          || dest.kind == subClassType || dest.kind == pointerType || dest.kind == arrayType || dest.kind == functionType || dest.kind == thisClassType)
2915
2916          /* dest.kind != voidType && dest.kind != structType && dest.kind != unionType  */
2917
2918          /*&& (dest.kind != classType || dest._class.registered.type != structClass)*/)
2919          return true;
2920
2921       if(((source.kind == classType && dest.kind == classType) || (source.kind == subClassType && dest.kind == subClassType)) && source._class)
2922       {
2923          if(source._class.registered && source._class.registered.type == unitClass)
2924          {
2925             if(conversions != null)
2926             {
2927                if(source._class.registered == dest._class.registered)
2928                   return true;
2929             }
2930             else
2931             {
2932                Class sourceBase, destBase;
2933                for(sourceBase = source._class.registered; sourceBase && sourceBase.base.type != systemClass; sourceBase = sourceBase.base);
2934                for(destBase = dest._class.registered; destBase && destBase.base.type != systemClass; destBase = destBase.base);
2935                if(sourceBase == destBase)
2936                   return true;
2937             }
2938          }
2939          // Don't match enum inheriting from other enum if resolving enumeration values
2940          // TESTING: !dest.classObjectType
2941          else if(source._class && dest._class && (dest.classObjectType == source.classObjectType || !dest.classObjectType) &&
2942             (enumBaseType ||
2943                (!source._class.registered || source._class.registered.type != enumClass) ||
2944                (!dest._class.registered || dest._class.registered.type != enumClass)) && eClass_IsDerived(source._class.registered, dest._class.registered))
2945             return true;
2946          else
2947          {
2948             // Added this so that DefinedColor = Color doesn't go through ColorRGB property
2949             if(enumBaseType &&
2950                dest._class && dest._class.registered && dest._class.registered.type == enumClass &&
2951                ((source._class && source._class.registered && source._class.registered.type != enumClass) || source.kind == classType)) // Added this here for a base enum to be acceptable for a derived enum (#139)
2952             {
2953                if(eClass_IsDerived(dest._class.registered, source._class.registered))
2954                {
2955                   return true;
2956                }
2957             }
2958          }
2959       }
2960
2961       // JUST ADDED THIS...
2962       if(source.kind == subClassType && dest.kind == classType && dest._class && !strcmp(dest._class.string, "ecere::com::Class"))
2963          return true;
2964
2965       if(doConversion)
2966       {
2967          // Just added this for Straight conversion of ColorAlpha => Color
2968          if(source.kind == classType)
2969          {
2970             Class _class;
2971             for(_class = source._class ? source._class.registered : null; _class; _class = _class.base)
2972             {
2973                Property convert;
2974                for(convert = _class.conversions.first; convert; convert = convert.next)
2975                {
2976                   if(convert.memberAccess == publicAccess || _class.module == privateModule)
2977                   {
2978                      Conversion after = (conversions != null) ? conversions.last : null;
2979
2980                      if(!convert.dataType)
2981                         convert.dataType = ProcessTypeString(convert.dataTypeString, false);
2982                      if(MatchTypes(convert.dataType, dest, conversions, null, null, false, true, false, true))
2983                      {
2984                         if(!conversions && !convert.Get)
2985                            return true;
2986                         else if(conversions != null)
2987                         {
2988                            if(_class.type == unitClass && convert.dataType.kind == classType && convert.dataType._class &&
2989                               convert.dataType._class.registered && _class.base == convert.dataType._class.registered.base &&
2990                               (dest.kind != classType || dest._class.registered != _class.base))
2991                               return true;
2992                            else
2993                            {
2994                               Conversion conv { convert = convert, isGet = true };
2995                               // conversions.Add(conv);
2996                               conversions.Insert(after, conv);
2997                               return true;
2998                            }
2999                         }
3000                      }
3001                   }
3002                }
3003             }
3004          }
3005
3006          // MOVING THIS??
3007
3008          if(dest.kind == classType)
3009          {
3010             Class _class;
3011             for(_class = dest._class ? dest._class.registered : null; _class; _class = _class.base)
3012             {
3013                Property convert;
3014                for(convert = _class.conversions.first; convert; convert = convert.next)
3015                {
3016                   if(convert.memberAccess == publicAccess || _class.module == privateModule)
3017                   {
3018                      // Conversion after = (conversions != null) ? conversions.last : null;
3019
3020                      if(!convert.dataType)
3021                         convert.dataType = ProcessTypeString(convert.dataTypeString, false);
3022                      // Just added this equality check to prevent recursion.... Make it safer?
3023                      // Changed enumBaseType to false here to prevent all int-compatible enums to show up in AnchorValues
3024                      if(convert.dataType != dest && MatchTypes(source, convert.dataType, conversions, null, null, true, false /*true*/, false, true))
3025                      {
3026                         if(!conversions && !convert.Set)
3027                            return true;
3028                         else if(conversions != null)
3029                         {
3030                            if(_class.type == unitClass && convert.dataType.kind == classType && convert.dataType._class &&
3031                               convert.dataType._class.registered && _class.base == convert.dataType._class.registered.base &&
3032                               (source.kind != classType || source._class.registered != _class.base))
3033                               return true;
3034                            else
3035                            {
3036                               // *** Testing this! ***
3037                               Conversion conv { convert = convert };
3038                               conversions.Add(conv);
3039                               //conversions.Insert(after, conv);
3040                               return true;
3041                            }
3042                         }
3043                      }
3044                   }
3045                }
3046             }
3047             /*if(dest._class.registered && !strcmp(dest._class.registered.name, "bool"))
3048             {
3049                if(source.kind != voidType && source.kind != structType && source.kind != unionType &&
3050                   (source.kind != classType || source._class.registered.type != structClass))
3051                   return true;
3052             }*/
3053
3054             // TESTING THIS... IS THIS OK??
3055             if(enumBaseType && dest._class && dest._class.registered && dest._class.registered.type == enumClass)
3056             {
3057                if(!dest._class.registered.dataType)
3058                   dest._class.registered.dataType = ProcessTypeString(dest._class.registered.dataTypeString, false);
3059                // Only support this for classes...
3060                if(dest._class.registered.dataType.kind == classType || source.truth || dest.truth/* ||
3061                   !strcmp(dest._class.registered.name, "bool") || (source.kind == classType && !strcmp(source._class.string, "bool"))*/)
3062                {
3063                   if(MatchTypes(source, dest._class.registered.dataType, conversions, null, null, true, true, false, false))
3064                   {
3065                      return true;
3066                   }
3067                }
3068             }
3069          }
3070
3071          // Moved this lower
3072          if(source.kind == classType)
3073          {
3074             Class _class;
3075             for(_class = source._class ? source._class.registered : null; _class; _class = _class.base)
3076             {
3077                Property convert;
3078                for(convert = _class.conversions.first; convert; convert = convert.next)
3079                {
3080                   if(convert.memberAccess == publicAccess || _class.module == privateModule)
3081                   {
3082                      Conversion after = (conversions != null) ? conversions.last : null;
3083
3084                      if(!convert.dataType)
3085                         convert.dataType = ProcessTypeString(convert.dataTypeString, false);
3086                      if(convert.dataType != source && MatchTypes(convert.dataType, dest, conversions, null, null, true, true, false, true))
3087                      {
3088                         if(!conversions && !convert.Get)
3089                            return true;
3090                         else if(conversions != null)
3091                         {
3092                            if(_class.type == unitClass && convert.dataType.kind == classType && convert.dataType._class &&
3093                               convert.dataType._class.registered && _class.base == convert.dataType._class.registered.base &&
3094                               (dest.kind != classType || dest._class.registered != _class.base))
3095                               return true;
3096                            else
3097                            {
3098                               Conversion conv { convert = convert, isGet = true };
3099
3100                               // conversions.Add(conv);
3101                               conversions.Insert(after, conv);
3102                               return true;
3103                            }
3104                         }
3105                      }
3106                   }
3107                }
3108             }
3109
3110             // TESTING THIS... IS THIS OK??
3111             if(enumBaseType && source._class && source._class.registered && source._class.registered.type == enumClass)
3112             {
3113                if(!source._class.registered.dataType)
3114                   source._class.registered.dataType = ProcessTypeString(source._class.registered.dataTypeString, false);
3115                if(MatchTypes(source._class.registered.dataType, dest, conversions, null, null, true, true, false, false))
3116                {
3117                   return true;
3118                }
3119             }
3120          }
3121       }
3122
3123       if(source.kind == classType || source.kind == subClassType)
3124          ;
3125       else if(dest.kind == source.kind &&
3126          (dest.kind != structType && dest.kind != unionType &&
3127           dest.kind != functionType && dest.kind != arrayType && dest.kind != pointerType && dest.kind != methodType))
3128           return true;
3129       // RECENTLY ADDED THESE
3130       else if(dest.kind == doubleType && source.kind == floatType)
3131          return true;
3132       else if(dest.kind == shortType && source.kind == charType)
3133          return true;
3134       else if(dest.kind == intType && (source.kind == shortType || source.kind == charType || source.kind == intSizeType /* Exception here for size_t */))
3135          return true;
3136       else if(dest.kind == int64Type && (source.kind == shortType || source.kind == charType || source.kind == intType || source.kind == intPtrType || source.kind == intSizeType))
3137          return true;
3138       else if(dest.kind == intPtrType && (source.kind == shortType || source.kind == charType || source.kind == intType || source.kind == intSizeType || source.kind == int64Type))
3139          return true;
3140       else if(dest.kind == intSizeType && (source.kind == shortType || source.kind == charType || source.kind == intType || source.kind == int64Type || source.kind == intPtrType))
3141          return true;
3142       else if(source.kind == enumType &&
3143          (dest.kind == intType || dest.kind == shortType || dest.kind == charType || dest.kind == longType || dest.kind == int64Type || dest.kind == intPtrType || dest.kind == intSizeType))
3144           return true;
3145       else if(dest.kind == enumType &&
3146          (source.kind == intType || source.kind == shortType || source.kind == charType || source.kind == longType || source.kind == int64Type || source.kind == intPtrType || source.kind == intSizeType))
3147           return true;
3148       else if((dest.kind == functionType || (dest.kind == pointerType && dest.type.kind == functionType) || dest.kind == methodType) &&
3149               ((source.kind == functionType || (source.kind == pointerType && source.type.kind == functionType) || source.kind == methodType)))
3150       {
3151          Type paramSource, paramDest;
3152
3153          if(dest.kind == methodType)
3154             owningClassDest = dest.methodClass ? dest.methodClass : dest.method._class;
3155          if(source.kind == methodType)
3156             owningClassSource = source.methodClass ? source.methodClass : source.method._class;
3157
3158          if(dest.kind == pointerType && dest.type.kind == functionType) dest = dest.type;
3159          if(source.kind == pointerType && source.type.kind == functionType) source = source.type;
3160          if(dest.kind == methodType)
3161             dest = dest.method.dataType;
3162          if(source.kind == methodType)
3163             source = source.method.dataType;
3164
3165          paramSource = source.params.first;
3166          if(paramSource && paramSource.kind == voidType) paramSource = null;
3167          paramDest = dest.params.first;
3168          if(paramDest && paramDest.kind == voidType) paramDest = null;
3169
3170
3171          if((dest.staticMethod || (!dest.thisClass && !owningClassDest)) &&
3172             !(source.staticMethod || (!source.thisClass && !owningClassSource)))
3173          {
3174             // Source thisClass must be derived from destination thisClass
3175             if(!paramDest || (!(paramDest.kind == pointerType && paramDest.type && paramDest.type.kind == voidType) && (paramDest.kind != classType ||
3176                !eClass_IsDerived(source.thisClass ? source.thisClass.registered : owningClassSource,paramDest._class.registered))))
3177             {
3178                if(paramDest && paramDest.kind == classType)
3179                   Compiler_Error($"method class must be derived from %s\n", paramDest._class.string);
3180                else
3181                   Compiler_Error($"method class should not take an object\n");
3182                return false;
3183             }
3184             paramDest = paramDest.next;
3185          }
3186          else if(!dest.staticMethod && (dest.thisClass || owningClassDest))
3187          {
3188             if((source.staticMethod || (!source.thisClass && !owningClassSource)))
3189             {
3190                if(dest.thisClass)
3191                {
3192                   if(!paramSource || paramSource.kind != classType || !eClass_IsDerived(paramSource._class.registered,dest.thisClass.registered))
3193                   {
3194                      Compiler_Error($"method class must be derived from %s\n", dest.thisClass.string);
3195                      return false;
3196                   }
3197                }
3198                else
3199                {
3200                   // THIS WAS BACKWARDS:
3201                   // if(!paramSource || paramSource.kind != classType || (owningClassDest && !eClass_IsDerived(owningClassDest, paramSource._class.registered)))
3202                   if(!paramSource || paramSource.kind != classType || (owningClassDest && !eClass_IsDerived(paramSource._class.registered, owningClassDest)))
3203                   {
3204                      if(owningClassDest)
3205                        Compiler_Error($"%s expected to be derived from method class\n", owningClassDest.fullName);
3206                      else
3207                         Compiler_Error($"overriding class expected to be derived from method class\n");
3208                      return false;
3209                   }
3210                }
3211                paramSource = paramSource.next;
3212             }
3213             else
3214             {
3215                if(dest.thisClass)
3216                {
3217                   // Source thisClass must be derived from destination thisClass
3218                   if(!eClass_IsDerived(source.thisClass ? source.thisClass.registered : owningClassSource, dest.thisClass.registered))
3219                   {
3220                      Compiler_Error($"method class must be derived from %s\n", dest.thisClass.string);
3221                      return false;
3222                   }
3223                }
3224                else
3225                {
3226                   // THIS WAS BACKWARDS TOO??
3227                   // if(source.thisClass && owningClassDest && !eClass_IsDerived(owningClassDest, source.thisClass.registered))
3228                   if(source.thisClass && source.thisClass.registered && owningClassDest && !eClass_IsDerived(source.thisClass.registered, owningClassDest))
3229                   {
3230                      //if(owningClass)
3231                         Compiler_Error($"%s expected to be derived from method class\n", /*owningClass.name*/ source.thisClass.registered.fullName);
3232                      //else
3233                         //Compiler_Error($"overriding class expected to be derived from method class\n");
3234                      return false;
3235                   }
3236                }
3237             }
3238          }
3239
3240
3241          // Source return type must be derived from destination return type
3242          if(!MatchTypes(source.returnType, dest.returnType, null, null, null, true, true, false, false))
3243          {
3244             Compiler_Warning($"incompatible return type for function\n");
3245             return false;
3246          }
3247
3248          // Check parameters
3249
3250          for(; paramDest; paramDest = paramDest.next)
3251          {
3252             if(!paramSource)
3253             {
3254                //Compiler_Warning($"not enough parameters\n");
3255                Compiler_Error($"not enough parameters\n");
3256                return false;
3257             }
3258             {
3259                Type paramDestType = paramDest;
3260                Type paramSourceType = paramSource;
3261                Type type = paramDestType;
3262
3263                // *** WORKING CODE: TESTING THIS HERE FOR TEMPLATES ***
3264                if(paramDest.kind == templateType && paramDest.templateParameter.type == TemplateParameterType::type && owningClassSource &&
3265                   paramSource.kind != templateType)
3266                {
3267                   int id = 0;
3268                   ClassTemplateParameter curParam = null;
3269                   Class sClass;
3270                   for(sClass = owningClassSource; sClass; sClass = sClass.base)
3271                   {
3272                      id = 0;
3273                      if(sClass.templateClass) sClass = sClass.templateClass;
3274                      for(curParam = sClass.templateParams.first; curParam; curParam = curParam.next)
3275                      {
3276                         if(curParam.type == TemplateParameterType::type && !strcmp(type.templateParameter.identifier.string, curParam.name))
3277                         {
3278                            for(sClass = sClass.base; sClass; sClass = sClass.base)
3279                            {
3280                               if(sClass.templateClass) sClass = sClass.templateClass;
3281                               id += sClass.templateParams.count;
3282                            }
3283                            break;
3284                         }
3285                         id++;
3286                      }
3287                      if(curParam) break;
3288                   }
3289
3290                   if(curParam)
3291                   {
3292                      ClassTemplateArgument arg = owningClassSource.templateArgs[id];
3293                      paramDestType = type = ProcessTypeString(arg.dataTypeString, false);
3294                   }
3295                }
3296
3297                // paramDest must be derived from paramSource
3298                if(!MatchTypes(paramDestType, paramSourceType, null, null, null, true, true, false, false) &&
3299                   (!acceptReversedParams || !MatchTypes(paramSourceType, paramDestType, null, null, null, true, true, false, false)))
3300                {
3301                   char type[1024];
3302                   type[0] = 0;
3303                   PrintType(paramDest, type, false, true);
3304                   Compiler_Warning($"incompatible parameter %s (expected %s)\n", paramSource.name, type);
3305
3306                   if(paramDestType != paramDest)
3307                      FreeType(paramDestType);
3308                   return false;
3309                }
3310                if(paramDestType != paramDest)
3311                   FreeType(paramDestType);
3312             }
3313
3314             paramSource = paramSource.next;
3315          }
3316          if(paramSource)
3317          {
3318             Compiler_Error($"too many parameters\n");
3319             return false;
3320          }
3321          return true;
3322       }
3323       else if((dest.kind == functionType || (dest.kind == pointerType && dest.type.kind == functionType) || dest.kind == methodType) && (source.kind == pointerType && source.type.kind == voidType))
3324       {
3325          return true;
3326       }
3327       else if((dest.kind == pointerType || dest.kind == arrayType) &&
3328          (source.kind == arrayType || source.kind == pointerType))
3329       {
3330          if(MatchTypes(source.type, dest.type, null, null, null, true, true, false, false))
3331             return true;
3332       }
3333    }
3334    return false;
3335 }
3336
3337 static void FreeConvert(Conversion convert)
3338 {
3339    if(convert.resultType)
3340       FreeType(convert.resultType);
3341 }
3342
3343 bool MatchWithEnums_NameSpace(NameSpace nameSpace, Expression sourceExp, Type dest,
3344                               char * string, OldList conversions)
3345 {
3346    BTNamedLink link;
3347
3348    for(link = (BTNamedLink)nameSpace.classes.first; link; link = (BTNamedLink)((BTNode)link).next)
3349    {
3350       Class _class = link.data;
3351       if(_class.type == enumClass)
3352       {
3353          OldList converts { };
3354          Type type { };
3355          type.kind = classType;
3356
3357          if(!_class.symbol)
3358             _class.symbol = FindClass(_class.fullName);
3359          type._class = _class.symbol;
3360
3361          if(MatchTypes(type, dest, &converts, null, null, true, false, false, false))
3362          {
3363             NamedLink value;
3364             Class enumClass = eSystem_FindClass(privateModule, "enum");
3365             if(enumClass)
3366             {
3367                Class baseClass;
3368                for(baseClass = _class ; baseClass && baseClass.type == ClassType::enumClass; baseClass = baseClass.base)
3369                {
3370                   EnumClassData e = ACCESS_CLASSDATA(baseClass, enumClass);
3371                   for(value = e.values.first; value; value = value.next)
3372                   {
3373                      if(!strcmp(value.name, string))
3374                         break;
3375                   }
3376                   if(value)
3377                   {
3378                      FreeExpContents(sourceExp);
3379                      FreeType(sourceExp.expType);
3380
3381                      sourceExp.isConstant = true;
3382                      sourceExp.expType = MkClassType(baseClass.fullName);
3383                      //if(inCompiler)
3384                      {
3385                         char constant[256];
3386                         sourceExp.type = constantExp;
3387                         if(!strcmp(baseClass.dataTypeString, "int"))
3388                            sprintf(constant, "%d",(int)value.data);
3389                         else
3390                            sprintf(constant, "0x%X",(int)value.data);
3391                         sourceExp.constant = CopyString(constant);
3392                         //for(;baseClass.base && baseClass.base.type != systemClass; baseClass = baseClass.base);
3393                      }
3394
3395                      while(converts.first)
3396                      {
3397                         Conversion convert = converts.first;
3398                         converts.Remove(convert);
3399                         conversions.Add(convert);
3400                      }
3401                      delete type;
3402                      return true;
3403                   }
3404                }
3405             }
3406          }
3407          if(converts.first)
3408             converts.Free(FreeConvert);
3409          delete type;
3410       }
3411    }
3412    for(nameSpace = (NameSpace *)nameSpace.nameSpaces.first; nameSpace != null; nameSpace = (NameSpace *)((BTNode)nameSpace).next)
3413       if(MatchWithEnums_NameSpace(nameSpace, sourceExp, dest, string, conversions))
3414          return true;
3415    return false;
3416 }
3417
3418 public bool ModuleVisibility(Module searchIn, Module searchFor)
3419 {
3420    SubModule subModule;
3421
3422    if(searchFor == searchIn)
3423       return true;
3424
3425    for(subModule = searchIn.modules.first; subModule; subModule = subModule.next)
3426    {
3427       if(subModule.importMode == publicAccess || searchIn == searchIn.application)
3428       {
3429          if(ModuleVisibility(subModule.module, searchFor))
3430             return true;
3431       }
3432    }
3433    return false;
3434 }
3435
3436 bool MatchWithEnums_Module(Module mainModule, Expression sourceExp, Type dest, char * string, OldList conversions)
3437 {
3438    Module module;
3439
3440    if(MatchWithEnums_NameSpace(mainModule.application.systemNameSpace, sourceExp, dest, string, conversions))
3441       return true;
3442    if(MatchWithEnums_NameSpace(mainModule.application.privateNameSpace, sourceExp, dest, string, conversions))
3443       return true;
3444    if(MatchWithEnums_NameSpace(mainModule.application.publicNameSpace, sourceExp, dest, string, conversions))
3445       return true;
3446
3447    for(module = mainModule.application.allModules.first; module; module = module.next)
3448    {
3449       if(ModuleVisibility(mainModule, module) && MatchWithEnums_NameSpace(module.publicNameSpace, sourceExp, dest, string, conversions))
3450          return true;
3451    }
3452    return false;
3453 }
3454
3455 bool MatchTypeExpression(Expression sourceExp, Type dest, OldList conversions, bool skipUnitBla)
3456 {
3457    Type source = sourceExp.expType;
3458    Type realDest = dest;
3459    Type backupSourceExpType = null;
3460
3461    if(dest.kind == pointerType && sourceExp.type == constantExp && !strtoul(sourceExp.constant, null, 0))
3462       return true;
3463
3464    if(!skipUnitBla && source && dest && source.kind == classType && dest.kind == classType)
3465    {
3466        if(source._class && source._class.registered && source._class.registered.type == unitClass)
3467        {
3468           Class sourceBase, destBase;
3469           for(sourceBase = source._class.registered;
3470               sourceBase && sourceBase.base && sourceBase.base.type != systemClass;
3471               sourceBase = sourceBase.base);
3472           for(destBase = dest._class.registered;
3473               destBase && destBase.base && destBase.base.type != systemClass;
3474               destBase = destBase.base);
3475           //if(source._class.registered == dest._class.registered)
3476           if(sourceBase == destBase)
3477              return true;
3478        }
3479    }
3480
3481    if(source)
3482    {
3483       OldList * specs;
3484       bool flag = false;
3485       int64 value = MAXINT;
3486
3487       source.refCount++;
3488       dest.refCount++;
3489
3490       if(sourceExp.type == constantExp)
3491       {
3492          if(source.isSigned)
3493             value = strtoll(sourceExp.constant, null, 0);
3494          else
3495             value = strtoull(sourceExp.constant, null, 0);
3496       }
3497       else if(sourceExp.type == opExp && sourceExp.op.op == '-' && !sourceExp.op.exp1 && sourceExp.op.exp2 && sourceExp.op.exp2.type == constantExp)
3498       {
3499          if(source.isSigned)
3500             value = -strtoll(sourceExp.op.exp2.constant, null, 0);
3501          else
3502             value = -strtoull(sourceExp.op.exp2.constant, null, 0);
3503       }
3504
3505       if(dest.kind != classType && source.kind == classType && source._class && source._class.registered &&
3506          !strcmp(source._class.registered.fullName, "ecere::com::unichar"))
3507       {
3508          FreeType(source);
3509          source = Type { kind = intType, isSigned = false, refCount = 1 };
3510       }
3511
3512       if(dest.kind == classType)
3513       {
3514          Class _class = dest._class ? dest._class.registered : null;
3515
3516          if(_class && _class.type == unitClass)
3517          {
3518             if(source.kind != classType)
3519             {
3520                Type tempType { };
3521                Type tempDest, tempSource;
3522
3523                for(; _class.base.type != systemClass; _class = _class.base);
3524                tempSource = dest;
3525                tempDest = tempType;
3526
3527                tempType.kind = classType;
3528                if(!_class.symbol)
3529                   _class.symbol = FindClass(_class.fullName);
3530
3531                tempType._class = _class.symbol;
3532                tempType.truth = dest.truth;
3533                if(tempType._class)
3534                   MatchTypes(tempSource, tempDest, conversions, null, null, true, true, false, false);
3535
3536                // NOTE: To handle bad warnings on int64 vs 32 bit eda::Id incompatibilities
3537                backupSourceExpType = sourceExp.expType;
3538                sourceExp.expType = dest; dest.refCount++;
3539                //sourceExp.expType = MkClassType(_class.fullName);
3540                flag = true;
3541
3542                delete tempType;
3543             }
3544          }
3545
3546
3547          // Why wasn't there something like this?
3548          if(_class && _class.type == bitClass && source.kind != classType)
3549          {
3550             if(!dest._class.registered.dataType)
3551                dest._class.registered.dataType = ProcessTypeString(dest._class.registered.dataTypeString, false);
3552             if(MatchTypes(source, dest._class.registered.dataType, conversions, null, null, true, true, false, false))
3553             {
3554                FreeType(source);
3555                FreeType(sourceExp.expType);
3556                source = sourceExp.expType = MkClassType(dest._class.string);
3557                source.refCount++;
3558
3559                //source.kind = classType;
3560                //source._class = dest._class;
3561             }
3562          }
3563
3564          // Adding two enumerations
3565          /*
3566          if(_class && _class.type == enumClass && source.kind == classType && source._class && source._class.registered && source._class.registered.type == enumClass)
3567          {
3568             if(!source._class.registered.dataType)
3569                source._class.registered.dataType = ProcessTypeString(source._class.registered.dataTypeString, false);
3570             if(!dest._class.registered.dataType)
3571                dest._class.registered.dataType = ProcessTypeString(dest._class.registered.dataTypeString, false);
3572
3573             if(MatchTypes(source._class.registered.dataType, dest._class.registered.dataType, conversions, null, null, true, false, false))
3574             {
3575                FreeType(source);
3576                source = sourceExp.expType = MkClassType(dest._class.string);
3577                source.refCount++;
3578
3579                //source.kind = classType;
3580                //source._class = dest._class;
3581             }
3582          }*/
3583
3584          if(_class && !strcmp(_class.fullName, "ecere::com::Class") && source.kind == pointerType && source.type && source.type.kind == charType && sourceExp.type == stringExp)
3585          {
3586             OldList * specs = MkList();
3587             Declarator decl;
3588             char string[1024];
3589
3590             ReadString(string, sourceExp.string);
3591             decl = SpecDeclFromString(string, specs, null);
3592
3593             FreeExpContents(sourceExp);
3594             FreeType(sourceExp.expType);
3595
3596             sourceExp.type = classExp;
3597             sourceExp._classExp.specifiers = specs;
3598             sourceExp._classExp.decl = decl;
3599             sourceExp.expType = dest;
3600             dest.refCount++;
3601
3602             FreeType(source);
3603             FreeType(dest);
3604             if(backupSourceExpType) FreeType(backupSourceExpType);
3605             return true;
3606          }
3607       }
3608       else if(source.kind == classType)
3609       {
3610          Class _class = source._class ? source._class.registered : null;
3611
3612          if(_class && (_class.type == unitClass || !strcmp(_class.fullName, "bool") || /*_class.type == enumClass || */_class.type == bitClass ))  // TOCHECK: enumClass, bitClass is new here...
3613          {
3614             /*
3615             if(dest.kind != classType)
3616             {
3617                // Testing this simpler piece of code... (Broke Units Conversion to no unit Logic)
3618                if(!source._class.registered.dataType)
3619                   source._class.registered.dataType = ProcessTypeString(source._class.registered.dataTypeString, false);
3620
3621                FreeType(dest);
3622                dest = MkClassType(source._class.string);
3623                //if(MatchTypes(source._class.registered.dataType, dest, conversions, null, null, true, false, false))
3624                //   dest = MkClassType(source._class.string);
3625             }
3626             */
3627
3628             if(dest.kind != classType)
3629             {
3630                Type tempType { };
3631                Type tempDest, tempSource;
3632
3633                if(!source._class.registered.dataType)
3634                   source._class.registered.dataType = ProcessTypeString(source._class.registered.dataTypeString, false);
3635
3636                for(; _class.base.type != systemClass; _class = _class.base);
3637                tempDest = source;
3638                tempSource = tempType;
3639                tempType.kind = classType;
3640                tempType._class = FindClass(_class.fullName);
3641                tempType.truth = source.truth;
3642                tempType.classObjectType = source.classObjectType;
3643
3644                if(tempType._class)
3645                   MatchTypes(tempSource, tempDest, conversions, null, null, true, true, false, false);
3646
3647                // PUT THIS BACK TESTING UNITS?
3648                if(conversions.last)
3649                {
3650                   ((Conversion)(conversions.last)).resultType = dest;
3651                   dest.refCount++;
3652                }
3653
3654                FreeType(sourceExp.expType);
3655                sourceExp.expType = MkClassType(_class.fullName);
3656                sourceExp.expType.truth = source.truth;
3657                sourceExp.expType.classObjectType = source.classObjectType;
3658
3659                // *** This if was commented out, put it back because "int a =^ Destroy()" shows up bool enum values in autocomplete ***
3660
3661                if(!sourceExp.destType)
3662                {
3663                   FreeType(sourceExp.destType);
3664                   sourceExp.destType = sourceExp.expType;
3665                   if(sourceExp.expType)
3666                      sourceExp.expType.refCount++;
3667                }
3668                //flag = true;
3669                //source = _class.dataType;
3670
3671
3672                // TOCHECK: TESTING THIS NEW CODE
3673                if(!_class.dataType)
3674                   _class.dataType = ProcessTypeString(_class.dataTypeString, false);
3675                FreeType(dest);
3676                dest = MkClassType(source._class.string);
3677                dest.truth = source.truth;
3678                dest.classObjectType = source.classObjectType;
3679
3680                FreeType(source);
3681                source = _class.dataType;
3682                source.refCount++;
3683
3684                delete tempType;
3685             }
3686          }
3687       }
3688
3689       if(!flag)
3690       {
3691          if(MatchTypes(source, dest, conversions, null, null, true, true, false, false))
3692          {
3693             FreeType(source);
3694             FreeType(dest);
3695             return true;
3696          }
3697       }
3698
3699       // Implicit Casts
3700       /*
3701       if(source.kind == classType)
3702       {
3703          Class _class = source._class.registered;
3704          if(_class.type == unitClass)
3705          {
3706             if(!_class.dataType)
3707                _class.dataType = ProcessTypeString(_class.dataTypeString, false);
3708             source = _class.dataType;
3709          }
3710       }*/
3711
3712       if(dest.kind == classType)
3713       {
3714          Class _class = dest._class ? dest._class.registered : null;
3715          if(_class && !dest.truth && (_class.type == unitClass || !strcmp(_class.fullName, "bool") ||
3716             (/*_class.type == enumClass*/_class.type != structClass && !value && source.kind == intType) || _class.type == bitClass))   // TOCHECK: enumClass, bitClass is new here...
3717          {
3718             if(_class.type == normalClass || _class.type == noHeadClass)
3719             {
3720                Expression newExp { };
3721                *newExp = *sourceExp;
3722                if(sourceExp.destType) sourceExp.destType.refCount++;
3723                if(sourceExp.expType)  sourceExp.expType.refCount++;
3724                sourceExp.type = castExp;
3725                sourceExp.cast.typeName = MkTypeName(MkListOne(MkSpecifier(VOID)), MkDeclaratorPointer(MkPointer(null, null), null));
3726                sourceExp.cast.exp = newExp;
3727                FreeType(sourceExp.expType);
3728                sourceExp.expType = null;
3729                ProcessExpressionType(sourceExp);
3730
3731                // In Debugger, this helps with addresses (e.g. null pointers) that end up casted to a void *: keeps a classType instead of a pointerType
3732                if(!inCompiler)
3733                {
3734                   FreeType(sourceExp.expType);
3735                   sourceExp.expType = dest;
3736                }
3737
3738                FreeType(source);
3739                if(inCompiler) FreeType(dest);
3740
3741                if(backupSourceExpType) FreeType(backupSourceExpType);
3742                return true;
3743             }
3744
3745             if(!_class.dataType)
3746                _class.dataType = ProcessTypeString(_class.dataTypeString, false);
3747             FreeType(dest);
3748             dest = _class.dataType;
3749             dest.refCount++;
3750          }
3751
3752          // Accept lower precision types for units, since we want to keep the unit type
3753          if(dest.kind == doubleType &&
3754             (source.kind == doubleType || source.kind == floatType || dest.kind == int64Type || source.kind == intType || source.kind == shortType ||
3755              source.kind == charType))
3756          {
3757             specs = MkListOne(MkSpecifier(DOUBLE));
3758          }
3759          else if(dest.kind == floatType &&
3760             (source.kind == floatType || dest.kind == int64Type || source.kind == intType || source.kind == shortType || source.kind == charType ||
3761             source.kind == doubleType))
3762          {
3763             specs = MkListOne(MkSpecifier(FLOAT));
3764          }
3765          else if(dest.kind == int64Type && (source.kind == int64Type || source.kind == intType || source.kind == shortType || source.kind == charType ||
3766             source.kind == floatType || source.kind == doubleType))
3767          {
3768             specs = MkList();
3769             if(!dest.isSigned) ListAdd(specs, MkSpecifier(UNSIGNED));
3770             ListAdd(specs, MkSpecifier(INT64));
3771          }
3772          else if(dest.kind == intType && (source.kind == intType || source.kind == shortType || source.kind == charType ||
3773             source.kind == floatType || source.kind == doubleType))
3774          {
3775             specs = MkList();
3776             if(!dest.isSigned) ListAdd(specs, MkSpecifier(UNSIGNED));
3777             ListAdd(specs, MkSpecifier(INT));
3778          }
3779          else if(dest.kind == shortType && (source.kind == shortType || source.kind == charType || source.kind == intType ||
3780             source.kind == floatType || source.kind == doubleType))
3781          {
3782             specs = MkList();
3783             if(!dest.isSigned) ListAdd(specs, MkSpecifier(UNSIGNED));
3784             ListAdd(specs, MkSpecifier(SHORT));
3785          }
3786          else if(dest.kind == charType && (source.kind == charType || source.kind == shortType || source.kind == intType ||
3787             source.kind == floatType || source.kind == doubleType))
3788          {
3789             specs = MkList();
3790             if(!dest.isSigned) ListAdd(specs, MkSpecifier(UNSIGNED));
3791             ListAdd(specs, MkSpecifier(CHAR));
3792          }
3793          else
3794          {
3795             FreeType(source);
3796             FreeType(dest);
3797             if(backupSourceExpType)
3798             {
3799                // Failed to convert: revert previous exp type
3800                if(sourceExp.expType) FreeType(sourceExp.expType);
3801                sourceExp.expType = backupSourceExpType;
3802             }
3803             return false;
3804          }
3805       }
3806       else if(dest.kind == doubleType &&
3807          (source.kind == doubleType || source.kind == floatType || source.kind == int64Type || source.kind == intType || source.kind == enumType || source.kind == shortType ||
3808           source.kind == charType))
3809       {
3810          specs = MkListOne(MkSpecifier(DOUBLE));
3811       }
3812       else if(dest.kind == floatType &&
3813          (source.kind == floatType || source.kind == enumType || source.kind == int64Type || source.kind == intType || source.kind == shortType || source.kind == charType))
3814       {
3815          specs = MkListOne(MkSpecifier(FLOAT));
3816       }
3817       else if(dest.kind == charType && (source.kind == charType || source.kind == enumType || source.kind == shortType || source.kind == intType) &&
3818          (dest.isSigned ? (value >= -128 && value <= 127) : (value >= 0 && value <= 255)))
3819       {
3820          specs = MkList();
3821          if(!dest.isSigned) ListAdd(specs, MkSpecifier(UNSIGNED));
3822          ListAdd(specs, MkSpecifier(CHAR));
3823       }
3824       else if(dest.kind == shortType && (source.kind == enumType || source.kind == charType || source.kind == shortType ||
3825          (source.kind == intType && (dest.isSigned ? (value >= -32768 && value <= 32767) : (value >= 0 && value <= 65535)))))
3826       {
3827          specs = MkList();
3828          if(!dest.isSigned) ListAdd(specs, MkSpecifier(UNSIGNED));
3829          ListAdd(specs, MkSpecifier(SHORT));
3830       }
3831       else if(dest.kind == intType && (source.kind == enumType || source.kind == shortType || source.kind == charType || source.kind == intType))
3832       {
3833          specs = MkList();
3834          if(!dest.isSigned) ListAdd(specs, MkSpecifier(UNSIGNED));
3835          ListAdd(specs, MkSpecifier(INT));
3836       }
3837       else if(dest.kind == int64Type && (source.kind == enumType || source.kind == shortType || source.kind == charType || source.kind == intType || source.kind == int64Type))
3838       {
3839          specs = MkList();
3840          if(!dest.isSigned) ListAdd(specs, MkSpecifier(UNSIGNED));
3841          ListAdd(specs, MkSpecifier(INT64));
3842       }
3843       else if(dest.kind == enumType &&
3844          (source.kind == int64Type || source.kind == intType || source.kind == shortType || source.kind == charType))
3845       {
3846          specs = MkListOne(MkEnum(MkIdentifier(dest.enumName), null));
3847       }
3848       else
3849       {
3850          FreeType(source);
3851          FreeType(dest);
3852          if(backupSourceExpType)
3853          {
3854             // Failed to convert: revert previous exp type
3855             if(sourceExp.expType) FreeType(sourceExp.expType);
3856             sourceExp.expType = backupSourceExpType;
3857          }
3858          return false;
3859       }
3860
3861       if(!flag)
3862       {
3863          Expression newExp { };
3864          *newExp = *sourceExp;
3865          newExp.prev = null;
3866          newExp.next = null;
3867          if(sourceExp.destType) sourceExp.destType.refCount++;
3868          if(sourceExp.expType)  sourceExp.expType.refCount++;
3869
3870          sourceExp.type = castExp;
3871          if(realDest.kind == classType)
3872          {
3873             sourceExp.cast.typeName = QMkClass(realDest._class.string, null);
3874             FreeList(specs, FreeSpecifier);
3875          }
3876          else
3877             sourceExp.cast.typeName = MkTypeName(specs, null);
3878          if(newExp.type == opExp)
3879          {
3880             sourceExp.cast.exp = MkExpBrackets(MkListOne(newExp));
3881          }
3882          else
3883             sourceExp.cast.exp = newExp;
3884
3885          FreeType(sourceExp.expType);
3886          sourceExp.expType = null;
3887          ProcessExpressionType(sourceExp);
3888       }
3889       else
3890          FreeList(specs, FreeSpecifier);
3891
3892       FreeType(dest);
3893       FreeType(source);
3894       if(backupSourceExpType) FreeType(backupSourceExpType);
3895
3896       return true;
3897    }
3898    else
3899    {
3900       while((sourceExp.type == bracketsExp || sourceExp.type == extensionExpressionExp) && sourceExp.list) sourceExp = sourceExp.list->last;
3901       if(sourceExp.type == identifierExp)
3902       {
3903          Identifier id = sourceExp.identifier;
3904          if(dest.kind == classType)
3905          {
3906             if(dest._class && dest._class.registered && dest._class.registered.type == enumClass)
3907             {
3908                Class _class = dest._class.registered;
3909                Class enumClass = eSystem_FindClass(privateModule, "enum");
3910                if(enumClass)
3911                {
3912                   for( ; _class && _class.type == ClassType::enumClass; _class = _class.base)
3913                   {
3914                      NamedLink value;
3915                      EnumClassData e = ACCESS_CLASSDATA(_class, enumClass);
3916                      for(value = e.values.first; value; value = value.next)
3917                      {
3918                         if(!strcmp(value.name, id.string))
3919                            break;
3920                      }
3921                      if(value)
3922                      {
3923                         FreeExpContents(sourceExp);
3924                         FreeType(sourceExp.expType);
3925
3926                         sourceExp.isConstant = true;
3927                         sourceExp.expType = MkClassType(_class.fullName);
3928                         //if(inCompiler)
3929                         {
3930                            char constant[256];
3931                            sourceExp.type = constantExp;
3932                            if(/*_class && */_class.dataTypeString && !strcmp(_class.dataTypeString, "int")) // _class cannot be null here!
3933                               sprintf(constant, "%d", (int) value.data);
3934                            else
3935                               sprintf(constant, "0x%X", (int) value.data);
3936                            sourceExp.constant = CopyString(constant);
3937                            //for(;_class.base && _class.base.type != systemClass; _class = _class.base);
3938                         }
3939                         return true;
3940                      }
3941                   }
3942                }
3943             }
3944          }
3945
3946          // Loop through all enum classes
3947          if(dest.classObjectType != typedObject && dest.kind == classType /*!= ellipsisType */&& MatchWithEnums_Module(privateModule, sourceExp, dest, id.string, conversions))
3948             return true;
3949       }
3950    }
3951    return false;
3952 }
3953
3954 #define TERTIARY(o, name, m, t, p) \
3955    static bool name(Expression exp, Operand op1, Operand op2, Operand op3)   \
3956    {                                                              \
3957       exp.type = constantExp;                                    \
3958       exp.string = p(op1.m ? op2.m : op3.m);                     \
3959       if(!exp.expType) \
3960          { exp.expType = op1.type; if(op1.type) op1.type.refCount++; } \
3961       return true;                                                \
3962    }
3963
3964 #define BINARY(o, name, m, t, p) \
3965    static bool name(Expression exp, Operand op1, Operand op2)   \
3966    {                                                              \
3967       t value2 = op2.m;                                           \
3968       exp.type = constantExp;                                    \
3969       exp.string = p(op1.m o value2);                     \
3970       if(!exp.expType) \
3971          { exp.expType = op1.type; if(op1.type) op1.type.refCount++; } \
3972       return true;                                                \
3973    }
3974
3975 #define BINARY_DIVIDE(o, name, m, t, p) \
3976    static bool name(Expression exp, Operand op1, Operand op2)   \
3977    {                                                              \
3978       t value2 = op2.m;                                           \
3979       exp.type = constantExp;                                    \
3980       exp.string = p(value2 ? (op1.m o value2) : 0);             \
3981       if(!exp.expType) \
3982          { exp.expType = op1.type; if(op1.type) op1.type.refCount++; } \
3983       return true;                                                \
3984    }
3985
3986 #define UNARY(o, name, m, t, p) \
3987    static bool name(Expression exp, Operand op1)                \
3988    {                                                              \
3989       exp.type = constantExp;                                    \
3990       exp.string = p((t)(o op1.m));                                   \
3991       if(!exp.expType) \
3992          { exp.expType = op1.type; if(op1.type) op1.type.refCount++; } \
3993       return true;                                                \
3994    }
3995
3996 #define OPERATOR_ALL(macro, o, name) \
3997    macro(o, Int##name, i, int, PrintInt) \
3998    macro(o, UInt##name, ui, unsigned int, PrintUInt) \
3999    macro(o, Short##name, s, short, PrintShort) \
4000    macro(o, UShort##name, us, unsigned short, PrintUShort) \
4001    macro(o, Char##name, c, char, PrintChar) \
4002    macro(o, UChar##name, uc, unsigned char, PrintUChar) \
4003    macro(o, Float##name, f, float, PrintFloat) \
4004    macro(o, Double##name, d, double, PrintDouble)
4005
4006 #define OPERATOR_INTTYPES(macro, o, name) \
4007    macro(o, Int##name, i, int, PrintInt) \
4008    macro(o, UInt##name, ui, unsigned int, PrintUInt) \
4009    macro(o, Short##name, s, short, PrintShort) \
4010    macro(o, UShort##name, us, unsigned short, PrintUShort) \
4011    macro(o, Char##name, c, char, PrintChar) \
4012    macro(o, UChar##name, uc, unsigned char, PrintUChar)
4013
4014
4015 // binary arithmetic
4016 OPERATOR_ALL(BINARY, +, Add)
4017 OPERATOR_ALL(BINARY, -, Sub)
4018 OPERATOR_ALL(BINARY, *, Mul)
4019 OPERATOR_ALL(BINARY_DIVIDE, /, Div)
4020 OPERATOR_INTTYPES(BINARY_DIVIDE, %, Mod)
4021
4022 // unary arithmetic
4023 OPERATOR_ALL(UNARY, -, Neg)
4024
4025 // unary arithmetic increment and decrement
4026 OPERATOR_ALL(UNARY, ++, Inc)
4027 OPERATOR_ALL(UNARY, --, Dec)
4028
4029 // binary arithmetic assignment
4030 OPERATOR_ALL(BINARY, =, Asign)
4031 OPERATOR_ALL(BINARY, +=, AddAsign)
4032 OPERATOR_ALL(BINARY, -=, SubAsign)
4033 OPERATOR_ALL(BINARY, *=, MulAsign)
4034 OPERATOR_ALL(BINARY_DIVIDE, /=, DivAsign)
4035 OPERATOR_INTTYPES(BINARY_DIVIDE, %=, ModAsign)
4036
4037 // binary bitwise
4038 OPERATOR_INTTYPES(BINARY, &, BitAnd)
4039 OPERATOR_INTTYPES(BINARY, |, BitOr)
4040 OPERATOR_INTTYPES(BINARY, ^, BitXor)
4041 OPERATOR_INTTYPES(BINARY, <<, LShift)
4042 OPERATOR_INTTYPES(BINARY, >>, RShift)
4043
4044 // unary bitwise
4045 OPERATOR_INTTYPES(UNARY, ~, BitNot)
4046
4047 // binary bitwise assignment
4048 OPERATOR_INTTYPES(BINARY, &=, AndAsign)
4049 OPERATOR_INTTYPES(BINARY, |=, OrAsign)
4050 OPERATOR_INTTYPES(BINARY, ^=, XorAsign)
4051 OPERATOR_INTTYPES(BINARY, <<=, LShiftAsign)
4052 OPERATOR_INTTYPES(BINARY, >>=, RShiftAsign)
4053
4054 // unary logical negation
4055 OPERATOR_INTTYPES(UNARY, !, Not)
4056
4057 // binary logical equality
4058 OPERATOR_ALL(BINARY, ==, Equ)
4059 OPERATOR_ALL(BINARY, !=, Nqu)
4060
4061 // binary logical
4062 OPERATOR_ALL(BINARY, &&, And)
4063 OPERATOR_ALL(BINARY, ||, Or)
4064
4065 // binary logical relational
4066 OPERATOR_ALL(BINARY, >, Grt)
4067 OPERATOR_ALL(BINARY, <, Sma)
4068 OPERATOR_ALL(BINARY, >=, GrtEqu)
4069 OPERATOR_ALL(BINARY, <=, SmaEqu)
4070
4071 // tertiary condition operator
4072 OPERATOR_ALL(TERTIARY, ?, Cond)
4073
4074 //Add, Sub, Mul, Div, Mod,     , Neg,     Inc, Dec,    Asign, AddAsign, SubAsign, MulAsign, DivAsign, ModAsign,     BitAnd, BitOr, BitXor, LShift, RShift, BitNot,     AndAsign, OrAsign, XorAsign, LShiftAsign, RShiftAsign,     Not,     Equ, Nqu,     And, Or,     Grt, Sma, GrtEqu, SmaEqu
4075 #define OPERATOR_TABLE_ALL(name, type) \
4076     OpTable name##Ops = { type##Add, type##Sub, type##Mul, type##Div, type##Mod, \
4077                           type##Neg, \
4078                           type##Inc, type##Dec, \
4079                           type##Asign, type##AddAsign, type##SubAsign, type##MulAsign, type##DivAsign, type##ModAsign, \
4080                           type##BitAnd, type##BitOr, type##BitXor, type##LShift, type##RShift, \
4081                           type##BitNot, \
4082                           type##AndAsign, type##OrAsign, type##XorAsign, type##LShiftAsign, type##RShiftAsign, \
4083                           type##Not, \
4084                           type##Equ, type##Nqu, \
4085                           type##And, type##Or, \
4086                           type##Grt, type##Sma, type##GrtEqu, type##SmaEqu, type##Cond \
4087                         }; \
4088
4089 #define OPERATOR_TABLE_INTTYPES(name, type) \
4090     OpTable name##Ops = { type##Add, type##Sub, type##Mul, type##Div, null, \
4091                           type##Neg, \
4092                           type##Inc, type##Dec, \
4093                           type##Asign, type##AddAsign, type##SubAsign, type##MulAsign, type##DivAsign, null, \
4094                           null, null, null, null, null, \
4095                           null, \
4096                           null, null, null, null, null, \
4097                           null, \
4098                           type##Equ, type##Nqu, \
4099                           type##And, type##Or, \
4100                           type##Grt, type##Sma, type##GrtEqu, type##SmaEqu \
4101                         }; \
4102
4103 OPERATOR_TABLE_ALL(int, Int)
4104 OPERATOR_TABLE_ALL(uint, UInt)
4105 OPERATOR_TABLE_ALL(short, Short)
4106 OPERATOR_TABLE_ALL(ushort, UShort)
4107 OPERATOR_TABLE_INTTYPES(float, Float)
4108 OPERATOR_TABLE_INTTYPES(double, Double)
4109 OPERATOR_TABLE_ALL(char, Char)
4110 OPERATOR_TABLE_ALL(uchar, UChar)
4111
4112 //OpTable intOps =    {    IntAdd,    IntSub,    IntMul,    IntDiv,    IntMod,    IntExp,    IntNot,    IntBwn,    IntOr,    IntAnd,    IntEqu,    IntNqu,    IntGrt,    IntSma,    IntGrtEqu,    IntSmaEqu,    IntNeg,    IntLBitSft,    IntRBitSft };
4113 //OpTable uintOps =   {   UIntAdd,   UIntSub,   UIntMul,   UIntDiv,   UIntMod,   UIntExp,   UIntNot,   UIntBwn,   UIntOr,   UIntAnd,   UIntEqu,   UIntNqu,   UIntGrt,   UIntSma,   UIntGrtEqu,   UIntSmaEqu,   UIntNeg,   UIntLBitSft,   UIntRBitSft };
4114 //OpTable shortOps =  {  ShortAdd,  ShortSub,  ShortMul,  ShortDiv,  ShortMod,  ShortExp,  ShortNot,  ShortBwn,  ShortOr,  ShortAnd,  ShortEqu,  ShortNqu,  ShortGrt,  ShortSma,  ShortGrtEqu,  ShortSmaEqu,  ShortNeg,  ShortLBitSft,  ShortRBitSft };
4115 //OpTable ushortOps = { UShortAdd, UShortSub, UShortMul, UShortDiv, UShortMod, UShortExp, UShortNot, UShortBwn, UShortOr, UShortAnd, UShortEqu, UShortNqu, UShortGrt, UShortSma, UShortGrtEqu, UShortSmaEqu, UShortNeg, UShortLBitSft, UShortRBitSft };
4116 //OpTable floatOps =  {  FloatAdd,  FloatSub,  FloatMul,  FloatDiv,      null,      null,      null,      null,     null,      null,  FloatEqu,  FloatNqu,  FloatGrt,  FloatSma,  FloatGrtEqu,  FloatSmaEqu,  FloatNeg,          null,          null };
4117 //OpTable doubleOps = { DoubleAdd, DoubleSub, DoubleMul, DoubleDiv,      null,      null,      null,      null,     null,      null, DoubleEqu, DoubleNqu, DoubleGrt, DoubleSma, DoubleGrtEqu, DoubleSmaEqu, DoubleNeg,          null,          null };
4118 //OpTable charOps =   {   CharAdd,   CharSub,   CharMul,   CharDiv,   CharMod,   CharExp,   CharNot,   CharBwn,   CharOr,   CharAnd,   CharEqu,   CharNqu,   CharGrt,   CharSma,   CharGrtEqu,   CharSmaEqu,   CharNeg,   CharLBitSft,   CharRBitSft };
4119 //OpTable ucharOps =  {  UCharAdd,  UCharSub,  UCharMul,  UCharDiv,  UCharMod,  UCharExp,  UCharNot,  UCharBwn,  UCharOr,  UCharAnd,  UCharEqu,  UCharNqu,  UCharGrt,  UCharSma,  UCharGrtEqu,  UCharSmaEqu,  UCharNeg,  UCharLBitSft,  UCharRBitSft };
4120
4121 public void ReadString(char * output,  char * string)
4122 {
4123    int len = strlen(string);
4124    int c,d = 0;
4125    bool quoted = false, escaped = false;
4126    for(c = 0; c<len; c++)
4127    {
4128       char ch = string[c];
4129       if(escaped)
4130       {
4131          switch(ch)
4132          {
4133             case 'n': output[d] = '\n'; break;
4134             case 't': output[d] = '\t'; break;
4135             case 'a': output[d] = '\a'; break;
4136             case 'b': output[d] = '\b'; break;
4137             case 'f': output[d] = '\f'; break;
4138             case 'r': output[d] = '\r'; break;
4139             case 'v': output[d] = '\v'; break;
4140             case '\\': output[d] = '\\'; break;
4141             case '\"': output[d] = '\"'; break;
4142             default: output[d++] = '\\'; output[d] = ch;
4143             //default: output[d] = ch;
4144          }
4145          d++;
4146          escaped = false;
4147       }
4148       else
4149       {
4150          if(ch == '\"')
4151             quoted ^= true;
4152          else if(quoted)
4153          {
4154             if(ch == '\\')
4155                escaped = true;
4156             else
4157                output[d++] = ch;
4158          }
4159       }
4160    }
4161    output[d] = '\0';
4162 }
4163
4164 public Operand GetOperand(Expression exp)
4165 {
4166    Operand op { };
4167    Type type = exp.expType;
4168    if(type)
4169    {
4170       while(type.kind == classType &&
4171          type._class.registered && (type._class.registered.type == bitClass || type._class.registered.type == unitClass || type._class.registered.type == enumClass))
4172       {
4173          if(!type._class.registered.dataType)
4174             type._class.registered.dataType = ProcessTypeString(type._class.registered.dataTypeString, false);
4175          type = type._class.registered.dataType;
4176
4177       }
4178       op.kind = type.kind;
4179       op.type = exp.expType;
4180       if(exp.isConstant && exp.type == constantExp)
4181       {
4182          switch(op.kind)
4183          {
4184             case charType:
4185             {
4186                if(exp.constant[0] == '\'')
4187                   op.c = exp.constant[1];
4188                else if(type.isSigned)
4189                {
4190                   op.c = (char)strtol(exp.constant, null, 0);
4191                   op.ops = charOps;
4192                }
4193                else
4194                {
4195                   op.uc = (unsigned char)strtoul(exp.constant, null, 0);
4196                   op.ops = ucharOps;
4197                }
4198                break;
4199             }
4200             case shortType:
4201                if(type.isSigned)
4202                {
4203                   op.s = (short)strtol(exp.constant, null, 0);
4204                   op.ops = shortOps;
4205                }
4206                else
4207                {
4208                   op.us = (unsigned short)strtoul(exp.constant, null, 0);
4209                   op.ops = ushortOps;
4210                }
4211                break;
4212             case intType:
4213             case longType:
4214                if(type.isSigned)
4215                {
4216                   op.i = (int)strtol(exp.constant, null, 0);
4217                   op.ops = intOps;
4218                }
4219                else
4220                {
4221                   op.ui = (unsigned int)strtoul(exp.constant, null, 0);
4222                   op.ops = uintOps;
4223                }
4224                op.kind = intType;
4225                break;
4226             case int64Type:
4227                if(type.isSigned)
4228                {
4229                   op.i64 = (int64)_strtoi64(exp.constant, null, 0);
4230                   op.ops = intOps;
4231                }
4232                else
4233                {
4234                   op.ui64 = (uint64)_strtoui64(exp.constant, null, 0);
4235                   op.ops = uintOps;
4236                }
4237                op.kind = intType;
4238                break;
4239             case intPtrType:
4240                if(type.isSigned)
4241                {
4242                   op.i64 = (int64)_strtoi64(exp.constant, null, 0);
4243                   op.ops = intOps;
4244                }
4245                else
4246                {
4247                   op.ui64 = (uint64)_strtoui64(exp.constant, null, 0);
4248                   op.ops = uintOps;
4249                }
4250                op.kind = intType;
4251                break;
4252             case intSizeType:
4253                if(type.isSigned)
4254                {
4255                   op.i64 = (int64)_strtoi64(exp.constant, null, 0);
4256                   op.ops = intOps;
4257                }
4258                else
4259                {
4260                   op.ui64 = (uint64)_strtoui64(exp.constant, null, 0);
4261                   op.ops = uintOps;
4262                }
4263                op.kind = intType;
4264                break;
4265             case floatType:
4266                op.f = (float)strtod(exp.constant, null);
4267                op.ops = floatOps;
4268                break;
4269             case doubleType:
4270                op.d = (double)strtod(exp.constant, null);
4271                op.ops = doubleOps;
4272                break;
4273             //case classType:    For when we have operator overloading...
4274             // Pointer additions
4275             //case functionType:
4276             case arrayType:
4277             case pointerType:
4278             case classType:
4279                op.ui64 = _strtoui64(exp.constant, null, 0);
4280                op.kind = pointerType;
4281                op.ops = uintOps;
4282                // op.ptrSize =
4283                break;
4284          }
4285       }
4286    }
4287    return op;
4288 }
4289
4290 static void UnusedFunction()
4291 {
4292    int a;
4293    a.OnGetString(0,0,0);
4294 }
4295 default:
4296 extern int __ecereVMethodID_class_OnGetString;
4297 public:
4298
4299 static void PopulateInstanceProcessMember(Instantiation inst, OldList * memberList, DataMember parentDataMember, uint offset)
4300 {
4301    DataMember dataMember;
4302    for(dataMember = parentDataMember.members.first; dataMember; dataMember = dataMember.next)
4303    {
4304       if(!dataMember.name && (dataMember.type == structMember || dataMember.type == unionMember))
4305          PopulateInstanceProcessMember(inst, memberList, dataMember, offset + dataMember.offset);
4306       else
4307       {
4308          Expression exp { };
4309          MemberInit member = MkMemberInit(MkListOne(MkIdentifier(dataMember.name)), MkInitializerAssignment(exp));
4310          Type type;
4311          void * ptr = inst.data + dataMember.offset + offset;
4312          char * result = null;
4313          exp.loc = member.loc = inst.loc;
4314          ((Identifier)member.identifiers->first).loc = inst.loc;
4315
4316          if(!dataMember.dataType)
4317             dataMember.dataType = ProcessTypeString(dataMember.dataTypeString, false);
4318          type = dataMember.dataType;
4319          if(type.kind == classType)
4320          {
4321             Class _class = type._class.registered;
4322             if(_class.type == enumClass)
4323             {
4324                Class enumClass = eSystem_FindClass(privateModule, "enum");
4325                if(enumClass)
4326                {
4327                   EnumClassData e = ACCESS_CLASSDATA(_class, enumClass);
4328                   NamedLink item;
4329                   for(item = e.values.first; item; item = item.next)
4330                   {
4331                      if((int)item.data == *(int *)ptr)
4332                      {
4333                         result = item.name;
4334                         break;
4335                      }
4336                   }
4337                   if(result)
4338                   {
4339                      exp.identifier = MkIdentifier(result);
4340                      exp.type = identifierExp;
4341                      exp.destType = MkClassType(_class.fullName);
4342                      ProcessExpressionType(exp);
4343                   }
4344                }
4345             }
4346             if(_class.type == enumClass || _class.type == unitClass || _class.type == bitClass)
4347             {
4348                if(!_class.dataType)
4349                   _class.dataType = ProcessTypeString(_class.dataTypeString, false);
4350                type = _class.dataType;
4351             }
4352          }
4353          if(!result)
4354          {
4355             switch(type.kind)
4356             {
4357                case floatType:
4358                {
4359                   FreeExpContents(exp);
4360
4361                   exp.constant = PrintFloat(*(float*)ptr);
4362                   exp.type = constantExp;
4363                   break;
4364                }
4365                case doubleType:
4366                {
4367                   FreeExpContents(exp);
4368
4369                   exp.constant = PrintDouble(*(double*)ptr);
4370                   exp.type = constantExp;
4371                   break;
4372                }
4373                case intType:
4374                {
4375                   FreeExpContents(exp);
4376
4377                   exp.constant = PrintInt(*(int*)ptr);
4378                   exp.type = constantExp;
4379                   break;
4380                }
4381                case int64Type:
4382                {
4383                   FreeExpContents(exp);
4384
4385                   exp.constant = PrintInt64(*(int64*)ptr);
4386                   exp.type = constantExp;
4387                   break;
4388                }
4389                case intPtrType:
4390                {
4391                   FreeExpContents(exp);
4392                   // TODO: This should probably use proper type
4393                   exp.constant = PrintInt64((int64)*(intptr*)ptr);
4394                   exp.type = constantExp;
4395                   break;
4396                }
4397                case intSizeType:
4398                {
4399                   FreeExpContents(exp);
4400                   // TODO: This should probably use proper type
4401                   exp.constant = PrintInt64((int64)*(intptr*)ptr);
4402                   exp.type = constantExp;
4403                   break;
4404                }
4405                default:
4406                   Compiler_Error($"Unhandled type populating instance\n");
4407             }
4408          }
4409          ListAdd(memberList, member);
4410       }
4411
4412       if(parentDataMember.type == unionMember)
4413          break;
4414    }
4415 }
4416
4417 void PopulateInstance(Instantiation inst)
4418 {
4419    Symbol classSym = inst._class.symbol; // FindClass(inst._class.name);
4420    Class _class = classSym.registered;
4421    DataMember dataMember;
4422    OldList * memberList = MkList();
4423    // Added this check and ->Add to prevent memory leaks on bad code
4424    if(!inst.members)
4425       inst.members = MkListOne(MkMembersInitList(memberList));
4426    else
4427       inst.members->Add(MkMembersInitList(memberList));
4428    for(dataMember = _class.membersAndProperties.first; dataMember; dataMember = dataMember.next)
4429    {
4430       if(!dataMember.isProperty)
4431       {
4432          if(!dataMember.name && (dataMember.type == structMember || dataMember.type == unionMember))
4433             PopulateInstanceProcessMember(inst, memberList, dataMember, dataMember.offset);
4434          else
4435          {
4436             Expression exp { };
4437             MemberInit member = MkMemberInit(MkListOne(MkIdentifier(dataMember.name)), MkInitializerAssignment(exp));
4438             Type type;
4439             void * ptr = inst.data + dataMember.offset;
4440             char * result = null;
4441
4442             exp.loc = member.loc = inst.loc;
4443             ((Identifier)member.identifiers->first).loc = inst.loc;
4444
4445             if(!dataMember.dataType)
4446                dataMember.dataType = ProcessTypeString(dataMember.dataTypeString, false);
4447             type = dataMember.dataType;
4448             if(type.kind == classType)
4449             {
4450                Class _class = type._class.registered;
4451                if(_class.type == enumClass)
4452                {
4453                   Class enumClass = eSystem_FindClass(privateModule, "enum");
4454                   if(enumClass)
4455                   {
4456                      EnumClassData e = ACCESS_CLASSDATA(_class, enumClass);
4457                      NamedLink item;
4458                      for(item = e.values.first; item; item = item.next)
4459                      {
4460                         if((int)item.data == *(int *)ptr)
4461                         {
4462                            result = item.name;
4463                            break;
4464                         }
4465                      }
4466                   }
4467                   if(result)
4468                   {
4469                      exp.identifier = MkIdentifier(result);
4470                      exp.type = identifierExp;
4471                      exp.destType = MkClassType(_class.fullName);
4472                      ProcessExpressionType(exp);
4473                   }
4474                }
4475                if(_class.type == enumClass || _class.type == unitClass || _class.type == bitClass)
4476                {
4477                   if(!_class.dataType)
4478                      _class.dataType = ProcessTypeString(_class.dataTypeString, false);
4479                   type = _class.dataType;
4480                }
4481             }
4482             if(!result)
4483             {
4484                switch(type.kind)
4485                {
4486                   case floatType:
4487                   {
4488                      exp.constant = PrintFloat(*(float*)ptr);
4489                      exp.type = constantExp;
4490                      break;
4491                   }
4492                   case doubleType:
4493                   {
4494                      exp.constant = PrintDouble(*(double*)ptr);
4495                      exp.type = constantExp;
4496                      break;
4497                   }
4498                   case intType:
4499                   {
4500                      exp.constant = PrintInt(*(int*)ptr);
4501                      exp.type = constantExp;
4502                      break;
4503                   }
4504                   case int64Type:
4505                   {
4506                      exp.constant = PrintInt64(*(int64*)ptr);
4507                      exp.type = constantExp;
4508                      break;
4509                   }
4510                   case intPtrType:
4511                   {
4512                      exp.constant = PrintInt64((int64)*(intptr*)ptr);
4513                      exp.type = constantExp;
4514                      break;
4515                   }
4516                   default:
4517                      Compiler_Error($"Unhandled type populating instance\n");
4518                }
4519             }
4520             ListAdd(memberList, member);
4521          }
4522       }
4523    }
4524 }
4525
4526 void ComputeInstantiation(Expression exp)
4527 {
4528    Instantiation inst = exp.instance;
4529    MembersInit members;
4530    Symbol classSym = inst._class ? inst._class.symbol : null; // FindClass(inst._class.name);
4531    Class _class = classSym ? classSym.registered : null;
4532    DataMember curMember = null;
4533    Class curClass = null;
4534    DataMember subMemberStack[256];
4535    int subMemberStackPos = 0;
4536    uint64 bits = 0;
4537
4538    if(_class && (_class.type == structClass || _class.type == normalClass || _class.type == noHeadClass ))
4539    {
4540       // Don't recompute the instantiation...
4541       // Non Simple classes will have become constants by now
4542       if(inst.data)
4543          return;
4544
4545       if(_class.type == normalClass || _class.type == noHeadClass)
4546          inst.data = (byte *)eInstance_New(_class);
4547       else
4548          inst.data = new0 byte[_class.structSize];
4549    }
4550
4551    if(inst.members)
4552    {
4553       for(members = inst.members->first; members; members = members.next)
4554       {
4555          switch(members.type)
4556          {
4557             case dataMembersInit:
4558             {
4559                if(members.dataMembers)
4560                {
4561                   MemberInit member;
4562                   for(member = members.dataMembers->first; member; member = member.next)
4563                   {
4564                      Identifier ident = member.identifiers ? member.identifiers->first : null;
4565                      bool found = false;
4566
4567                      Property prop = null;
4568                      DataMember dataMember = null;
4569                      Method method = null;
4570                      uint dataMemberOffset;
4571
4572                      if(!ident)
4573                      {
4574                         eClass_FindNextMember(_class, &curClass, &curMember, subMemberStack, &subMemberStackPos);
4575                         if(curMember)
4576                         {
4577                            if(curMember.isProperty)
4578                               prop = (Property)curMember;
4579                            else
4580                            {
4581                               dataMember = curMember;
4582
4583                               // CHANGED THIS HERE
4584                               eClass_FindDataMemberAndOffset(_class, dataMember.name, &dataMemberOffset, privateModule, null, null);
4585
4586                               // 2013/17/29 -- It seems that this was missing here!
4587                               if(_class.type == normalClass)
4588                                  dataMemberOffset += _class.base.structSize;
4589                               // dataMemberOffset = dataMember.offset;
4590                            }
4591                            found = true;
4592                         }
4593                      }
4594                      else
4595                      {
4596                         prop = eClass_FindProperty(_class, ident.string, privateModule);
4597                         if(prop)
4598                         {
4599                            found = true;
4600                            if(prop.memberAccess == publicAccess)
4601                            {
4602                               curMember = (DataMember)prop;
4603                               curClass = prop._class;
4604                            }
4605                         }
4606                         else
4607                         {
4608                            DataMember _subMemberStack[256];
4609                            int _subMemberStackPos = 0;
4610
4611                            // FILL MEMBER STACK
4612                            dataMember = eClass_FindDataMemberAndOffset(_class, ident.string, &dataMemberOffset, privateModule, _subMemberStack, &_subMemberStackPos);
4613
4614                            if(dataMember)
4615                            {
4616                               found = true;
4617                               if(dataMember.memberAccess == publicAccess)
4618                               {
4619                                  curMember = dataMember;
4620                                  curClass = dataMember._class;
4621                                  memcpy(subMemberStack, _subMemberStack, sizeof(DataMember) * _subMemberStackPos);
4622                                  subMemberStackPos = _subMemberStackPos;
4623                               }
4624                            }
4625                         }
4626                      }
4627
4628                      if(found && member.initializer && member.initializer.type == expInitializer)
4629                      {
4630                         Expression value = member.initializer.exp;
4631                         Type type = null;
4632                         bool deepMember = false;
4633                         if(prop)
4634                         {
4635                            type = prop.dataType;
4636                         }
4637                         else if(dataMember)
4638                         {
4639                            if(!dataMember.dataType)
4640                               dataMember.dataType = ProcessTypeString(dataMember.dataTypeString, false);
4641
4642                            type = dataMember.dataType;
4643                         }
4644
4645                         if(ident && ident.next)
4646                         {
4647                            deepMember = true;
4648
4649                            // for(; ident && type; ident = ident.next)
4650                            for(ident = ident.next; ident && type; ident = ident.next)
4651                            {
4652                               if(type.kind == classType)
4653                               {
4654                                  prop = eClass_FindProperty(type._class.registered,
4655                                     ident.string, privateModule);
4656                                  if(prop)
4657                                     type = prop.dataType;
4658                                  else
4659                                  {
4660                                     dataMember = eClass_FindDataMemberAndOffset(type._class.registered,
4661                                        ident.string, &dataMemberOffset, privateModule, null, null);
4662                                     if(dataMember)
4663                                        type = dataMember.dataType;
4664                                  }
4665                               }
4666                               else if(type.kind == structType || type.kind == unionType)
4667                               {
4668                                  Type memberType;
4669                                  for(memberType = type.members.first; memberType; memberType = memberType.next)
4670                                  {
4671                                     if(!strcmp(memberType.name, ident.string))
4672                                     {
4673                                        type = memberType;
4674                                        break;
4675                                     }
4676                                  }
4677                               }
4678                            }
4679                         }
4680                         if(value)
4681                         {
4682                            FreeType(value.destType);
4683                            value.destType = type;
4684                            if(type) type.refCount++;
4685                            ComputeExpression(value);
4686                         }
4687                         if(!deepMember && type && value && (_class.type == structClass || _class.type == normalClass || _class.type == noHeadClass /*&& value.expType.kind == type.kind*/))
4688                         {
4689                            if(type.kind == classType)
4690                            {
4691                               Class _class = type._class.registered;
4692                               if(_class.type == bitClass || _class.type == unitClass ||
4693                                  _class.type == enumClass)
4694                               {
4695                                  if(!_class.dataType)
4696                                     _class.dataType = ProcessTypeString(_class.dataTypeString, false);
4697                                  type = _class.dataType;
4698                               }
4699                            }
4700
4701                            if(dataMember)
4702                            {
4703                               void * ptr = inst.data + dataMemberOffset;
4704
4705                               if(value.type == constantExp)
4706                               {
4707                                  switch(type.kind)
4708                                  {
4709                                     case intType:
4710                                     {
4711                                        GetInt(value, (int*)ptr);
4712                                        break;
4713                                     }
4714                                     case int64Type:
4715                                     {
4716                                        GetInt64(value, (int64*)ptr);
4717                                        break;
4718                                     }
4719                                     case intPtrType:
4720                                     {
4721                                        GetIntPtr(value, (intptr*)ptr);
4722                                        break;
4723                                     }
4724                                     case intSizeType:
4725                                     {
4726                                        GetIntSize(value, (intsize*)ptr);
4727                                        break;
4728                                     }
4729                                     case floatType:
4730                                     {
4731                                        GetFloat(value, (float*)ptr);
4732                                        break;
4733                                     }
4734                                     case doubleType:
4735                                     {
4736                                        GetDouble(value, (double *)ptr);
4737                                        break;
4738                                     }
4739                                  }
4740                               }
4741                               else if(value.type == instanceExp)
4742                               {
4743                                  if(type.kind == classType)
4744                                  {
4745                                     Class _class = type._class.registered;
4746                                     if(_class.type == structClass)
4747                                     {
4748                                        ComputeTypeSize(type);
4749                                        if(value.instance.data)
4750                                           memcpy(ptr, value.instance.data, type.size);
4751                                     }
4752                                  }
4753                               }
4754                            }
4755                            else if(prop)
4756                            {
4757                               if(value.type == instanceExp && value.instance.data)
4758                               {
4759                                  if(type.kind == classType)
4760                                  {
4761                                     Class _class = type._class.registered;
4762                                     if(_class && (_class.type != normalClass || eClass_IsDerived(((Instance)value.instance.data)._class, _class)))
4763                                     {
4764                                        void (*Set)(void *, void *) = (void *)prop.Set;
4765                                        Set(inst.data, value.instance.data);
4766                                        PopulateInstance(inst);
4767                                     }
4768                                  }
4769                               }
4770                               else if(value.type == constantExp)
4771                               {
4772                                  switch(type.kind)
4773                                  {
4774                                     case doubleType:
4775                                     {
4776                                        void (*Set)(void *, double) = (void *)prop.Set;
4777                                        Set(inst.data, strtod(value.constant, null) );
4778                                        break;
4779                                     }
4780                                     case floatType:
4781                                     {
4782                                        void (*Set)(void *, float) = (void *)prop.Set;
4783                                        Set(inst.data, (float)(strtod(value.constant, null)));
4784                                        break;
4785                                     }
4786                                     case intType:
4787                                     {
4788                                        void (*Set)(void *, int) = (void *)prop.Set;
4789                                        Set(inst.data, (int)strtol(value.constant, null, 0));
4790                                        break;
4791                                     }
4792                                     case int64Type:
4793                                     {
4794                                        void (*Set)(void *, int64) = (void *)prop.Set;
4795                                        Set(inst.data, _strtoi64(value.constant, null, 0));
4796                                        break;
4797                                     }
4798                                     case intPtrType:
4799                                     {
4800                                        void (*Set)(void *, intptr) = (void *)prop.Set;
4801                                        Set(inst.data, (intptr)_strtoi64(value.constant, null, 0));
4802                                        break;
4803                                     }
4804                                     case intSizeType:
4805                                     {
4806                                        void (*Set)(void *, intsize) = (void *)prop.Set;
4807                                        Set(inst.data, (intsize)_strtoi64(value.constant, null, 0));
4808                                        break;
4809                                     }
4810                                  }
4811                               }
4812                               else if(value.type == stringExp)
4813                               {
4814                                  char temp[1024];
4815                                  ReadString(temp, value.string);
4816                                  ((void (*)(void *, void *))(void *)prop.Set)(inst.data, temp);
4817                               }
4818                            }
4819                         }
4820                         else if(!deepMember && type && _class.type == unitClass)
4821                         {
4822                            if(prop)
4823                            {
4824                               // Only support converting units to units for now...
4825                               if(value.type == constantExp)
4826                               {
4827                                  if(type.kind == classType)
4828                                  {
4829                                     Class _class = type._class.registered;
4830                                     if(_class.type == unitClass)
4831                                     {
4832                                        if(!_class.dataType)
4833                                           _class.dataType = ProcessTypeString(_class.dataTypeString, false);
4834                                        type = _class.dataType;
4835                                     }
4836                                  }
4837                                  // TODO: Assuming same base type for units...
4838                                  switch(type.kind)
4839                                  {
4840                                     case floatType:
4841                                     {
4842                                        float fValue;
4843                                        float (*Set)(float) = (void *)prop.Set;
4844                                        GetFloat(member.initializer.exp, &fValue);
4845                                        exp.constant = PrintFloat(Set(fValue));
4846                                        exp.type = constantExp;
4847                                        break;
4848                                     }
4849                                     case doubleType:
4850                                     {
4851                                        double dValue;
4852                                        double (*Set)(double) = (void *)prop.Set;
4853                                        GetDouble(member.initializer.exp, &dValue);
4854                                        exp.constant = PrintDouble(Set(dValue));
4855                                        exp.type = constantExp;
4856                                        break;
4857                                     }
4858                                  }
4859                               }
4860                            }
4861                         }
4862                         else if(!deepMember && type && _class.type == bitClass)
4863                         {
4864                            if(prop)
4865                            {
4866                               if(value.type == instanceExp && value.instance.data)
4867                               {
4868                                  unsigned int (*Set)(void *) = (void *)prop.Set;
4869                                  bits = Set(value.instance.data);
4870                               }
4871                               else if(value.type == constantExp)
4872                               {
4873                               }
4874                            }
4875                            else if(dataMember)
4876                            {
4877                               BitMember bitMember = (BitMember) dataMember;
4878                               Type type;
4879                               int part = 0;
4880                               GetInt(value, &part);
4881                               bits = (bits & ~bitMember.mask);
4882                               if(!bitMember.dataType)
4883                                  bitMember.dataType = ProcessTypeString(bitMember.dataTypeString, false);
4884
4885                               type = bitMember.dataType;
4886
4887                               if(type.kind == classType && type._class && type._class.registered)
4888                               {
4889                                  if(!type._class.registered.dataType)
4890                                     type._class.registered.dataType = ProcessTypeString(type._class.registered.dataTypeString, false);
4891                                  type = type._class.registered.dataType;
4892                               }
4893
4894                               switch(type.kind)
4895                               {
4896                                  case charType:
4897                                     if(type.isSigned)
4898                                        bits |= ((char)part << bitMember.pos);
4899                                     else
4900                                        bits |= ((unsigned char)part << bitMember.pos);
4901                                     break;
4902                                  case shortType:
4903                                     if(type.isSigned)
4904                                        bits |= ((short)part << bitMember.pos);
4905                                     else
4906                                        bits |= ((unsigned short)part << bitMember.pos);
4907                                     break;
4908                                  case intType:
4909                                  case longType:
4910                                     if(type.isSigned)
4911                                        bits |= ((int)part << bitMember.pos);
4912                                     else
4913                                        bits |= ((unsigned int)part << bitMember.pos);
4914                                     break;
4915                                  case int64Type:
4916                                     if(type.isSigned)
4917                                        bits |= ((int64)part << bitMember.pos);
4918                                     else
4919                                        bits |= ((uint64)part << bitMember.pos);
4920                                     break;
4921                                  case intPtrType:
4922                                     if(type.isSigned)
4923                                     {
4924                                        bits |= ((intptr)part << bitMember.pos);
4925                                     }
4926                                     else
4927                                     {
4928                                        bits |= ((uintptr)part << bitMember.pos);
4929                                     }
4930                                     break;
4931                                  case intSizeType:
4932                                     if(type.isSigned)
4933                                     {
4934                                        bits |= ((ssize_t)(intsize)part << bitMember.pos);
4935                                     }
4936                                     else
4937                                     {
4938                                        bits |= ((size_t) (uintsize)part << bitMember.pos);
4939                                     }
4940                                     break;
4941                               }
4942                            }
4943                         }
4944                      }
4945                      else
4946                      {
4947                         if(_class && _class.type == unitClass)
4948                         {
4949                            ComputeExpression(member.initializer.exp);
4950                            exp.constant = member.initializer.exp.constant;
4951                            exp.type = constantExp;
4952
4953                            member.initializer.exp.constant = null;
4954                         }
4955                      }
4956                   }
4957                }
4958                break;
4959             }
4960          }
4961       }
4962    }
4963    if(_class && _class.type == bitClass)
4964    {
4965       exp.constant = PrintHexUInt(bits);
4966       exp.type = constantExp;
4967    }
4968    if(exp.type != instanceExp)
4969    {
4970       FreeInstance(inst);
4971    }
4972 }
4973
4974 void CallOperator(Expression exp, Expression exp1, Expression exp2, Operand op1, Operand op2)
4975 {
4976    if(exp.op.op == SIZEOF)
4977    {
4978       FreeExpContents(exp);
4979       exp.type = constantExp;
4980       exp.constant = PrintUInt(ComputeTypeSize(op1.type));
4981    }
4982    else
4983    {
4984       if(!exp.op.exp1)
4985       {
4986          switch(exp.op.op)
4987          {
4988             // unary arithmetic
4989             case '+':
4990             {
4991                // Provide default unary +
4992                Expression exp2 = exp.op.exp2;
4993                exp.op.exp2 = null;
4994                FreeExpContents(exp);
4995                FreeType(exp.expType);
4996                FreeType(exp.destType);
4997                *exp = *exp2;
4998                delete exp2;
4999                break;
5000             }
5001             case '-':
5002                if(op1.ops.Neg) { FreeExpContents(exp); op1.ops.Neg(exp, op1); }
5003                break;
5004             // unary arithmetic increment and decrement
5005                   //OPERATOR_ALL(UNARY, ++, Inc)
5006                   //OPERATOR_ALL(UNARY, --, Dec)
5007             // unary bitwise
5008             case '~':
5009                if(op1.ops.BitNot) { FreeExpContents(exp); op1.ops.BitNot(exp, op1); }
5010                break;
5011             // unary logical negation
5012             case '!':
5013                if(op1.ops.Not) { FreeExpContents(exp); op1.ops.Not(exp, op1); }
5014                break;
5015          }
5016       }
5017       else
5018       {
5019          switch(exp.op.op)
5020          {
5021             // binary arithmetic
5022             case '+':
5023                if(op1.ops.Add) { FreeExpContents(exp); op1.ops.Add(exp, op1, op2); }
5024                break;
5025             case '-':
5026                if(op1.ops.Sub) { FreeExpContents(exp); op1.ops.Sub(exp, op1, op2); }
5027                break;
5028             case '*':
5029                if(op1.ops.Mul) { FreeExpContents(exp); op1.ops.Mul(exp, op1, op2); }
5030                break;
5031             case '/':
5032                if(op1.ops.Div) { FreeExpContents(exp); op1.ops.Div(exp, op1, op2); }
5033                break;
5034             case '%':
5035                if(op1.ops.Mod) { FreeExpContents(exp); op1.ops.Mod(exp, op1, op2); }
5036                break;
5037             // binary arithmetic assignment
5038                   //OPERATOR_ALL(BINARY, =, Asign)
5039                   //OPERATOR_ALL(BINARY, +=, AddAsign)
5040                   //OPERATOR_ALL(BINARY, -=, SubAsign)
5041                   //OPERATOR_ALL(BINARY, *=, MulAsign)
5042                   //OPERATOR_ALL(BINARY, /=, DivAsign)
5043                   //OPERATOR_ALL(BINARY, %=, ModAsign)
5044             // binary bitwise
5045             case '&':
5046                if(exp.op.exp2)
5047                {
5048                   if(op1.ops.BitAnd) { FreeExpContents(exp); op1.ops.BitAnd(exp, op1, op2); }
5049                }
5050                break;
5051             case '|':
5052                if(op1.ops.BitOr) { FreeExpContents(exp); op1.ops.BitOr(exp, op1, op2); }
5053                break;
5054             case '^':
5055                if(op1.ops.BitXor) { FreeExpContents(exp); op1.ops.BitXor(exp, op1, op2); }
5056                break;
5057             case LEFT_OP:
5058                if(op1.ops.LShift) { FreeExpContents(exp); op1.ops.LShift(exp, op1, op2); }
5059                break;
5060             case RIGHT_OP:
5061                if(op1.ops.RShift) { FreeExpContents(exp); op1.ops.RShift(exp, op1, op2); }
5062                break;
5063             // binary bitwise assignment
5064                   //OPERATOR_INTTYPES(BINARY, &=, AndAsign)
5065                   //OPERATOR_INTTYPES(BINARY, |=, OrAsign)
5066                   //OPERATOR_INTTYPES(BINARY, ^=, XorAsign)
5067                   //OPERATOR_INTTYPES(BINARY, <<=, LShiftAsign)
5068                   //OPERATOR_INTTYPES(BINARY, >>=, RShiftAsign)
5069             // binary logical equality
5070             case EQ_OP:
5071                if(op1.ops.Equ) { FreeExpContents(exp); op1.ops.Equ(exp, op1, op2); }
5072                break;
5073             case NE_OP:
5074                if(op1.ops.Nqu) { FreeExpContents(exp); op1.ops.Nqu(exp, op1, op2); }
5075                break;
5076             // binary logical
5077             case AND_OP:
5078                if(op1.ops.And) { FreeExpContents(exp); op1.ops.And(exp, op1, op2); }
5079                break;
5080             case OR_OP:
5081                if(op1.ops.Or) { FreeExpContents(exp); op1.ops.Or(exp, op1, op2); }
5082                break;
5083             // binary logical relational
5084             case '>':
5085                if(op1.ops.Grt) { FreeExpContents(exp); op1.ops.Grt(exp, op1, op2); }
5086                break;
5087             case '<':
5088                if(op1.ops.Sma) { FreeExpContents(exp); op1.ops.Sma(exp, op1, op2); }
5089                break;
5090             case GE_OP:
5091                if(op1.ops.GrtEqu) { FreeExpContents(exp); op1.ops.GrtEqu(exp, op1, op2); }
5092                break;
5093             case LE_OP:
5094                if(op1.ops.SmaEqu) { FreeExpContents(exp); op1.ops.SmaEqu(exp, op1, op2); }
5095                break;
5096          }
5097       }
5098    }
5099 }
5100
5101 void ComputeExpression(Expression exp)
5102 {
5103    char expString[10240];
5104    expString[0] = '\0';
5105 #ifdef _DEBUG
5106    PrintExpression(exp, expString);
5107 #endif
5108
5109    switch(exp.type)
5110    {
5111       case instanceExp:
5112       {
5113          ComputeInstantiation(exp);
5114          break;
5115       }
5116       /*
5117       case constantExp:
5118          break;
5119       */
5120       case opExp:
5121       {
5122          Expression exp1, exp2 = null;
5123          Operand op1 { };
5124          Operand op2 { };
5125
5126          // We don't care about operations with only exp2 (INC_OP, DEC_OP...)
5127          if(exp.op.exp2)
5128             ComputeExpression(exp.op.exp2);
5129          if(exp.op.exp1)
5130          {
5131             ComputeExpression(exp.op.exp1);
5132             exp1 = exp.op.exp1;
5133             exp2 = exp.op.exp2;
5134             op1 = GetOperand(exp1);
5135             if(op1.type) op1.type.refCount++;
5136             if(exp2)
5137             {
5138                op2 = GetOperand(exp2);
5139                if(op2.type) op2.type.refCount++;
5140             }
5141          }
5142          else
5143          {
5144             exp1 = exp.op.exp2;
5145             op1 = GetOperand(exp1);
5146             if(op1.type) op1.type.refCount++;
5147          }
5148
5149          CallOperator(exp, exp1, exp2, op1, op2);
5150          /*
5151          switch(exp.op.op)
5152          {
5153             // Unary operators
5154             case '&':
5155                // Also binary
5156                if(exp.op.exp1 && exp.op.exp2)
5157                {
5158                   // Binary And
5159                   if(op1.ops.BitAnd)
5160                   {
5161                      FreeExpContents(exp);
5162                      op1.ops.BitAnd(exp, op1, op2);
5163                   }
5164                }
5165                break;
5166             case '*':
5167                if(exp.op.exp1)
5168                {
5169                   if(op1.ops.Mul)
5170                   {
5171                      FreeExpContents(exp);
5172                      op1.ops.Mul(exp, op1, op2);
5173                   }
5174                }
5175                break;
5176             case '+':
5177                if(exp.op.exp1)
5178                {
5179                   if(op1.ops.Add)
5180                   {
5181                      FreeExpContents(exp);
5182                      op1.ops.Add(exp, op1, op2);
5183                   }
5184                }
5185                else
5186                {
5187                   // Provide default unary +
5188                   Expression exp2 = exp.op.exp2;
5189                   exp.op.exp2 = null;
5190                   FreeExpContents(exp);
5191                   FreeType(exp.expType);
5192                   FreeType(exp.destType);
5193
5194                   *exp = *exp2;
5195                   delete exp2;
5196                }
5197                break;
5198             case '-':
5199                if(exp.op.exp1)
5200                {
5201                   if(op1.ops.Sub)
5202                   {
5203                      FreeExpContents(exp);
5204                      op1.ops.Sub(exp, op1, op2);
5205                   }
5206                }
5207                else
5208                {
5209                   if(op1.ops.Neg)
5210                   {
5211                      FreeExpContents(exp);
5212                      op1.ops.Neg(exp, op1);
5213                   }
5214                }
5215                break;
5216             case '~':
5217                if(op1.ops.BitNot)
5218                {
5219                   FreeExpContents(exp);
5220                   op1.ops.BitNot(exp, op1);
5221                }
5222                break;
5223             case '!':
5224                if(op1.ops.Not)
5225                {
5226                   FreeExpContents(exp);
5227                   op1.ops.Not(exp, op1);
5228                }
5229                break;
5230             // Binary only operators
5231             case '/':
5232                if(op1.ops.Div)
5233                {
5234                   FreeExpContents(exp);
5235                   op1.ops.Div(exp, op1, op2);
5236                }
5237                break;
5238             case '%':
5239                if(op1.ops.Mod)
5240                {
5241                   FreeExpContents(exp);
5242                   op1.ops.Mod(exp, op1, op2);
5243                }
5244                break;
5245             case LEFT_OP:
5246                break;
5247             case RIGHT_OP:
5248                break;
5249             case '<':
5250                if(exp.op.exp1)
5251                {
5252                   if(op1.ops.Sma)
5253                   {
5254                      FreeExpContents(exp);
5255                      op1.ops.Sma(exp, op1, op2);
5256                   }
5257                }
5258                break;
5259             case '>':
5260                if(exp.op.exp1)
5261                {
5262                   if(op1.ops.Grt)
5263                   {
5264                      FreeExpContents(exp);
5265                      op1.ops.Grt(exp, op1, op2);
5266                   }
5267                }
5268                break;
5269             case LE_OP:
5270                if(exp.op.exp1)
5271                {
5272                   if(op1.ops.SmaEqu)
5273                   {
5274                      FreeExpContents(exp);
5275                      op1.ops.SmaEqu(exp, op1, op2);
5276                   }
5277                }
5278                break;
5279             case GE_OP:
5280                if(exp.op.exp1)
5281                {
5282                   if(op1.ops.GrtEqu)
5283                   {
5284                      FreeExpContents(exp);
5285                      op1.ops.GrtEqu(exp, op1, op2);
5286                   }
5287                }
5288                break;
5289             case EQ_OP:
5290                if(exp.op.exp1)
5291                {
5292                   if(op1.ops.Equ)
5293                   {
5294                      FreeExpContents(exp);
5295                      op1.ops.Equ(exp, op1, op2);
5296                   }
5297                }
5298                break;
5299             case NE_OP:
5300                if(exp.op.exp1)
5301                {
5302                   if(op1.ops.Nqu)
5303                   {
5304                      FreeExpContents(exp);
5305                      op1.ops.Nqu(exp, op1, op2);
5306                   }
5307                }
5308                break;
5309             case '|':
5310                if(op1.ops.BitOr)
5311                {
5312                   FreeExpContents(exp);
5313                   op1.ops.BitOr(exp, op1, op2);
5314                }
5315                break;
5316             case '^':
5317                if(op1.ops.BitXor)
5318                {
5319                   FreeExpContents(exp);
5320                   op1.ops.BitXor(exp, op1, op2);
5321                }
5322                break;
5323             case AND_OP:
5324                break;
5325             case OR_OP:
5326                break;
5327             case SIZEOF:
5328                FreeExpContents(exp);
5329                exp.type = constantExp;
5330                exp.constant = PrintUInt(ComputeTypeSize(op1.type));
5331                break;
5332          }
5333          */
5334          if(op1.type) FreeType(op1.type);
5335          if(op2.type) FreeType(op2.type);
5336          break;
5337       }
5338       case bracketsExp:
5339       case extensionExpressionExp:
5340       {
5341          Expression e, n;
5342          for(e = exp.list->first; e; e = n)
5343          {
5344             n = e.next;
5345             if(!n)
5346             {
5347                OldList * list = exp.list;
5348                ComputeExpression(e);
5349                //FreeExpContents(exp);
5350                FreeType(exp.expType);
5351                FreeType(exp.destType);
5352                *exp = *e;
5353                delete e;
5354                delete list;
5355             }
5356             else
5357             {
5358                FreeExpression(e);
5359             }
5360          }
5361          break;
5362       }
5363       /*
5364
5365       case ExpIndex:
5366       {
5367          Expression e;
5368          exp.isConstant = true;
5369
5370          ComputeExpression(exp.index.exp);
5371          if(!exp.index.exp.isConstant)
5372             exp.isConstant = false;
5373
5374          for(e = exp.index.index->first; e; e = e.next)
5375          {
5376             ComputeExpression(e);
5377             if(!e.next)
5378             {
5379                // Check if this type is int
5380             }
5381             if(!e.isConstant)
5382                exp.isConstant = false;
5383          }
5384          exp.expType = Dereference(exp.index.exp.expType);
5385          break;
5386       }
5387       */
5388       case memberExp:
5389       {
5390          Expression memberExp = exp.member.exp;
5391          Identifier memberID = exp.member.member;
5392
5393          Type type;
5394          ComputeExpression(exp.member.exp);
5395          type = exp.member.exp.expType;
5396          if(type)
5397          {
5398             Class _class = (exp.member.member && exp.member.member.classSym) ? exp.member.member.classSym.registered : (((type.kind == classType || type.kind == subClassType) && type._class) ? type._class.registered : null);
5399             Property prop = null;
5400             DataMember member = null;
5401             Class convertTo = null;
5402             if(type.kind == subClassType && exp.member.exp.type == classExp)
5403                _class = eSystem_FindClass(privateModule, "ecere::com::Class");
5404
5405             if(!_class)
5406             {
5407                char string[256];
5408                Symbol classSym;
5409                string[0] = '\0';
5410                PrintTypeNoConst(type, string, false, true);
5411                classSym = FindClass(string);
5412                _class = classSym ? classSym.registered : null;
5413             }
5414
5415             if(exp.member.member)
5416             {
5417                prop = eClass_FindProperty(_class, exp.member.member.string, privateModule);
5418                if(!prop)
5419                   member = eClass_FindDataMember(_class, exp.member.member.string, privateModule, null, null);
5420             }
5421             if(!prop && !member && _class && exp.member.member)
5422             {
5423                Symbol classSym = FindClass(exp.member.member.string);
5424                convertTo = _class;
5425                _class = classSym ? classSym.registered : null;
5426                prop = eClass_FindProperty(_class, convertTo.fullName, privateModule);
5427             }
5428
5429             if(prop)
5430             {
5431                if(prop.compiled)
5432                {
5433                   Type type = prop.dataType;
5434                   // TODO: Assuming same base type for units...
5435                   if(_class.type == unitClass)
5436                   {
5437                      if(type.kind == classType)
5438                      {
5439                         Class _class = type._class.registered;
5440                         if(_class.type == unitClass)
5441                         {
5442                            if(!_class.dataType)
5443                               _class.dataType = ProcessTypeString(_class.dataTypeString, false);
5444                            type = _class.dataType;
5445                         }
5446                      }
5447                      switch(type.kind)
5448                      {
5449                         case floatType:
5450                         {
5451                            float value;
5452                            float (*Get)(float) = (void *)prop.Get;
5453                            GetFloat(exp.member.exp, &value);
5454                            exp.constant = PrintFloat(Get ? Get(value) : value);
5455                            exp.type = constantExp;
5456                            break;
5457                         }
5458                         case doubleType:
5459                         {
5460                            double value;
5461                            double (*Get)(double);
5462                            GetDouble(exp.member.exp, &value);
5463
5464                            if(convertTo)
5465                               Get = (void *)prop.Set;
5466                            else
5467                               Get = (void *)prop.Get;
5468                            exp.constant = PrintDouble(Get ? Get(value) : value);
5469                            exp.type = constantExp;
5470                            break;
5471                         }
5472                      }
5473                   }
5474                   else
5475                   {
5476                      if(convertTo)
5477                      {
5478                         Expression value = exp.member.exp;
5479                         Type type;
5480                         if(!prop.dataType)
5481                            ProcessPropertyType(prop);
5482
5483                         type = prop.dataType;
5484                         if(!type)
5485                         {
5486                             // printf("Investigate this\n");
5487                         }
5488                         else if(_class.type == structClass)
5489                         {
5490                            switch(type.kind)
5491                            {
5492                               case classType:
5493                               {
5494                                  Class propertyClass = type._class.registered;
5495                                  if(propertyClass.type == structClass && value.type == instanceExp)
5496                                  {
5497                                     void (*Set)(void *, void *) = (void *)prop.Set;
5498                                     exp.instance = Instantiation { };
5499                                     exp.instance.data = new0 byte[_class.structSize];
5500                                     exp.instance._class = MkSpecifierName/*MkClassName*/(_class.fullName);
5501                                     exp.instance.loc = exp.loc;
5502                                     exp.type = instanceExp;
5503                                     Set(exp.instance.data, value.instance.data);
5504                                     PopulateInstance(exp.instance);
5505                                  }
5506                                  break;
5507                               }
5508                               case intType:
5509                               {
5510                                  int intValue;
5511                                  void (*Set)(void *, int) = (void *)prop.Set;
5512
5513                                  exp.instance = Instantiation { };
5514                                  exp.instance.data = new0 byte[_class.structSize];
5515                                  exp.instance._class = MkSpecifierName/*MkClassName*/(_class.fullName);
5516                                  exp.instance.loc = exp.loc;
5517                                  exp.type = instanceExp;
5518
5519                                  GetInt(value, &intValue);
5520
5521                                  Set(exp.instance.data, intValue);
5522                                  PopulateInstance(exp.instance);
5523                                  break;
5524                               }
5525                               case int64Type:
5526                               {
5527                                  int64 intValue;
5528                                  void (*Set)(void *, int64) = (void *)prop.Set;
5529
5530                                  exp.instance = Instantiation { };
5531                                  exp.instance.data = new0 byte[_class.structSize];
5532                                  exp.instance._class = MkSpecifierName/*MkClassName*/(_class.fullName);
5533                                  exp.instance.loc = exp.loc;
5534                                  exp.type = instanceExp;
5535
5536                                  GetInt64(value, &intValue);
5537
5538                                  Set(exp.instance.data, intValue);
5539                                  PopulateInstance(exp.instance);
5540                                  break;
5541                               }
5542                               case intPtrType:
5543                               {
5544                                  // TOFIX:
5545                                  intptr intValue;
5546                                  void (*Set)(void *, intptr) = (void *)prop.Set;
5547
5548                                  exp.instance = Instantiation { };
5549                                  exp.instance.data = new0 byte[_class.structSize];
5550                                  exp.instance._class = MkSpecifierName/*MkClassName*/(_class.fullName);
5551                                  exp.instance.loc = exp.loc;
5552                                  exp.type = instanceExp;
5553
5554                                  GetIntPtr(value, &intValue);
5555
5556                                  Set(exp.instance.data, intValue);
5557                                  PopulateInstance(exp.instance);
5558                                  break;
5559                               }
5560                               case intSizeType:
5561                               {
5562                                  // TOFIX:
5563                                  intsize intValue;
5564                                  void (*Set)(void *, intsize) = (void *)prop.Set;
5565
5566                                  exp.instance = Instantiation { };
5567                                  exp.instance.data = new0 byte[_class.structSize];
5568                                  exp.instance._class = MkSpecifierName/*MkClassName*/(_class.fullName);
5569                                  exp.instance.loc = exp.loc;
5570                                  exp.type = instanceExp;
5571
5572                                  GetIntSize(value, &intValue);
5573
5574                                  Set(exp.instance.data, intValue);
5575                                  PopulateInstance(exp.instance);
5576                                  break;
5577                               }
5578                               case doubleType:
5579                               {
5580                                  double doubleValue;
5581                                  void (*Set)(void *, double) = (void *)prop.Set;
5582
5583                                  exp.instance = Instantiation { };
5584                                  exp.instance.data = new0 byte[_class.structSize];
5585                                  exp.instance._class = MkSpecifierName/*MkClassName*/(_class.fullName);
5586                                  exp.instance.loc = exp.loc;
5587                                  exp.type = instanceExp;
5588
5589                                  GetDouble(value, &doubleValue);
5590
5591                                  Set(exp.instance.data, doubleValue);
5592                                  PopulateInstance(exp.instance);
5593                                  break;
5594                               }
5595                            }
5596                         }
5597                         else if(_class.type == bitClass)
5598                         {
5599                            switch(type.kind)
5600                            {
5601                               case classType:
5602                               {
5603                                  Class propertyClass = type._class.registered;
5604                                  if(propertyClass.type == structClass && value.instance.data)
5605                                  {
5606                                     unsigned int (*Set)(void *) = (void *)prop.Set;
5607                                     unsigned int bits = Set(value.instance.data);
5608                                     exp.constant = PrintHexUInt(bits);
5609                                     exp.type = constantExp;
5610                                     break;
5611                                  }
5612                                  else if(_class.type == bitClass)
5613                                  {
5614                                     unsigned int value;
5615                                     unsigned int (*Set)(unsigned int) = (void *)prop.Set;
5616                                     unsigned int bits;
5617
5618                                     GetUInt(exp.member.exp, &value);
5619                                     bits = Set(value);
5620                                     exp.constant = PrintHexUInt(bits);
5621                                     exp.type = constantExp;
5622                                  }
5623                               }
5624                            }
5625                         }
5626                      }
5627                      else
5628                      {
5629                         if(_class.type == bitClass)
5630                         {
5631                            unsigned int value;
5632                            GetUInt(exp.member.exp, &value);
5633
5634                            switch(type.kind)
5635                            {
5636                               case classType:
5637                               {
5638                                  Class _class = type._class.registered;
5639                                  if(_class.type == structClass)
5640                                  {
5641                                     void (*Get)(unsigned int, void *) = (void *)prop.Get;
5642
5643                                     exp.instance = Instantiation { };
5644                                     exp.instance.data = new0 byte[_class.structSize];
5645                                     exp.instance._class = MkSpecifierName/*MkClassName*/(_class.fullName);
5646                                     exp.instance.loc = exp.loc;
5647                                     //exp.instance.fullSet = true;
5648                                     exp.type = instanceExp;
5649                                     Get(value, exp.instance.data);
5650                                     PopulateInstance(exp.instance);
5651                                  }
5652                                  else if(_class.type == bitClass)
5653                                  {
5654                                     unsigned int (*Get)(unsigned int) = (void *)prop.Get;
5655                                     uint64 bits = Get(value);
5656                                     exp.constant = PrintHexUInt64(bits);
5657                                     exp.type = constantExp;
5658                                  }
5659                                  break;
5660                               }
5661                            }
5662                         }
5663                         else if(_class.type == structClass)
5664                         {
5665                            char * value = (exp.member.exp.type == instanceExp ) ? exp.member.exp.instance.data : null;
5666                            switch(type.kind)
5667                            {
5668                               case classType:
5669                               {
5670                                  Class _class = type._class.registered;
5671                                  if(_class.type == structClass && value)
5672                                  {
5673                                     void (*Get)(void *, void *) = (void *)prop.Get;
5674
5675                                     exp.instance = Instantiation { };
5676                                     exp.instance.data = new0 byte[_class.structSize];
5677                                     exp.instance._class = MkSpecifierName/*MkClassName*/(_class.fullName);
5678                                     exp.instance.loc = exp.loc;
5679                                     //exp.instance.fullSet = true;
5680                                     exp.type = instanceExp;
5681                                     Get(value, exp.instance.data);
5682                                     PopulateInstance(exp.instance);
5683                                  }
5684                                  break;
5685                               }
5686                            }
5687                         }
5688                         /*else
5689                         {
5690                            char * value = exp.member.exp.instance.data;
5691                            switch(type.kind)
5692                            {
5693                               case classType:
5694                               {
5695                                  Class _class = type._class.registered;
5696                                  if(_class.type == normalClass)
5697                                  {
5698                                     void *(*Get)(void *) = (void *)prop.Get;
5699
5700                                     exp.instance = Instantiation { };
5701                                     exp.instance._class = MkSpecifierName(_class.fullName); //MkClassName(_class.fullName);
5702                                     exp.type = instanceExp;
5703                                     exp.instance.data = Get(value, exp.instance.data);
5704                                  }
5705                                  break;
5706                               }
5707                            }
5708                         }
5709                         */
5710                      }
5711                   }
5712                }
5713                else
5714                {
5715                   exp.isConstant = false;
5716                }
5717             }
5718             else if(member)
5719             {
5720             }
5721          }
5722
5723          if(exp.type != ExpressionType::memberExp)
5724          {
5725             FreeExpression(memberExp);
5726             FreeIdentifier(memberID);
5727          }
5728          break;
5729       }
5730       case typeSizeExp:
5731       {
5732          Type type = ProcessType(exp.typeName.qualifiers, exp.typeName.declarator);
5733          FreeExpContents(exp);
5734          exp.constant = PrintUInt(ComputeTypeSize(type));
5735          exp.type = constantExp;
5736          FreeType(type);
5737          break;
5738       }
5739       case classSizeExp:
5740       {
5741          Symbol classSym = exp._class.symbol; // FindClass(exp._class.name);
5742          if(classSym && classSym.registered)
5743          {
5744             if(classSym.registered.fixed)
5745             {
5746                FreeSpecifier(exp._class);
5747                exp.constant = PrintUInt(classSym.registered.templateClass ? classSym.registered.templateClass.structSize : classSym.registered.structSize);
5748                exp.type = constantExp;
5749             }
5750             else
5751             {
5752                char className[1024];
5753                strcpy(className, "__ecereClass_");
5754                FullClassNameCat(className, classSym.string, true);
5755                MangleClassName(className);
5756
5757                // TOFIX: TESTING THIS...
5758                DeclareClass(classSym, className);
5759
5760                FreeExpContents(exp);
5761                exp.type = pointerExp;
5762                exp.member.exp = MkExpIdentifier(MkIdentifier(className));
5763                exp.member.member = MkIdentifier("structSize");
5764             }
5765          }
5766          break;
5767       }
5768       case castExp:
5769       //case constantExp:
5770       {
5771          Type type;
5772          Expression e = exp;
5773          if(exp.type == castExp)
5774          {
5775             if(exp.cast.exp)
5776                ComputeExpression(exp.cast.exp);
5777             e = exp.cast.exp;
5778          }
5779          if(e && exp.expType)
5780          {
5781             /*if(exp.destType)
5782                type = exp.destType;
5783             else*/
5784                type = exp.expType;
5785             if(type.kind == classType)
5786             {
5787                Class _class = type._class.registered;
5788                if(_class && (_class.type == unitClass || _class.type == bitClass))
5789                {
5790                   if(!_class.dataType)
5791                      _class.dataType = ProcessTypeString(_class.dataTypeString, false);
5792                   type = _class.dataType;
5793                }
5794             }
5795
5796             switch(type.kind)
5797             {
5798                case charType:
5799                   if(type.isSigned)
5800                   {
5801                      char value;
5802                      GetChar(e, &value);
5803                      FreeExpContents(exp);
5804                      exp.constant = PrintChar(value);
5805                      exp.type = constantExp;
5806                   }
5807                   else
5808                   {
5809                      unsigned char value;
5810                      GetUChar(e, &value);
5811                      FreeExpContents(exp);
5812                      exp.constant = PrintUChar(value);
5813                      exp.type = constantExp;
5814                   }
5815                   break;
5816                case shortType:
5817                   if(type.isSigned)
5818                   {
5819                      short value;
5820                      GetShort(e, &value);
5821                      FreeExpContents(exp);
5822                      exp.constant = PrintShort(value);
5823                      exp.type = constantExp;
5824                   }
5825                   else
5826                   {
5827                      unsigned short value;
5828                      GetUShort(e, &value);
5829                      FreeExpContents(exp);
5830                      exp.constant = PrintUShort(value);
5831                      exp.type = constantExp;
5832                   }
5833                   break;
5834                case intType:
5835                   if(type.isSigned)
5836                   {
5837                      int value;
5838                      GetInt(e, &value);
5839                      FreeExpContents(exp);
5840                      exp.constant = PrintInt(value);
5841                      exp.type = constantExp;
5842                   }
5843                   else
5844                   {
5845                      unsigned int value;
5846                      GetUInt(e, &value);
5847                      FreeExpContents(exp);
5848                      exp.constant = PrintUInt(value);
5849                      exp.type = constantExp;
5850                   }
5851                   break;
5852                case int64Type:
5853                   if(type.isSigned)
5854                   {
5855                      int64 value;
5856                      GetInt64(e, &value);
5857                      FreeExpContents(exp);
5858                      exp.constant = PrintInt64(value);
5859                      exp.type = constantExp;
5860                   }
5861                   else
5862                   {
5863                      uint64 value;
5864                      GetUInt64(e, &value);
5865                      FreeExpContents(exp);
5866                      exp.constant = PrintUInt64(value);
5867                      exp.type = constantExp;
5868                   }
5869                   break;
5870                case intPtrType:
5871                   if(type.isSigned)
5872                   {
5873                      intptr value;
5874                      GetIntPtr(e, &value);
5875                      FreeExpContents(exp);
5876                      exp.constant = PrintInt64((int64)value);
5877                      exp.type = constantExp;
5878                   }
5879                   else
5880                   {
5881                      uintptr value;
5882                      GetUIntPtr(e, &value);
5883                      FreeExpContents(exp);
5884                      exp.constant = PrintUInt64((uint64)value);
5885                      exp.type = constantExp;
5886                   }
5887                   break;
5888                case intSizeType:
5889                   if(type.isSigned)
5890                   {
5891                      intsize value;
5892                      GetIntSize(e, &value);
5893                      FreeExpContents(exp);
5894                      exp.constant = PrintInt64((int64)value);
5895                      exp.type = constantExp;
5896                   }
5897                   else
5898                   {
5899                      uintsize value;
5900                      GetUIntSize(e, &value);
5901                      FreeExpContents(exp);
5902                      exp.constant = PrintUInt64((uint64)value);
5903                      exp.type = constantExp;
5904                   }
5905                   break;
5906                case floatType:
5907                {
5908                   float value;
5909                   GetFloat(e, &value);
5910                   FreeExpContents(exp);
5911                   exp.constant = PrintFloat(value);
5912                   exp.type = constantExp;
5913                   break;
5914                }
5915                case doubleType:
5916                {
5917                   double value;
5918                   GetDouble(e, &value);
5919                   FreeExpContents(exp);
5920                   exp.constant = PrintDouble(value);
5921                   exp.type = constantExp;
5922                   break;
5923                }
5924             }
5925          }
5926          break;
5927       }
5928       case conditionExp:
5929       {
5930          Operand op1 { };
5931          Operand op2 { };
5932          Operand op3 { };
5933
5934          if(exp.cond.exp)
5935             // Caring only about last expression for now...
5936             ComputeExpression(exp.cond.exp->last);
5937          if(exp.cond.elseExp)
5938             ComputeExpression(exp.cond.elseExp);
5939          if(exp.cond.cond)
5940             ComputeExpression(exp.cond.cond);
5941
5942          op1 = GetOperand(exp.cond.cond);
5943          if(op1.type) op1.type.refCount++;
5944          op2 = GetOperand(exp.cond.exp->last);
5945          if(op2.type) op2.type.refCount++;
5946          op3 = GetOperand(exp.cond.elseExp);
5947          if(op3.type) op3.type.refCount++;
5948
5949          if(op1.ops.Cond) { FreeExpContents(exp); op1.ops.Cond(exp, op1, op2, op3); }
5950          if(op1.type) FreeType(op1.type);
5951          if(op2.type) FreeType(op2.type);
5952          if(op3.type) FreeType(op3.type);
5953          break;
5954       }
5955    }
5956 }
5957
5958 static bool CheckExpressionType(Expression exp, Type destType, bool skipUnitBla)
5959 {
5960    bool result = true;
5961    if(destType)
5962    {
5963       OldList converts { };
5964       Conversion convert;
5965
5966       if(destType.kind == voidType)
5967          return false;
5968
5969       if(!MatchTypeExpression(exp, destType, &converts, skipUnitBla))
5970          result = false;
5971       if(converts.count)
5972       {
5973          // for(convert = converts.last; convert; convert = convert.prev)
5974          for(convert = converts.first; convert; convert = convert.next)
5975          {
5976             bool empty = !(convert.isGet ? (void *)convert.convert.Get : (void *)convert.convert.Set);
5977             if(!empty)
5978             {
5979                Expression newExp { };
5980                ClassObjectType objectType = exp.expType ? exp.expType.classObjectType : none;
5981
5982                // TODO: Check this...
5983                *newExp = *exp;
5984                newExp.destType = null;
5985
5986                if(convert.isGet)
5987                {
5988                   // [exp].ColorRGB
5989                   exp.type = memberExp;
5990                   exp.addedThis = true;
5991                   exp.member.exp = newExp;
5992                   FreeType(exp.member.exp.expType);
5993
5994                   exp.member.exp.expType = MkClassType(convert.convert._class.fullName);
5995                   exp.member.exp.expType.classObjectType = objectType;
5996                   exp.member.member = MkIdentifier(convert.convert.dataTypeString);
5997                   exp.member.memberType = propertyMember;
5998                   exp.expType = convert.resultType ? convert.resultType : convert.convert.dataType;
5999                   // TESTING THIS... for (int)degrees
6000                   exp.needCast = true;
6001                   if(exp.expType) exp.expType.refCount++;
6002                   ApplyAnyObjectLogic(exp.member.exp);
6003                }
6004                else
6005                {
6006
6007                   /*if(exp.isConstant)
6008                   {
6009                      // Color { ColorRGB = [exp] };
6010                      exp.type = instanceExp;
6011                      exp.instance = MkInstantiation(MkSpecifierName((convert.convert._class.fullName), //MkClassName(convert.convert._class.fullName),
6012                         null, MkListOne(MkMembersInitList(MkListOne(MkMemberInit(
6013                         MkListOne(MkIdentifier(convert.convert.dataTypeString)), newExp)))));
6014                   }
6015                   else*/
6016                   {
6017                      // If not constant, don't turn it yet into an instantiation
6018                      // (Go through the deep members system first)
6019                      exp.type = memberExp;
6020                      exp.addedThis = true;
6021                      exp.member.exp = newExp;
6022
6023                      // ADDED THIS HERE TO SOLVE PROPERTY ISSUES WITH NOHEAD CLASSES
6024                      if(/*!notByReference && */newExp.expType && newExp.expType.kind == classType && newExp.expType._class && newExp.expType._class.registered &&
6025                         newExp.expType._class.registered.type == noHeadClass)
6026                      {
6027                         newExp.byReference = true;
6028                      }
6029
6030                      FreeType(exp.member.exp.expType);
6031                      /*exp.member.exp.expType = convert.convert.dataType;
6032                      if(convert.convert.dataType) convert.convert.dataType.refCount++;*/
6033                      exp.member.exp.expType = null;
6034                      if(convert.convert.dataType)
6035                      {
6036                         exp.member.exp.expType = { };
6037                         CopyTypeInto(exp.member.exp.expType, convert.convert.dataType);
6038                         exp.member.exp.expType.refCount = 1;
6039                         exp.member.exp.expType.classObjectType = objectType;
6040                         ApplyAnyObjectLogic(exp.member.exp);
6041                      }
6042
6043                      exp.member.member = MkIdentifier(convert.convert._class.fullName);
6044                      exp.member.memberType = reverseConversionMember;
6045                      exp.expType = convert.resultType ? convert.resultType :
6046                         MkClassType(convert.convert._class.fullName);
6047                      exp.needCast = true;
6048                      if(convert.resultType) convert.resultType.refCount++;
6049                   }
6050                }
6051             }
6052             else
6053             {
6054                FreeType(exp.expType);
6055                if(convert.isGet)
6056                {
6057                   exp.expType = convert.resultType ? convert.resultType : convert.convert.dataType;
6058                   exp.needCast = true;
6059                   if(exp.expType) exp.expType.refCount++;
6060                }
6061                else
6062                {
6063                   exp.expType = convert.resultType ? convert.resultType : MkClassType(convert.convert._class.fullName);
6064                   exp.needCast = true;
6065                   if(convert.resultType)
6066                      convert.resultType.refCount++;
6067                }
6068             }
6069          }
6070          if(exp.isConstant && inCompiler)
6071             ComputeExpression(exp);
6072
6073          converts.Free(FreeConvert);
6074       }
6075
6076       if(!result && exp.expType && converts.count)      // TO TEST: Added converts.count here to avoid a double warning with function type
6077       {
6078          result = MatchTypes(exp.expType, exp.destType, null, null, null, true, true, false, false);
6079       }
6080       if(!result && exp.expType && exp.destType)
6081       {
6082          if((exp.destType.kind == classType && exp.expType.kind == pointerType &&
6083              exp.expType.type.kind == classType && exp.expType.type._class == exp.destType._class && exp.destType._class.registered && exp.destType._class.registered.type == structClass) ||
6084             (exp.expType.kind == classType && exp.destType.kind == pointerType &&
6085             exp.destType.type.kind == classType && exp.destType.type._class == exp.expType._class && exp.expType._class.registered && exp.expType._class.registered.type == structClass))
6086             result = true;
6087       }
6088    }
6089    // if(result) CheckTemplateTypes(exp);
6090    return result;
6091 }
6092
6093 void CheckTemplateTypes(Expression exp)
6094 {
6095    if(exp.destType && exp.destType.passAsTemplate && exp.expType && exp.expType.kind != templateType && !exp.expType.passAsTemplate)
6096    {
6097       Expression newExp { };
6098       Statement compound;
6099       Context context;
6100       *newExp = *exp;
6101       if(exp.destType) exp.destType.refCount++;
6102       if(exp.expType)  exp.expType.refCount++;
6103       newExp.prev = null;
6104       newExp.next = null;
6105
6106       switch(exp.expType.kind)
6107       {
6108          case doubleType:
6109             if(exp.destType.classObjectType)
6110             {
6111                // We need to pass the address, just pass it along (Undo what was done above)
6112                if(exp.destType) exp.destType.refCount--;
6113                if(exp.expType)  exp.expType.refCount--;
6114                delete newExp;
6115             }
6116             else
6117             {
6118                // If we're looking for value:
6119                // ({ union { double d; uint64 i; } u; u.i = [newExp]; u.d; })
6120                OldList * specs;
6121                OldList * unionDefs = MkList();
6122                OldList * statements = MkList();
6123                context = PushContext();
6124                ListAdd(unionDefs, MkClassDefDeclaration(MkStructDeclaration(MkListOne(MkSpecifier(DOUBLE)), MkListOne(MkDeclaratorIdentifier(MkIdentifier("d"))), null)));
6125                ListAdd(unionDefs, MkClassDefDeclaration(MkStructDeclaration(MkListOne(MkSpecifierName("uint64")), MkListOne(MkDeclaratorIdentifier(MkIdentifier("i"))), null)));
6126                specs = MkListOne(MkStructOrUnion(unionSpecifier, null, unionDefs ));
6127                exp.type = extensionCompoundExp;
6128                exp.compound = MkCompoundStmt(MkListOne(MkDeclaration(specs, MkListOne(MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier("__internal_union")), null)))),statements);
6129                ListAdd(statements, MkExpressionStmt(MkListOne(MkExpOp(MkExpMember(MkExpIdentifier(MkIdentifier("__internal_union")), MkIdentifier("d")), '=', newExp))));
6130                ListAdd(statements, MkExpressionStmt(MkListOne(MkExpMember(MkExpIdentifier(MkIdentifier("__internal_union")), MkIdentifier("i")))));
6131                exp.compound.compound.context = context;
6132                PopContext(context);
6133             }
6134             break;
6135          default:
6136             exp.type = castExp;
6137             exp.cast.typeName = MkTypeName(MkListOne(MkSpecifierName("uint64")), null);
6138             exp.cast.exp = MkExpBrackets(MkListOne(newExp));
6139             break;
6140       }
6141    }
6142    else if(exp.expType && exp.expType.passAsTemplate && exp.destType && exp.usage.usageGet && exp.destType.kind != templateType && !exp.destType.passAsTemplate)
6143    {
6144       Expression newExp { };
6145       Statement compound;
6146       Context context;
6147       *newExp = *exp;
6148       if(exp.destType) exp.destType.refCount++;
6149       if(exp.expType)  exp.expType.refCount++;
6150       newExp.prev = null;
6151       newExp.next = null;
6152
6153       switch(exp.expType.kind)
6154       {
6155          case doubleType:
6156             if(exp.destType.classObjectType)
6157             {
6158                // We need to pass the address, just pass it along (Undo what was done above)
6159                if(exp.destType) exp.destType.refCount--;
6160                if(exp.expType)  exp.expType.refCount--;
6161                delete newExp;
6162             }
6163             else
6164             {
6165                // If we're looking for value:
6166                // ({ union { double d; uint64 i; } u; u.i = [newExp]; u.d; })
6167                OldList * specs;
6168                OldList * unionDefs = MkList();
6169                OldList * statements = MkList();
6170                context = PushContext();
6171                ListAdd(unionDefs, MkClassDefDeclaration(MkStructDeclaration(MkListOne(MkSpecifier(DOUBLE)), MkListOne(MkDeclaratorIdentifier(MkIdentifier("d"))), null)));
6172                ListAdd(unionDefs, MkClassDefDeclaration(MkStructDeclaration(MkListOne(MkSpecifierName("uint64")), MkListOne(MkDeclaratorIdentifier(MkIdentifier("i"))), null)));
6173                specs = MkListOne(MkStructOrUnion(unionSpecifier, null, unionDefs ));
6174                exp.type = extensionCompoundExp;
6175                exp.compound = MkCompoundStmt(MkListOne(MkDeclaration(specs, MkListOne(MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier("__internal_union")), null)))),statements);
6176                ListAdd(statements, MkExpressionStmt(MkListOne(MkExpOp(MkExpMember(MkExpIdentifier(MkIdentifier("__internal_union")), MkIdentifier("i")), '=', newExp))));
6177                ListAdd(statements, MkExpressionStmt(MkListOne(MkExpMember(MkExpIdentifier(MkIdentifier("__internal_union")), MkIdentifier("d")))));
6178                exp.compound.compound.context = context;
6179                PopContext(context);
6180             }
6181             break;
6182          case classType:
6183          {
6184             if(exp.expType._class && exp.expType._class.registered && exp.expType._class.registered.type == structClass)
6185             {
6186                exp.type = bracketsExp;
6187                exp.list = MkListOne(MkExpOp(null, '*', MkExpCast(MkTypeName(MkListOne(MkSpecifierName(exp.expType._class.string)),
6188                   MkDeclaratorPointer(MkPointer(null, null), null)), newExp)));
6189                ProcessExpressionType(exp.list->first);
6190                break;
6191             }
6192             else
6193             {
6194                exp.type = bracketsExp;
6195                exp.list = MkListOne(MkExpCast(MkTypeName(MkListOne(MkSpecifierName(exp.expType._class.string)), null), newExp));
6196                newExp.needCast = true;
6197                ProcessExpressionType(exp.list->first);
6198                break;
6199             }
6200          }
6201          default:
6202          {
6203             if(exp.expType.kind == templateType)
6204             {
6205                Type type = ProcessTemplateParameterType(exp.expType.templateParameter);
6206                if(type)
6207                {
6208                   FreeType(exp.destType);
6209                   FreeType(exp.expType);
6210                   delete newExp;
6211                   break;
6212                }
6213             }
6214             if(newExp.type == memberExp && newExp.member.memberType == dataMember)
6215             {
6216                exp.type = opExp;
6217                exp.op.op = '*';
6218                exp.op.exp1 = null;
6219                exp.op.exp2 = MkExpCast(MkTypeName(MkListOne(MkSpecifierName("uint64")), MkDeclaratorPointer(MkPointer(null, null), null)),
6220                   MkExpBrackets(MkListOne(MkExpOp(null, '&', newExp))));
6221             }
6222             else
6223             {
6224                char typeString[1024];
6225                Declarator decl;
6226                OldList * specs = MkList();
6227                typeString[0] = '\0';
6228                PrintType(exp.expType, typeString, false, false);
6229                decl = SpecDeclFromString(typeString, specs, null);
6230
6231                exp.type = castExp;
6232                //exp.cast.typeName = MkTypeName(MkListOne(MkSpecifierName("uint64")), null);
6233                exp.cast.typeName = MkTypeName(specs, decl);
6234                exp.cast.exp = MkExpBrackets(MkListOne(newExp));
6235                exp.cast.exp.needCast = true;
6236             }
6237             break;
6238          }
6239       }
6240    }
6241 }
6242 // TODO: The Symbol tree should be reorganized by namespaces
6243 // Name Space:
6244 //    - Tree of all symbols within (stored without namespace)
6245 //    - Tree of sub-namespaces
6246
6247 static Symbol ScanWithNameSpace(BinaryTree tree, char * nameSpace, char * name)
6248 {
6249    int nsLen = strlen(nameSpace);
6250    Symbol symbol;
6251    // Start at the name space prefix
6252    for(symbol = (Symbol)tree.FindPrefix(nameSpace); symbol; symbol = (Symbol)((BTNode)symbol).next)
6253    {
6254       char * s = symbol.string;
6255       if(!strncmp(s, nameSpace, nsLen))
6256       {
6257          // This supports e.g. matching ecere::Socket to ecere::net::Socket
6258          int c;
6259          char * namePart;
6260          for(c = strlen(s)-1; c >= 0; c--)
6261             if(s[c] == ':')
6262                break;
6263
6264          namePart = s+c+1;
6265          if(!strcmp(namePart, name))
6266          {
6267             // TODO: Error on ambiguity
6268             return symbol;
6269          }
6270       }
6271       else
6272          break;
6273    }
6274    return null;
6275 }
6276
6277 static Symbol FindWithNameSpace(BinaryTree tree, char * name)
6278 {
6279    int c;
6280    char nameSpace[1024];
6281    char * namePart;
6282    bool gotColon = false;
6283
6284    nameSpace[0] = '\0';
6285    for(c = strlen(name)-1; c >= 0; c--)
6286       if(name[c] == ':')
6287       {
6288          gotColon = true;
6289          break;
6290       }
6291
6292    namePart = name+c+1;
6293    while(c >= 0 && name[c] == ':') c--;
6294    if(c >= 0)
6295    {
6296       // Try an exact match first
6297       Symbol symbol = (Symbol)tree.FindString(name);
6298       if(symbol)
6299          return symbol;
6300
6301       // Namespace specified
6302       memcpy(nameSpace, name, c + 1);
6303       nameSpace[c+1] = 0;
6304
6305       return ScanWithNameSpace(tree, nameSpace, namePart);
6306    }
6307    else if(gotColon)
6308    {
6309       // Looking for a global symbol, e.g. ::Sleep()
6310       Symbol symbol = (Symbol)tree.FindString(namePart);
6311       return symbol;
6312    }
6313    else
6314    {
6315       // Name only (no namespace specified)
6316       Symbol symbol = (Symbol)tree.FindString(namePart);
6317       if(symbol)
6318          return symbol;
6319       return ScanWithNameSpace(tree, "", namePart);
6320    }
6321    return null;
6322 }
6323
6324 static void ProcessDeclaration(Declaration decl);
6325
6326 /*static */Symbol FindSymbol(char * name, Context startContext, Context endContext, bool isStruct, bool globalNameSpace)
6327 {
6328 #ifdef _DEBUG
6329    //Time startTime = GetTime();
6330 #endif
6331    // Optimize this later? Do this before/less?
6332    Context ctx;
6333    Symbol symbol = null;
6334    // First, check if the identifier is declared inside the function
6335    //for(ctx = curContext; ctx /*!= topContext.parent */&& !symbol; ctx = ctx.parent)
6336
6337    for(ctx = startContext; ctx /*!= topContext.parent */&& !symbol; ctx = ctx.parent)
6338    {
6339       if(ctx == globalContext && !globalNameSpace && ctx.hasNameSpace)
6340       {
6341          symbol = null;
6342          if(thisNameSpace)
6343          {
6344             char curName[1024];
6345             strcpy(curName, thisNameSpace);
6346             strcat(curName, "::");
6347             strcat(curName, name);
6348             // Try to resolve in current namespace first
6349             symbol = FindWithNameSpace(isStruct ? ctx.structSymbols : ctx.symbols, curName);
6350          }
6351          if(!symbol)
6352             symbol = FindWithNameSpace(isStruct ? ctx.structSymbols : ctx.symbols, name);
6353       }
6354       else
6355          symbol = (Symbol)(isStruct ? ctx.structSymbols : ctx.symbols).FindString(name);
6356
6357       if(symbol || ctx == endContext) break;
6358    }
6359    if(inCompiler && curExternal && symbol && ctx == globalContext && curExternal.symbol && symbol.id > curExternal.symbol.idCode && symbol.pointerExternal)
6360    {
6361       if(symbol.pointerExternal.type == functionExternal)
6362       {
6363          FunctionDefinition function = symbol.pointerExternal.function;
6364
6365          // Modified this recently...
6366          Context tmpContext = curContext;
6367          curContext = null;
6368          symbol.pointerExternal = MkExternalDeclaration(MkDeclaration(CopyList(function.specifiers, CopySpecifier), MkListOne(MkInitDeclarator(CopyDeclarator(function.declarator), null))));
6369          curContext = tmpContext;
6370
6371          symbol.pointerExternal.symbol = symbol;
6372
6373          // TESTING THIS:
6374          DeclareType(symbol.type, true, true);
6375
6376          ast->Insert(curExternal.prev, symbol.pointerExternal);
6377
6378          symbol.id = curExternal.symbol.idCode;
6379
6380       }
6381       else if(symbol.pointerExternal.type == declarationExternal && curExternal.symbol.idCode < symbol.pointerExternal.symbol.id) // Added id comparison because Global Function prototypes were broken
6382       {
6383          ast->Move(symbol.pointerExternal, curExternal.prev);
6384          symbol.id = curExternal.symbol.idCode;
6385       }
6386    }
6387 #ifdef _DEBUG
6388    //findSymbolTotalTime += GetTime() - startTime;
6389 #endif
6390    return symbol;
6391 }
6392
6393 static void GetTypeSpecs(Type type, OldList * specs)
6394 {
6395    if(!type.isSigned && type.kind != intPtrType && type.kind != intSizeType) ListAdd(specs, MkSpecifier(UNSIGNED));
6396    switch(type.kind)
6397    {
6398       case classType:
6399       {
6400          if(type._class.registered)
6401          {
6402             if(!type._class.registered.dataType)
6403                type._class.registered.dataType = ProcessTypeString(type._class.registered.dataTypeString, false);
6404             GetTypeSpecs(type._class.registered.dataType, specs);
6405          }
6406          break;
6407       }
6408       case doubleType: ListAdd(specs, MkSpecifier(DOUBLE)); break;
6409       case floatType: ListAdd(specs, MkSpecifier(FLOAT)); break;
6410       case charType: ListAdd(specs, MkSpecifier(CHAR)); break;
6411       case shortType: ListAdd(specs, MkSpecifier(SHORT)); break;
6412       case int64Type: ListAdd(specs, MkSpecifier(INT64)); break;
6413       case intPtrType: ListAdd(specs, MkSpecifierName(type.isSigned ? "intptr" : "uintptr")); break;
6414       case intSizeType: ListAdd(specs, MkSpecifierName(type.isSigned ? "intsize" : "uintsize")); break;
6415       case intType:
6416       default:
6417          ListAdd(specs, MkSpecifier(INT)); break;
6418    }
6419 }
6420
6421 static void PrintArraySize(Type arrayType, char * string)
6422 {
6423    char size[256];
6424    size[0] = '\0';
6425    strcat(size, "[");
6426    if(arrayType.enumClass)
6427       strcat(size, arrayType.enumClass.string);
6428    else if(arrayType.arraySizeExp)
6429       PrintExpression(arrayType.arraySizeExp, size);
6430    strcat(size, "]");
6431    strcat(string, size);
6432 }
6433
6434 // WARNING : This function expects a null terminated string since it recursively concatenate...
6435 static void PrintTypeSpecs(Type type, char * string, bool fullName, bool printConst)
6436 {
6437    if(type)
6438    {
6439       if(printConst && type.constant)
6440          strcat(string, "const ");
6441       switch(type.kind)
6442       {
6443          case classType:
6444          {
6445             Symbol c = type._class;
6446             // TODO: typed_object does not fully qualify the type, as it may have taken up an actual class (Stored in _class) from overriding
6447             //       look into merging with thisclass ?
6448             if(type.classObjectType == typedObject)
6449                strcat(string, "typed_object");
6450             else if(type.classObjectType == anyObject)
6451                strcat(string, "any_object");
6452             else
6453             {
6454                if(c && c.string)
6455                   strcat(string, (fullName || !c.registered) ? c.string : c.registered.name);
6456             }
6457             if(type.byReference)
6458                strcat(string, " &");
6459             break;
6460          }
6461          case voidType: strcat(string, "void"); break;
6462          case intType:  strcat(string, type.isSigned ? "int" : "uint"); break;
6463          case int64Type:  strcat(string, type.isSigned ? "int64" : "uint64"); break;
6464          case intPtrType:  strcat(string, type.isSigned ? "intptr" : "uintptr"); break;
6465          case intSizeType:  strcat(string, type.isSigned ? "intsize" : "uintsize"); break;
6466          case charType: strcat(string, type.isSigned ? "char" : "byte"); break;
6467          case shortType: strcat(string, type.isSigned ? "short" : "uint16"); break;
6468          case floatType: strcat(string, "float"); break;
6469          case doubleType: strcat(string, "double"); break;
6470          case structType:
6471             if(type.enumName)
6472             {
6473                strcat(string, "struct ");
6474                strcat(string, type.enumName);
6475             }
6476             else if(type.typeName)
6477                strcat(string, type.typeName);
6478             else
6479             {
6480                Type member;
6481                strcat(string, "struct { ");
6482                for(member = type.members.first; member; member = member.next)
6483                {
6484                   PrintType(member, string, true, fullName);
6485                   strcat(string,"; ");
6486                }
6487                strcat(string,"}");
6488             }
6489             break;
6490          case unionType:
6491             if(type.enumName)
6492             {
6493                strcat(string, "union ");
6494                strcat(string, type.enumName);
6495             }
6496             else if(type.typeName)
6497                strcat(string, type.typeName);
6498             else
6499             {
6500                strcat(string, "union ");
6501                strcat(string,"(unnamed)");
6502             }
6503             break;
6504          case enumType:
6505             if(type.enumName)
6506             {
6507                strcat(string, "enum ");
6508                strcat(string, type.enumName);
6509             }
6510             else if(type.typeName)
6511                strcat(string, type.typeName);
6512             else
6513                strcat(string, "int"); // "enum");
6514             break;
6515          case ellipsisType:
6516             strcat(string, "...");
6517             break;
6518          case subClassType:
6519             strcat(string, "subclass(");
6520             strcat(string, type._class ? type._class.string : "int");
6521             strcat(string, ")");
6522             break;
6523          case templateType:
6524             strcat(string, type.templateParameter.identifier.string);
6525             break;
6526          case thisClassType:
6527             strcat(string, "thisclass");
6528             break;
6529          case vaListType:
6530             strcat(string, "__builtin_va_list");
6531             break;
6532       }
6533    }
6534 }
6535
6536 static void PrintName(Type type, char * string, bool fullName)
6537 {
6538    if(type.name && type.name[0])
6539    {
6540       if(fullName)
6541          strcat(string, type.name);
6542       else
6543       {
6544          char * name = RSearchString(type.name, "::", strlen(type.name), true, false);
6545          if(name) name += 2; else name = type.name;
6546          strcat(string, name);
6547       }
6548    }
6549 }
6550
6551 static void PrintAttribs(Type type, char * string)
6552 {
6553    if(type)
6554    {
6555       if(type.dllExport)   strcat(string, "dllexport ");
6556       if(type.attrStdcall) strcat(string, "stdcall ");
6557    }
6558 }
6559
6560 static void PrePrintType(Type type, char * string, bool fullName, Type parentType, bool printConst)
6561 {
6562    if(type.kind == arrayType || type.kind == pointerType || type.kind == functionType || type.kind == methodType)
6563    {
6564       Type attrType = null;
6565       if((type.kind == functionType || type.kind == methodType) && (!parentType || parentType.kind != pointerType))
6566          PrintAttribs(type, string);
6567       if(printConst && type.constant && (type.kind == functionType || type.kind == methodType))
6568          strcat(string, " const");
6569       PrePrintType(type.kind == methodType ? type.method.dataType : type.type, string, fullName, type, printConst);
6570       if(type.kind == pointerType && (type.type.kind == arrayType || type.type.kind == functionType || type.type.kind == methodType))
6571          strcat(string, " (");
6572       if(type.kind == pointerType)
6573       {
6574          if(type.type.kind == functionType || type.type.kind == methodType)
6575             PrintAttribs(type.type, string);
6576       }
6577       if(type.kind == pointerType)
6578       {
6579          if(type.type.kind == functionType || type.type.kind == methodType || type.type.kind == arrayType)
6580             strcat(string, "*");
6581          else
6582             strcat(string, " *");
6583       }
6584       if(printConst && type.constant && type.kind == pointerType)
6585          strcat(string, " const");
6586    }
6587    else
6588       PrintTypeSpecs(type, string, fullName, printConst);
6589 }
6590
6591 static void PostPrintType(Type type, char * string, bool fullName)
6592 {
6593    if(type.kind == pointerType && (type.type.kind == arrayType || type.type.kind == functionType || type.type.kind == methodType))
6594       strcat(string, ")");
6595    if(type.kind == arrayType)
6596       PrintArraySize(type, string);
6597    else if(type.kind == functionType)
6598    {
6599       Type param;
6600       strcat(string, "(");
6601       for(param = type.params.first; param; param = param.next)
6602       {
6603          PrintType(param, string, true, fullName);
6604          if(param.next) strcat(string, ", ");
6605       }
6606       strcat(string, ")");
6607    }
6608    if(type.kind == arrayType || type.kind == pointerType || type.kind == functionType || type.kind == methodType)
6609       PostPrintType(type.kind == methodType ? type.method.dataType : type.type, string, fullName);
6610 }
6611
6612 // *****
6613 // TODO: Add a max buffer size to avoid overflows. This function is used with static size char arrays.
6614 // *****
6615 static void _PrintType(Type type, char * string, bool printName, bool fullName, bool printConst)
6616 {
6617    PrePrintType(type, string, fullName, null, printConst);
6618
6619    if(type.thisClass || (printName && type.name && type.name[0]))
6620       strcat(string, " ");
6621    if(/*(type.kind == methodType || type.kind == functionType) && */(type.thisClass || type.staticMethod))
6622    {
6623       Symbol _class = type.thisClass;
6624       if((type.classObjectType == typedObject || type.classObjectType == classPointer) || (_class && !strcmp(_class.string, "class")))
6625       {
6626          if(type.classObjectType == classPointer)
6627             strcat(string, "class");
6628          else
6629             strcat(string, type.byReference ? "typed_object&" : "typed_object");
6630       }
6631       else if(_class && _class.string)
6632       {
6633          String s = _class.string;
6634          if(fullName)
6635             strcat(string, s);
6636          else
6637          {
6638             char * name = RSearchString(s, "::", strlen(s), true, false);
6639             if(name) name += 2; else name = s;
6640             strcat(string, name);
6641          }
6642       }
6643       strcat(string, "::");
6644    }
6645
6646    if(printName && type.name)
6647       PrintName(type, string, fullName);
6648    PostPrintType(type, string, fullName);
6649    if(type.bitFieldCount)
6650    {
6651       char count[100];
6652       sprintf(count, ":%d", type.bitFieldCount);
6653       strcat(string, count);
6654    }
6655 }
6656
6657 void PrintType(Type type, char * string, bool printName, bool fullName)
6658 {
6659    _PrintType(type, string, printName, fullName, true);
6660 }
6661
6662 void PrintTypeNoConst(Type type, char * string, bool printName, bool fullName)
6663 {
6664    _PrintType(type, string, printName, fullName, false);
6665 }
6666
6667 static Type FindMember(Type type, char * string)
6668 {
6669    Type memberType;
6670    for(memberType = type.members.first; memberType; memberType = memberType.next)
6671    {
6672       if(!memberType.name)
6673       {
6674          Type subType = FindMember(memberType, string);
6675          if(subType)
6676             return subType;
6677       }
6678       else if(!strcmp(memberType.name, string))
6679          return memberType;
6680    }
6681    return null;
6682 }
6683
6684 Type FindMemberAndOffset(Type type, char * string, uint * offset)
6685 {
6686    Type memberType;
6687    for(memberType = type.members.first; memberType; memberType = memberType.next)
6688    {
6689       if(!memberType.name)
6690       {
6691          Type subType = FindMember(memberType, string);
6692          if(subType)
6693          {
6694             *offset += memberType.offset;
6695             return subType;
6696          }
6697       }
6698       else if(!strcmp(memberType.name, string))
6699       {
6700          *offset += memberType.offset;
6701          return memberType;
6702       }
6703    }
6704    return null;
6705 }
6706
6707 Expression ParseExpressionString(char * expression)
6708 {
6709    fileInput = TempFile { };
6710    fileInput.Write(expression, 1, strlen(expression));
6711    fileInput.Seek(0, start);
6712
6713    echoOn = false;
6714    parsedExpression = null;
6715    resetScanner();
6716    expression_yyparse();
6717    delete fileInput;
6718
6719    return parsedExpression;
6720 }
6721
6722 static bool ResolveIdWithClass(Expression exp, Class _class, bool skipIDClassCheck)
6723 {
6724    Identifier id = exp.identifier;
6725    Method method = null;
6726    Property prop = null;
6727    DataMember member = null;
6728    ClassProperty classProp = null;
6729
6730    if(_class && _class.type == enumClass)
6731    {
6732       NamedLink value = null;
6733       Class enumClass = eSystem_FindClass(privateModule, "enum");
6734       if(enumClass)
6735       {
6736          Class baseClass;
6737          for(baseClass = _class; baseClass && baseClass.type == ClassType::enumClass; baseClass = baseClass.base)
6738          {
6739             EnumClassData e = ACCESS_CLASSDATA(baseClass, enumClass);
6740             for(value = e.values.first; value; value = value.next)
6741             {
6742                if(!strcmp(value.name, id.string))
6743                   break;
6744             }
6745             if(value)
6746             {
6747                char constant[256];
6748
6749                FreeExpContents(exp);
6750
6751                exp.type = constantExp;
6752                exp.isConstant = true;
6753                if(!strcmp(baseClass.dataTypeString, "int"))
6754                   sprintf(constant, "%d",(int)value.data);
6755                else
6756                   sprintf(constant, "0x%X",(int)value.data);
6757                exp.constant = CopyString(constant);
6758                //for(;_class.base && _class.base.type != systemClass; _class = _class.base);
6759                exp.expType = MkClassType(baseClass.fullName);
6760                break;
6761             }
6762          }
6763       }
6764       if(value)
6765          return true;
6766    }
6767    if((method = eClass_FindMethod(_class, id.string, privateModule)))
6768    {
6769       ProcessMethodType(method);
6770       exp.expType = Type
6771       {
6772          refCount = 1;
6773          kind = methodType;
6774          method = method;
6775          // Crash here?
6776          // TOCHECK: Put it back to what it was...
6777          // methodClass = _class;
6778          methodClass = (skipIDClassCheck || (id && id._class)) ? _class : null;
6779       };
6780       //id._class = null;
6781       return true;
6782    }
6783    else if((prop = eClass_FindProperty(_class, id.string, privateModule)))
6784    {
6785       if(!prop.dataType)
6786          ProcessPropertyType(prop);
6787       exp.expType = prop.dataType;
6788       if(prop.dataType) prop.dataType.refCount++;
6789       return true;
6790    }
6791    else if((member = eClass_FindDataMember(_class, id.string, privateModule, null, null)))
6792    {
6793       if(!member.dataType)
6794          member.dataType = ProcessTypeString(member.dataTypeString, false);
6795       exp.expType = member.dataType;
6796       if(member.dataType) member.dataType.refCount++;
6797       return true;
6798    }
6799    else if((classProp = eClass_FindClassProperty(_class, id.string)))
6800    {
6801       if(!classProp.dataType)
6802          classProp.dataType = ProcessTypeString(classProp.dataTypeString, false);
6803
6804       if(classProp.constant)
6805       {
6806          FreeExpContents(exp);
6807
6808          exp.isConstant = true;
6809          if(classProp.dataType.kind == pointerType && classProp.dataType.type.kind == charType)
6810          {
6811             //char constant[256];
6812             exp.type = stringExp;
6813             exp.constant = QMkString((char *)classProp.Get(_class));
6814          }
6815          else
6816          {
6817             char constant[256];
6818             exp.type = constantExp;
6819             sprintf(constant, "%d", (int)classProp.Get(_class));
6820             exp.constant = CopyString(constant);
6821          }
6822       }
6823       else
6824       {
6825          // TO IMPLEMENT...
6826       }
6827
6828       exp.expType = classProp.dataType;
6829       if(classProp.dataType) classProp.dataType.refCount++;
6830       return true;
6831    }
6832    return false;
6833 }
6834
6835 static GlobalData ScanGlobalData(NameSpace nameSpace, char * name)
6836 {
6837    BinaryTree * tree = &nameSpace.functions;
6838    GlobalData data = (GlobalData)tree->FindString(name);
6839    NameSpace * child;
6840    if(!data)
6841    {
6842       for(child = (NameSpace *)nameSpace.nameSpaces.first; child; child = (NameSpace *)((BTNode)child).next)
6843       {
6844          data = ScanGlobalData(child, name);
6845          if(data)
6846             break;
6847       }
6848    }
6849    return data;
6850 }
6851
6852 static GlobalData FindGlobalData(char * name)
6853 {
6854    int start = 0, c;
6855    NameSpace * nameSpace;
6856    nameSpace = globalData;
6857    for(c = 0; name[c]; c++)
6858    {
6859       if(name[c] == '.' || (name[c] == ':' && name[c+1] == ':'))
6860       {
6861          NameSpace * newSpace;
6862          char * spaceName = new char[c - start + 1];
6863          strncpy(spaceName, name + start, c - start);
6864          spaceName[c-start] = '\0';
6865          newSpace = (NameSpace *)nameSpace->nameSpaces.FindString(spaceName);
6866          delete spaceName;
6867          if(!newSpace)
6868             return null;
6869          nameSpace = newSpace;
6870          if(name[c] == ':') c++;
6871          start = c+1;
6872       }
6873    }
6874    if(c - start)
6875    {
6876       return ScanGlobalData(nameSpace, name + start);
6877    }
6878    return null;
6879 }
6880
6881 static int definedExpStackPos;
6882 static void * definedExpStack[512];
6883
6884 // This function makes checkedExp equivalent to newExp, ending up freeing newExp
6885 void ReplaceExpContents(Expression checkedExp, Expression newExp)
6886 {
6887    Expression prev = checkedExp.prev, next = checkedExp.next;
6888
6889    FreeExpContents(checkedExp);
6890    FreeType(checkedExp.expType);
6891    FreeType(checkedExp.destType);
6892
6893    *checkedExp = *newExp;
6894
6895    delete newExp;
6896
6897    checkedExp.prev = prev;
6898    checkedExp.next = next;
6899 }
6900
6901 void ApplyAnyObjectLogic(Expression e)
6902 {
6903    Type destType = /*(e.destType && e.destType.kind == ellipsisType) ? ellipsisDestType : */e.destType;
6904 #ifdef _DEBUG
6905    char debugExpString[4096];
6906    debugExpString[0] = '\0';
6907    PrintExpression(e, debugExpString);
6908 #endif
6909
6910    if(destType && (/*destType.classObjectType == ClassObjectType::typedObject || */destType.classObjectType == anyObject))
6911    {
6912       //if(e.destType && e.destType.kind == ellipsisType) usedEllipsis = true;
6913       //ellipsisDestType = destType;
6914       if(e && e.expType)
6915       {
6916          Type type = e.expType;
6917          Class _class = null;
6918          //Type destType = e.destType;
6919
6920          if(type.kind == classType && type._class && type._class.registered)
6921          {
6922             _class = type._class.registered;
6923          }
6924          else if(type.kind == subClassType)
6925          {
6926             _class = FindClass("ecere::com::Class").registered;
6927          }
6928          else
6929          {
6930             char string[1024] = "";
6931             Symbol classSym;
6932
6933             PrintTypeNoConst(type, string, false, true);
6934             classSym = FindClass(string);
6935             if(classSym) _class = classSym.registered;
6936          }
6937
6938          if((_class && (_class.type == enumClass || _class.type == unitClass || _class.type == bitClass || _class.type == systemClass) && strcmp(_class.fullName, "class") && strcmp(_class.fullName, "uintptr") && strcmp(_class.fullName, "intptr")) || // Patched so that class isn't considered SYSTEM...
6939             (!e.expType.classObjectType && (((type.kind != pointerType && type.kind != intPtrType && type.kind != subClassType && (type.kind != classType || !type._class || !type._class.registered || type._class.registered.type == structClass))) ||
6940             destType.byReference)))
6941          {
6942             if(!_class || strcmp(_class.fullName, "char *"))     // TESTING THIS WITH NEW String class...
6943             {
6944                Expression checkedExp = e, newExp;
6945
6946                while(((checkedExp.type == bracketsExp || checkedExp.type == extensionExpressionExp || checkedExp.type == extensionCompoundExp) && checkedExp.list) || checkedExp.type == castExp)
6947                {
6948                   if(checkedExp.type == bracketsExp || checkedExp.type == extensionExpressionExp || checkedExp.type == extensionCompoundExp)
6949                   {
6950                      if(checkedExp.type == extensionCompoundExp)
6951                      {
6952                         checkedExp = ((Statement)checkedExp.compound.compound.statements->last).expressions->last;
6953                      }
6954                      else
6955                         checkedExp = checkedExp.list->last;
6956                   }
6957                   else if(checkedExp.type == castExp)
6958                      checkedExp = checkedExp.cast.exp;
6959                }
6960
6961                if(checkedExp && checkedExp.type == opExp && checkedExp.op.op == '*' && !checkedExp.op.exp1)
6962                {
6963                   newExp = checkedExp.op.exp2;
6964                   checkedExp.op.exp2 = null;
6965                   FreeExpContents(checkedExp);
6966
6967                   if(e.expType && e.expType.passAsTemplate)
6968                   {
6969                      char size[100];
6970                      ComputeTypeSize(e.expType);
6971                      sprintf(size, "%d", e.expType.size);
6972                      newExp = MkExpBrackets(MkListOne(MkExpOp(MkExpCast(MkTypeName(MkListOne(MkSpecifier(CHAR)),
6973                         MkDeclaratorPointer(MkPointer(null, null), null)), newExp), '+',
6974                            MkExpCall(MkExpIdentifier(MkIdentifier("__ENDIAN_PAD")), MkListOne(MkExpConstant(size))))));
6975                   }
6976
6977                   ReplaceExpContents(checkedExp, newExp);
6978                   e.byReference = true;
6979                }
6980                else if(!e.byReference || (_class && _class.type == noHeadClass))     // TESTING THIS HERE...
6981                {
6982                   Expression checkedExp, newExp;
6983
6984                   {
6985                      // TODO: Move code from debugTools.ec for hasAddress flag, this is just temporary
6986                      bool hasAddress =
6987                         e.type == identifierExp ||
6988                         (e.type == ExpressionType::memberExp && e.member.memberType == dataMember) ||
6989                         (e.type == ExpressionType::pointerExp && e.member.memberType == dataMember) ||
6990                         (e.type == opExp && !e.op.exp1 && e.op.op == '*') ||
6991                         e.type == indexExp;
6992
6993                      if(_class && _class.type != noHeadClass && _class.type != normalClass && _class.type != structClass && !hasAddress)
6994                      {
6995                         Context context = PushContext();
6996                         Declarator decl;
6997                         OldList * specs = MkList();
6998                         char typeString[1024];
6999                         Expression newExp { };
7000
7001                         typeString[0] = '\0';
7002                         *newExp = *e;
7003
7004                         //if(e.destType) e.destType.refCount++;
7005                         // if(exp.expType) exp.expType.refCount++;
7006                         newExp.prev = null;
7007                         newExp.next = null;
7008                         newExp.expType = null;
7009
7010                         PrintTypeNoConst(e.expType, typeString, false, true);
7011                         decl = SpecDeclFromString(typeString, specs, null);
7012                         newExp.destType = ProcessType(specs, decl);
7013
7014                         curContext = context;
7015
7016                         // We need a current compound for this
7017                         if(curCompound)
7018                         {
7019                            char name[100];
7020                            OldList * stmts = MkList();
7021                            e.type = extensionCompoundExp;
7022                            sprintf(name, "__internalValue%03X", internalValueCounter++);
7023                            if(!curCompound.compound.declarations)
7024                               curCompound.compound.declarations = MkList();
7025                            curCompound.compound.declarations->Insert(null, MkDeclaration(specs, MkListOne(MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier(name)), null))));
7026                            ListAdd(stmts, MkExpressionStmt(MkListOne(MkExpOp(MkExpIdentifier(MkIdentifier(name)), '=', newExp))));
7027                            ListAdd(stmts, MkExpressionStmt(MkListOne(MkExpIdentifier(MkIdentifier(name)))));
7028                            e.compound = MkCompoundStmt(null, stmts);
7029                         }
7030                         else
7031                            printf("libec: compiler error, curCompound is null in ApplyAnyObjectLogic\n");
7032
7033                         /*
7034                         e.compound = MkCompoundStmt(
7035                            MkListOne(MkDeclaration(specs, MkListOne(MkInitDeclarator(
7036                               MkDeclaratorIdentifier(MkIdentifier("__internalValue")), MkInitializerAssignment(newExp))))),
7037
7038                            MkListOne(MkExpressionStmt(MkListOne(MkExpIdentifier(MkIdentifier("__internalValue"))))));
7039                         */
7040
7041                         {
7042                            Type type = e.destType;
7043                            e.destType = { };
7044                            CopyTypeInto(e.destType, type);
7045                            e.destType.refCount = 1;
7046                            e.destType.classObjectType = none;
7047                            FreeType(type);
7048                         }
7049
7050                         e.compound.compound.context = context;
7051                         PopContext(context);
7052                         curContext = context.parent;
7053                      }
7054                   }
7055
7056                   // TODO: INTEGRATE THIS WITH VERSION ABOVE WHICH WAS ADDED TO ENCOMPASS OTHER CASE (*pointer)
7057                   checkedExp = e;
7058                   while(((checkedExp.type == bracketsExp || checkedExp.type == extensionExpressionExp || checkedExp.type == extensionCompoundExp) && checkedExp.list) || checkedExp.type == castExp)
7059                   {
7060                      if(checkedExp.type == bracketsExp || checkedExp.type == extensionExpressionExp || checkedExp.type == extensionCompoundExp)
7061                      {
7062                         if(checkedExp.type == extensionCompoundExp)
7063                         {
7064                            checkedExp = ((Statement)checkedExp.compound.compound.statements->last).expressions->last;
7065                         }
7066                         else
7067                            checkedExp = checkedExp.list->last;
7068                      }
7069                      else if(checkedExp.type == castExp)
7070                         checkedExp = checkedExp.cast.exp;
7071                   }
7072                   {
7073                      Expression operand { };
7074                      operand = *checkedExp;
7075                      checkedExp.destType = null;
7076                      checkedExp.expType = null;
7077                      checkedExp.Clear();
7078                      checkedExp.type = opExp;
7079                      checkedExp.op.op = '&';
7080                      checkedExp.op.exp1 = null;
7081                      checkedExp.op.exp2 = operand;
7082
7083                      //newExp = MkExpOp(null, '&', checkedExp);
7084                   }
7085                   //ReplaceExpContents(checkedExp, newExp);
7086                }
7087             }
7088          }
7089       }
7090    }
7091    {
7092       // If expression type is a simple class, make it an address
7093       // FixReference(e, true);
7094    }
7095 //#if 0
7096    if((!destType || destType.kind == ellipsisType || destType.kind == voidType) && e.expType && (e.expType.classObjectType == anyObject || e.expType.classObjectType == typedObject) &&
7097       (e.expType.byReference || (e.expType.kind == classType && e.expType._class && e.expType._class.registered &&
7098          (e.expType._class.registered.type == bitClass || e.expType._class.registered.type == enumClass || e.expType._class.registered.type == unitClass ) )))
7099    {
7100       if(e.expType.classObjectType && destType && destType.classObjectType) //e.expType.kind == classType && e.expType._class && e.expType._class.registered && !strcmp(e.expType._class.registered.name, "class"))
7101       {
7102          return;  // LEAVE THIS CASE (typed_object & :: methods 's this) TO PASS 2 FOR NOW
7103       }
7104       else
7105       {
7106          Expression thisExp { };
7107
7108          *thisExp = *e;
7109          thisExp.prev = null;
7110          thisExp.next = null;
7111          e.Clear();
7112
7113          e.type = bracketsExp;
7114          e.list = MkListOne(MkExpOp(null, '*', thisExp.type == identifierExp ? thisExp : MkExpBrackets(MkListOne(thisExp))));
7115          if(thisExp.expType.kind == classType && thisExp.expType._class && thisExp.expType._class.registered && thisExp.expType._class.registered.type == noHeadClass)
7116             ((Expression)e.list->first).byReference = true;
7117
7118          /*if(thisExp.expType.kind == classType && thisExp.expType._class && thisExp.expType._class.registered && !strcmp(thisExp.expType._class.registered.name, "class"))
7119          {
7120             e.expType = thisExp.expType;
7121             e.expType.refCount++;
7122          }
7123          else*/
7124          {
7125             e.expType = { };
7126             CopyTypeInto(e.expType, thisExp.expType);
7127             e.expType.byReference = false;
7128             e.expType.refCount = 1;
7129
7130             if(e.expType.kind == classType && e.expType._class && e.expType._class.registered &&
7131                (e.expType._class.registered.type == bitClass || e.expType._class.registered.type == enumClass || e.expType._class.registered.type == unitClass))
7132             {
7133                e.expType.classObjectType = none;
7134             }
7135          }
7136       }
7137    }
7138 // TOFIX: Try this for a nice IDE crash!
7139 //#endif
7140    // The other way around
7141    else
7142 //#endif
7143    if(destType && e.expType &&
7144          //e.expType.kind == classType && e.expType._class && e.expType._class.registered && !strcmp(e.expType._class.registered.name, "class") &&
7145          (e.expType.classObjectType == anyObject || e.expType.classObjectType == typedObject) &&
7146          !destType.classObjectType && /*(destType.kind != pointerType || !destType.type || destType.type.kind != voidType) &&*/ destType.kind != voidType)
7147    {
7148       if(destType.kind == ellipsisType)
7149       {
7150          Compiler_Error($"Unspecified type\n");
7151       }
7152       else if(!(destType.truth && e.expType.kind == classType && e.expType._class && e.expType._class.registered && e.expType._class.registered.type == structClass))
7153       {
7154          bool byReference = e.expType.byReference;
7155          Expression thisExp { };
7156          Declarator decl;
7157          OldList * specs = MkList();
7158          char typeString[1024]; // Watch buffer overruns
7159          Type type;
7160          ClassObjectType backupClassObjectType;
7161          bool backupByReference;
7162
7163          if(e.expType.kind == classType && e.expType._class && e.expType._class.registered && strcmp(e.expType._class.registered.name, "class"))
7164             type = e.expType;
7165          else
7166             type = destType;
7167
7168          backupClassObjectType = type.classObjectType;
7169          backupByReference = type.byReference;
7170
7171          type.classObjectType = none;
7172          type.byReference = false;
7173
7174          typeString[0] = '\0';
7175          PrintType(type, typeString, false, true);
7176          decl = SpecDeclFromString(typeString, specs, null);
7177
7178          type.classObjectType = backupClassObjectType;
7179          type.byReference = backupByReference;
7180
7181          *thisExp = *e;
7182          thisExp.prev = null;
7183          thisExp.next = null;
7184          e.Clear();
7185
7186          if( ( type.kind == classType && type._class && type._class.registered &&
7187                    (type._class.registered.type == systemClass || type._class.registered.type == bitClass ||
7188                     type._class.registered.type == enumClass || type._class.registered.type == unitClass) ) ||
7189              (type.kind != pointerType && type.kind != intPtrType && type.kind != arrayType && type.kind != classType) ||
7190              (!destType.byReference && byReference && (destType.kind != pointerType || type.kind != pointerType)))
7191          {
7192             e.type = opExp;
7193             e.op.op = '*';
7194             e.op.exp1 = null;
7195             e.op.exp2 = MkExpCast(MkTypeName(specs, MkDeclaratorPointer(MkPointer(null, null), decl)), thisExp);
7196
7197             e.expType = { };
7198             CopyTypeInto(e.expType, type);
7199             e.expType.byReference = false;
7200             e.expType.refCount = 1;
7201          }
7202          else
7203          {
7204             e.type = castExp;
7205             e.cast.typeName = MkTypeName(specs, decl);
7206             e.cast.exp = thisExp;
7207             e.byReference = true;
7208             e.expType = type;
7209             type.refCount++;
7210          }
7211          e.destType = destType;
7212          destType.refCount++;
7213          /*e.expType = type;
7214          type.refCount++;*/
7215       }
7216    }
7217 }
7218
7219 void ProcessExpressionType(Expression exp)
7220 {
7221    bool unresolved = false;
7222    Location oldyylloc = yylloc;
7223    bool notByReference = false;
7224 #ifdef _DEBUG
7225    char debugExpString[4096];
7226    debugExpString[0] = '\0';
7227    PrintExpression(exp, debugExpString);
7228 #endif
7229    if(!exp || exp.expType)
7230       return;
7231
7232    //eSystem_Logf("%s\n", expString);
7233
7234    // Testing this here
7235    yylloc = exp.loc;
7236    switch(exp.type)
7237    {
7238       case identifierExp:
7239       {
7240          Identifier id = exp.identifier;
7241          if(!id) return;
7242
7243          // DOING THIS LATER NOW...
7244          if(id._class && id._class.name)
7245          {
7246             id.classSym = id._class.symbol; // FindClass(id._class.name);
7247             /* TODO: Name Space Fix ups
7248             if(!id.classSym)
7249                id.nameSpace = eSystem_FindNameSpace(privateModule, id._class.name);
7250             */
7251          }
7252
7253          /* WHY WAS THIS COMMENTED OUT? if(!strcmp(id.string, "__thisModule"))
7254          {
7255             exp.expType = ProcessTypeString("Module", true);
7256             break;
7257          }
7258          else */if(strstr(id.string, "__ecereClass") == id.string)
7259          {
7260             exp.expType = ProcessTypeString("ecere::com::Class", true);
7261             break;
7262          }
7263          else if(id._class && (id.classSym || (id._class.name && !strcmp(id._class.name, "property"))))
7264          {
7265             // Added this here as well
7266             ReplaceClassMembers(exp, thisClass);
7267             if(exp.type != identifierExp)
7268             {
7269                ProcessExpressionType(exp);
7270                break;
7271             }
7272
7273             if(id.classSym && ResolveIdWithClass(exp, id.classSym.registered, false))
7274                break;
7275          }
7276          else
7277          {
7278             Symbol symbol = FindSymbol(id.string, curContext, topContext /*exp.destType ? topContext : globalContext*/, false, id._class && id._class.name == null);
7279             // Enums should be resolved here (Special pass in opExp to fix identifiers not seen as enum on the first pass)
7280             if(!symbol/* && exp.destType*/)
7281             {
7282                if(exp.destType && CheckExpressionType(exp, exp.destType, false))
7283                   break;
7284                else
7285                {
7286                   if(thisClass)
7287                   {
7288                      ReplaceClassMembers(exp, thisClass ? thisClass : currentClass);
7289                      if(exp.type != identifierExp)
7290                      {
7291                         ProcessExpressionType(exp);
7292                         break;
7293                      }
7294                   }
7295                   // Static methods called from inside the _class
7296                   else if(currentClass && !id._class)
7297                   {
7298                      if(ResolveIdWithClass(exp, currentClass, true))
7299                         break;
7300                   }
7301                   symbol = FindSymbol(id.string, topContext.parent, globalContext, false, id._class && id._class.name == null);
7302                }
7303             }
7304
7305             // If we manage to resolve this symbol
7306             if(symbol)
7307             {
7308                Type type = symbol.type;
7309                Class _class = (type && type.kind == classType && type._class) ? type._class.registered : null;
7310
7311                if(_class && !strcmp(id.string, "this") && !type.classObjectType)
7312                {
7313                   Context context = SetupTemplatesContext(_class);
7314                   type = ReplaceThisClassType(_class);
7315                   FinishTemplatesContext(context);
7316                   if(type) type.refCount = 0;   // We'll be incrementing it right below...
7317                }
7318
7319                FreeSpecifier(id._class);
7320                id._class = null;
7321                delete id.string;
7322                id.string = CopyString(symbol.string);
7323
7324                id.classSym = null;
7325                exp.expType = type;
7326                if(type)
7327                   type.refCount++;
7328                if(type && (type.kind == enumType || (_class && _class.type == enumClass)))
7329                   // Add missing cases here... enum Classes...
7330                   exp.isConstant = true;
7331
7332                // TOCHECK: Why was !strcmp(id.string, "this") commented out?
7333                if(symbol.isParam || !strcmp(id.string, "this"))
7334                {
7335                   if(_class && _class.type == structClass && !type.declaredWithStruct)
7336                      exp.byReference = true;
7337
7338                   //TESTING COMMENTING THIS OUT IN FAVOR OF ApplyAnyObjectLogic
7339                   /*if(type && _class && (type.classObjectType == typedObject || type.classObjectType == anyObject) &&
7340                      ((_class.type == unitClass || _class.type == enumClass || _class.type == bitClass) ||
7341                      (type.byReference && (_class.type == normalClass || _class.type == noHeadClass))))
7342                   {
7343                      Identifier id = exp.identifier;
7344                      exp.type = bracketsExp;
7345                      exp.list = MkListOne(MkExpOp(null, '*', MkExpIdentifier(id)));
7346                   }*/
7347                }
7348
7349                if(symbol.isIterator)
7350                {
7351                   if(symbol.isIterator == 3)
7352                   {
7353                      exp.type = bracketsExp;
7354                      exp.list = MkListOne(MkExpOp(null, '*', MkExpIdentifier(exp.identifier)));
7355                      ((Expression)exp.list->first).op.exp2.expType = exp.expType;
7356                      exp.expType = null;
7357                      ProcessExpressionType(exp);
7358                   }
7359                   else if(symbol.isIterator != 4)
7360                   {
7361                      exp.type = memberExp;
7362                      exp.member.exp = MkExpIdentifier(exp.identifier);
7363                      exp.member.exp.expType = exp.expType;
7364                      /*if(symbol.isIterator == 6)
7365                         exp.member.member = MkIdentifier("key");
7366                      else*/
7367                         exp.member.member = MkIdentifier("data");
7368                      exp.expType = null;
7369                      ProcessExpressionType(exp);
7370                   }
7371                }
7372                break;
7373             }
7374             else
7375             {
7376                DefinedExpression definedExp = null;
7377                if(thisNameSpace && !(id._class && !id._class.name))
7378                {
7379                   char name[1024];
7380                   strcpy(name, thisNameSpace);
7381                   strcat(name, "::");
7382                   strcat(name, id.string);
7383                   definedExp = eSystem_FindDefine(privateModule, name);
7384                }
7385                if(!definedExp)
7386                   definedExp = eSystem_FindDefine(privateModule, id.string);
7387                if(definedExp)
7388                {
7389                   int c;
7390                   for(c = 0; c<definedExpStackPos; c++)
7391                      if(definedExpStack[c] == definedExp)
7392                         break;
7393                   if(c == definedExpStackPos && c < sizeof(definedExpStack) / sizeof(void *))
7394                   {
7395                      Location backupYylloc = yylloc;
7396                      definedExpStack[definedExpStackPos++] = definedExp;
7397                      fileInput = TempFile { };
7398                      fileInput.Write(definedExp.value, 1, strlen(definedExp.value));
7399                      fileInput.Seek(0, start);
7400
7401                      echoOn = false;
7402                      parsedExpression = null;
7403                      resetScanner();
7404                      expression_yyparse();
7405                      delete fileInput;
7406
7407                      yylloc = backupYylloc;
7408
7409                      if(parsedExpression)
7410                      {
7411                         FreeIdentifier(id);
7412                         exp.type = bracketsExp;
7413                         exp.list = MkListOne(parsedExpression);
7414                         parsedExpression.loc = yylloc;
7415                         ProcessExpressionType(exp);
7416                         definedExpStackPos--;
7417                         return;
7418                      }
7419                      definedExpStackPos--;
7420                   }
7421                   else
7422                   {
7423                      if(inCompiler)
7424                      {
7425                         Compiler_Error($"Recursion in defined expression %s\n", id.string);
7426                      }
7427                   }
7428                }
7429                else
7430                {
7431                   GlobalData data = null;
7432                   if(thisNameSpace && !(id._class && !id._class.name))
7433                   {
7434                      char name[1024];
7435                      strcpy(name, thisNameSpace);
7436                      strcat(name, "::");
7437                      strcat(name, id.string);
7438                      data = FindGlobalData(name);
7439                   }
7440                   if(!data)
7441                      data = FindGlobalData(id.string);
7442                   if(data)
7443                   {
7444                      DeclareGlobalData(data);
7445                      exp.expType = data.dataType;
7446                      if(data.dataType) data.dataType.refCount++;
7447
7448                      delete id.string;
7449                      id.string = CopyString(data.fullName);
7450                      FreeSpecifier(id._class);
7451                      id._class = null;
7452
7453                      break;
7454                   }
7455                   else
7456                   {
7457                      GlobalFunction function = null;
7458                      if(thisNameSpace && !(id._class && !id._class.name))
7459                      {
7460                         char name[1024];
7461                         strcpy(name, thisNameSpace);
7462                         strcat(name, "::");
7463                         strcat(name, id.string);
7464                         function = eSystem_FindFunction(privateModule, name);
7465                      }
7466                      if(!function)
7467                         function = eSystem_FindFunction(privateModule, id.string);
7468                      if(function)
7469                      {
7470                         char name[1024];
7471                         delete id.string;
7472                         id.string = CopyString(function.name);
7473                         name[0] = 0;
7474
7475                         if(function.module.importType != staticImport && (!function.dataType || !function.dataType.dllExport))
7476                            strcpy(name, "__ecereFunction_");
7477                         FullClassNameCat(name, id.string, false); // Why is this using FullClassNameCat ?
7478                         if(DeclareFunction(function, name))
7479                         {
7480                            delete id.string;
7481                            id.string = CopyString(name);
7482                         }
7483                         exp.expType = function.dataType;
7484                         if(function.dataType) function.dataType.refCount++;
7485
7486                         FreeSpecifier(id._class);
7487                         id._class = null;
7488
7489                         break;
7490                      }
7491                   }
7492                }
7493             }
7494          }
7495          unresolved = true;
7496          break;
7497       }
7498       case instanceExp:
7499       {
7500          Class _class;
7501          // Symbol classSym;
7502
7503          if(!exp.instance._class)
7504          {
7505             if(exp.destType && exp.destType.kind == classType && exp.destType._class)
7506             {
7507                exp.instance._class = MkSpecifierName(exp.destType._class.string);
7508             }
7509          }
7510
7511          //classSym = FindClass(exp.instance._class.fullName);
7512          //_class = classSym ? classSym.registered : null;
7513
7514          ProcessInstantiationType(exp.instance);
7515          exp.isConstant = exp.instance.isConstant;
7516
7517          /*
7518          if(_class.type == unitClass && _class.base.type != systemClass)
7519          {
7520             {
7521                Type destType = exp.destType;
7522
7523                exp.destType = MkClassType(_class.base.fullName);
7524                exp.expType = MkClassType(_class.fullName);
7525                CheckExpressionType(exp, exp.destType, true);
7526
7527                exp.destType = destType;
7528             }
7529             exp.expType = MkClassType(_class.fullName);
7530          }
7531          else*/
7532          if(exp.instance._class)
7533          {
7534             exp.expType = MkClassType(exp.instance._class.name);
7535             /*if(exp.expType._class && exp.expType._class.registered &&
7536                (exp.expType._class.registered.type == normalClass || exp.expType._class.registered.type == noHeadClass))
7537                exp.expType.byReference = true;*/
7538          }
7539          break;
7540       }
7541       case constantExp:
7542       {
7543          if(!exp.expType)
7544          {
7545             Type type
7546             {
7547                refCount = 1;
7548                constant = true;
7549             };
7550             exp.expType = type;
7551
7552             if(exp.constant[0] == '\'')
7553             {
7554                if((int)((byte *)exp.constant)[1] > 127)
7555                {
7556                   int nb;
7557                   unichar ch = UTF8GetChar(exp.constant + 1, &nb);
7558                   if(nb < 2) ch = exp.constant[1];
7559                   delete exp.constant;
7560                   exp.constant = PrintUInt(ch);
7561                   // type.kind = (ch > 0xFFFF) ? intType : shortType;
7562                   type.kind = classType; //(ch > 0xFFFF) ? intType : shortType;
7563                   type._class = FindClass("unichar");
7564
7565                   type.isSigned = false;
7566                }
7567                else
7568                {
7569                   type.kind = charType;
7570                   type.isSigned = true;
7571                }
7572             }
7573             else if(strchr(exp.constant, '.'))
7574             {
7575                char ch = exp.constant[strlen(exp.constant)-1];
7576                if(ch == 'f')
7577                   type.kind = floatType;
7578                else
7579                   type.kind = doubleType;
7580                type.isSigned = true;
7581             }
7582             else
7583             {
7584                if(exp.constant[0] == '0' && exp.constant[1])
7585                   type.isSigned = false;
7586                else if(strchr(exp.constant, 'L') || strchr(exp.constant, 'l'))
7587                   type.isSigned = false;
7588                else if(strtoll(exp.constant, null, 0) > MAXINT)
7589                   type.isSigned = false;
7590                else
7591                   type.isSigned = true;
7592                type.kind = intType;
7593             }
7594             exp.isConstant = true;
7595             if(exp.destType && exp.destType.kind == doubleType)
7596                type.kind = doubleType;
7597             else if(exp.destType && exp.destType.kind == floatType)
7598                type.kind = floatType;
7599             else if(exp.destType && exp.destType.kind == int64Type)
7600                type.kind = int64Type;
7601          }
7602          break;
7603       }
7604       case stringExp:
7605       {
7606          exp.isConstant = true;      // Why wasn't this constant?
7607          exp.expType = Type
7608          {
7609             refCount = 1;
7610             kind = pointerType;
7611             type = Type
7612             {
7613                refCount = 1;
7614                kind = charType;
7615                constant = true;
7616             }
7617          };
7618          break;
7619       }
7620       case newExp:
7621       case new0Exp:
7622          ProcessExpressionType(exp._new.size);
7623          exp.expType = Type
7624          {
7625             refCount = 1;
7626             kind = pointerType;
7627             type = ProcessType(exp._new.typeName.qualifiers, exp._new.typeName.declarator);
7628          };
7629          DeclareType(exp.expType.type, false, false);
7630          break;
7631       case renewExp:
7632       case renew0Exp:
7633          ProcessExpressionType(exp._renew.size);
7634          ProcessExpressionType(exp._renew.exp);
7635          exp.expType = Type
7636          {
7637             refCount = 1;
7638             kind = pointerType;
7639             type = ProcessType(exp._renew.typeName.qualifiers, exp._renew.typeName.declarator);
7640          };
7641          DeclareType(exp.expType.type, false, false);
7642          break;
7643       case opExp:
7644       {
7645          bool assign = false, boolResult = false, boolOps = false;
7646          Type type1 = null, type2 = null;
7647          bool useDestType = false, useSideType = false;
7648          Location oldyylloc = yylloc;
7649          bool useSideUnit = false;
7650
7651          // Dummy type to prevent ProcessExpression of operands to say unresolved identifiers yet
7652          Type dummy
7653          {
7654             count = 1;
7655             refCount = 1;
7656          };
7657
7658          switch(exp.op.op)
7659          {
7660             // Assignment Operators
7661             case '=':
7662             case MUL_ASSIGN:
7663             case DIV_ASSIGN:
7664             case MOD_ASSIGN:
7665             case ADD_ASSIGN:
7666             case SUB_ASSIGN:
7667             case LEFT_ASSIGN:
7668             case RIGHT_ASSIGN:
7669             case AND_ASSIGN:
7670             case XOR_ASSIGN:
7671             case OR_ASSIGN:
7672                assign = true;
7673                break;
7674             // boolean Operators
7675             case '!':
7676                // Expect boolean operators
7677                //boolOps = true;
7678                //boolResult = true;
7679                break;
7680             case AND_OP:
7681             case OR_OP:
7682                // Expect boolean operands
7683                boolOps = true;
7684                boolResult = true;
7685                break;
7686             // Comparisons
7687             case EQ_OP:
7688             case '<':
7689             case '>':
7690             case LE_OP:
7691             case GE_OP:
7692             case NE_OP:
7693                // Gives boolean result
7694                boolResult = true;
7695                useSideType = true;
7696                break;
7697             case '+':
7698             case '-':
7699                useSideUnit = true;
7700
7701                // Just added these... testing
7702             case '|':
7703             case '&':
7704             case '^':
7705
7706             // DANGER: Verify units
7707             case '/':
7708             case '%':
7709             case '*':
7710
7711                if(exp.op.op != '*' || exp.op.exp1)
7712                {
7713                   useSideType = true;
7714                   useDestType = true;
7715                }
7716                break;
7717
7718             /*// Implement speed etc.
7719             case '*':
7720             case '/':
7721                break;
7722             */
7723          }
7724          if(exp.op.op == '&')
7725          {
7726             // Added this here earlier for Iterator address as key
7727             if(!exp.op.exp1 && exp.op.exp2 && exp.op.exp2.type == identifierExp && exp.op.exp2.identifier)
7728             {
7729                Identifier id = exp.op.exp2.identifier;
7730                Symbol symbol = FindSymbol(id.string, curContext, topContext, false, id._class && id._class.name == null);
7731                if(symbol && symbol.isIterator == 2)
7732                {
7733                   exp.type = memberExp;
7734                   exp.member.exp = exp.op.exp2;
7735                   exp.member.member = MkIdentifier("key");
7736                   exp.expType = null;
7737                   exp.op.exp2.expType = symbol.type;
7738                   symbol.type.refCount++;
7739                   ProcessExpressionType(exp);
7740                   FreeType(dummy);
7741                   break;
7742                }
7743                // exp.op.exp2.usage.usageRef = true;
7744             }
7745          }
7746
7747          //dummy.kind = TypeDummy;
7748
7749          if(exp.op.exp1)
7750          {
7751             if(exp.destType && exp.destType.kind == classType &&
7752                exp.destType._class && exp.destType._class.registered && useDestType &&
7753
7754               ((exp.destType._class.registered.type == unitClass && useSideUnit) ||
7755                exp.destType._class.registered.type == enumClass ||
7756                exp.destType._class.registered.type == bitClass
7757                ))
7758
7759               //(exp.destType._class.registered.type == unitClass || exp.destType._class.registered.type == enumClass) && useDestType)
7760             {
7761                if(exp.op.exp1.destType) FreeType(exp.op.exp1.destType);
7762                exp.op.exp1.destType = exp.destType;
7763                if(exp.destType)
7764                   exp.destType.refCount++;
7765             }
7766             else if(!assign)
7767             {
7768                if(exp.op.exp1.destType) FreeType(exp.op.exp1.destType);
7769                exp.op.exp1.destType = dummy;
7770                dummy.refCount++;
7771             }
7772
7773             // TESTING THIS HERE...
7774             if(exp.op.exp1.destType && exp.op.op != '=') exp.op.exp1.destType.count++;
7775             ProcessExpressionType(exp.op.exp1);
7776             if(exp.op.exp1.destType && exp.op.op != '=') exp.op.exp1.destType.count--;
7777
7778             if(exp.op.exp1.destType == dummy)
7779             {
7780                FreeType(dummy);
7781                exp.op.exp1.destType = null;
7782             }
7783             type1 = exp.op.exp1.expType;
7784          }
7785
7786          if(exp.op.exp2)
7787          {
7788             char expString[10240];
7789             expString[0] = '\0';
7790             if(exp.op.exp2.type == instanceExp && !exp.op.exp2.instance._class)
7791             {
7792                if(exp.op.exp1)
7793                {
7794                   exp.op.exp2.destType = exp.op.exp1.expType;
7795                   if(exp.op.exp1.expType)
7796                      exp.op.exp1.expType.refCount++;
7797                }
7798                else
7799                {
7800                   exp.op.exp2.destType = exp.destType;
7801                   if(exp.destType)
7802                      exp.destType.refCount++;
7803                }
7804
7805                if(type1) type1.refCount++;
7806                exp.expType = type1;
7807             }
7808             else if(assign)
7809             {
7810                if(inCompiler)
7811                   PrintExpression(exp.op.exp2, expString);
7812
7813                if(type1 && type1.kind == pointerType)
7814                {
7815                   if(exp.op.op == MUL_ASSIGN || exp.op.op == DIV_ASSIGN ||exp.op.op == MOD_ASSIGN ||exp.op.op == LEFT_ASSIGN ||exp.op.op == RIGHT_ASSIGN ||
7816                      exp.op.op == AND_ASSIGN || exp.op.op == OR_ASSIGN)
7817                      Compiler_Error($"operator %s illegal on pointer\n", exp.op.op);
7818                   else if(exp.op.op == '=')
7819                   {
7820                      if(exp.op.exp2.destType) FreeType(exp.op.exp2.destType);
7821                      exp.op.exp2.destType = type1;
7822                      if(type1)
7823                         type1.refCount++;
7824                   }
7825                }
7826                else
7827                {
7828                   // Don't convert to the type for those... (e.g.: Degrees a; a /= 2;)
7829                   if(exp.op.op == MUL_ASSIGN || exp.op.op == DIV_ASSIGN ||exp.op.op == MOD_ASSIGN ||exp.op.op == LEFT_ASSIGN ||exp.op.op == RIGHT_ASSIGN/* ||
7830                      exp.op.op == AND_ASSIGN || exp.op.op == OR_ASSIGN*/);
7831                   else
7832                   {
7833                      if(exp.op.exp2.destType) FreeType(exp.op.exp2.destType);
7834                      exp.op.exp2.destType = type1;
7835                      if(type1)
7836                         type1.refCount++;
7837                   }
7838                }
7839                if(type1) type1.refCount++;
7840                exp.expType = type1;
7841             }
7842             else if(exp.destType && exp.destType.kind == classType &&
7843                exp.destType._class && exp.destType._class.registered &&
7844
7845                   ((exp.destType._class.registered.type == unitClass && useDestType && useSideUnit) ||
7846                   (exp.destType._class.registered.type == enumClass && useDestType))
7847                   )
7848             {
7849                if(exp.op.exp2.destType) FreeType(exp.op.exp2.destType);
7850                exp.op.exp2.destType = exp.destType;
7851                if(exp.destType)
7852                   exp.destType.refCount++;
7853             }
7854             else
7855             {
7856                if(exp.op.exp2.destType) FreeType(exp.op.exp2.destType);
7857                exp.op.exp2.destType = dummy;
7858                dummy.refCount++;
7859             }
7860
7861             // TESTING THIS HERE... (DANGEROUS)
7862             if(type1 && boolResult && useSideType && type1.kind == classType && type1._class && type1._class.registered &&
7863                (type1._class.registered.type == bitClass || type1._class.registered.type == enumClass))
7864             {
7865                FreeType(exp.op.exp2.destType);
7866                exp.op.exp2.destType = type1;
7867                type1.refCount++;
7868             }
7869             if(exp.op.exp2.destType && exp.op.op != '=') exp.op.exp2.destType.count++;
7870             ProcessExpressionType(exp.op.exp2);
7871             if(exp.op.exp2.destType && exp.op.op != '=') exp.op.exp2.destType.count--;
7872
7873             if(assign && type1 && type1.kind == pointerType && exp.op.exp2.expType)
7874             {
7875                if(exp.op.exp2.expType.kind == intSizeType || exp.op.exp2.expType.kind == intPtrType || exp.op.exp2.expType.kind == int64Type || exp.op.exp2.expType.kind == intType || exp.op.exp2.expType.kind == shortType || exp.op.exp2.expType.kind == charType)
7876                {
7877                   if(exp.op.op != '=' && type1.type.kind == voidType)
7878                      Compiler_Error($"void *: unknown size\n");
7879                }
7880                else if(exp.op.exp2.expType.kind == pointerType || exp.op.exp2.expType.kind == arrayType || exp.op.exp2.expType.kind == functionType || exp.op.exp2.expType.kind == methodType||
7881                            (type1.type.kind == voidType && exp.op.exp2.expType.kind == classType && exp.op.exp2.expType._class.registered &&
7882                               (exp.op.exp2.expType._class.registered.type == normalClass ||
7883                               exp.op.exp2.expType._class.registered.type == structClass ||
7884                               exp.op.exp2.expType._class.registered.type == noHeadClass)))
7885                {
7886                   if(exp.op.op == ADD_ASSIGN)
7887                      Compiler_Error($"cannot add two pointers\n");
7888                }
7889                else if((exp.op.exp2.expType.kind == classType && type1.kind == pointerType && type1.type.kind == classType &&
7890                   type1.type._class == exp.op.exp2.expType._class && exp.op.exp2.expType._class.registered && exp.op.exp2.expType._class.registered.type == structClass))
7891                {
7892                   if(exp.op.op == ADD_ASSIGN)
7893                      Compiler_Error($"cannot add two pointers\n");
7894                }
7895                else if(inCompiler)
7896                {
7897                   char type1String[1024];
7898                   char type2String[1024];
7899                   type1String[0] = '\0';
7900                   type2String[0] = '\0';
7901
7902                   PrintType(exp.op.exp2.expType, type1String, false, true);
7903                   PrintType(type1, type2String, false, true);
7904                   ChangeCh(expString, '\n', ' ');
7905                   Compiler_Warning($"incompatible expression %s (%s); expected %s\n", expString, type1String, type2String);
7906                }
7907             }
7908
7909             if(exp.op.exp2.destType == dummy)
7910             {
7911                FreeType(dummy);
7912                exp.op.exp2.destType = null;
7913             }
7914
7915             if(exp.op.op == '-' && !exp.op.exp1 && exp.op.exp2.expType && !exp.op.exp2.expType.isSigned)
7916             {
7917                type2 = { };
7918                type2.refCount = 1;
7919                CopyTypeInto(type2, exp.op.exp2.expType);
7920                type2.isSigned = true;
7921             }
7922             else if(exp.op.op == '~' && !exp.op.exp1 && exp.op.exp2.expType && (!exp.op.exp2.expType.isSigned || exp.op.exp2.expType.kind != intType))
7923             {
7924                type2 = { kind = intType };
7925                type2.refCount = 1;
7926                type2.isSigned = true;
7927             }
7928             else
7929                type2 = exp.op.exp2.expType;
7930          }
7931
7932          dummy.kind = voidType;
7933
7934          if(exp.op.op == SIZEOF)
7935          {
7936             exp.expType = Type
7937             {
7938                refCount = 1;
7939                kind = intType;
7940             };
7941             exp.isConstant = true;
7942          }
7943          // Get type of dereferenced pointer
7944          else if(exp.op.op == '*' && !exp.op.exp1)
7945          {
7946             exp.expType = Dereference(type2);
7947             if(type2 && type2.kind == classType)
7948                notByReference = true;
7949          }
7950          else if(exp.op.op == '&' && !exp.op.exp1)
7951             exp.expType = Reference(type2);
7952          else if(!assign)
7953          {
7954             if(boolOps)
7955             {
7956                if(exp.op.exp1)
7957                {
7958                   if(exp.op.exp1.destType) FreeType(exp.op.exp1.destType);
7959                   exp.op.exp1.destType = MkClassType("bool");
7960                   exp.op.exp1.destType.truth = true;
7961                   if(!exp.op.exp1.expType)
7962                      ProcessExpressionType(exp.op.exp1);
7963                   else
7964                      CheckExpressionType(exp.op.exp1, exp.op.exp1.destType, false);
7965                   FreeType(exp.op.exp1.expType);
7966                   exp.op.exp1.expType = MkClassType("bool");
7967                   exp.op.exp1.expType.truth = true;
7968                }
7969                if(exp.op.exp2)
7970                {
7971                   if(exp.op.exp2.destType) FreeType(exp.op.exp2.destType);
7972                   exp.op.exp2.destType = MkClassType("bool");
7973                   exp.op.exp2.destType.truth = true;
7974                   if(!exp.op.exp2.expType)
7975                      ProcessExpressionType(exp.op.exp2);
7976                   else
7977                      CheckExpressionType(exp.op.exp2, exp.op.exp2.destType, false);
7978                   FreeType(exp.op.exp2.expType);
7979                   exp.op.exp2.expType = MkClassType("bool");
7980                   exp.op.exp2.expType.truth = true;
7981                }
7982             }
7983             else if(exp.op.exp1 && exp.op.exp2 &&
7984                ((useSideType /*&&
7985                      (useSideUnit ||
7986                         ((!type1 || type1.kind != classType || type1._class.registered.type != unitClass) &&
7987                          (!type2 || type2.kind != classType || type2._class.registered.type != unitClass)))*/) ||
7988                   ((!type1 || type1.kind != classType || !strcmp(type1._class.string, "String")) &&
7989                   (!type2 || type2.kind != classType || !strcmp(type2._class.string, "String")))))
7990             {
7991                if(type1 && type2 &&
7992                   // If either both are class or both are not class
7993                   ((type1.kind == classType && type1._class && strcmp(type1._class.string, "String")) == (type2.kind == classType && type2._class && strcmp(type2._class.string, "String"))))
7994                {
7995                   if(exp.op.exp2.destType) FreeType(exp.op.exp2.destType);
7996                   exp.op.exp2.destType = type1;
7997                   type1.refCount++;
7998                   if(exp.op.exp1.destType) FreeType(exp.op.exp1.destType);
7999                   exp.op.exp1.destType = type2;
8000                   type2.refCount++;
8001                   // Warning here for adding Radians + Degrees with no destination type
8002                   if(!boolResult && type1.kind == classType && (!exp.destType || exp.destType.kind != classType) &&
8003                      type1._class.registered && type1._class.registered.type == unitClass &&
8004                      type2._class.registered && type2._class.registered.type == unitClass &&
8005                      type1._class.registered != type2._class.registered)
8006                      Compiler_Warning($"operating on %s and %s with an untyped result, assuming %s\n",
8007                         type1._class.string, type2._class.string, type1._class.string);
8008
8009                   if(type1.kind == pointerType && type1.type.kind == templateType && type2.kind != pointerType)
8010                   {
8011                      Expression argExp = GetTemplateArgExp(type1.type.templateParameter, thisClass, true);
8012                      if(argExp)
8013                      {
8014                         Expression classExp = MkExpMember(argExp, MkIdentifier("dataTypeClass"));
8015
8016                         exp.op.exp1 = MkExpBrackets(MkListOne(MkExpCast(
8017                            MkTypeName(MkListOne(MkSpecifierName("byte")), MkDeclaratorPointer(MkPointer(null, null), null)),
8018                            exp.op.exp1)));
8019
8020                         ProcessExpressionType(exp.op.exp1);
8021
8022                         if(type2.kind != pointerType)
8023                         {
8024                            ProcessExpressionType(classExp);
8025
8026                            exp.op.exp2 = MkExpBrackets(MkListOne(MkExpOp(exp.op.exp2, '*',
8027                               // ((_class.type == noHeadClass || _class.type == normalClass) ? sizeof(void *) : type.size)
8028                               MkExpBrackets(MkListOne(MkExpCondition(MkExpBrackets(MkListOne(MkExpOp(
8029                                  // noHeadClass
8030                                  MkExpOp(MkExpMember(CopyExpression(classExp), MkIdentifier("type")), EQ_OP, MkExpConstant("5")),
8031                                     OR_OP,
8032                                  // normalClass
8033                                  MkExpOp(MkExpMember(CopyExpression(classExp), MkIdentifier("type")), EQ_OP, MkExpConstant("0"))))),
8034                                     MkListOne(MkExpTypeSize(MkTypeName(MkListOne(MkSpecifier(VOID)), MkDeclaratorPointer(
8035                                        MkPointer(null, null), null)))),
8036                                        MkExpMember(classExp, MkIdentifier("typeSize"))))))));
8037
8038                            if(!exp.op.exp2.expType)
8039                               type2 = exp.op.exp2.expType = ProcessTypeString("int", false);
8040
8041                            ProcessExpressionType(exp.op.exp2);
8042                         }
8043                      }
8044                   }
8045
8046                   if(!boolResult && ((type1.kind == pointerType || type1.kind == arrayType || (type1.kind == classType && !strcmp(type1._class.string, "String"))) && (type2.kind == intSizeType || type2.kind == intPtrType || type2.kind == int64Type || type2.kind == intType || type2.kind == shortType || type2.kind == charType)))
8047                   {
8048                      if(type1.kind != classType && type1.type.kind == voidType)
8049                         Compiler_Error($"void *: unknown size\n");
8050                      exp.expType = type1;
8051                      if(type1) type1.refCount++;
8052                   }
8053                   else if(!boolResult && ((type2.kind == pointerType || type2.kind == arrayType || (type2.kind == classType && !strcmp(type2._class.string, "String"))) && (type1.kind == intSizeType || type1.kind == intPtrType || type1.kind == int64Type || type1.kind == intType || type1.kind == shortType || type1.kind == charType)))
8054                   {
8055                      if(type2.kind != classType && type2.type.kind == voidType)
8056                         Compiler_Error($"void *: unknown size\n");
8057                      exp.expType = type2;
8058                      if(type2) type2.refCount++;
8059                   }
8060                   else if((type1.kind == pointerType && type2.kind != pointerType && type2.kind != arrayType && type2.kind != functionType && type2.kind != methodType && type2.kind != classType && type2.kind != subClassType) ||
8061                           (type2.kind == pointerType && type1.kind != pointerType && type1.kind != arrayType && type1.kind != functionType && type1.kind != methodType && type1.kind != classType && type1.kind != subClassType))
8062                   {
8063                      Compiler_Warning($"different levels of indirection\n");
8064                   }
8065                   else
8066                   {
8067                      bool success = false;
8068                      if(type1.kind == pointerType && type2.kind == pointerType)
8069                      {
8070                         if(exp.op.op == '+')
8071                            Compiler_Error($"cannot add two pointers\n");
8072                         else if(exp.op.op == '-')
8073                         {
8074                            // Pointer Subtraction gives integer
8075                            if(MatchTypes(type1.type, type2.type, null, null, null, false, false, false, false))
8076                            {
8077                               exp.expType = Type
8078                               {
8079                                  kind = intType;
8080                                  refCount = 1;
8081                               };
8082                               success = true;
8083
8084                               if(type1.type.kind == templateType)
8085                               {
8086                                  Expression argExp = GetTemplateArgExp(type1.type.templateParameter, thisClass, true);
8087                                  if(argExp)
8088                                  {
8089                                     Expression classExp = MkExpMember(argExp, MkIdentifier("dataTypeClass"));
8090
8091                                     ProcessExpressionType(classExp);
8092
8093                                     exp.type = bracketsExp;
8094                                     exp.list = MkListOne(MkExpOp(
8095                                        MkExpBrackets(MkListOne(MkExpOp(
8096                                              MkExpCast(MkTypeName(MkListOne(MkSpecifierName("byte")), MkDeclaratorPointer(MkPointer(null, null), null)), MkExpBrackets(MkListOne(exp.op.exp1)))
8097                                              , exp.op.op,
8098                                              MkExpCast(MkTypeName(MkListOne(MkSpecifierName("byte")), MkDeclaratorPointer(MkPointer(null, null), null)), MkExpBrackets(MkListOne(exp.op.exp2)))))), '/',
8099
8100                                              //MkExpMember(classExp, MkIdentifier("typeSize"))
8101
8102                                              // ((_class.type == noHeadClass || _class.type == normalClass) ? sizeof(void *) : type.size)
8103                                              MkExpBrackets(MkListOne(MkExpCondition(MkExpBrackets(MkListOne(MkExpOp(
8104                                                 // noHeadClass
8105                                                 MkExpOp(MkExpMember(CopyExpression(classExp), MkIdentifier("type")), EQ_OP, MkExpIdentifier(MkIdentifier("noHeadClass"))),
8106                                                    OR_OP,
8107                                                 // normalClass
8108                                                 MkExpOp(MkExpMember(CopyExpression(classExp), MkIdentifier("type")), EQ_OP, MkExpIdentifier(MkIdentifier("normalClass")))))),
8109                                                    MkListOne(MkExpTypeSize(MkTypeName(MkListOne(MkSpecifier(VOID)), MkDeclaratorPointer(
8110                                                       MkPointer(null, null), null)))),
8111                                                       MkExpMember(classExp, MkIdentifier("typeSize")))))
8112
8113
8114                                              ));
8115
8116                                     ProcessExpressionType(((Expression)exp.list->first).op.exp2);
8117                                     FreeType(dummy);
8118                                     return;
8119                                  }
8120                               }
8121                            }
8122                         }
8123                      }
8124
8125                      if(!success && exp.op.exp1.type == constantExp)
8126                      {
8127                         // If first expression is constant, try to match that first
8128                         if(CheckExpressionType(exp.op.exp1, exp.op.exp1.destType, false))
8129                         {
8130                            if(exp.expType) FreeType(exp.expType);
8131                            exp.expType = exp.op.exp1.destType;
8132                            if(exp.op.exp1.destType) exp.op.exp1.destType.refCount++;
8133                            success = true;
8134                         }
8135                         else if(CheckExpressionType(exp.op.exp2, exp.op.exp2.destType, false))
8136                         {
8137                            if(exp.expType) FreeType(exp.expType);
8138                            exp.expType = exp.op.exp2.destType;
8139                            if(exp.op.exp2.destType) exp.op.exp2.destType.refCount++;
8140                            success = true;
8141                         }
8142                      }
8143                      else if(!success)
8144                      {
8145                         if(CheckExpressionType(exp.op.exp2, exp.op.exp2.destType, false))
8146                         {
8147                            if(exp.expType) FreeType(exp.expType);
8148                            exp.expType = exp.op.exp2.destType;
8149                            if(exp.op.exp2.destType) exp.op.exp2.destType.refCount++;
8150                            success = true;
8151                         }
8152                         else if(CheckExpressionType(exp.op.exp1, exp.op.exp1.destType, false))
8153                         {
8154                            if(exp.expType) FreeType(exp.expType);
8155                            exp.expType = exp.op.exp1.destType;
8156                            if(exp.op.exp1.destType) exp.op.exp1.destType.refCount++;
8157                            success = true;
8158                         }
8159                      }
8160                      if(!success)
8161                      {
8162                         char expString1[10240];
8163                         char expString2[10240];
8164                         char type1[1024];
8165                         char type2[1024];
8166                         expString1[0] = '\0';
8167                         expString2[0] = '\0';
8168                         type1[0] = '\0';
8169                         type2[0] = '\0';
8170                         if(inCompiler)
8171                         {
8172                            PrintExpression(exp.op.exp1, expString1);
8173                            ChangeCh(expString1, '\n', ' ');
8174                            PrintExpression(exp.op.exp2, expString2);
8175                            ChangeCh(expString2, '\n', ' ');
8176                            PrintType(exp.op.exp1.expType, type1, false, true);
8177                            PrintType(exp.op.exp2.expType, type2, false, true);
8178                         }
8179
8180                         Compiler_Warning($"incompatible expressions %s (%s) and %s (%s)\n", expString1, type1, expString2, type2);
8181                      }
8182                   }
8183                }
8184                // ADDED THESE TWO FROM OUTSIDE useSideType CHECK
8185                else if(!boolResult && (!useSideUnit /*|| exp.destType*/) && type2 && type1 && type2.kind == classType && type1.kind != classType && type2._class && type2._class.registered && type2._class.registered.type == unitClass)
8186                {
8187                   if(exp.op.exp1.destType) FreeType(exp.op.exp1.destType);
8188                   // Convert e.g. / 4 into / 4.0
8189                   exp.op.exp1.destType = type2._class.registered.dataType;
8190                   if(type2._class.registered.dataType)
8191                      type2._class.registered.dataType.refCount++;
8192                   CheckExpressionType(exp.op.exp1, exp.op.exp1.destType, false);
8193                   exp.expType = type2;
8194                   if(type2) type2.refCount++;
8195                }
8196                else if(!boolResult && (!useSideUnit /*|| exp.destType*/) && type1 && type2 && type1.kind == classType && type2.kind != classType && type1._class && type1._class.registered && type1._class.registered.type == unitClass)
8197                {
8198                   if(exp.op.exp2.destType) FreeType(exp.op.exp2.destType);
8199                   // Convert e.g. / 4 into / 4.0
8200                   exp.op.exp2.destType = type1._class.registered.dataType;
8201                   if(type1._class.registered.dataType)
8202                      type1._class.registered.dataType.refCount++;
8203                   CheckExpressionType(exp.op.exp2, exp.op.exp2.destType, false);
8204                   exp.expType = type1;
8205                   if(type1) type1.refCount++;
8206                }
8207                else if(type1)
8208                {
8209                   bool valid = false;
8210
8211                   if(!boolResult && useSideUnit && type1 && type1.kind == classType && type1._class.registered && type1._class.registered.type == unitClass && type2 && type2.kind != classType)
8212                   {
8213                      if(exp.op.exp2.destType) FreeType(exp.op.exp2.destType);
8214
8215                      if(!type1._class.registered.dataType)
8216                         type1._class.registered.dataType = ProcessTypeString(type1._class.registered.dataTypeString, false);
8217                      exp.op.exp2.destType = type1._class.registered.dataType;
8218                      exp.op.exp2.destType.refCount++;
8219
8220                      CheckExpressionType(exp.op.exp2, exp.op.exp2.destType, false);
8221                      type2 = exp.op.exp2.destType;
8222
8223                      exp.expType = type2;
8224                      type2.refCount++;
8225                   }
8226
8227                   if(!boolResult && useSideUnit && type2 && type2.kind == classType && type2._class.registered && type2._class.registered.type == unitClass && type1 && type1.kind != classType)
8228                   {
8229                      if(exp.op.exp1.destType) FreeType(exp.op.exp1.destType);
8230
8231                      if(!type2._class.registered.dataType)
8232                         type2._class.registered.dataType = ProcessTypeString(type2._class.registered.dataTypeString, false);
8233                      exp.op.exp1.destType = type2._class.registered.dataType;
8234                      exp.op.exp1.destType.refCount++;
8235
8236                      CheckExpressionType(exp.op.exp1, exp.op.exp1.destType, false);
8237                      type1 = exp.op.exp1.destType;
8238                      exp.expType = type1;
8239                      type1.refCount++;
8240                   }
8241
8242                   // TESTING THIS NEW CODE
8243                   if(!boolResult || exp.op.op == '>' || exp.op.op == '<')
8244                   {
8245                      if(type1.kind == classType && type1._class && type1._class.registered && type1._class.registered.type == enumClass && exp.op.exp2.expType)
8246                      {
8247                         if(CheckExpressionType(exp.op.exp1, exp.op.exp2.expType, false))
8248                         {
8249                            if(exp.expType) FreeType(exp.expType);
8250                            exp.expType = exp.op.exp1.expType;
8251                            if(exp.op.exp2.expType) exp.op.exp1.expType.refCount++;
8252                            valid = true;
8253                         }
8254                      }
8255
8256                      else if(type2 && (type2.kind == classType && type2._class && type2._class.registered && type2._class.registered.type == enumClass && exp.op.exp1.expType))
8257                      {
8258                         if(CheckExpressionType(exp.op.exp2, exp.op.exp1.expType, false))
8259                         {
8260                            if(exp.expType) FreeType(exp.expType);
8261                            exp.expType = exp.op.exp2.expType;
8262                            if(exp.op.exp2.expType) exp.op.exp2.expType.refCount++;
8263                            valid = true;
8264                         }
8265                      }
8266                   }
8267
8268                   if(!valid)
8269                   {
8270                      if(exp.op.exp2.destType) FreeType(exp.op.exp2.destType);
8271                      exp.op.exp2.destType = type1;
8272                      type1.refCount++;
8273
8274                      /*
8275                      // Maybe this was meant to be an enum...
8276                      if(type1.kind == classType && type1._class && type1._class.registered && type1._class.registered.type == enumClass)
8277                      {
8278                         Type oldType = exp.op.exp2.expType;
8279                         exp.op.exp2.expType = null;
8280                         if(CheckExpressionType(exp.op.exp2, exp.op.exp2.destType, false))
8281                            FreeType(oldType);
8282                         else
8283                            exp.op.exp2.expType = oldType;
8284                      }
8285                      */
8286
8287                      /*
8288                      // TESTING THIS HERE... LATEST ADDITION
8289                      if(type2 && type2.kind == classType && type2._class.registered && type2._class.registered.type == unitClass && type1 && type1.kind != classType)
8290                      {
8291                         if(exp.op.exp2.destType) FreeType(exp.op.exp2.destType);
8292                         exp.op.exp2.destType = type2._class.registered.dataType;
8293                         if(type2._class.registered.dataType)
8294                            type2._class.registered.dataType.refCount++;
8295                         CheckExpressionType(exp.op.exp2, exp.op.exp2.destType, false);
8296
8297                         //exp.expType = type2._class.registered.dataType; //type2;
8298                         //if(type2) type2.refCount++;
8299                      }
8300
8301                      // TESTING THIS HERE... LATEST ADDITION
8302                      if(type1 && type1.kind == classType && type1._class.registered && type1._class.registered.type == unitClass && type2 && type2.kind != classType)
8303                      {
8304                         if(exp.op.exp1.destType) FreeType(exp.op.exp1.destType);
8305                         exp.op.exp1.destType = type1._class.registered.dataType;
8306                         if(type1._class.registered.dataType)
8307                            type1._class.registered.dataType.refCount++;
8308                         CheckExpressionType(exp.op.exp1, exp.op.exp1.destType, false);
8309                         exp.expType = type1._class.registered.dataType; //type1;
8310                         if(type1) type1.refCount++;
8311                      }
8312                      */
8313
8314                      if(CheckExpressionType(exp.op.exp2, exp.op.exp2.destType, false))
8315                      {
8316                         if(exp.expType) FreeType(exp.expType);
8317                         exp.expType = exp.op.exp2.destType;
8318                         if(exp.op.exp2.destType) exp.op.exp2.destType.refCount++;
8319                      }
8320                      else if(type1 && type2)
8321                      {
8322                         char expString1[10240];
8323                         char expString2[10240];
8324                         char type1String[1024];
8325                         char type2String[1024];
8326                         expString1[0] = '\0';
8327                         expString2[0] = '\0';
8328                         type1String[0] = '\0';
8329                         type2String[0] = '\0';
8330                         if(inCompiler)
8331                         {
8332                            PrintExpression(exp.op.exp1, expString1);
8333                            ChangeCh(expString1, '\n', ' ');
8334                            PrintExpression(exp.op.exp2, expString2);
8335                            ChangeCh(expString2, '\n', ' ');
8336                            PrintType(exp.op.exp1.expType, type1String, false, true);
8337                            PrintType(exp.op.exp2.expType, type2String, false, true);
8338                         }
8339
8340                         Compiler_Warning($"incompatible expressions %s (%s) and %s (%s)\n", expString1, type1String, expString2, type2String);
8341
8342                         if(type1.kind == classType && type1._class && type1._class.registered && type1._class.registered.type == enumClass)
8343                         {
8344                            exp.expType = exp.op.exp1.expType;
8345                            if(exp.op.exp1.expType) exp.op.exp1.expType.refCount++;
8346                         }
8347                         else if(type2.kind == classType && type2._class && type2._class.registered && type2._class.registered.type == enumClass)
8348                         {
8349                            exp.expType = exp.op.exp2.expType;
8350                            if(exp.op.exp2.expType) exp.op.exp2.expType.refCount++;
8351                         }
8352                      }
8353                   }
8354                }
8355                else if(type2)
8356                {
8357                   // Maybe this was meant to be an enum...
8358                   if(type2.kind == classType && type2._class && type2._class.registered && type2._class.registered.type == enumClass)
8359                   {
8360                      Type oldType = exp.op.exp1.expType;
8361                      exp.op.exp1.expType = null;
8362                      if(CheckExpressionType(exp.op.exp1, exp.op.exp1.destType, false))
8363                         FreeType(oldType);
8364                      else
8365                         exp.op.exp1.expType = oldType;
8366                   }
8367
8368                   if(exp.op.exp1.destType) FreeType(exp.op.exp1.destType);
8369                   exp.op.exp1.destType = type2;
8370                   type2.refCount++;
8371                   /*
8372                   // TESTING THIS HERE... LATEST ADDITION
8373                   if(type1 && type1.kind == classType && type1._class.registered && type1._class.registered.type == unitClass && type2 && type2.kind != classType)
8374                   {
8375                      if(exp.op.exp1.destType) FreeType(exp.op.exp1.destType);
8376                      exp.op.exp1.destType = type1._class.registered.dataType;
8377                      if(type1._class.registered.dataType)
8378                         type1._class.registered.dataType.refCount++;
8379                   }
8380
8381                   // TESTING THIS HERE... LATEST ADDITION
8382                   if(type2 && type2.kind == classType && type2._class.registered && type2._class.registered.type == unitClass && type1 && type1.kind != classType)
8383                   {
8384                      if(exp.op.exp2.destType) FreeType(exp.op.exp2.destType);
8385                      exp.op.exp2.destType = type2._class.registered.dataType;
8386                      if(type2._class.registered.dataType)
8387                         type2._class.registered.dataType.refCount++;
8388                   }
8389                   */
8390
8391                   if(CheckExpressionType(exp.op.exp1, exp.op.exp1.destType, false))
8392                   {
8393                      if(exp.expType) FreeType(exp.expType);
8394                      exp.expType = exp.op.exp1.destType;
8395                      if(exp.op.exp1.destType) exp.op.exp1.destType.refCount++;
8396                   }
8397                }
8398             }
8399             else if(type2 && (!type1 || (type2.kind == classType && type1.kind != classType)))
8400             {
8401                if(type1 && type2._class && type2._class.registered && type2._class.registered.type == unitClass)
8402                {
8403                   if(exp.op.exp1.destType) FreeType(exp.op.exp1.destType);
8404                   // Convert e.g. / 4 into / 4.0
8405                   exp.op.exp1.destType = type2._class.registered.dataType;
8406                   if(type2._class.registered.dataType)
8407                      type2._class.registered.dataType.refCount++;
8408                   CheckExpressionType(exp.op.exp1, exp.op.exp1.destType, false);
8409                }
8410                if(exp.op.op == '!')
8411                {
8412                   exp.expType = MkClassType("bool");
8413                   exp.expType.truth = true;
8414                }
8415                else
8416                {
8417                   exp.expType = type2;
8418                   if(type2) type2.refCount++;
8419                }
8420             }
8421             else if(type1 && (!type2 || (type1.kind == classType && type2.kind != classType)))
8422             {
8423                if(type2 && type1._class && type1._class.registered && type1._class.registered.type == unitClass)
8424                {
8425                   if(exp.op.exp2.destType) FreeType(exp.op.exp2.destType);
8426                   // Convert e.g. / 4 into / 4.0
8427                   exp.op.exp2.destType = type1._class.registered.dataType;
8428                   if(type1._class.registered.dataType)
8429                      type1._class.registered.dataType.refCount++;
8430                   CheckExpressionType(exp.op.exp2, exp.op.exp2.destType, false);
8431                }
8432                exp.expType = type1;
8433                if(type1) type1.refCount++;
8434             }
8435          }
8436
8437          yylloc = exp.loc;
8438          if(exp.op.exp1 && !exp.op.exp1.expType)
8439          {
8440             char expString[10000];
8441             expString[0] = '\0';
8442             if(inCompiler)
8443             {
8444                PrintExpression(exp.op.exp1, expString);
8445                ChangeCh(expString, '\n', ' ');
8446             }
8447             if(expString[0])
8448                Compiler_Error($"couldn't determine type of %s\n", expString);
8449          }
8450          if(exp.op.exp2 && !exp.op.exp2.expType)
8451          {
8452             char expString[10240];
8453             expString[0] = '\0';
8454             if(inCompiler)
8455             {
8456                PrintExpression(exp.op.exp2, expString);
8457                ChangeCh(expString, '\n', ' ');
8458             }
8459             if(expString[0])
8460                Compiler_Error($"couldn't determine type of %s\n", expString);
8461          }
8462
8463          if(boolResult)
8464          {
8465             FreeType(exp.expType);
8466             exp.expType = MkClassType("bool");
8467             exp.expType.truth = true;
8468          }
8469
8470          if(exp.op.op != SIZEOF)
8471             exp.isConstant = (!exp.op.exp1 || exp.op.exp1.isConstant) &&
8472                (!exp.op.exp2 || exp.op.exp2.isConstant);
8473
8474          if(exp.op.op == SIZEOF && exp.op.exp2.expType)
8475          {
8476             DeclareType(exp.op.exp2.expType, false, false);
8477          }
8478
8479          yylloc = oldyylloc;
8480
8481          FreeType(dummy);
8482          break;
8483       }
8484       case bracketsExp:
8485       case extensionExpressionExp:
8486       {
8487          Expression e;
8488          exp.isConstant = true;
8489          for(e = exp.list->first; e; e = e.next)
8490          {
8491             bool inced = false;
8492             if(!e.next)
8493             {
8494                FreeType(e.destType);
8495                e.destType = exp.destType;
8496                if(e.destType) { exp.destType.refCount++; e.destType.count++; inced = true; }
8497             }
8498             ProcessExpressionType(e);
8499             if(inced)
8500                exp.destType.count--;
8501             if(!exp.expType && !e.next)
8502             {
8503                exp.expType = e.expType;
8504                if(e.expType) e.expType.refCount++;
8505             }
8506             if(!e.isConstant)
8507                exp.isConstant = false;
8508          }
8509
8510          // In case a cast became a member...
8511          e = exp.list->first;
8512          if(!e.next && e.type == memberExp)
8513          {
8514             // Preserve prev, next
8515             Expression next = exp.next, prev = exp.prev;
8516
8517
8518             FreeType(exp.expType);
8519             FreeType(exp.destType);
8520             delete exp.list;
8521
8522             *exp = *e;
8523
8524             exp.prev = prev;
8525             exp.next = next;
8526
8527             delete e;
8528
8529             ProcessExpressionType(exp);
8530          }
8531          break;
8532       }
8533       case indexExp:
8534       {
8535          Expression e;
8536          exp.isConstant = true;
8537
8538          ProcessExpressionType(exp.index.exp);
8539          if(!exp.index.exp.isConstant)
8540             exp.isConstant = false;
8541
8542          if(exp.index.exp.expType)
8543          {
8544             Type source = exp.index.exp.expType;
8545             if(source.kind == classType && source._class && source._class.registered)
8546             {
8547                Class _class = source._class.registered;
8548                Class c = _class.templateClass ? _class.templateClass : _class;
8549                if(_class != containerClass && eClass_IsDerived(c, containerClass) && _class.templateArgs)
8550                {
8551                   exp.expType = ProcessTypeString(_class.templateArgs[2].dataTypeString, false);
8552
8553                   if(exp.index.index && exp.index.index->last)
8554                   {
8555                      ((Expression)exp.index.index->last).destType = ProcessTypeString(_class.templateArgs[1].dataTypeString, false);
8556                   }
8557                }
8558             }
8559          }
8560
8561          for(e = exp.index.index->first; e; e = e.next)
8562          {
8563             if(!e.next && exp.index.exp.expType && exp.index.exp.expType.kind == arrayType && exp.index.exp.expType.enumClass)
8564             {
8565                if(e.destType) FreeType(e.destType);
8566                e.destType = MkClassType(exp.index.exp.expType.enumClass.string);
8567             }
8568             ProcessExpressionType(e);
8569             if(!e.next)
8570             {
8571                // Check if this type is int
8572             }
8573             if(!e.isConstant)
8574                exp.isConstant = false;
8575          }
8576
8577          if(!exp.expType)
8578             exp.expType = Dereference(exp.index.exp.expType);
8579          if(exp.expType)
8580             DeclareType(exp.expType, false, false);
8581          break;
8582       }
8583       case callExp:
8584       {
8585          Expression e;
8586          Type functionType;
8587          Type methodType = null;
8588          char name[1024];
8589          name[0] = '\0';
8590
8591          if(inCompiler)
8592          {
8593             PrintExpression(exp.call.exp,  name);
8594             if(exp.call.exp.expType && !exp.call.exp.expType.returnType)
8595             {
8596                //exp.call.exp.expType = null;
8597                PrintExpression(exp.call.exp,  name);
8598             }
8599          }
8600          if(exp.call.exp.type == identifierExp)
8601          {
8602             Expression idExp = exp.call.exp;
8603             Identifier id = idExp.identifier;
8604             if(!strcmp(id.string, "__builtin_frame_address"))
8605             {
8606                exp.expType = ProcessTypeString("void *", true);
8607                if(exp.call.arguments && exp.call.arguments->first)
8608                   ProcessExpressionType(exp.call.arguments->first);
8609                break;
8610             }
8611             else if(!strcmp(id.string, "__ENDIAN_PAD"))
8612             {
8613                exp.expType = ProcessTypeString("int", true);
8614                if(exp.call.arguments && exp.call.arguments->first)
8615                   ProcessExpressionType(exp.call.arguments->first);
8616                break;
8617             }
8618             else if(!strcmp(id.string, "Max") ||
8619                !strcmp(id.string, "Min") ||
8620                !strcmp(id.string, "Sgn") ||
8621                !strcmp(id.string, "Abs"))
8622             {
8623                Expression a = null;
8624                Expression b = null;
8625                Expression tempExp1 = null, tempExp2 = null;
8626                if((!strcmp(id.string, "Max") ||
8627                   !strcmp(id.string, "Min")) && exp.call.arguments->count == 2)
8628                {
8629                   a = exp.call.arguments->first;
8630                   b = exp.call.arguments->last;
8631                   tempExp1 = a;
8632                   tempExp2 = b;
8633                }
8634                else if(exp.call.arguments->count == 1)
8635                {
8636                   a = exp.call.arguments->first;
8637                   tempExp1 = a;
8638                }
8639
8640                if(a)
8641                {
8642                   exp.call.arguments->Clear();
8643                   idExp.identifier = null;
8644
8645                   FreeExpContents(exp);
8646
8647                   ProcessExpressionType(a);
8648                   if(b)
8649                      ProcessExpressionType(b);
8650
8651                   exp.type = bracketsExp;
8652                   exp.list = MkList();
8653
8654                   if(a.expType && (!b || b.expType))
8655                   {
8656                      if((!a.isConstant && a.type != identifierExp) || (b && !b.isConstant && b.type != identifierExp))
8657                      {
8658                         // Use the simpleStruct name/ids for now...
8659                         if(inCompiler)
8660                         {
8661                            OldList * specs = MkList();
8662                            OldList * decls = MkList();
8663                            Declaration decl;
8664                            char temp1[1024], temp2[1024];
8665
8666                            GetTypeSpecs(a.expType, specs);
8667
8668                            if(a && !a.isConstant && a.type != identifierExp)
8669                            {
8670                               sprintf(temp1, "__simpleStruct%d", curContext.simpleID++);
8671                               ListAdd(decls, MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier(temp1)), null));
8672                               tempExp1 = QMkExpId(temp1);
8673                               tempExp1.expType = a.expType;
8674                               if(a.expType)
8675                                  a.expType.refCount++;
8676                               ListAdd(exp.list, MkExpOp(CopyExpression(tempExp1), '=', a));
8677                            }
8678                            if(b && !b.isConstant && b.type != identifierExp)
8679                            {
8680                               sprintf(temp2, "__simpleStruct%d", curContext.simpleID++);
8681                               ListAdd(decls, MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier(temp2)), null));
8682                               tempExp2 = QMkExpId(temp2);
8683                               tempExp2.expType = b.expType;
8684                               if(b.expType)
8685                                  b.expType.refCount++;
8686                               ListAdd(exp.list, MkExpOp(CopyExpression(tempExp2), '=', b));
8687                            }
8688
8689                            decl = MkDeclaration(specs, decls);
8690                            if(!curCompound.compound.declarations)
8691                               curCompound.compound.declarations = MkList();
8692                            curCompound.compound.declarations->Insert(null, decl);
8693                         }
8694                      }
8695                   }
8696
8697                   if(!strcmp(id.string, "Max") || !strcmp(id.string, "Min"))
8698                   {
8699                      int op = (!strcmp(id.string, "Max")) ? '>' : '<';
8700                      ListAdd(exp.list,
8701                         MkExpCondition(MkExpBrackets(MkListOne(
8702                            MkExpOp(CopyExpression(tempExp1), op, CopyExpression(tempExp2)))),
8703                            MkListOne(CopyExpression(tempExp1)), CopyExpression(tempExp2)));
8704                      exp.expType = a.expType;
8705                      if(a.expType)
8706                         a.expType.refCount++;
8707                   }
8708                   else if(!strcmp(id.string, "Abs"))
8709                   {
8710                      ListAdd(exp.list,
8711                         MkExpCondition(MkExpBrackets(MkListOne(
8712                            MkExpOp(CopyExpression(tempExp1), '<', MkExpConstant("0")))),
8713                            MkListOne(MkExpOp(null, '-', CopyExpression(tempExp1))), CopyExpression(tempExp1)));
8714                      exp.expType = a.expType;
8715                      if(a.expType)
8716                         a.expType.refCount++;
8717                   }
8718                   else if(!strcmp(id.string, "Sgn"))
8719                   {
8720                      // ((!(a))?(0):(((a)<0)?(-1):(1)))
8721                      ListAdd(exp.list,
8722                         MkExpCondition(MkExpBrackets(MkListOne(
8723                            MkExpOp(null, '!', CopyExpression(tempExp1)))), MkListOne(MkExpConstant("0")),
8724                               MkExpBrackets(MkListOne(MkExpCondition(MkExpBrackets(MkListOne(
8725                                  MkExpOp(CopyExpression(tempExp1), '<', MkExpConstant("0")))),
8726                                  MkListOne(MkExpConstant("-1")), MkExpConstant("1"))))));
8727                      exp.expType = ProcessTypeString("int", false);
8728                   }
8729
8730                   FreeExpression(tempExp1);
8731                   if(tempExp2) FreeExpression(tempExp2);
8732
8733                   FreeIdentifier(id);
8734                   break;
8735                }
8736             }
8737          }
8738
8739          {
8740             Type dummy
8741             {
8742                count = 1;
8743                refCount = 1;
8744             };
8745             if(!exp.call.exp.destType)
8746             {
8747                exp.call.exp.destType = dummy;
8748                dummy.refCount++;
8749             }
8750             ProcessExpressionType(exp.call.exp);
8751             if(exp.call.exp.destType == dummy)
8752             {
8753                FreeType(dummy);
8754                exp.call.exp.destType = null;
8755             }
8756             FreeType(dummy);
8757          }
8758
8759          // Check argument types against parameter types
8760          functionType = exp.call.exp.expType;
8761
8762          if(functionType && functionType.kind == TypeKind::methodType)
8763          {
8764             methodType = functionType;
8765             functionType = methodType.method.dataType;
8766
8767             //if(functionType.returnType && functionType.returnType.kind == thisClassType)
8768             // TOCHECK: Instead of doing this here could this be done per param?
8769             if(exp.call.exp.expType.usedClass)
8770             {
8771                char typeString[1024];
8772                typeString[0] = '\0';
8773                {
8774                   Symbol back = functionType.thisClass;
8775                   // Do not output class specifier here (thisclass was added to this)
8776                   functionType.thisClass = null;
8777                   PrintType(functionType, typeString, true, true);
8778                   functionType.thisClass = back;
8779                }
8780                if(strstr(typeString, "thisclass"))
8781                {
8782                   OldList * specs = MkList();
8783                   Declarator decl;
8784                   {
8785                      Context context = SetupTemplatesContext(exp.call.exp.expType.usedClass);
8786
8787                      decl = SpecDeclFromString(typeString, specs, null);
8788
8789                      // SET THIS TO FALSE WHEN PROCESSING THISCLASS OUTSIDE THE CLASS
8790                      if(thisClass != (exp.call.exp.expType.usedClass.templateClass ? exp.call.exp.expType.usedClass.templateClass :
8791                         exp.call.exp.expType.usedClass))
8792                         thisClassParams = false;
8793
8794                      ReplaceThisClassSpecifiers(specs, exp.call.exp.expType.usedClass);
8795                      {
8796                         Class backupThisClass = thisClass;
8797                         thisClass = exp.call.exp.expType.usedClass;
8798                         ProcessDeclarator(decl);
8799                         thisClass = backupThisClass;
8800                      }
8801
8802                      thisClassParams = true;
8803
8804                      functionType = ProcessType(specs, decl);
8805                      functionType.refCount = 0;
8806                      FinishTemplatesContext(context);
8807                   }
8808
8809                   FreeList(specs, FreeSpecifier);
8810                   FreeDeclarator(decl);
8811                 }
8812             }
8813          }
8814          if(functionType && functionType.kind == pointerType && functionType.type && functionType.type.kind == TypeKind::functionType)
8815          {
8816             Type type = functionType.type;
8817             if(!functionType.refCount)
8818             {
8819                functionType.type = null;
8820                FreeType(functionType);
8821             }
8822             //methodType = functionType;
8823             functionType = type;
8824          }
8825          if(functionType && functionType.kind != TypeKind::functionType)
8826          {
8827             Compiler_Error($"called object %s is not a function\n", name);
8828          }
8829          else if(functionType)
8830          {
8831             bool emptyParams = false, noParams = false;
8832             Expression e = exp.call.arguments ? exp.call.arguments->first : null;
8833             Type type = functionType.params.first;
8834             Expression memberExp = (exp.call.exp.type == ExpressionType::memberExp) ? exp.call.exp : null;
8835             int extra = 0;
8836             Location oldyylloc = yylloc;
8837
8838             if(!type) emptyParams = true;
8839
8840             // WORKING ON THIS:
8841             if(functionType.extraParam && e && functionType.thisClass)
8842             {
8843                e.destType = MkClassType(functionType.thisClass.string);
8844                e = e.next;
8845             }
8846
8847             // WHY WAS THIS COMMENTED OUT ? Broke DisplaySystem::FontExtent(this ? displaySystem : null, font, text, len, width, height);
8848             // Fixed #141 by adding '&& !functionType.extraParam'
8849             if(!functionType.staticMethod && !functionType.extraParam)
8850             {
8851                if(memberExp && memberExp.member.exp && memberExp.member.exp.expType && memberExp.member.exp.expType.kind == subClassType &&
8852                   memberExp.member.exp.expType._class)
8853                {
8854                   type = MkClassType(memberExp.member.exp.expType._class.string);
8855                   if(e)
8856                   {
8857                      e.destType = type;
8858                      e = e.next;
8859                      type = functionType.params.first;
8860                   }
8861                   else
8862                      type.refCount = 0;
8863                }
8864                else if(!memberExp && (functionType.thisClass || (methodType && methodType.methodClass)))
8865                {
8866                   type = MkClassType(functionType.thisClass ? functionType.thisClass.string : (methodType ? methodType.methodClass.fullName : null));
8867                   type.byReference = functionType.byReference;
8868                   type.typedByReference = functionType.typedByReference;
8869                   if(e)
8870                   {
8871                      // Allow manually passing a class for typed object
8872                      if(type.kind == classType && (functionType && functionType.thisClass) && functionType.classObjectType == typedObject)
8873                         e = e.next;
8874                      e.destType = type;
8875                      e = e.next;
8876                      type = functionType.params.first;
8877                   }
8878                   else
8879                      type.refCount = 0;
8880                   //extra = 1;
8881                }
8882             }
8883
8884             if(type && type.kind == voidType)
8885             {
8886                noParams = true;
8887                if(!type.refCount) FreeType(type);
8888                type = null;
8889             }
8890
8891             for( ; e; e = e.next)
8892             {
8893                if(!type && !emptyParams)
8894                {
8895                   yylloc = e.loc;
8896                   if(methodType && methodType.methodClass)
8897                      Compiler_Error($"too many arguments for method %s::%s (%d given, expected %d)\n",
8898                         methodType.methodClass.fullName, methodType.method.name, exp.call.arguments->count,
8899                         noParams ? 0 : functionType.params.count);
8900                   else
8901                      Compiler_Error($"too many arguments for function %s (%d given, expected %d)\n",
8902                         name /*exp.call.exp.identifier.string*/, exp.call.arguments->count,
8903                         noParams ? 0 : functionType.params.count);
8904                   break;
8905                }
8906
8907                if(methodType && type && type.kind == templateType && type.templateParameter.type == TemplateParameterType::type)
8908                {
8909                   Type templatedType = null;
8910                   Class _class = methodType.usedClass;
8911                   ClassTemplateParameter curParam = null;
8912                   int id = 0;
8913                   if(_class && _class.templateArgs /*&& _class.templateClass*/)
8914                   {
8915                      Class sClass;
8916                      for(sClass = _class; sClass; sClass = sClass.base)
8917                      {
8918                         if(sClass.templateClass) sClass = sClass.templateClass;
8919                         id = 0;
8920                         for(curParam = sClass.templateParams.first; curParam; curParam = curParam.next)
8921                         {
8922                            if(curParam.type == TemplateParameterType::type && !strcmp(type.templateParameter.identifier.string, curParam.name))
8923                            {
8924                               Class nextClass;
8925                               for(nextClass = sClass.base; nextClass; nextClass = nextClass.base)
8926                               {
8927                                  if(nextClass.templateClass) nextClass = nextClass.templateClass;
8928                                  id += nextClass.templateParams.count;
8929                               }
8930                               break;
8931                            }
8932                            id++;
8933                         }
8934                         if(curParam) break;
8935                      }
8936                   }
8937                   if(curParam && _class.templateArgs[id].dataTypeString)
8938                   {
8939                      ClassTemplateArgument arg = _class.templateArgs[id];
8940                      {
8941                         Context context = SetupTemplatesContext(_class);
8942
8943                         /*if(!arg.dataType)
8944                            arg.dataType = ProcessTypeString(arg.dataTypeString, false);*/
8945                         templatedType = ProcessTypeString(arg.dataTypeString, false);
8946                         FinishTemplatesContext(context);
8947                      }
8948                      e.destType = templatedType;
8949                      if(templatedType)
8950                      {
8951                         templatedType.passAsTemplate = true;
8952                         // templatedType.refCount++;
8953                      }
8954                   }
8955                   else
8956                   {
8957                      e.destType = type;
8958                      if(type) type.refCount++;
8959                   }
8960                }
8961                else
8962                {
8963                   if(type && type.kind == ellipsisType && type.prev && type.prev.kind == classType && type.prev.classObjectType)
8964                   {
8965                      e.destType = type.prev;
8966                      e.destType.refCount++;
8967                   }
8968                   else
8969                   {
8970                      e.destType = type;
8971                      if(type) type.refCount++;
8972                   }
8973                }
8974                // Don't reach the end for the ellipsis
8975                if(type && type.kind != ellipsisType)
8976                {
8977                   Type next = type.next;
8978                   if(!type.refCount) FreeType(type);
8979                   type = next;
8980                }
8981             }
8982
8983             if(type && type.kind != ellipsisType)
8984             {
8985                if(methodType && methodType.methodClass)
8986                   Compiler_Warning($"not enough arguments for method %s::%s (%d given, expected %d)\n",
8987                      methodType.methodClass.fullName, methodType.method.name, exp.call.arguments ? exp.call.arguments->count : 0,
8988                      functionType.params.count + extra);
8989                else
8990                   Compiler_Warning($"not enough arguments for function %s (%d given, expected %d)\n",
8991                      name /*exp.call.exp.identifier.string*/, exp.call.arguments ? exp.call.arguments->count : 0,
8992                      functionType.params.count + extra);
8993             }
8994             yylloc = oldyylloc;
8995             if(type && !type.refCount) FreeType(type);
8996          }
8997          else
8998          {
8999             functionType = Type
9000             {
9001                refCount = 0;
9002                kind = TypeKind::functionType;
9003             };
9004
9005             if(exp.call.exp.type == identifierExp)
9006             {
9007                char * string = exp.call.exp.identifier.string;
9008                if(inCompiler)
9009                {
9010                   Symbol symbol;
9011                   Location oldyylloc = yylloc;
9012
9013                   yylloc = exp.call.exp.identifier.loc;
9014                   if(strstr(string, "__builtin_") == string)
9015                   {
9016                      if(exp.destType)
9017                      {
9018                         functionType.returnType = exp.destType;
9019                         exp.destType.refCount++;
9020                      }
9021                   }
9022                   else
9023                      Compiler_Warning($"%s undefined; assuming extern returning int\n", string);
9024                   symbol = Symbol { string = CopyString(string), type = ProcessTypeString("int()", true) };
9025                   globalContext.symbols.Add((BTNode)symbol);
9026                   if(strstr(symbol.string, "::"))
9027                      globalContext.hasNameSpace = true;
9028
9029                   yylloc = oldyylloc;
9030                }
9031             }
9032             else if(exp.call.exp.type == memberExp)
9033             {
9034                /*Compiler_Warning($"%s undefined; assuming returning int\n",
9035                   exp.call.exp.member.member.string);*/
9036             }
9037             else
9038                Compiler_Warning($"callable object undefined; extern assuming returning int\n");
9039
9040             if(!functionType.returnType)
9041             {
9042                functionType.returnType = Type
9043                {
9044                   refCount = 1;
9045                   kind = intType;
9046                };
9047             }
9048          }
9049          if(functionType && functionType.kind == TypeKind::functionType)
9050          {
9051             exp.expType = functionType.returnType;
9052
9053             if(functionType.returnType)
9054                functionType.returnType.refCount++;
9055
9056             if(!functionType.refCount)
9057                FreeType(functionType);
9058          }
9059
9060          if(exp.call.arguments)
9061          {
9062             for(e = exp.call.arguments->first; e; e = e.next)
9063             {
9064                Type destType = e.destType;
9065                ProcessExpressionType(e);
9066             }
9067          }
9068          break;
9069       }
9070       case memberExp:
9071       {
9072          Type type;
9073          Location oldyylloc = yylloc;
9074          bool thisPtr;// = (exp.member.exp && exp.member.exp.type == identifierExp && !strcmp(exp.member.exp.identifier.string, "this");
9075          Expression checkExp = exp.member.exp;
9076          while(checkExp)
9077          {
9078             if(checkExp.type == castExp)
9079                checkExp = checkExp.cast.exp;
9080             else if(checkExp.type == bracketsExp)
9081                checkExp = checkExp.list ? checkExp.list->first : null;
9082             else
9083                break;
9084          }
9085
9086          thisPtr = (checkExp && checkExp.type == identifierExp && !strcmp(checkExp.identifier.string, "this"));
9087          exp.thisPtr = thisPtr;
9088
9089          // DOING THIS LATER NOW...
9090          if(exp.member.member && exp.member.member._class && exp.member.member._class.name)
9091          {
9092             exp.member.member.classSym = exp.member.member._class.symbol; // FindClass(exp.member.member._class.name);
9093             /* TODO: Name Space Fix ups
9094             if(!exp.member.member.classSym)
9095                exp.member.member.nameSpace = eSystem_FindNameSpace(privateModule, exp.member.member._class.fullName);
9096             */
9097          }
9098
9099          ProcessExpressionType(exp.member.exp);
9100          if(exp.member.exp.expType && exp.member.exp.expType.kind == classType && exp.member.exp.expType._class &&
9101             exp.member.exp.expType._class.registered && exp.member.exp.expType._class.registered.type == normalClass)
9102          {
9103             exp.isConstant = false;
9104          }
9105          else
9106             exp.isConstant = exp.member.exp.isConstant;
9107          type = exp.member.exp.expType;
9108
9109          yylloc = exp.loc;
9110
9111          if(type && (type.kind == templateType))
9112          {
9113             Class _class = thisClass ? thisClass : currentClass;
9114             ClassTemplateParameter param = null;
9115             if(_class)
9116             {
9117                for(param = _class.templateParams.first; param; param = param.next)
9118                {
9119                   if(param.type == identifier && exp.member.member && exp.member.member.string && !strcmp(param.name, exp.member.member.string))
9120                      break;
9121                }
9122             }
9123             if(param && param.defaultArg.member)
9124             {
9125                Expression argExp = GetTemplateArgExpByName(param.name, thisClass, TemplateParameterType::identifier);
9126                if(argExp)
9127                {
9128                   Expression expMember = exp.member.exp;
9129                   Declarator decl;
9130                   OldList * specs = MkList();
9131                   char thisClassTypeString[1024];
9132
9133                   FreeIdentifier(exp.member.member);
9134
9135                   ProcessExpressionType(argExp);
9136
9137                   {
9138                      char * colon = strstr(param.defaultArg.memberString, "::");
9139                      if(colon)
9140                      {
9141                         char className[1024];
9142                         Class sClass;
9143
9144                         memcpy(thisClassTypeString, param.defaultArg.memberString, colon - param.defaultArg.memberString);
9145                         thisClassTypeString[colon - param.defaultArg.memberString] = '\0';
9146                      }
9147                      else
9148                         strcpy(thisClassTypeString, _class.fullName);
9149                   }
9150
9151                   decl = SpecDeclFromString(param.defaultArg.member.dataTypeString, specs, null);
9152
9153                   exp.expType = ProcessType(specs, decl);
9154                   if(exp.expType.kind == classType && exp.expType._class && exp.expType._class.registered && exp.expType._class.registered.templateClass)
9155                   {
9156                      Class expClass = exp.expType._class.registered;
9157                      Class cClass = null;
9158                      int c;
9159                      int paramCount = 0;
9160                      int lastParam = -1;
9161
9162                      char templateString[1024];
9163                      ClassTemplateParameter param;
9164                      sprintf(templateString, "%s<", expClass.templateClass.fullName);
9165                      for(cClass = expClass; cClass; cClass = cClass.base)
9166                      {
9167                         int p = 0;
9168                         for(param = cClass.templateParams.first; param; param = param.next)
9169                         {
9170                            int id = p;
9171                            Class sClass;
9172                            ClassTemplateArgument arg;
9173                            for(sClass = cClass.base; sClass; sClass = sClass.base) id += sClass.templateParams.count;
9174                            arg = expClass.templateArgs[id];
9175
9176                            for(sClass = _class /*expClass*/; sClass; sClass = sClass.base)
9177                            {
9178                               ClassTemplateParameter cParam;
9179                               //int p = numParams - sClass.templateParams.count;
9180                               int p = 0;
9181                               Class nextClass;
9182                               for(nextClass = sClass.base; nextClass; nextClass = nextClass.base) p += nextClass.templateParams.count;
9183
9184                               for(cParam = sClass.templateParams.first; cParam; cParam = cParam.next, p++)
9185                               {
9186                                  if(cParam.type == TemplateParameterType::type && arg.dataTypeString && !strcmp(cParam.name, arg.dataTypeString))
9187                                  {
9188                                     if(_class.templateArgs && arg.dataTypeString && (!param.defaultArg.dataTypeString || strcmp(arg.dataTypeString, param.defaultArg.dataTypeString)))
9189                                     {
9190                                        arg.dataTypeString = _class.templateArgs[p].dataTypeString;
9191                                        arg.dataTypeClass = _class.templateArgs[p].dataTypeClass;
9192                                        break;
9193                                     }
9194                                  }
9195                               }
9196                            }
9197
9198                            {
9199                               char argument[256];
9200                               argument[0] = '\0';
9201                               /*if(arg.name)
9202                               {
9203                                  strcat(argument, arg.name.string);
9204                                  strcat(argument, " = ");
9205                               }*/
9206                               switch(param.type)
9207                               {
9208                                  case expression:
9209                                  {
9210                                     // THIS WHOLE THING IS A WILD GUESS... FIX IT UP
9211                                     char expString[1024];
9212                                     OldList * specs = MkList();
9213                                     Declarator decl = SpecDeclFromString(param.dataTypeString, specs, null);
9214                                     Expression exp;
9215                                     char * string = PrintHexUInt64(arg.expression.ui64);
9216                                     exp = MkExpCast(MkTypeName(specs, decl), MkExpConstant(string));
9217
9218                                     ProcessExpressionType(exp);
9219                                     ComputeExpression(exp);
9220                                     expString[0] = '\0';
9221                                     PrintExpression(exp, expString);
9222                                     strcat(argument, expString);
9223                                     // delete exp;
9224                                     FreeExpression(exp);
9225                                     break;
9226                                  }
9227                                  case identifier:
9228                                  {
9229                                     strcat(argument, arg.member.name);
9230                                     break;
9231                                  }
9232                                  case TemplateParameterType::type:
9233                                  {
9234                                     if(arg.dataTypeString && (!param.defaultArg.dataTypeString || strcmp(arg.dataTypeString, param.defaultArg.dataTypeString)))
9235                                     {
9236                                        if(!strcmp(arg.dataTypeString, "thisclass"))
9237                                           strcat(argument, thisClassTypeString);
9238                                        else
9239                                           strcat(argument, arg.dataTypeString);
9240                                     }
9241                                     break;
9242                                  }
9243                               }
9244                               if(argument[0])
9245                               {
9246                                  if(paramCount) strcat(templateString, ", ");
9247                                  if(lastParam != p - 1)
9248                                  {
9249                                     strcat(templateString, param.name);
9250                                     strcat(templateString, " = ");
9251                                  }
9252                                  strcat(templateString, argument);
9253                                  paramCount++;
9254                                  lastParam = p;
9255                               }
9256                               p++;
9257                            }
9258                         }
9259                      }
9260                      {
9261                         int len = strlen(templateString);
9262                         if(templateString[len-1] == '>') templateString[len++] = ' ';
9263                         templateString[len++] = '>';
9264                         templateString[len++] = '\0';
9265                      }
9266                      {
9267                         Context context = SetupTemplatesContext(_class);
9268                         FreeType(exp.expType);
9269                         exp.expType = ProcessTypeString(templateString, false);
9270                         FinishTemplatesContext(context);
9271                      }
9272                   }
9273
9274                   // *([expType] *)(((byte *)[exp.member.exp]) + [argExp].member.offset)
9275                   exp.type = bracketsExp;
9276                   exp.list = MkListOne(MkExpOp(null, '*',
9277                   /*opExp;
9278                   exp.op.op = '*';
9279                   exp.op.exp1 = null;
9280                   exp.op.exp2 = */
9281                   MkExpCast(MkTypeName(specs, MkDeclaratorPointer(MkPointer(null, null), decl)), MkExpBrackets(MkListOne(MkExpOp(
9282                      MkExpBrackets(MkListOne(
9283                         MkExpCast(MkTypeName(MkListOne(MkSpecifierName("byte")), MkDeclaratorPointer(MkPointer(null, null), null)), expMember))),
9284                            '+',
9285                            MkExpOp(MkExpMember(MkExpMember(argExp, MkIdentifier("member")), MkIdentifier("offset")),
9286                            '+',
9287                            MkExpMember(MkExpMember(MkExpMember(CopyExpression(argExp), MkIdentifier("member")), MkIdentifier("_class")), MkIdentifier("offset")))))))
9288
9289                            ));
9290                }
9291             }
9292             else if(type.templateParameter && type.templateParameter.type == TemplateParameterType::type &&
9293                (type.templateParameter.dataType || type.templateParameter.dataTypeString))
9294             {
9295                type = ProcessTemplateParameterType(type.templateParameter);
9296             }
9297          }
9298          // TODO: *** This seems to be where we should add method support for all basic types ***
9299          if(type && (type.kind == templateType));
9300          else if(type && (type.kind == classType || type.kind == subClassType || type.kind == intType || type.kind == enumType ||
9301                           type.kind == int64Type || type.kind == shortType || type.kind == longType || type.kind == charType ||
9302                           type.kind == intPtrType || type.kind == intSizeType || type.kind == floatType || type.kind == doubleType ||
9303                           (type.kind == pointerType && type.type.kind == charType)))
9304          {
9305             Identifier id = exp.member.member;
9306             TypeKind typeKind = type.kind;
9307             Class _class = (id && (!id._class || id._class.name))? ( id.classSym ? id.classSym.registered : (type._class ? type._class.registered : null)) : null;
9308             if(typeKind == subClassType && exp.member.exp.type == classExp)
9309             {
9310                _class = eSystem_FindClass(privateModule, "ecere::com::Class");
9311                typeKind = classType;
9312             }
9313
9314             if(id)
9315             {
9316                if(typeKind == intType || typeKind == enumType)
9317                   _class = eSystem_FindClass(privateModule, "int");
9318                else if(!_class)
9319                {
9320                   if(type.kind == classType && type._class && type._class.registered)
9321                   {
9322                      _class = type._class.registered;
9323                   }
9324                   else if((type.kind == arrayType || type.kind == pointerType) && type.type && type.type.kind == charType)
9325                   {
9326                      _class = FindClass("char *").registered;
9327                   }
9328                   else if(type.kind == pointerType)
9329                   {
9330                      _class = eSystem_FindClass(privateModule, "uintptr");
9331                      FreeType(exp.expType);
9332                      exp.expType = ProcessTypeString("uintptr", false);
9333                      exp.byReference = true;
9334                   }
9335                   else
9336                   {
9337                      char string[1024] = "";
9338                      Symbol classSym;
9339                      PrintTypeNoConst(type, string, false, true);
9340                      classSym = FindClass(string);
9341                      if(classSym) _class = classSym.registered;
9342                   }
9343                }
9344             }
9345
9346             if(_class && id)
9347             {
9348                /*bool thisPtr =
9349                   (exp.member.exp.type == identifierExp &&
9350                   !strcmp(exp.member.exp.identifier.string, "this"));*/
9351                Property prop = null;
9352                Method method = null;
9353                DataMember member = null;
9354                Property revConvert = null;
9355                ClassProperty classProp = null;
9356
9357                if(id && id._class && id._class.name && !strcmp(id._class.name, "property"))
9358                   exp.member.memberType = propertyMember;
9359
9360                if(id && id._class && type._class && !eClass_IsDerived(type._class.registered, _class))
9361                   Compiler_Error($"invalid class specifier %s for object of class %s\n", _class.fullName, type._class.string);
9362
9363                if(typeKind != subClassType)
9364                {
9365                   // Prioritize data members over properties for "this"
9366                   if((exp.member.memberType == unresolvedMember && thisPtr) || exp.member.memberType == dataMember)
9367                   {
9368                      member = eClass_FindDataMember(_class, id.string, privateModule, null, null);
9369                      if(member && member._class != (_class.templateClass ? _class.templateClass : _class) && exp.member.memberType != dataMember)
9370                      {
9371                         prop = eClass_FindProperty(_class, id.string, privateModule);
9372                         if(prop)
9373                            member = null;
9374                      }
9375                      if(!member && !prop)
9376                         prop = eClass_FindProperty(_class, id.string, privateModule);
9377                      if((member && member._class == (_class.templateClass ? _class.templateClass : _class)) ||
9378                         (prop && prop._class == (_class.templateClass ? _class.templateClass : _class)))
9379                         exp.member.thisPtr = true;
9380                   }
9381                   // Prioritize properties over data members otherwise
9382                   else
9383                   {
9384                      // First look for Public Members (Unless class specifier is provided, which skips public priority)
9385                      if(!id.classSym)
9386                      {
9387                         prop = eClass_FindProperty(_class, id.string, null);
9388                         if(!id._class || !id._class.name || strcmp(id._class.name, "property"))
9389                            member = eClass_FindDataMember(_class, id.string, null, null, null);
9390                      }
9391
9392                      if(!prop && !member)
9393                      {
9394                         method = eClass_FindMethod(_class, id.string, null);
9395                         if(!method)
9396                         {
9397                            prop = eClass_FindProperty(_class, id.string, privateModule);
9398                            if(!id._class || !id._class.name || strcmp(id._class.name, "property"))
9399                               member = eClass_FindDataMember(_class, id.string, privateModule, null, null);
9400                         }
9401                      }
9402
9403                      if(member && prop)
9404                      {
9405                         if(member._class != prop._class && !id._class && eClass_IsDerived(member._class, prop._class))
9406                            prop = null;
9407                         else
9408                            member = null;
9409                      }
9410                   }
9411                }
9412                if(!prop && !member && !method)     // NOTE: Recently added the !method here, causes private methods to unprioritized
9413                   method = eClass_FindMethod(_class, id.string, privateModule);
9414                if(!prop && !member && !method)
9415                {
9416                   if(typeKind == subClassType)
9417                   {
9418                      classProp = eClass_FindClassProperty(type._class.registered, exp.member.member.string);
9419                      if(classProp)
9420                      {
9421                         exp.member.memberType = classPropertyMember;
9422                         exp.expType = ProcessTypeString(classProp.dataTypeString, false);
9423                      }
9424                      else
9425                      {
9426                         // Assume this is a class_data member
9427                         char structName[1024];
9428                         Identifier id = exp.member.member;
9429                         Expression classExp = exp.member.exp;
9430                         type.refCount++;
9431
9432                         FreeType(classExp.expType);
9433                         classExp.expType = ProcessTypeString("ecere::com::Class", false);
9434
9435                         strcpy(structName, "__ecereClassData_");
9436                         FullClassNameCat(structName, type._class.string, false);
9437                         exp.type = pointerExp;
9438                         exp.member.member = id;
9439
9440                         exp.member.exp = MkExpBrackets(MkListOne(MkExpCast(
9441                            MkTypeName(MkListOne(MkStructOrUnion(structSpecifier, MkIdentifier(structName), null)), MkDeclaratorPointer(MkPointer(null, null), null)),
9442                               MkExpBrackets(MkListOne(MkExpOp(
9443                                  MkExpCast(MkTypeName(MkListOne(MkSpecifier(CHAR)), MkDeclaratorPointer(MkPointer(null,null), null)),
9444                                     MkExpMember(classExp, MkIdentifier("data"))), '+',
9445                                        MkExpMember(MkExpClass(MkListOne(MkSpecifierName(type._class.string)), null), MkIdentifier("offsetClass")))))
9446                                  )));
9447
9448                         FreeType(type);
9449
9450                         ProcessExpressionType(exp);
9451                         return;
9452                      }
9453                   }
9454                   else
9455                   {
9456                      // Check for reverse conversion
9457                      // (Convert in an instantiation later, so that we can use
9458                      //  deep properties system)
9459                      Symbol classSym = FindClass(id.string);
9460                      if(classSym)
9461                      {
9462                         Class convertClass = classSym.registered;
9463                         if(convertClass)
9464                            revConvert = eClass_FindProperty(convertClass, _class.fullName, privateModule);
9465                      }
9466                   }
9467                }
9468
9469                if(prop)
9470                {
9471                   exp.member.memberType = propertyMember;
9472                   if(!prop.dataType)
9473                      ProcessPropertyType(prop);
9474                   exp.expType = prop.dataType;
9475                   if(prop.dataType) prop.dataType.refCount++;
9476                }
9477                else if(member)
9478                {
9479                   if(exp.member.exp.expType.classObjectType == typedObject && !strcmp(exp.member.member.string, "_class"))
9480                   {
9481                      FreeExpContents(exp);
9482                      exp.type = identifierExp;
9483                      exp.identifier = MkIdentifier("class");
9484                      ProcessExpressionType(exp);
9485                      return;
9486                   }
9487
9488                   exp.member.memberType = dataMember;
9489                   DeclareStruct(_class.fullName, false);
9490                   if(!member.dataType)
9491                   {
9492                      Context context = SetupTemplatesContext(_class);
9493                      member.dataType = ProcessTypeString(member.dataTypeString, false);
9494                      FinishTemplatesContext(context);
9495                   }
9496                   exp.expType = member.dataType;
9497                   if(member.dataType) member.dataType.refCount++;
9498                }
9499                else if(revConvert)
9500                {
9501                   exp.member.memberType = reverseConversionMember;
9502                   exp.expType = MkClassType(revConvert._class.fullName);
9503                }
9504                else if(method)
9505                {
9506                   //if(inCompiler)
9507                   {
9508                      /*if(id._class)
9509                      {
9510                         exp.type = identifierExp;
9511                         exp.identifier = exp.member.member;
9512                      }
9513                      else*/
9514                         exp.member.memberType = methodMember;
9515                   }
9516                   if(!method.dataType)
9517                      ProcessMethodType(method);
9518                   exp.expType = Type
9519                   {
9520                      refCount = 1;
9521                      kind = methodType;
9522                      method = method;
9523                   };
9524
9525                   // Tricky spot here... To use instance versus class virtual table
9526                   // Put it back to what it was... What did we break?
9527
9528                   // Had to put it back for overriding Main of Thread global instance
9529
9530                   //exp.expType.methodClass = _class;
9531                   exp.expType.methodClass = (id && id._class) ? _class : null;
9532
9533                   // Need the actual class used for templated classes
9534                   exp.expType.usedClass = _class;
9535                }
9536                else if(!classProp)
9537                {
9538                   if(exp.member.exp.expType.classObjectType == typedObject && !strcmp(exp.member.member.string, "_class"))
9539                   {
9540                      FreeExpContents(exp);
9541                      exp.type = identifierExp;
9542                      exp.identifier = MkIdentifier("class");
9543                      ProcessExpressionType(exp);
9544                      return;
9545                   }
9546                   yylloc = exp.member.member.loc;
9547                   Compiler_Error($"couldn't find member %s in class %s\n", id.string, _class.fullName);
9548                   if(inCompiler)
9549                      eClass_AddDataMember(_class, id.string, "int", 0, 0, publicAccess);
9550                }
9551
9552                if(_class && /*(_class.templateClass || _class.templateArgs) && */exp.expType)
9553                {
9554                   Class tClass;
9555
9556                   tClass = _class;
9557                   while(tClass && !tClass.templateClass) tClass = tClass.base;
9558
9559                   if(tClass && exp.expType.kind == templateType && exp.expType.templateParameter.type == TemplateParameterType::type)
9560                   {
9561                      int id = 0;
9562                      ClassTemplateParameter curParam = null;
9563                      Class sClass;
9564
9565                      for(sClass = tClass; sClass; sClass = sClass.base)
9566                      {
9567                         id = 0;
9568                         if(sClass.templateClass) sClass = sClass.templateClass;
9569                         for(curParam = sClass.templateParams.first; curParam; curParam = curParam.next)
9570                         {
9571                            if(curParam.type == TemplateParameterType::type && !strcmp(exp.expType.templateParameter.identifier.string, curParam.name))
9572                            {
9573                               for(sClass = sClass.base; sClass; sClass = sClass.base)
9574                                  id += sClass.templateParams.count;
9575                               break;
9576                            }
9577                            id++;
9578                         }
9579                         if(curParam) break;
9580                      }
9581
9582                      if(curParam && tClass.templateArgs[id].dataTypeString)
9583                      {
9584                         ClassTemplateArgument arg = tClass.templateArgs[id];
9585                         Context context = SetupTemplatesContext(tClass);
9586                         /*if(!arg.dataType)
9587                            arg.dataType = ProcessTypeString(arg.dataTypeString, false);*/
9588                         FreeType(exp.expType);
9589                         exp.expType = ProcessTypeString(arg.dataTypeString, false);
9590                         if(exp.expType)
9591                         {
9592                            if(exp.expType.kind == thisClassType)
9593                            {
9594                               FreeType(exp.expType);
9595                               exp.expType = ReplaceThisClassType(_class);
9596                            }
9597
9598                            if(tClass.templateClass)
9599                               exp.expType.passAsTemplate = true;
9600                            //exp.expType.refCount++;
9601                            if(!exp.destType)
9602                            {
9603                               exp.destType = ProcessTypeString(arg.dataTypeString, false);
9604                               //exp.destType.refCount++;
9605
9606                               if(exp.destType.kind == thisClassType)
9607                               {
9608                                  FreeType(exp.destType);
9609                                  exp.destType = ReplaceThisClassType(_class);
9610                               }
9611                            }
9612                         }
9613                         FinishTemplatesContext(context);
9614                      }
9615                   }
9616                   // TODO: MORE GENERIC SUPPORT FOR DEEPER TYPES
9617                   else if(tClass && exp.expType.kind == pointerType && exp.expType.type && exp.expType.type.kind == templateType && exp.expType.type.templateParameter.type == TemplateParameterType::type)
9618                   {
9619                      int id = 0;
9620                      ClassTemplateParameter curParam = null;
9621                      Class sClass;
9622
9623                      for(sClass = tClass; sClass; sClass = sClass.base)
9624                      {
9625                         id = 0;
9626                         if(sClass.templateClass) sClass = sClass.templateClass;
9627                         for(curParam = sClass.templateParams.first; curParam; curParam = curParam.next)
9628                         {
9629                            if(curParam.type == TemplateParameterType::type &&
9630                               !strcmp(exp.expType.type.templateParameter.identifier.string, curParam.name))
9631                            {
9632                               for(sClass = sClass.base; sClass; sClass = sClass.base)
9633                                  id += sClass.templateParams.count;
9634                               break;
9635                            }
9636                            id++;
9637                         }
9638                         if(curParam) break;
9639                      }
9640
9641                      if(curParam)
9642                      {
9643                         ClassTemplateArgument arg = tClass.templateArgs[id];
9644                         Context context = SetupTemplatesContext(tClass);
9645                         Type basicType;
9646                         /*if(!arg.dataType)
9647                            arg.dataType = ProcessTypeString(arg.dataTypeString, false);*/
9648
9649                         basicType = ProcessTypeString(arg.dataTypeString, false);
9650                         if(basicType)
9651                         {
9652                            if(basicType.kind == thisClassType)
9653                            {
9654                               FreeType(basicType);
9655                               basicType = ReplaceThisClassType(_class);
9656                            }
9657
9658                            /*    DO WE REALLY WANT THIS HERE? IT SEEMS TO BE ONLY USED WITH Array::array which was causing bug 135
9659                            if(tClass.templateClass)
9660                               basicType.passAsTemplate = true;
9661                            */
9662
9663                            FreeType(exp.expType);
9664
9665                            exp.expType = Type { refCount = 1, kind = pointerType, type = basicType };
9666                            //exp.expType.refCount++;
9667                            if(!exp.destType)
9668                            {
9669                               exp.destType = exp.expType;
9670                               exp.destType.refCount++;
9671                            }
9672
9673                            {
9674                               Expression newExp { };
9675                               OldList * specs = MkList();
9676                               Declarator decl;
9677                               decl = SpecDeclFromString(arg.dataTypeString, specs, null);
9678                               *newExp = *exp;
9679                               if(exp.destType) exp.destType.refCount++;
9680                               if(exp.expType)  exp.expType.refCount++;
9681                               exp.type = castExp;
9682                               exp.cast.typeName = MkTypeName(specs, MkDeclaratorPointer(MkPointer(null, null), decl));
9683                               exp.cast.exp = newExp;
9684                               //FreeType(exp.expType);
9685                               //exp.expType = null;
9686                               //ProcessExpressionType(sourceExp);
9687                            }
9688                         }
9689                         FinishTemplatesContext(context);
9690                      }
9691                   }
9692                   else if(tClass && exp.expType.kind == classType && exp.expType._class && strchr(exp.expType._class.string, '<'))
9693                   {
9694                      Class expClass = exp.expType._class.registered;
9695                      if(expClass)
9696                      {
9697                         Class cClass = null;
9698                         int c;
9699                         int p = 0;
9700                         int paramCount = 0;
9701                         int lastParam = -1;
9702                         char templateString[1024];
9703                         ClassTemplateParameter param;
9704                         sprintf(templateString, "%s<", expClass.templateClass.fullName);
9705                         while(cClass != expClass)
9706                         {
9707                            Class sClass;
9708                            for(sClass = expClass; sClass && sClass.base != cClass; sClass = sClass.base);
9709                            cClass = sClass;
9710
9711                            for(param = cClass.templateParams.first; param; param = param.next)
9712                            {
9713                               Class cClassCur = null;
9714                               int c;
9715                               int cp = 0;
9716                               ClassTemplateParameter paramCur = null;
9717                               ClassTemplateArgument arg;
9718                               while(cClassCur != tClass && !paramCur)
9719                               {
9720                                  Class sClassCur;
9721                                  for(sClassCur = tClass; sClassCur && sClassCur.base != cClassCur; sClassCur = sClassCur.base);
9722                                  cClassCur = sClassCur;
9723
9724                                  for(paramCur = cClassCur.templateParams.first; paramCur; paramCur = paramCur.next)
9725                                  {
9726                                     if(!strcmp(paramCur.name, param.name))
9727                                     {
9728
9729                                        break;
9730                                     }
9731                                     cp++;
9732                                  }
9733                               }
9734                               if(paramCur && paramCur.type == TemplateParameterType::type)
9735                                  arg = tClass.templateArgs[cp];
9736                               else
9737                                  arg = expClass.templateArgs[p];
9738
9739                               {
9740                                  char argument[256];
9741                                  argument[0] = '\0';
9742                                  /*if(arg.name)
9743                                  {
9744                                     strcat(argument, arg.name.string);
9745                                     strcat(argument, " = ");
9746                                  }*/
9747                                  switch(param.type)
9748                                  {
9749                                     case expression:
9750                                     {
9751                                        // THIS WHOLE THING IS A WILD GUESS... FIX IT UP
9752                                        char expString[1024];
9753                                        OldList * specs = MkList();
9754                                        Declarator decl = SpecDeclFromString(param.dataTypeString, specs, null);
9755                                        Expression exp;
9756                                        char * string = PrintHexUInt64(arg.expression.ui64);
9757                                        exp = MkExpCast(MkTypeName(specs, decl), MkExpConstant(string));
9758
9759                                        ProcessExpressionType(exp);
9760                                        ComputeExpression(exp);
9761                                        expString[0] = '\0';
9762                                        PrintExpression(exp, expString);
9763                                        strcat(argument, expString);
9764                                        // delete exp;
9765                                        FreeExpression(exp);
9766                                        break;
9767                                     }
9768                                     case identifier:
9769                                     {
9770                                        strcat(argument, arg.member.name);
9771                                        break;
9772                                     }
9773                                     case TemplateParameterType::type:
9774                                     {
9775                                        if(arg.dataTypeString && (!param.defaultArg.dataTypeString || strcmp(arg.dataTypeString, param.defaultArg.dataTypeString)))
9776                                           strcat(argument, arg.dataTypeString);
9777                                        break;
9778                                     }
9779                                  }
9780                                  if(argument[0])
9781                                  {
9782                                     if(paramCount) strcat(templateString, ", ");
9783                                     if(lastParam != p - 1)
9784                                     {
9785                                        strcat(templateString, param.name);
9786                                        strcat(templateString, " = ");
9787                                     }
9788                                     strcat(templateString, argument);
9789                                     paramCount++;
9790                                     lastParam = p;
9791                                  }
9792                               }
9793                               p++;
9794                            }
9795                         }
9796                         {
9797                            int len = strlen(templateString);
9798                            if(templateString[len-1] == '>') templateString[len++] = ' ';
9799                            templateString[len++] = '>';
9800                            templateString[len++] = '\0';
9801                         }
9802
9803                         FreeType(exp.expType);
9804                         {
9805                            Context context = SetupTemplatesContext(tClass);
9806                            exp.expType = ProcessTypeString(templateString, false);
9807                            FinishTemplatesContext(context);
9808                         }
9809                      }
9810                   }
9811                }
9812             }
9813             else
9814                Compiler_Error($"undefined class %s\n", (id && (!id._class || id._class.name))? (id.classSym ? id.classSym.string : (type._class ? type._class.string : null)) : "(null)");
9815          }
9816          else if(type && (type.kind == structType || type.kind == unionType))
9817          {
9818             Type memberType = exp.member.member ? FindMember(type, exp.member.member.string) : null;
9819             if(memberType)
9820             {
9821                exp.expType = memberType;
9822                if(memberType)
9823                   memberType.refCount++;
9824             }
9825          }
9826          else
9827          {
9828             char expString[10240];
9829             expString[0] = '\0';
9830             if(inCompiler) { PrintExpression(exp, expString); ChangeCh(expString, '\n', ' '); }
9831             Compiler_Error($"member operator on non-structure type expression %s\n", expString);
9832          }
9833
9834          if(exp.expType && exp.expType.kind == thisClassType && (!exp.destType || exp.destType.kind != thisClassType))
9835          {
9836             if(type && (type.kind == classType || type.kind == subClassType || type.kind == intType || type.kind == enumType))
9837             {
9838                Identifier id = exp.member.member;
9839                Class _class = (id && (!id._class || id._class.name))? ( id.classSym ? id.classSym.registered : (type._class ? type._class.registered : null)) : null;
9840                if(_class)
9841                {
9842                   FreeType(exp.expType);
9843                   exp.expType = ReplaceThisClassType(_class);
9844                }
9845             }
9846          }
9847          yylloc = oldyylloc;
9848          break;
9849       }
9850       // Convert x->y into (*x).y
9851       case pointerExp:
9852       {
9853          Type destType = exp.destType;
9854
9855          // DOING THIS LATER NOW...
9856          if(exp.member.member && exp.member.member._class && exp.member.member._class.name)
9857          {
9858             exp.member.member.classSym = exp.member.member._class.symbol; // FindClass(exp.member.member._class.name);
9859             /* TODO: Name Space Fix ups
9860             if(!exp.member.member.classSym)
9861                exp.member.member.nameSpace = eSystem_FindNameSpace(privateModule, exp.member.member._class.name);
9862             */
9863          }
9864
9865          exp.member.exp = MkExpBrackets(MkListOne(MkExpOp(null, '*', exp.member.exp)));
9866          exp.type = memberExp;
9867          if(destType)
9868             destType.count++;
9869          ProcessExpressionType(exp);
9870          if(destType)
9871             destType.count--;
9872          break;
9873       }
9874       case classSizeExp:
9875       {
9876          //ComputeExpression(exp);
9877
9878          Symbol classSym = exp._class.symbol; // FindClass(exp._class.name);
9879          if(classSym && classSym.registered)
9880          {
9881             if(classSym.registered.type == noHeadClass)
9882             {
9883                char name[1024];
9884                name[0] = '\0';
9885                DeclareStruct(classSym.string, false);
9886                FreeSpecifier(exp._class);
9887                exp.type = typeSizeExp;
9888                FullClassNameCat(name, classSym.string, false);
9889                exp.typeName = MkTypeName(MkListOne(MkStructOrUnion(structSpecifier, MkIdentifier(name), null)), null);
9890             }
9891             else
9892             {
9893                if(classSym.registered.fixed)
9894                {
9895                   FreeSpecifier(exp._class);
9896                   exp.constant = PrintUInt(classSym.registered.templateClass ? classSym.registered.templateClass.structSize : classSym.registered.structSize);
9897                   exp.type = constantExp;
9898                }
9899                else
9900                {
9901                   char className[1024];
9902                   strcpy(className, "__ecereClass_");
9903                   FullClassNameCat(className, classSym.string, true);
9904                   MangleClassName(className);
9905
9906                   DeclareClass(classSym, className);
9907
9908                   FreeExpContents(exp);
9909                   exp.type = pointerExp;
9910                   exp.member.exp = MkExpIdentifier(MkIdentifier(className));
9911                   exp.member.member = MkIdentifier("structSize");
9912                }
9913             }
9914          }
9915
9916          exp.expType = Type
9917          {
9918             refCount = 1;
9919             kind = intType;
9920          };
9921          // exp.isConstant = true;
9922          break;
9923       }
9924       case typeSizeExp:
9925       {
9926          Type type = ProcessType(exp.typeName.qualifiers, exp.typeName.declarator);
9927
9928          exp.expType = Type
9929          {
9930             refCount = 1;
9931             kind = intType;
9932          };
9933          exp.isConstant = true;
9934
9935          DeclareType(type, false, false);
9936          FreeType(type);
9937          break;
9938       }
9939       case castExp:
9940       {
9941          Type type = ProcessType(exp.cast.typeName.qualifiers, exp.cast.typeName.declarator);
9942          type.count = 1;
9943          FreeType(exp.cast.exp.destType);
9944          exp.cast.exp.destType = type;
9945          type.refCount++;
9946          ProcessExpressionType(exp.cast.exp);
9947          type.count = 0;
9948          exp.expType = type;
9949          //type.refCount++;
9950
9951          // if(!NeedCast(exp.cast.exp.expType, exp.cast.exp.destType))
9952          if(!exp.cast.exp.needCast && !NeedCast(exp.cast.exp.expType, type))
9953          {
9954             void * prev = exp.prev, * next = exp.next;
9955             Type expType = exp.cast.exp.destType;
9956             Expression castExp = exp.cast.exp;
9957             Type destType = exp.destType;
9958
9959             if(expType) expType.refCount++;
9960
9961             //FreeType(exp.destType);
9962             FreeType(exp.expType);
9963             FreeTypeName(exp.cast.typeName);
9964
9965             *exp = *castExp;
9966             FreeType(exp.expType);
9967             FreeType(exp.destType);
9968
9969             exp.expType = expType;
9970             exp.destType = destType;
9971
9972             delete castExp;
9973
9974             exp.prev = prev;
9975             exp.next = next;
9976
9977          }
9978          else
9979          {
9980             exp.isConstant = exp.cast.exp.isConstant;
9981          }
9982          //FreeType(type);
9983          break;
9984       }
9985       case extensionInitializerExp:
9986       {
9987          Type type = ProcessType(exp.initializer.typeName.qualifiers, exp.initializer.typeName.declarator);
9988          // We have yet to support this... ( { } initializers are currently processed inside ProcessDeclaration()'s initDeclaration case statement
9989          // ProcessInitializer(exp.initializer.initializer, type);
9990          exp.expType = type;
9991          break;
9992       }
9993       case vaArgExp:
9994       {
9995          Type type = ProcessType(exp.vaArg.typeName.qualifiers, exp.vaArg.typeName.declarator);
9996          ProcessExpressionType(exp.vaArg.exp);
9997          exp.expType = type;
9998          break;
9999       }
10000       case conditionExp:
10001       {
10002          Expression e;
10003          exp.isConstant = true;
10004
10005          FreeType(exp.cond.cond.destType);
10006          exp.cond.cond.destType = MkClassType("bool");
10007          exp.cond.cond.destType.truth = true;
10008          ProcessExpressionType(exp.cond.cond);
10009          if(!exp.cond.cond.isConstant)
10010             exp.isConstant = false;
10011          for(e = exp.cond.exp->first; e; e = e.next)
10012          {
10013             if(!e.next)
10014             {
10015                FreeType(e.destType);
10016                e.destType = exp.destType;
10017                if(e.destType) e.destType.refCount++;
10018             }
10019             ProcessExpressionType(e);
10020             if(!e.next)
10021             {
10022                exp.expType = e.expType;
10023                if(e.expType) e.expType.refCount++;
10024             }
10025             if(!e.isConstant)
10026                exp.isConstant = false;
10027          }
10028
10029          FreeType(exp.cond.elseExp.destType);
10030          // Added this check if we failed to find an expType
10031          // exp.cond.elseExp.destType = exp.expType ? exp.expType : exp.destType;
10032
10033          // Reversed it...
10034          exp.cond.elseExp.destType = exp.destType ? exp.destType : exp.expType;
10035
10036          if(exp.cond.elseExp.destType)
10037             exp.cond.elseExp.destType.refCount++;
10038          ProcessExpressionType(exp.cond.elseExp);
10039
10040          // FIXED THIS: Was done before calling process on elseExp
10041          if(!exp.cond.elseExp.isConstant)
10042             exp.isConstant = false;
10043          break;
10044       }
10045       case extensionCompoundExp:
10046       {
10047          if(exp.compound && exp.compound.compound.statements && exp.compound.compound.statements->last)
10048          {
10049             Statement last = exp.compound.compound.statements->last;
10050             if(last.type == expressionStmt && last.expressions && last.expressions->last)
10051             {
10052                ((Expression)last.expressions->last).destType = exp.destType;
10053                if(exp.destType)
10054                   exp.destType.refCount++;
10055             }
10056             ProcessStatement(exp.compound);
10057             exp.expType = (last.expressions && last.expressions->last) ? ((Expression)last.expressions->last).expType : null;
10058             if(exp.expType)
10059                exp.expType.refCount++;
10060          }
10061          break;
10062       }
10063       case classExp:
10064       {
10065          Specifier spec = exp._classExp.specifiers->first;
10066          if(spec && spec.type == nameSpecifier)
10067          {
10068             exp.expType = MkClassType(spec.name);
10069             exp.expType.kind = subClassType;
10070             exp.byReference = true;
10071          }
10072          else
10073          {
10074             exp.expType = MkClassType("ecere::com::Class");
10075             exp.byReference = true;
10076          }
10077          break;
10078       }
10079       case classDataExp:
10080       {
10081          Class _class = thisClass ? thisClass : currentClass;
10082          if(_class)
10083          {
10084             Identifier id = exp.classData.id;
10085             char structName[1024];
10086             Expression classExp;
10087             strcpy(structName, "__ecereClassData_");
10088             FullClassNameCat(structName, _class.fullName, false);
10089             exp.type = pointerExp;
10090             exp.member.member = id;
10091             if(curCompound && FindSymbol("this", curContext, curCompound.compound.context, false, false))
10092                classExp = MkExpMember(MkExpIdentifier(MkIdentifier("this")), MkIdentifier("_class"));
10093             else
10094                classExp = MkExpIdentifier(MkIdentifier("class"));
10095
10096             exp.member.exp = MkExpBrackets(MkListOne(MkExpCast(
10097                MkTypeName(MkListOne(MkStructOrUnion(structSpecifier, MkIdentifier(structName), null)), MkDeclaratorPointer(MkPointer(null, null), null)),
10098                   MkExpBrackets(MkListOne(MkExpOp(
10099                      MkExpCast(MkTypeName(MkListOne(MkSpecifier(CHAR)), MkDeclaratorPointer(MkPointer(null,null), null)),
10100                         MkExpMember(classExp, MkIdentifier("data"))), '+',
10101                            MkExpMember(MkExpClass(MkListOne(MkSpecifierName(_class.fullName)), null), MkIdentifier("offsetClass")))))
10102                      )));
10103
10104             ProcessExpressionType(exp);
10105             return;
10106          }
10107          break;
10108       }
10109       case arrayExp:
10110       {
10111          Type type = null;
10112          char * typeString = null;
10113          char typeStringBuf[1024];
10114          if(exp.destType && exp.destType.kind == classType && exp.destType._class && exp.destType._class.registered &&
10115             exp.destType._class.registered != containerClass && eClass_IsDerived(exp.destType._class.registered, containerClass))
10116          {
10117             Class templateClass = exp.destType._class.registered;
10118             typeString = templateClass.templateArgs[2].dataTypeString;
10119          }
10120          else if(exp.list)
10121          {
10122             // Guess type from expressions in the array
10123             Expression e;
10124             for(e = exp.list->first; e; e = e.next)
10125             {
10126                ProcessExpressionType(e);
10127                if(e.expType)
10128                {
10129                   if(!type) { type = e.expType; type.refCount++; }
10130                   else
10131                   {
10132                      // if(!MatchType(e.expType, type, null, null, null, false, false, false))
10133                      if(!MatchTypeExpression(e, type, null, false))
10134                      {
10135                         FreeType(type);
10136                         type = e.expType;
10137                         e.expType = null;
10138
10139                         e = exp.list->first;
10140                         ProcessExpressionType(e);
10141                         if(e.expType)
10142                         {
10143                            //if(!MatchTypes(e.expType, type, null, null, null, false, false, false))
10144                            if(!MatchTypeExpression(e, type, null, false))
10145                            {
10146                               FreeType(e.expType);
10147                               e.expType = null;
10148                               FreeType(type);
10149                               type = null;
10150                               break;
10151                            }
10152                         }
10153                      }
10154                   }
10155                   if(e.expType)
10156                   {
10157                      FreeType(e.expType);
10158                      e.expType = null;
10159                   }
10160                }
10161             }
10162             if(type)
10163             {
10164                typeStringBuf[0] = '\0';
10165                PrintTypeNoConst(type, typeStringBuf, false, true);
10166                typeString = typeStringBuf;
10167                FreeType(type);
10168                type = null;
10169             }
10170          }
10171          if(typeString)
10172          {
10173             /*
10174             (Container)& (struct BuiltInContainer)
10175             {
10176                ._vTbl = class(BuiltInContainer)._vTbl,
10177                ._class = class(BuiltInContainer),
10178                .refCount = 0,
10179                .data = (int[]){ 1, 7, 3, 4, 5 },
10180                .count = 5,
10181                .type = class(int),
10182             }
10183             */
10184             char templateString[1024];
10185             OldList * initializers = MkList();
10186             OldList * structInitializers = MkList();
10187             OldList * specs = MkList();
10188             Expression expExt;
10189             Declarator decl = SpecDeclFromString(typeString, specs, null);
10190             sprintf(templateString, "Container<%s>", typeString);
10191
10192             if(exp.list)
10193             {
10194                Expression e;
10195                type = ProcessTypeString(typeString, false);
10196                while(e = exp.list->first)
10197                {
10198                   exp.list->Remove(e);
10199                   e.destType = type;
10200                   type.refCount++;
10201                   ProcessExpressionType(e);
10202                   ListAdd(initializers, MkInitializerAssignment(e));
10203                }
10204                FreeType(type);
10205                delete exp.list;
10206             }
10207
10208             DeclareStruct("ecere::com::BuiltInContainer", false);
10209
10210             ListAdd(structInitializers, /*MkIdentifier("_vTbl")*/    MkInitializerAssignment(MkExpMember(MkExpClass(MkListOne(MkSpecifierName("BuiltInContainer")), null), MkIdentifier("_vTbl"))));
10211                ProcessExpressionType(((Initializer)structInitializers->last).exp);
10212             ListAdd(structInitializers, /*MkIdentifier("_class")*/   MkInitializerAssignment(MkExpClass(MkListOne(MkSpecifierName("BuiltInContainer")), null)));
10213                ProcessExpressionType(((Initializer)structInitializers->last).exp);
10214             ListAdd(structInitializers, /*MkIdentifier("_refCount")*/MkInitializerAssignment(MkExpConstant("0")));
10215                ProcessExpressionType(((Initializer)structInitializers->last).exp);
10216             ListAdd(structInitializers, /*MkIdentifier("data")*/     MkInitializerAssignment(MkExpExtensionInitializer(
10217                MkTypeName(specs, MkDeclaratorArray(decl, null)),
10218                MkInitializerList(initializers))));
10219                ProcessExpressionType(((Initializer)structInitializers->last).exp);
10220             ListAdd(structInitializers, /*MkIdentifier("count")*/    MkInitializerAssignment({ type = constantExp, constant = PrintString(initializers->count) }));
10221                ProcessExpressionType(((Initializer)structInitializers->last).exp);
10222             ListAdd(structInitializers, /*MkIdentifier("type")*/     MkInitializerAssignment(MkExpClass(CopyList(specs, CopySpecifier), CopyDeclarator(decl))));
10223                ProcessExpressionType(((Initializer)structInitializers->last).exp);
10224             exp.expType = ProcessTypeString(templateString, false);
10225             exp.type = bracketsExp;
10226             exp.list = MkListOne(MkExpCast(MkTypeName(MkListOne(MkSpecifierName(templateString)), null),
10227                MkExpOp(null, '&',
10228                expExt = MkExpExtensionInitializer(MkTypeName(MkListOne(MkSpecifierName("BuiltInContainer")), null),
10229                   MkInitializerList(structInitializers)))));
10230             ProcessExpressionType(expExt);
10231          }
10232          else
10233          {
10234             exp.expType = ProcessTypeString("Container", false);
10235             Compiler_Error($"Couldn't determine type of array elements\n");
10236          }
10237          break;
10238       }
10239    }
10240
10241    if(exp.expType && exp.expType.kind == thisClassType && thisClass && (!exp.destType || exp.destType.kind != thisClassType))
10242    {
10243       FreeType(exp.expType);
10244       exp.expType = ReplaceThisClassType(thisClass);
10245    }
10246
10247    // Resolve structures here
10248    if(exp.expType && (exp.expType.kind == structType || exp.expType.kind == unionType || exp.expType.kind == enumType) && !exp.expType.members.first && exp.expType.enumName)
10249    {
10250       Symbol symbol = FindSymbol(exp.expType.enumName, curContext, globalContext, true, false);
10251       // TODO: Fix members reference...
10252       if(symbol)
10253       {
10254          if(exp.expType.kind != enumType)
10255          {
10256             Type member;
10257             String enumName = CopyString(exp.expType.enumName);
10258
10259             // Fixed a memory leak on self-referencing C structs typedefs
10260             // by instantiating a new type rather than simply copying members
10261             // into exp.expType
10262             FreeType(exp.expType);
10263             exp.expType = Type { };
10264             exp.expType.kind = symbol.type.kind;
10265             exp.expType.refCount++;
10266             exp.expType.enumName = enumName;
10267
10268             exp.expType.members = symbol.type.members;
10269             for(member = symbol.type.members.first; member; member = member.next)
10270                member.refCount++;
10271          }
10272          else
10273          {
10274             NamedLink member;
10275             for(member = symbol.type.members.first; member; member = member.next)
10276             {
10277                NamedLink value { name = CopyString(member.name) };
10278                exp.expType.members.Add(value);
10279             }
10280          }
10281       }
10282    }
10283
10284    yylloc = exp.loc;
10285    if(exp.destType && (exp.destType.kind == voidType || exp.destType.kind == dummyType) );
10286    else if(exp.destType && !exp.destType.keepCast)
10287    {
10288       if(!CheckExpressionType(exp, exp.destType, false))
10289       {
10290          if(!exp.destType.count || unresolved)
10291          {
10292             if(!exp.expType)
10293             {
10294                yylloc = exp.loc;
10295                if(exp.destType.kind != ellipsisType)
10296                {
10297                   char type2[1024];
10298                   type2[0] = '\0';
10299                   if(inCompiler)
10300                   {
10301                      char expString[10240];
10302                      expString[0] = '\0';
10303
10304                      PrintType(exp.destType, type2, false, true);
10305
10306                      if(inCompiler) { PrintExpression(exp, expString); ChangeCh(expString, '\n', ' '); }
10307                      if(unresolved)
10308                         Compiler_Error($"unresolved identifier %s; expected %s\n", expString, type2);
10309                      else if(exp.type != dummyExp)
10310                         Compiler_Error($"couldn't determine type of %s; expected %s\n", expString, type2);
10311                   }
10312                }
10313                else
10314                {
10315                   char expString[10240] ;
10316                   expString[0] = '\0';
10317                   if(inCompiler) { PrintExpression(exp, expString); ChangeCh(expString, '\n', ' '); }
10318
10319                   if(unresolved)
10320                      Compiler_Error($"unresolved identifier %s\n", expString);
10321                   else if(exp.type != dummyExp)
10322                      Compiler_Error($"couldn't determine type of %s\n", expString);
10323                }
10324             }
10325             else
10326             {
10327                char type1[1024];
10328                char type2[1024];
10329                type1[0] = '\0';
10330                type2[0] = '\0';
10331                if(inCompiler)
10332                {
10333                   PrintType(exp.expType, type1, false, true);
10334                   PrintType(exp.destType, type2, false, true);
10335                }
10336
10337                //CheckExpressionType(exp, exp.destType, false);
10338
10339                if(exp.destType.truth && exp.destType._class && exp.destType._class.registered && !strcmp(exp.destType._class.registered.name, "bool") &&
10340                   exp.expType.kind != voidType && exp.expType.kind != structType && exp.expType.kind != unionType &&
10341                   (exp.expType.kind != classType || exp.expType.classObjectType || (exp.expType._class && exp.expType._class.registered && exp.expType._class.registered.type != structClass)));
10342                else
10343                {
10344                   char expString[10240];
10345                   expString[0] = '\0';
10346                   if(inCompiler) { PrintExpression(exp, expString); ChangeCh(expString, '\n', ' '); }
10347
10348 #ifdef _DEBUG
10349                   CheckExpressionType(exp, exp.destType, false);
10350 #endif
10351                   // Flex & Bison generate code that triggers this, so we ignore it for a quiet sdk build:
10352                   if(!sourceFile || (strcmp(sourceFile, "src\\lexer.ec") && strcmp(sourceFile, "src/lexer.ec") && strcmp(sourceFile, "src\\grammar.ec") && strcmp(sourceFile, "src/grammar.ec")))
10353                      Compiler_Warning($"incompatible expression %s (%s); expected %s\n", expString, type1, type2);
10354
10355                   // TO CHECK: FORCING HERE TO HELP DEBUGGER
10356                   FreeType(exp.expType);
10357                   exp.destType.refCount++;
10358                   exp.expType = exp.destType;
10359                }
10360             }
10361          }
10362       }
10363       else if(exp.destType && exp.destType.kind == ellipsisType && exp.expType && exp.expType.passAsTemplate)
10364       {
10365          Expression newExp { };
10366          char typeString[1024];
10367          OldList * specs = MkList();
10368          Declarator decl;
10369
10370          typeString[0] = '\0';
10371
10372          *newExp = *exp;
10373
10374          if(exp.expType)  exp.expType.refCount++;
10375          if(exp.expType)  exp.expType.refCount++;
10376          exp.type = castExp;
10377          newExp.destType = exp.expType;
10378
10379          PrintType(exp.expType, typeString, false, false);
10380          decl = SpecDeclFromString(typeString, specs, null);
10381
10382          exp.cast.typeName = MkTypeName(specs, decl);
10383          exp.cast.exp = newExp;
10384       }
10385    }
10386    else if(unresolved)
10387    {
10388       if(exp.identifier._class && exp.identifier._class.name)
10389          Compiler_Error($"unresolved identifier %s::%s\n", exp.identifier._class.name, exp.identifier.string);
10390       else if(exp.identifier.string && exp.identifier.string[0])
10391          Compiler_Error($"unresolved identifier %s\n", exp.identifier.string);
10392    }
10393    else if(!exp.expType && exp.type != dummyExp)
10394    {
10395       char expString[10240];
10396       expString[0] = '\0';
10397       if(inCompiler) { PrintExpression(exp, expString); ChangeCh(expString, '\n', ' '); }
10398       Compiler_Error($"couldn't determine type of %s\n", expString);
10399    }
10400
10401    // Let's try to support any_object & typed_object here:
10402    if(inCompiler)
10403       ApplyAnyObjectLogic(exp);
10404
10405    // Mark nohead classes as by reference, unless we're casting them to an integral type
10406    if(!notByReference && exp.expType && exp.expType.kind == classType && exp.expType._class && exp.expType._class.registered &&
10407       exp.expType._class.registered.type == noHeadClass && (!exp.destType ||
10408          (exp.destType.kind != intType && exp.destType.kind != int64Type && exp.destType.kind != intPtrType && exp.destType.kind != intSizeType &&
10409           exp.destType.kind != longType && exp.destType.kind != shortType && exp.destType.kind != charType)))
10410    {
10411       exp.byReference = true;
10412    }
10413    yylloc = oldyylloc;
10414 }
10415
10416 static void FindNextDataMember(Class _class, Class * curClass, DataMember * curMember, DataMember * subMemberStack, int * subMemberStackPos)
10417 {
10418    // THIS CODE WILL FIND NEXT MEMBER...
10419    if(*curMember)
10420    {
10421       *curMember = (*curMember).next;
10422
10423       if(subMemberStackPos && *subMemberStackPos > 0 && subMemberStack[*subMemberStackPos-1].type == unionMember)
10424       {
10425          *curMember = subMemberStack[--(*subMemberStackPos)];
10426          *curMember = (*curMember).next;
10427       }
10428
10429       // SKIP ALL PROPERTIES HERE...
10430       while((*curMember) && (*curMember).isProperty)
10431          *curMember = (*curMember).next;
10432
10433       if(subMemberStackPos)
10434       {
10435          while((*curMember) && !(*curMember).isProperty && !(*curMember).name && ((*curMember).type == structMember || (*curMember).type == unionMember))
10436          {
10437             subMemberStack[(*subMemberStackPos)++] = *curMember;
10438
10439             *curMember = (*curMember).members.first;
10440             while(*curMember && (*curMember).isProperty)
10441                *curMember = (*curMember).next;
10442          }
10443       }
10444    }
10445    while(!*curMember)
10446    {
10447       if(!*curMember)
10448       {
10449          if(subMemberStackPos && *subMemberStackPos)
10450          {
10451             *curMember = subMemberStack[--(*subMemberStackPos)];
10452             *curMember = (*curMember).next;
10453          }
10454          else
10455          {
10456             Class lastCurClass = *curClass;
10457
10458             if(*curClass == _class) break;     // REACHED THE END
10459
10460             for(*curClass = _class; (*curClass).base != lastCurClass && (*curClass).base.type != systemClass; *curClass = (*curClass).base);
10461             *curMember = (*curClass).membersAndProperties.first;
10462          }
10463
10464          while((*curMember) && (*curMember).isProperty)
10465             *curMember = (*curMember).next;
10466          if(subMemberStackPos)
10467          {
10468             while((*curMember) && !(*curMember).isProperty && !(*curMember).name && ((*curMember).type == structMember || (*curMember).type == unionMember))
10469             {
10470                subMemberStack[(*subMemberStackPos)++] = *curMember;
10471
10472                *curMember = (*curMember).members.first;
10473                while(*curMember && (*curMember).isProperty)
10474                   *curMember = (*curMember).next;
10475             }
10476          }
10477       }
10478    }
10479 }
10480
10481
10482 static void ProcessInitializer(Initializer init, Type type)
10483 {
10484    switch(init.type)
10485    {
10486       case expInitializer:
10487          if(!init.exp || init.exp.type != instanceExp || !init.exp.instance || init.exp.instance._class || !type || type.kind == classType)
10488          {
10489             // TESTING THIS FOR SHUTTING = 0 WARNING
10490             if(init.exp && !init.exp.destType)
10491             {
10492                FreeType(init.exp.destType);
10493                init.exp.destType = type;
10494                if(type) type.refCount++;
10495             }
10496             if(init.exp)
10497             {
10498                ProcessExpressionType(init.exp);
10499                init.isConstant = init.exp.isConstant;
10500             }
10501             break;
10502          }
10503          else
10504          {
10505             Expression exp = init.exp;
10506             Instantiation inst = exp.instance;
10507             MembersInit members;
10508
10509             init.type = listInitializer;
10510             init.list = MkList();
10511
10512             if(inst.members)
10513             {
10514                for(members = inst.members->first; members; members = members.next)
10515                {
10516                   if(members.type == dataMembersInit)
10517                   {
10518                      MemberInit member;
10519                      for(member = members.dataMembers->first; member; member = member.next)
10520                      {
10521                         ListAdd(init.list, member.initializer);
10522                         member.initializer = null;
10523                      }
10524                   }
10525                   // Discard all MembersInitMethod
10526                }
10527             }
10528             FreeExpression(exp);
10529          }
10530       case listInitializer:
10531       {
10532          Initializer i;
10533          Type initializerType = null;
10534          Class curClass = null;
10535          DataMember curMember = null;
10536          DataMember subMemberStack[256];
10537          int subMemberStackPos = 0;
10538
10539          if(type && type.kind == arrayType)
10540             initializerType = Dereference(type);
10541          else if(type && (type.kind == structType || type.kind == unionType))
10542             initializerType = type.members.first;
10543
10544          for(i = init.list->first; i; i = i.next)
10545          {
10546             if(type && type.kind == classType && type._class && type._class.registered)
10547             {
10548                // THIS IS FOR A C STYLE INSTANTIATION OF STRUCT CLASSES ONLY... WE ONLY CARE ABOUT DATA MEMBERS, AND ACTUAL MEMORY ORDER (PRIVATE MEMBERS ARE INCLUDED)
10549                FindNextDataMember(type._class.registered, &curClass, &curMember, subMemberStack, &subMemberStackPos);
10550                // TODO: Generate error on initializing a private data member this way from another module...
10551                if(curMember)
10552                {
10553                   if(!curMember.dataType)
10554                      curMember.dataType = ProcessTypeString(curMember.dataTypeString, false);
10555                   initializerType = curMember.dataType;
10556                }
10557             }
10558             ProcessInitializer(i, initializerType);
10559             if(initializerType && type && (type.kind == structType || type.kind == unionType))
10560                initializerType = initializerType.next;
10561             if(!i.isConstant)
10562                init.isConstant = false;
10563          }
10564
10565          if(type && type.kind == arrayType)
10566             FreeType(initializerType);
10567
10568          if(type && type.kind != arrayType && type.kind != structType && type.kind != unionType && (type.kind != classType || !type._class.registered || type._class.registered.type != structClass))
10569          {
10570             Compiler_Error($"Assigning list initializer to non list\n");
10571          }
10572          break;
10573       }
10574    }
10575 }
10576
10577 static void ProcessSpecifier(Specifier spec, bool declareStruct)
10578 {
10579    switch(spec.type)
10580    {
10581       case baseSpecifier:
10582       {
10583          if(spec.specifier == THISCLASS)
10584          {
10585             if(thisClass)
10586             {
10587                spec.type = nameSpecifier;
10588                spec.name = ReplaceThisClass(thisClass);
10589                spec.symbol = FindClass(spec.name);
10590                ProcessSpecifier(spec, declareStruct);
10591             }
10592          }
10593          break;
10594       }
10595       case nameSpecifier:
10596       {
10597          Symbol symbol = FindType(curContext, spec.name);
10598          if(symbol)
10599             DeclareType(symbol.type, true, true);
10600          else if((symbol = spec.symbol /*FindClass(spec.name)*/) && symbol.registered && symbol.registered.type == structClass && declareStruct)
10601             DeclareStruct(spec.name, false);
10602          break;
10603       }
10604       case enumSpecifier:
10605       {
10606          Enumerator e;
10607          if(spec.list)
10608          {
10609             for(e = spec.list->first; e; e = e.next)
10610             {
10611                if(e.exp)
10612                   ProcessExpressionType(e.exp);
10613             }
10614          }
10615          break;
10616       }
10617       case structSpecifier:
10618       case unionSpecifier:
10619       {
10620          if(spec.definitions)
10621          {
10622             ClassDef def;
10623             Symbol symbol = spec.id ? FindClass(spec.id.string) : null;
10624             //if(symbol)
10625                ProcessClass(spec.definitions, symbol);
10626             /*else
10627             {
10628                for(def = spec.definitions->first; def; def = def.next)
10629                {
10630                   //if(def.type == declarationClassDef && def.decl && def.decl.type == DeclarationStruct)
10631                      ProcessDeclaration(def.decl);
10632                }
10633             }*/
10634          }
10635          break;
10636       }
10637       /*
10638       case classSpecifier:
10639       {
10640          Symbol classSym = FindClass(spec.name);
10641          if(classSym && classSym.registered && classSym.registered.type == structClass)
10642             DeclareStruct(spec.name, false);
10643          break;
10644       }
10645       */
10646    }
10647 }
10648
10649
10650 static void ProcessDeclarator(Declarator decl)
10651 {
10652    switch(decl.type)
10653    {
10654       case identifierDeclarator:
10655          if(decl.identifier.classSym /* TODO: Name Space Fix ups  || decl.identifier.nameSpace*/)
10656          {
10657             FreeSpecifier(decl.identifier._class);
10658             decl.identifier._class = null;
10659          }
10660          break;
10661       case arrayDeclarator:
10662          if(decl.array.exp)
10663             ProcessExpressionType(decl.array.exp);
10664       case structDeclarator:
10665       case bracketsDeclarator:
10666       case functionDeclarator:
10667       case pointerDeclarator:
10668       case extendedDeclarator:
10669       case extendedDeclaratorEnd:
10670          if(decl.declarator)
10671             ProcessDeclarator(decl.declarator);
10672          if(decl.type == functionDeclarator)
10673          {
10674             Identifier id = GetDeclId(decl);
10675             if(id && id._class)
10676             {
10677                TypeName param
10678                {
10679                   qualifiers = MkListOne(id._class);
10680                   declarator = null;
10681                };
10682                if(!decl.function.parameters)
10683                   decl.function.parameters = MkList();
10684                decl.function.parameters->Insert(null, param);
10685                id._class = null;
10686             }
10687             if(decl.function.parameters)
10688             {
10689                TypeName param;
10690
10691                for(param = decl.function.parameters->first; param; param = param.next)
10692                {
10693                   if(param.qualifiers && param.qualifiers->first)
10694                   {
10695                      Specifier spec = param.qualifiers->first;
10696                      if(spec && spec.specifier == TYPED_OBJECT)
10697                      {
10698                         Declarator d = param.declarator;
10699                         TypeName newParam
10700                         {
10701                            qualifiers = MkListOne(MkSpecifier(VOID));
10702                            declarator = MkDeclaratorPointer(MkPointer(null,null), d);
10703                         };
10704
10705                         FreeList(param.qualifiers, FreeSpecifier);
10706
10707                         param.qualifiers = MkListOne(MkStructOrUnion(structSpecifier, MkIdentifier("__ecereNameSpace__ecere__com__Class"), null));
10708                         param.declarator = MkDeclaratorPointer(MkPointer(null,null), MkDeclaratorIdentifier(MkIdentifier("class")));
10709
10710                         decl.function.parameters->Insert(param, newParam);
10711                         param = newParam;
10712                      }
10713                      else if(spec && spec.specifier == ANY_OBJECT)
10714                      {
10715                         Declarator d = param.declarator;
10716
10717                         FreeList(param.qualifiers, FreeSpecifier);
10718
10719                         param.qualifiers = MkListOne(MkSpecifier(VOID));
10720                         param.declarator = MkDeclaratorPointer(MkPointer(null,null), d);
10721                      }
10722                      else if(spec.specifier == THISCLASS)
10723                      {
10724                         if(thisClass)
10725                         {
10726                            spec.type = nameSpecifier;
10727                            spec.name = ReplaceThisClass(thisClass);
10728                            spec.symbol = FindClass(spec.name);
10729                            ProcessSpecifier(spec, false);
10730                         }
10731                      }
10732                   }
10733
10734                   if(param.declarator)
10735                      ProcessDeclarator(param.declarator);
10736                }
10737             }
10738          }
10739          break;
10740    }
10741 }
10742
10743 static void ProcessDeclaration(Declaration decl)
10744 {
10745    yylloc = decl.loc;
10746    switch(decl.type)
10747    {
10748       case initDeclaration:
10749       {
10750          bool declareStruct = false;
10751          /*
10752          lineNum = decl.pos.line;
10753          column = decl.pos.col;
10754          */
10755
10756          if(decl.declarators)
10757          {
10758             InitDeclarator d;
10759
10760             for(d = decl.declarators->first; d; d = d.next)
10761             {
10762                Type type, subType;
10763                ProcessDeclarator(d.declarator);
10764
10765                type = ProcessType(decl.specifiers, d.declarator);
10766
10767                if(d.initializer)
10768                {
10769                   ProcessInitializer(d.initializer, type);
10770
10771                   // Change "ColorRGB a = ColorRGB { 1,2,3 } => ColorRGB a { 1,2,3 }
10772
10773                   if(decl.declarators->count == 1 && d.initializer.type == expInitializer &&
10774                      d.initializer.exp.type == instanceExp)
10775                   {
10776                      if(type.kind == classType && type._class ==
10777                         d.initializer.exp.expType._class)
10778                      {
10779                         Instantiation inst = d.initializer.exp.instance;
10780                         inst.exp = MkExpIdentifier(CopyIdentifier(GetDeclId(d.declarator)));
10781
10782                         d.initializer.exp.instance = null;
10783                         if(decl.specifiers)
10784                            FreeList(decl.specifiers, FreeSpecifier);
10785                         FreeList(decl.declarators, FreeInitDeclarator);
10786
10787                         d = null;
10788
10789                         decl.type = instDeclaration;
10790                         decl.inst = inst;
10791                      }
10792                   }
10793                }
10794                for(subType = type; subType;)
10795                {
10796                   if(subType.kind == classType)
10797                   {
10798                      declareStruct = true;
10799                      break;
10800                   }
10801                   else if(subType.kind == pointerType)
10802                      break;
10803                   else if(subType.kind == arrayType)
10804                      subType = subType.arrayType;
10805                   else
10806                      break;
10807                }
10808
10809                FreeType(type);
10810                if(!d) break;
10811             }
10812          }
10813
10814          if(decl.specifiers)
10815          {
10816             Specifier s;
10817             for(s = decl.specifiers->first; s; s = s.next)
10818             {
10819                ProcessSpecifier(s, declareStruct);
10820             }
10821          }
10822          break;
10823       }
10824       case instDeclaration:
10825       {
10826          ProcessInstantiationType(decl.inst);
10827          break;
10828       }
10829       case structDeclaration:
10830       {
10831          Specifier spec;
10832          Declarator d;
10833          bool declareStruct = false;
10834
10835          if(decl.declarators)
10836          {
10837             for(d = decl.declarators->first; d; d = d.next)
10838             {
10839                Type type = ProcessType(decl.specifiers, d.declarator);
10840                Type subType;
10841                ProcessDeclarator(d);
10842                for(subType = type; subType;)
10843                {
10844                   if(subType.kind == classType)
10845                   {
10846                      declareStruct = true;
10847                      break;
10848                   }
10849                   else if(subType.kind == pointerType)
10850                      break;
10851                   else if(subType.kind == arrayType)
10852                      subType = subType.arrayType;
10853                   else
10854                      break;
10855                }
10856                FreeType(type);
10857             }
10858          }
10859          if(decl.specifiers)
10860          {
10861             for(spec = decl.specifiers->first; spec; spec = spec.next)
10862                ProcessSpecifier(spec, declareStruct);
10863          }
10864          break;
10865       }
10866    }
10867 }
10868
10869 static FunctionDefinition curFunction;
10870
10871 static void CreateFireWatcher(Property prop, Expression object, Statement stmt)
10872 {
10873    char propName[1024], propNameM[1024];
10874    char getName[1024], setName[1024];
10875    OldList * args;
10876
10877    DeclareProperty(prop, setName, getName);
10878
10879    // eInstance_FireWatchers(object, prop);
10880    strcpy(propName, "__ecereProp_");
10881    FullClassNameCat(propName, prop._class.fullName, false);
10882    strcat(propName, "_");
10883    // strcat(propName, prop.name);
10884    FullClassNameCat(propName, prop.name, true);
10885    MangleClassName(propName);
10886
10887    strcpy(propNameM, "__ecerePropM_");
10888    FullClassNameCat(propNameM, prop._class.fullName, false);
10889    strcat(propNameM, "_");
10890    // strcat(propNameM, prop.name);
10891    FullClassNameCat(propNameM, prop.name, true);
10892    MangleClassName(propNameM);
10893
10894    if(prop.isWatchable)
10895    {
10896       args = MkList();
10897       ListAdd(args, object ? CopyExpression(object) : MkExpIdentifier(MkIdentifier("this")));
10898       ListAdd(args, MkExpIdentifier(MkIdentifier(propName)));
10899       ListAdd(stmt.expressions, MkExpCall(MkExpIdentifier(MkIdentifier("ecere::com::eInstance_FireWatchers")), args));
10900
10901       args = MkList();
10902       ListAdd(args, object ? CopyExpression(object) : MkExpIdentifier(MkIdentifier("this")));
10903       ListAdd(args, MkExpIdentifier(MkIdentifier(propNameM)));
10904       ListAdd(stmt.expressions, MkExpCall(MkExpIdentifier(MkIdentifier("ecere::com::eInstance_FireWatchers")), args));
10905    }
10906
10907
10908    {
10909       args = MkList();
10910       ListAdd(args, object ? CopyExpression(object) : MkExpIdentifier(MkIdentifier("this")));
10911       ListAdd(args, MkExpIdentifier(MkIdentifier(propName)));
10912       ListAdd(stmt.expressions, MkExpCall(MkExpIdentifier(MkIdentifier("ecere::com::eInstance_FireSelfWatchers")), args));
10913
10914       args = MkList();
10915       ListAdd(args, object ? CopyExpression(object) : MkExpIdentifier(MkIdentifier("this")));
10916       ListAdd(args, MkExpIdentifier(MkIdentifier(propNameM)));
10917       ListAdd(stmt.expressions, MkExpCall(MkExpIdentifier(MkIdentifier("ecere::com::eInstance_FireSelfWatchers")), args));
10918    }
10919
10920    if(curFunction.propSet && !strcmp(curFunction.propSet.string, prop.name) &&
10921       (!object || (object.type == identifierExp && !strcmp(object.identifier.string, "this"))))
10922       curFunction.propSet.fireWatchersDone = true;
10923 }
10924
10925 static void ProcessStatement(Statement stmt)
10926 {
10927    yylloc = stmt.loc;
10928    /*
10929    lineNum = stmt.pos.line;
10930    column = stmt.pos.col;
10931    */
10932    switch(stmt.type)
10933    {
10934       case labeledStmt:
10935          ProcessStatement(stmt.labeled.stmt);
10936          break;
10937       case caseStmt:
10938          // This expression should be constant...
10939          if(stmt.caseStmt.exp)
10940          {
10941             FreeType(stmt.caseStmt.exp.destType);
10942             stmt.caseStmt.exp.destType = curSwitchType;
10943             if(curSwitchType) curSwitchType.refCount++;
10944             ProcessExpressionType(stmt.caseStmt.exp);
10945             ComputeExpression(stmt.caseStmt.exp);
10946          }
10947          if(stmt.caseStmt.stmt)
10948             ProcessStatement(stmt.caseStmt.stmt);
10949          break;
10950       case compoundStmt:
10951       {
10952          if(stmt.compound.context)
10953          {
10954             Declaration decl;
10955             Statement s;
10956
10957             Statement prevCompound = curCompound;
10958             Context prevContext = curContext;
10959
10960             if(!stmt.compound.isSwitch)
10961             {
10962                curCompound = stmt;
10963                curContext = stmt.compound.context;
10964             }
10965
10966             if(stmt.compound.declarations)
10967             {
10968                for(decl = stmt.compound.declarations->first; decl; decl = decl.next)
10969                   ProcessDeclaration(decl);
10970             }
10971             if(stmt.compound.statements)
10972             {
10973                for(s = stmt.compound.statements->first; s; s = s.next)
10974                   ProcessStatement(s);
10975             }
10976
10977             curContext = prevContext;
10978             curCompound = prevCompound;
10979          }
10980          break;
10981       }
10982       case expressionStmt:
10983       {
10984          Expression exp;
10985          if(stmt.expressions)
10986          {
10987             for(exp = stmt.expressions->first; exp; exp = exp.next)
10988                ProcessExpressionType(exp);
10989          }
10990          break;
10991       }
10992       case ifStmt:
10993       {
10994          Expression exp;
10995
10996          FreeType(((Expression)stmt.ifStmt.exp->last).destType);
10997          ((Expression)stmt.ifStmt.exp->last).destType = MkClassType("bool");
10998          ((Expression)stmt.ifStmt.exp->last).destType.truth = true;
10999          for(exp = stmt.ifStmt.exp->first; exp; exp = exp.next)
11000          {
11001             ProcessExpressionType(exp);
11002          }
11003          if(stmt.ifStmt.stmt)
11004             ProcessStatement(stmt.ifStmt.stmt);
11005          if(stmt.ifStmt.elseStmt)
11006             ProcessStatement(stmt.ifStmt.elseStmt);
11007          break;
11008       }
11009       case switchStmt:
11010       {
11011          Type oldSwitchType = curSwitchType;
11012          if(stmt.switchStmt.exp)
11013          {
11014             Expression exp;
11015             for(exp = stmt.switchStmt.exp->first; exp; exp = exp.next)
11016             {
11017                if(!exp.next)
11018                {
11019                   /*
11020                   Type destType
11021                   {
11022                      kind = intType;
11023                      refCount = 1;
11024                   };
11025                   e.exp.destType = destType;
11026                   */
11027
11028                   ProcessExpressionType(exp);
11029                }
11030                if(!exp.next)
11031                   curSwitchType = exp.expType;
11032             }
11033          }
11034          ProcessStatement(stmt.switchStmt.stmt);
11035          curSwitchType = oldSwitchType;
11036          break;
11037       }
11038       case whileStmt:
11039       {
11040          if(stmt.whileStmt.exp)
11041          {
11042             Expression exp;
11043
11044             FreeType(((Expression)stmt.whileStmt.exp->last).destType);
11045             ((Expression)stmt.whileStmt.exp->last).destType = MkClassType("bool");
11046             ((Expression)stmt.whileStmt.exp->last).destType.truth = true;
11047             for(exp = stmt.whileStmt.exp->first; exp; exp = exp.next)
11048             {
11049                ProcessExpressionType(exp);
11050             }
11051          }
11052          if(stmt.whileStmt.stmt)
11053             ProcessStatement(stmt.whileStmt.stmt);
11054          break;
11055       }
11056       case doWhileStmt:
11057       {
11058          if(stmt.doWhile.exp)
11059          {
11060             Expression exp;
11061
11062             if(stmt.doWhile.exp->last)
11063             {
11064                FreeType(((Expression)stmt.doWhile.exp->last).destType);
11065                ((Expression)stmt.doWhile.exp->last).destType = MkClassType("bool");
11066                ((Expression)stmt.doWhile.exp->last).destType.truth = true;
11067             }
11068             for(exp = stmt.doWhile.exp->first; exp; exp = exp.next)
11069             {
11070                ProcessExpressionType(exp);
11071             }
11072          }
11073          if(stmt.doWhile.stmt)
11074             ProcessStatement(stmt.doWhile.stmt);
11075          break;
11076       }
11077       case forStmt:
11078       {
11079          Expression exp;
11080          if(stmt.forStmt.init)
11081             ProcessStatement(stmt.forStmt.init);
11082
11083          if(stmt.forStmt.check && stmt.forStmt.check.expressions)
11084          {
11085             FreeType(((Expression)stmt.forStmt.check.expressions->last).destType);
11086             ((Expression)stmt.forStmt.check.expressions->last).destType = MkClassType("bool");
11087             ((Expression)stmt.forStmt.check.expressions->last).destType.truth = true;
11088          }
11089
11090          if(stmt.forStmt.check)
11091             ProcessStatement(stmt.forStmt.check);
11092          if(stmt.forStmt.increment)
11093          {
11094             for(exp = stmt.forStmt.increment->first; exp; exp = exp.next)
11095                ProcessExpressionType(exp);
11096          }
11097
11098          if(stmt.forStmt.stmt)
11099             ProcessStatement(stmt.forStmt.stmt);
11100          break;
11101       }
11102       case forEachStmt:
11103       {
11104          Identifier id = stmt.forEachStmt.id;
11105          OldList * exp = stmt.forEachStmt.exp;
11106          OldList * filter = stmt.forEachStmt.filter;
11107          Statement block = stmt.forEachStmt.stmt;
11108          char iteratorType[1024];
11109          Type source;
11110          Expression e;
11111          bool isBuiltin = exp && exp->last &&
11112             (((Expression)exp->last).type == ExpressionType::arrayExp ||
11113               (((Expression)exp->last).type == castExp && ((Expression)exp->last).cast.exp.type == ExpressionType::arrayExp));
11114          Expression arrayExp;
11115          char * typeString = null;
11116          int builtinCount = 0;
11117
11118          for(e = exp ? exp->first : null; e; e = e.next)
11119          {
11120             if(!e.next)
11121             {
11122                FreeType(e.destType);
11123                e.destType = ProcessTypeString("Container", false);
11124             }
11125             if(!isBuiltin || e.next)
11126                ProcessExpressionType(e);
11127          }
11128
11129          source = (exp && exp->last) ? ((Expression)exp->last).expType : null;
11130          if(isBuiltin || (source && source.kind == classType && source._class && source._class.registered && source._class.registered != containerClass &&
11131             eClass_IsDerived(source._class.registered, containerClass)))
11132          {
11133             Class _class = source ? source._class.registered : null;
11134             Symbol symbol;
11135             Expression expIt = null;
11136             bool isMap = false, isArray = false, isLinkList = false, isList = false, isCustomAVLTree = false, isAVLTree = false;
11137             Class arrayClass = eSystem_FindClass(privateModule, "Array");
11138             Class linkListClass = eSystem_FindClass(privateModule, "LinkList");
11139             Class customAVLTreeClass = eSystem_FindClass(privateModule, "CustomAVLTree");
11140             stmt.type = compoundStmt;
11141
11142             stmt.compound.context = Context { };
11143             stmt.compound.context.parent = curContext;
11144             curContext = stmt.compound.context;
11145
11146             if(source && eClass_IsDerived(source._class.registered, customAVLTreeClass))
11147             {
11148                Class mapClass = eSystem_FindClass(privateModule, "Map");
11149                Class avlTreeClass = eSystem_FindClass(privateModule, "AVLTree");
11150                isCustomAVLTree = true;
11151                if(eClass_IsDerived(source._class.registered, avlTreeClass))
11152                   isAVLTree = true;
11153                else if(eClass_IsDerived(source._class.registered, mapClass))
11154                   isMap = true;
11155             }
11156             else if(source && eClass_IsDerived(source._class.registered, arrayClass)) isArray = true;
11157             else if(source && eClass_IsDerived(source._class.registered, linkListClass))
11158             {
11159                Class listClass = eSystem_FindClass(privateModule, "List");
11160                isLinkList = true;
11161                isList = eClass_IsDerived(source._class.registered, listClass);
11162             }
11163
11164             if(isArray)
11165             {
11166                Declarator decl;
11167                OldList * specs = MkList();
11168                decl = SpecDeclFromString(_class.templateArgs[2].dataTypeString, specs,
11169                   MkDeclaratorPointer(MkPointer(null, null), MkDeclaratorIdentifier(id)));
11170                stmt.compound.declarations = MkListOne(
11171                   MkDeclaration(specs, MkListOne(MkInitDeclarator(decl, null))));
11172                ListAdd(stmt.compound.declarations, MkDeclaration(MkListOne(MkSpecifierName(source._class.registered.fullName)),
11173                   MkListOne(MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier("__internalArray")),
11174                      MkInitializerAssignment(MkExpBrackets(exp))))));
11175             }
11176             else if(isBuiltin)
11177             {
11178                Type type = null;
11179                char typeStringBuf[1024];
11180
11181                // TODO: Merge this code?
11182                arrayExp = (((Expression)exp->last).type == ExpressionType::arrayExp) ? (Expression)exp->last : ((Expression)exp->last).cast.exp;
11183                if(((Expression)exp->last).type == castExp)
11184                {
11185                   TypeName typeName = ((Expression)exp->last).cast.typeName;
11186                   if(typeName)
11187                      arrayExp.destType = ProcessType(typeName.qualifiers, typeName.declarator);
11188                }
11189
11190                if(arrayExp.destType && arrayExp.destType.kind == classType && arrayExp.destType._class && arrayExp.destType._class.registered &&
11191                   arrayExp.destType._class.registered != containerClass && eClass_IsDerived(arrayExp.destType._class.registered, containerClass) &&
11192                   arrayExp.destType._class.registered.templateArgs)
11193                {
11194                   Class templateClass = arrayExp.destType._class.registered;
11195                   typeString = templateClass.templateArgs[2].dataTypeString;
11196                }
11197                else if(arrayExp.list)
11198                {
11199                   // Guess type from expressions in the array
11200                   Expression e;
11201                   for(e = arrayExp.list->first; e; e = e.next)
11202                   {
11203                      ProcessExpressionType(e);
11204                      if(e.expType)
11205                      {
11206                         if(!type) { type = e.expType; type.refCount++; }
11207                         else
11208                         {
11209                            // if(!MatchType(e.expType, type, null, null, null, false, false, false))
11210                            if(!MatchTypeExpression(e, type, null, false))
11211                            {
11212                               FreeType(type);
11213                               type = e.expType;
11214                               e.expType = null;
11215
11216                               e = arrayExp.list->first;
11217                               ProcessExpressionType(e);
11218                               if(e.expType)
11219                               {
11220                                  //if(!MatchTypes(e.expType, type, null, null, null, false, false, false, false))
11221                                  if(!MatchTypeExpression(e, type, null, false))
11222                                  {
11223                                     FreeType(e.expType);
11224                                     e.expType = null;
11225                                     FreeType(type);
11226                                     type = null;
11227                                     break;
11228                                  }
11229                               }
11230                            }
11231                         }
11232                         if(e.expType)
11233                         {
11234                            FreeType(e.expType);
11235                            e.expType = null;
11236                         }
11237                      }
11238                   }
11239                   if(type)
11240                   {
11241                      typeStringBuf[0] = '\0';
11242                      PrintType(type, typeStringBuf, false, true);
11243                      typeString = typeStringBuf;
11244                      FreeType(type);
11245                   }
11246                }
11247                if(typeString)
11248                {
11249                   OldList * initializers = MkList();
11250                   Declarator decl;
11251                   OldList * specs = MkList();
11252                   if(arrayExp.list)
11253                   {
11254                      Expression e;
11255
11256                      builtinCount = arrayExp.list->count;
11257                      type = ProcessTypeString(typeString, false);
11258                      while(e = arrayExp.list->first)
11259                      {
11260                         arrayExp.list->Remove(e);
11261                         e.destType = type;
11262                         type.refCount++;
11263                         ProcessExpressionType(e);
11264                         ListAdd(initializers, MkInitializerAssignment(e));
11265                      }
11266                      FreeType(type);
11267                      delete arrayExp.list;
11268                   }
11269                   decl = SpecDeclFromString(typeString, specs, MkDeclaratorIdentifier(id));
11270                   stmt.compound.declarations = MkListOne(MkDeclaration(CopyList(specs, CopySpecifier),
11271                      MkListOne(MkInitDeclarator(MkDeclaratorPointer(MkPointer(null, null), /*CopyDeclarator(*/decl/*)*/), null))));
11272
11273                   ListAdd(stmt.compound.declarations, MkDeclaration(specs, MkListOne(MkInitDeclarator(
11274                      PlugDeclarator(
11275                         /*CopyDeclarator(*/decl/*)*/, MkDeclaratorArray(MkDeclaratorIdentifier(MkIdentifier("__internalArray")), null)
11276                         ), MkInitializerList(initializers)))));
11277                   FreeList(exp, FreeExpression);
11278                }
11279                else
11280                {
11281                   arrayExp.expType = ProcessTypeString("Container", false);
11282                   Compiler_Error($"Couldn't determine type of array elements\n");
11283                }
11284
11285                /*
11286                Declarator decl;
11287                OldList * specs = MkList();
11288
11289                decl = SpecDeclFromString(_class.templateArgs[2].dataTypeString, specs,
11290                   MkDeclaratorPointer(MkPointer(null, null), MkDeclaratorIdentifier(id)));
11291                stmt.compound.declarations = MkListOne(
11292                   MkDeclaration(specs, MkListOne(MkInitDeclarator(decl, null))));
11293                ListAdd(stmt.compound.declarations, MkDeclaration(MkListOne(MkSpecifierName("BuiltInContainer")),
11294                   MkListOne(MkInitDeclarator(MkDeclaratorPointer(MkPointer(null, null), MkDeclaratorIdentifier(MkIdentifier("__internalArray"))),
11295                      MkInitializerAssignment(MkExpBrackets(exp))))));
11296                */
11297             }
11298             else if(isLinkList && !isList)
11299             {
11300                Declarator decl;
11301                OldList * specs = MkList();
11302                decl = SpecDeclFromString(_class.templateArgs[3].dataTypeString, specs, MkDeclaratorIdentifier(id));
11303                stmt.compound.declarations = MkListOne(MkDeclaration(specs, MkListOne(MkInitDeclarator(decl, null))));
11304                ListAdd(stmt.compound.declarations, MkDeclaration(MkListOne(MkSpecifierName(source._class.registered.fullName)),
11305                   MkListOne(MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier("__internalLinkList")),
11306                      MkInitializerAssignment(MkExpBrackets(exp))))));
11307             }
11308             /*else if(isCustomAVLTree)
11309             {
11310                Declarator decl;
11311                OldList * specs = MkList();
11312                decl = SpecDeclFromString(_class.templateArgs[3].dataTypeString, specs, MkDeclaratorIdentifier(id));
11313                stmt.compound.declarations = MkListOne(MkDeclaration(specs, MkListOne(MkInitDeclarator(decl, null))));
11314                ListAdd(stmt.compound.declarations, MkDeclaration(MkListOne(MkSpecifierName(source._class.registered.fullName)),
11315                   MkListOne(MkInitDeclarator(MkDeclaratorIdentifier(MkIdentifier("__internalTree")),
11316                      MkInitializerAssignment(MkExpBrackets(exp))))));
11317             }*/
11318             else if(_class.templateArgs)
11319             {
11320                if(isMap)
11321                   sprintf(iteratorType, "MapIterator<%s, %s >", _class.templateArgs[5].dataTypeString, _class.templateArgs[6].dataTypeString);
11322                else
11323                   sprintf(iteratorType, "Iterator<%s, %s >", _class.templateArgs[2].dataTypeString, _class.templateArgs[1].dataTypeString);
11324
11325                stmt.compound.declarations = MkListOne(
11326                   MkDeclarationInst(MkInstantiationNamed(MkListOne(MkSpecifierName(iteratorType)),
11327                   MkExpIdentifier(id), MkListOne(MkMembersInitList(MkListOne(MkMemberInit(isMap ? MkListOne(MkIdentifier("map")) : null,
11328                   MkInitializerAssignment(MkExpBrackets(exp)))))))));
11329             }
11330             symbol = FindSymbol(id.string, curContext, curContext, false, false);
11331
11332             if(block && block.type == compoundStmt && block.compound.context)
11333             {
11334                block.compound.context.parent = stmt.compound.context;
11335             }
11336             if(filter)
11337             {
11338                block = MkIfStmt(filter, block, null);
11339             }
11340             if(isArray)
11341             {
11342                stmt.compound.statements = MkListOne(MkForStmt(
11343                   MkExpressionStmt(MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), '=', MkExpMember(MkExpIdentifier(MkIdentifier("__internalArray")), MkIdentifier("array"))))),
11344                   MkExpressionStmt(MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), '<',
11345                      MkExpOp(MkExpMember(MkExpIdentifier(MkIdentifier("__internalArray")), MkIdentifier("array")), '+', MkExpMember(MkExpIdentifier(MkIdentifier("__internalArray")), MkIdentifier("count")))))),
11346                   MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), INC_OP, null)),
11347                   block));
11348               ProcessStatement(((Statement)stmt.compound.statements->first).forStmt.init);
11349               ProcessStatement(((Statement)stmt.compound.statements->first).forStmt.check);
11350               ProcessExpressionType(((Statement)stmt.compound.statements->first).forStmt.increment->first);
11351             }
11352             else if(isBuiltin)
11353             {
11354                char count[128];
11355                //OldList * specs = MkList();
11356                // Declarator decl = SpecDeclFromString(typeString, specs, MkDeclaratorPointer(MkPointer(null, null), null));
11357
11358                sprintf(count, "%d", builtinCount);
11359
11360                stmt.compound.statements = MkListOne(MkForStmt(
11361                   MkExpressionStmt(MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), '=', MkExpIdentifier(MkIdentifier("__internalArray"))))),
11362                   MkExpressionStmt(MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), '<',
11363                      MkExpOp(MkExpIdentifier(MkIdentifier("__internalArray")), '+', MkExpConstant(count))))),
11364                   MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), INC_OP, null)),
11365                   block));
11366
11367                /*
11368                Declarator decl = SpecDeclFromString(_class.templateArgs[2].dataTypeString, specs, MkDeclaratorPointer(MkPointer(null, null), null));
11369                stmt.compound.statements = MkListOne(MkForStmt(
11370                   MkExpressionStmt(MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), '=', MkExpPointer(MkExpIdentifier(MkIdentifier("__internalArray")), MkIdentifier("data"))))),
11371                   MkExpressionStmt(MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), '<',
11372                      MkExpOp(MkExpCast(MkTypeName(specs, decl), MkExpPointer(MkExpIdentifier(MkIdentifier("__internalArray")), MkIdentifier("data"))), '+', MkExpPointer(MkExpIdentifier(MkIdentifier("__internalArray")), MkIdentifier("count")))))),
11373                   MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), INC_OP, null)),
11374                   block));
11375               */
11376               ProcessStatement(((Statement)stmt.compound.statements->first).forStmt.init);
11377               ProcessStatement(((Statement)stmt.compound.statements->first).forStmt.check);
11378               ProcessExpressionType(((Statement)stmt.compound.statements->first).forStmt.increment->first);
11379             }
11380             else if(isLinkList && !isList)
11381             {
11382                Class typeClass = eSystem_FindClass(_class.module, _class.templateArgs[3].dataTypeString);
11383                Class listItemClass = eSystem_FindClass(_class.module, "ListItem");
11384                if(typeClass && eClass_IsDerived(typeClass, listItemClass) && _class.templateArgs[5].dataTypeString &&
11385                   !strcmp(_class.templateArgs[5].dataTypeString, "LT::link"))
11386                {
11387                   stmt.compound.statements = MkListOne(MkForStmt(
11388                      MkExpressionStmt(MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), '=', MkExpMember(MkExpIdentifier(MkIdentifier("__internalLinkList")), MkIdentifier("first"))))),
11389                      MkExpressionStmt(MkListOne(MkExpIdentifier(CopyIdentifier(id)))),
11390                      MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), '=', MkExpMember(MkExpIdentifier(CopyIdentifier(id)), MkIdentifier("next")))),
11391                      block));
11392                }
11393                else
11394                {
11395                   OldList * specs = MkList();
11396                   Declarator decl = SpecDeclFromString(_class.templateArgs[3].dataTypeString, specs, null);
11397                   stmt.compound.statements = MkListOne(MkForStmt(
11398                      MkExpressionStmt(MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), '=', MkExpMember(MkExpIdentifier(MkIdentifier("__internalLinkList")), MkIdentifier("first"))))),
11399                      MkExpressionStmt(MkListOne(MkExpIdentifier(CopyIdentifier(id)))),
11400                      MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), '=', MkExpCast(MkTypeName(specs, decl), MkExpCall(
11401                         MkExpMember(MkExpIdentifier(MkIdentifier("__internalLinkList")), MkIdentifier("GetNext")),
11402                            MkListOne(MkExpCast(MkTypeName(MkListOne(MkSpecifierName("IteratorPointer")), null), MkExpIdentifier(CopyIdentifier(id)))))))),
11403                      block));
11404                }
11405                ProcessStatement(((Statement)stmt.compound.statements->first).forStmt.init);
11406                ProcessStatement(((Statement)stmt.compound.statements->first).forStmt.check);
11407                ProcessExpressionType(((Statement)stmt.compound.statements->first).forStmt.increment->first);
11408             }
11409             /*else if(isCustomAVLTree)
11410             {
11411                stmt.compound.statements = MkListOne(MkForStmt(
11412                   MkExpressionStmt(MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), '=', MkExpMember(MkExpMember(MkExpIdentifier(
11413                      MkIdentifier("__internalTree")), MkIdentifier("root")), MkIdentifier("minimum"))))),
11414                   MkExpressionStmt(MkListOne(MkExpIdentifier(CopyIdentifier(id)))),
11415                   MkListOne(MkExpOp(MkExpIdentifier(CopyIdentifier(id)), '=', MkExpMember(MkExpIdentifier(CopyIdentifier(id)), MkIdentifier("next")))),
11416                   block));
11417
11418                ProcessStatement(((Statement)stmt.compound.statements->first).forStmt.init);
11419                ProcessStatement(((Statement)stmt.compound.statements->first).forStmt.check);
11420                ProcessExpressionType(((Statement)stmt.compound.statements->first).forStmt.increment->first);
11421             }*/
11422             else
11423             {
11424                stmt.compound.statements = MkListOne(MkWhileStmt(MkListOne(MkExpCall(MkExpMember(expIt = MkExpIdentifier(CopyIdentifier(id)),
11425                   MkIdentifier("Next")), null)), block));
11426             }
11427             ProcessExpressionType(expIt);
11428             if(stmt.compound.declarations->first)
11429                ProcessDeclaration(stmt.compound.declarations->first);
11430
11431             if(symbol)
11432                symbol.isIterator = isMap ? 2 : ((isArray || isBuiltin) ? 3 : (isLinkList ? (isList ? 5 : 4) : (isCustomAVLTree ? 6 : 1)));
11433
11434             ProcessStatement(stmt);
11435             curContext = stmt.compound.context.parent;
11436             break;
11437          }
11438          else
11439          {
11440             Compiler_Error($"Expression is not a container\n");
11441          }
11442          break;
11443       }
11444       case gotoStmt:
11445          break;
11446       case continueStmt:
11447          break;
11448       case breakStmt:
11449          break;
11450       case returnStmt:
11451       {
11452          Expression exp;
11453          if(stmt.expressions)
11454          {
11455             for(exp = stmt.expressions->first; exp; exp = exp.next)
11456             {
11457                if(!exp.next)
11458                {
11459                   if(curFunction && !curFunction.type)
11460                      curFunction.type = ProcessType(
11461                         curFunction.specifiers, curFunction.declarator);
11462                   FreeType(exp.destType);
11463                   exp.destType = (curFunction && curFunction.type && curFunction.type.kind == functionType) ? curFunction.type.returnType : null;
11464                   if(exp.destType) exp.destType.refCount++;
11465                }
11466                ProcessExpressionType(exp);
11467             }
11468          }
11469          break;
11470       }
11471       case badDeclarationStmt:
11472       {
11473          ProcessDeclaration(stmt.decl);
11474          break;
11475       }
11476       case asmStmt:
11477       {
11478          AsmField field;
11479          if(stmt.asmStmt.inputFields)
11480          {
11481             for(field = stmt.asmStmt.inputFields->first; field; field = field.next)
11482                if(field.expression)
11483                   ProcessExpressionType(field.expression);
11484          }
11485          if(stmt.asmStmt.outputFields)
11486          {
11487             for(field = stmt.asmStmt.outputFields->first; field; field = field.next)
11488                if(field.expression)
11489                   ProcessExpressionType(field.expression);
11490          }
11491          if(stmt.asmStmt.clobberedFields)
11492          {
11493             for(field = stmt.asmStmt.clobberedFields->first; field; field = field.next)
11494             {
11495                if(field.expression)
11496                   ProcessExpressionType(field.expression);
11497             }
11498          }
11499          break;
11500       }
11501       case watchStmt:
11502       {
11503          PropertyWatch propWatch;
11504          OldList * watches = stmt._watch.watches;
11505          Expression object = stmt._watch.object;
11506          Expression watcher = stmt._watch.watcher;
11507          if(watcher)
11508             ProcessExpressionType(watcher);
11509          if(object)
11510             ProcessExpressionType(object);
11511
11512          if(inCompiler)
11513          {
11514             if(watcher || thisClass)
11515             {
11516                External external = curExternal;
11517                Context context = curContext;
11518
11519                stmt.type = expressionStmt;
11520                stmt.expressions = MkList();
11521
11522                curExternal = external.prev;
11523
11524                for(propWatch = watches->first; propWatch; propWatch = propWatch.next)
11525                {
11526                   ClassFunction func;
11527                   char watcherName[1024];
11528                   Class watcherClass = watcher ?
11529                      ((watcher.expType && watcher.expType.kind == classType && watcher.expType._class) ? watcher.expType._class.registered : null) : thisClass;
11530                   External createdExternal;
11531
11532                   // Create a declaration above
11533                   External externalDecl = MkExternalDeclaration(null);
11534                   ast->Insert(curExternal.prev, externalDecl);
11535
11536                   sprintf(watcherName,"__ecerePropertyWatcher_%d", propWatcherID++);
11537                   if(propWatch.deleteWatch)
11538                      strcat(watcherName, "_delete");
11539                   else
11540                   {
11541                      Identifier propID;
11542                      for(propID = propWatch.properties->first; propID; propID = propID.next)
11543                      {
11544                         strcat(watcherName, "_");
11545                         strcat(watcherName, propID.string);
11546                      }
11547                   }
11548
11549                   if(object && object.expType && object.expType.kind == classType && object.expType._class && object.expType._class.registered)
11550                   {
11551                      // TESTING THIS STUFF... BEWARE OF SYMBOL ID ISSUES
11552                      func = MkClassFunction(MkListOne(MkSpecifier(VOID)), null, MkDeclaratorFunction(MkDeclaratorIdentifier(MkIdentifier(watcherName)),
11553                         //MkListOne(MkTypeName(MkListOne(MkSpecifier(VOID)), null))), null);
11554                         MkListOne(MkTypeName(MkListOne(MkSpecifierName(object.expType._class.string)), MkDeclaratorIdentifier(MkIdentifier("value"))))), null);
11555                      ProcessClassFunctionBody(func, propWatch.compound);
11556                      propWatch.compound = null;
11557
11558                      //afterExternal = afterExternal ? afterExternal : curExternal;
11559
11560                      //createdExternal = ProcessClassFunction(watcherClass, func, ast, curExternal.prev);
11561                      createdExternal = ProcessClassFunction(watcherClass, func, ast, curExternal, true);
11562                      // TESTING THIS...
11563                      createdExternal.symbol.idCode = external.symbol.idCode;
11564
11565                      curExternal = createdExternal;
11566                      ProcessFunction(createdExternal.function);
11567
11568
11569                      // Create a declaration above
11570                      {
11571                         Declaration decl = MkDeclaration(CopyList(createdExternal.function.specifiers, CopySpecifier),
11572                            MkListOne(MkInitDeclarator(CopyDeclarator(createdExternal.function.declarator), null)));
11573                         externalDecl.declaration = decl;
11574                         if(decl.symbol && !decl.symbol.pointerExternal)
11575                            decl.symbol.pointerExternal = externalDecl;
11576                      }
11577
11578                      if(propWatch.deleteWatch)
11579                      {
11580                         OldList * args = MkList();
11581                         ListAdd(args, CopyExpression(object));
11582                         ListAdd(args, watcher ? CopyExpression(watcher) : MkExpIdentifier(MkIdentifier("this")));
11583                         ListAdd(args, MkExpIdentifier(MkIdentifier(watcherName)));
11584                         ListAdd(stmt.expressions, MkExpCall(MkExpIdentifier(MkIdentifier("ecere::com::eInstance_WatchDestruction")), args));
11585                      }
11586                      else
11587                      {
11588                         Class _class = object.expType._class.registered;
11589                         Identifier propID;
11590
11591                         for(propID = propWatch.properties->first; propID; propID = propID.next)
11592                         {
11593                            char propName[1024];
11594                            Property prop = eClass_FindProperty(_class, propID.string, privateModule);
11595                            if(prop)
11596                            {
11597                               char getName[1024], setName[1024];
11598                               OldList * args = MkList();
11599
11600                               DeclareProperty(prop, setName, getName);
11601
11602                               // eInstance_Watch(stmt.watch.object, prop, stmt.watch.watcher, callback);
11603                               strcpy(propName, "__ecereProp_");
11604                               FullClassNameCat(propName, prop._class.fullName, false);
11605                               strcat(propName, "_");
11606                               // strcat(propName, prop.name);
11607                               FullClassNameCat(propName, prop.name, true);
11608
11609                               ListAdd(args, CopyExpression(object));
11610                               ListAdd(args, MkExpIdentifier(MkIdentifier(propName)));
11611                               ListAdd(args, watcher ? CopyExpression(watcher) : MkExpIdentifier(MkIdentifier("this")));
11612                               ListAdd(args, MkExpIdentifier(MkIdentifier(watcherName)));
11613
11614                               ListAdd(stmt.expressions, MkExpCall(MkExpIdentifier(MkIdentifier("ecere::com::eInstance_Watch")), args));
11615                            }
11616                            else
11617                               Compiler_Error($"Property %s not found in class %s\n", prop.name, _class.fullName);
11618                         }
11619                      }
11620                   }
11621                   else
11622                      Compiler_Error($"Invalid watched object\n");
11623                }
11624
11625                curExternal = external;
11626                curContext = context;
11627
11628                if(watcher)
11629                   FreeExpression(watcher);
11630                if(object)
11631                   FreeExpression(object);
11632                FreeList(watches, FreePropertyWatch);
11633             }
11634             else
11635                Compiler_Error($"No observer specified and not inside a _class\n");
11636          }
11637          else
11638          {
11639             for(propWatch = watches->first; propWatch; propWatch = propWatch.next)
11640             {
11641                ProcessStatement(propWatch.compound);
11642             }
11643
11644          }
11645          break;
11646       }
11647       case fireWatchersStmt:
11648       {
11649          OldList * watches = stmt._watch.watches;
11650          Expression object = stmt._watch.object;
11651          Class _class;
11652          // DEBUGGER BUG: Why doesn't watches evaluate to null??
11653          // printf("%X\n", watches);
11654          // printf("%X\n", stmt._watch.watches);
11655          if(object)
11656             ProcessExpressionType(object);
11657
11658          if(inCompiler)
11659          {
11660             _class = object ?
11661                   ((object.expType && object.expType.kind == classType && object.expType._class) ? object.expType._class.registered : null) : thisClass;
11662
11663             if(_class)
11664             {
11665                Identifier propID;
11666
11667                stmt.type = expressionStmt;
11668                stmt.expressions = MkList();
11669
11670                // Check if we're inside a property set
11671                if(!watches && curFunction.propSet && (!object || (object.type == identifierExp && !strcmp(object.identifier.string, "this"))))
11672                {
11673                   watches = MkListOne(MkIdentifier(curFunction.propSet.string));
11674                }
11675                else if(!watches)
11676                {
11677                   //Compiler_Error($"No property specified and not inside a property set\n");
11678                }
11679                if(watches)
11680                {
11681                   for(propID = watches->first; propID; propID = propID.next)
11682                   {
11683                      Property prop = eClass_FindProperty(_class, propID.string, privateModule);
11684                      if(prop)
11685                      {
11686                         CreateFireWatcher(prop, object, stmt);
11687                      }
11688                      else
11689                         Compiler_Error($"Property %s not found in class %s\n", propID.string, _class.fullName);
11690                   }
11691                }
11692                else
11693                {
11694                   // Fire all properties!
11695                   Property prop;
11696                   Class base;
11697                   for(base = _class; base; base = base.base)
11698                   {
11699                      for(prop = base.membersAndProperties.first; prop; prop = prop.next)
11700                      {
11701                         if(prop.isProperty && prop.isWatchable)
11702                         {
11703                            CreateFireWatcher(prop, object, stmt);
11704                         }
11705                      }
11706                   }
11707                }
11708
11709                if(object)
11710                   FreeExpression(object);
11711                FreeList(watches, FreeIdentifier);
11712             }
11713             else
11714                Compiler_Error($"Invalid object specified and not inside a class\n");
11715          }
11716          break;
11717       }
11718       case stopWatchingStmt:
11719       {
11720          OldList * watches = stmt._watch.watches;
11721          Expression object = stmt._watch.object;
11722          Expression watcher = stmt._watch.watcher;
11723          Class _class;
11724          if(object)
11725             ProcessExpressionType(object);
11726          if(watcher)
11727             ProcessExpressionType(watcher);
11728          if(inCompiler)
11729          {
11730             _class = (object && object.expType && object.expType.kind == classType && object.expType._class) ? object.expType._class.registered : null;
11731
11732             if(watcher || thisClass)
11733             {
11734                if(_class)
11735                {
11736                   Identifier propID;
11737
11738                   stmt.type = expressionStmt;
11739                   stmt.expressions = MkList();
11740
11741                   if(!watches)
11742                   {
11743                      OldList * args;
11744                      // eInstance_StopWatching(object, null, watcher);
11745                      args = MkList();
11746                      ListAdd(args, CopyExpression(object));
11747                      ListAdd(args, MkExpConstant("0"));
11748                      ListAdd(args, watcher ? CopyExpression(watcher) : MkExpIdentifier(MkIdentifier("this")));
11749                      ListAdd(stmt.expressions, MkExpCall(MkExpIdentifier(MkIdentifier("ecere::com::eInstance_StopWatching")), args));
11750                   }
11751                   else
11752                   {
11753                      for(propID = watches->first; propID; propID = propID.next)
11754                      {
11755                         char propName[1024];
11756                         Property prop = eClass_FindProperty(_class, propID.string, privateModule);
11757                         if(prop)
11758                         {
11759                            char getName[1024], setName[1024];
11760                            OldList * args = MkList();
11761
11762                            DeclareProperty(prop, setName, getName);
11763
11764                            // eInstance_StopWatching(object, prop, watcher);
11765                            strcpy(propName, "__ecereProp_");
11766                            FullClassNameCat(propName, prop._class.fullName, false);
11767                            strcat(propName, "_");
11768                            // strcat(propName, prop.name);
11769                            FullClassNameCat(propName, prop.name, true);
11770                            MangleClassName(propName);
11771
11772                            ListAdd(args, CopyExpression(object));
11773                            ListAdd(args, MkExpIdentifier(MkIdentifier(propName)));
11774                            ListAdd(args, watcher ? CopyExpression(watcher) : MkExpIdentifier(MkIdentifier("this")));
11775                            ListAdd(stmt.expressions, MkExpCall(MkExpIdentifier(MkIdentifier("ecere::com::eInstance_StopWatching")), args));
11776                         }
11777                         else
11778                            Compiler_Error($"Property %s not found in class %s\n", prop.name, _class.fullName);
11779                      }
11780                   }
11781
11782                   if(object)
11783                      FreeExpression(object);
11784                   if(watcher)
11785                      FreeExpression(watcher);
11786                   FreeList(watches, FreeIdentifier);
11787                }
11788                else
11789                   Compiler_Error($"Invalid object specified and not inside a class\n");
11790             }
11791             else
11792                Compiler_Error($"No observer specified and not inside a class\n");
11793          }
11794          break;
11795       }
11796    }
11797 }
11798
11799 static void ProcessFunction(FunctionDefinition function)
11800 {
11801    Identifier id = GetDeclId(function.declarator);
11802    Symbol symbol = function.declarator ? function.declarator.symbol : null;
11803    Type type = symbol ? symbol.type : null;
11804    Class oldThisClass = thisClass;
11805    Context oldTopContext = topContext;
11806
11807    yylloc = function.loc;
11808    // Process thisClass
11809
11810    if(type && type.thisClass)
11811    {
11812       Symbol classSym = type.thisClass;
11813       Class _class = type.thisClass.registered;
11814       char className[1024];
11815       char structName[1024];
11816       Declarator funcDecl;
11817       Symbol thisSymbol;
11818
11819       bool typedObject = false;
11820
11821       if(_class && !_class.base)
11822       {
11823          _class = currentClass;
11824          if(_class && !_class.symbol)
11825             _class.symbol = FindClass(_class.fullName);
11826          classSym = _class ? _class.symbol : null;
11827          typedObject = true;
11828       }
11829
11830       thisClass = _class;
11831
11832       if(inCompiler && _class)
11833       {
11834          if(type.kind == functionType)
11835          {
11836             if(symbol.type.params.count == 1 && ((Type)symbol.type.params.first).kind == voidType)
11837             {
11838                //TypeName param = symbol.type.params.first;
11839                Type param = symbol.type.params.first;
11840                symbol.type.params.Remove(param);
11841                //FreeTypeName(param);
11842                FreeType(param);
11843             }
11844             if(type.classObjectType != classPointer)
11845             {
11846                symbol.type.params.Insert(null, MkClassType(_class.fullName));
11847                symbol.type.staticMethod = true;
11848                symbol.type.thisClass = null;
11849
11850                // HIGH DANGER: VERIFYING THIS...
11851                symbol.type.extraParam = false;
11852             }
11853          }
11854
11855          strcpy(className, "__ecereClass_");
11856          FullClassNameCat(className, _class.fullName, true);
11857
11858          MangleClassName(className);
11859
11860          structName[0] = 0;
11861          FullClassNameCat(structName, _class.fullName, false);
11862
11863          // [class] this
11864
11865
11866          funcDecl = GetFuncDecl(function.declarator);
11867          if(funcDecl)
11868          {
11869             if(funcDecl.function.parameters && funcDecl.function.parameters->count == 1)
11870             {
11871                TypeName param = funcDecl.function.parameters->first;
11872                if(param.qualifiers && param.qualifiers->count == 1 && ((Specifier)param.qualifiers->first).specifier == VOID && !param.declarator)
11873                {
11874                   funcDecl.function.parameters->Remove(param);
11875                   FreeTypeName(param);
11876                }
11877             }
11878
11879             // DANGER: Watch for this... Check if it's a Conversion?
11880             // if((_class.type != bitClass && _class.type != unitClass && _class.type != enumClass) || function != (FunctionDefinition)symbol.externalSet)
11881
11882             // WAS TRYING THIS FOR CONVERSION PROPERTIES ON NOHEAD CLASSES: if((_class.type == structClass) || function != (FunctionDefinition)symbol.externalSet)
11883             if(!function.propertyNoThis)
11884             {
11885                TypeName thisParam;
11886
11887                if(type.classObjectType != classPointer)
11888                {
11889                   thisParam = QMkClass(_class.fullName, MkDeclaratorIdentifier(MkIdentifier("this")));
11890                   if(!funcDecl.function.parameters)
11891                      funcDecl.function.parameters = MkList();
11892                   funcDecl.function.parameters->Insert(null, thisParam);
11893                }
11894
11895                if(typedObject)
11896                {
11897                   if(type.classObjectType != classPointer)
11898                   {
11899                      if(type.byReference || _class.type == unitClass || _class.type == systemClass || _class.type == enumClass || _class.type == bitClass)
11900                         thisParam.declarator = MkDeclaratorPointer(MkPointer(null,null), thisParam.declarator);
11901                   }
11902
11903                   thisParam = TypeName
11904                   {
11905                      declarator = MkDeclaratorPointer(MkPointer(null,null), MkDeclaratorIdentifier(MkIdentifier("class")));
11906                      qualifiers = MkListOne(MkStructOrUnion(structSpecifier, MkIdentifier("__ecereNameSpace__ecere__com__Class"), null));
11907                   };
11908                   funcDecl.function.parameters->Insert(null, thisParam);
11909                }
11910             }
11911          }
11912
11913          if(symbol && symbol.pointerExternal && symbol.pointerExternal.type == declarationExternal)
11914          {
11915             InitDeclarator initDecl = symbol.pointerExternal.declaration.declarators->first;
11916             funcDecl = GetFuncDecl(initDecl.declarator);
11917             if(funcDecl)
11918             {
11919                if(funcDecl.function.parameters && funcDecl.function.parameters->count == 1)
11920                {
11921                   TypeName param = funcDecl.function.parameters->first;
11922                   if(param.qualifiers && param.qualifiers->count == 1 && ((Specifier)param.qualifiers->first).specifier == VOID && !param.declarator)
11923                   {
11924                      funcDecl.function.parameters->Remove(param);
11925                      FreeTypeName(param);
11926                   }
11927                }
11928
11929                if(type.classObjectType != classPointer)
11930                {
11931                   // DANGER: Watch for this... Check if it's a Conversion?
11932                   if((_class.type != bitClass && _class.type != unitClass && _class.type != enumClass) || function != (FunctionDefinition)symbol.externalSet)
11933                   {
11934                      TypeName thisParam = QMkClass(_class.fullName, MkDeclaratorIdentifier(MkIdentifier("this")));
11935
11936                      if(!funcDecl.function.parameters)
11937                         funcDecl.function.parameters = MkList();
11938                      funcDecl.function.parameters->Insert(null, thisParam);
11939                   }
11940                }
11941             }
11942          }
11943       }
11944
11945       // Add this to the context
11946       if(function.body)
11947       {
11948          if(type.classObjectType != classPointer)
11949          {
11950             thisSymbol = Symbol
11951             {
11952                string = CopyString("this");
11953                type = classSym ? MkClassType(classSym.string) : null; //_class.fullName);
11954             };
11955             function.body.compound.context.symbols.Add((BTNode)thisSymbol);
11956
11957             if(typedObject && thisSymbol.type)
11958             {
11959                thisSymbol.type.classObjectType = ClassObjectType::typedObject;
11960                thisSymbol.type.byReference = type.byReference;
11961                thisSymbol.type.typedByReference = type.byReference;
11962                /*
11963                thisSymbol = Symbol { string = CopyString("class") };
11964                function.body.compound.context.symbols.Add(thisSymbol);
11965                */
11966             }
11967          }
11968       }
11969
11970       // Pointer to class data
11971
11972       if(inCompiler && _class && (_class.type == normalClass /*|| _class.type == noHeadClass*/) && type.classObjectType != classPointer)
11973       {
11974          DataMember member = null;
11975          {
11976             Class base;
11977             for(base = _class; base && base.type != systemClass; base = base.next)
11978             {
11979                for(member = base.membersAndProperties.first; member; member = member.next)
11980                   if(!member.isProperty)
11981                      break;
11982                if(member)
11983                   break;
11984             }
11985          }
11986          for(member = _class.membersAndProperties.first; member; member = member.next)
11987             if(!member.isProperty)
11988                break;
11989          if(member)
11990          {
11991             char pointerName[1024];
11992
11993             Declaration decl;
11994             Initializer initializer;
11995             Expression exp, bytePtr;
11996
11997             strcpy(pointerName, "__ecerePointer_");
11998             FullClassNameCat(pointerName, _class.fullName, false);
11999             {
12000                char className[1024];
12001                strcpy(className, "__ecereClass_");
12002                FullClassNameCat(className, classSym.string, true);
12003                MangleClassName(className);
12004
12005                // Testing This
12006                DeclareClass(classSym, className);
12007             }
12008
12009             // ((byte *) this)
12010             bytePtr = QBrackets(MkExpCast(QMkType("char", QMkPtrDecl(null)), QMkExpId("this")));
12011
12012             if(_class.fixed)
12013             {
12014                char string[256];
12015                sprintf(string, "%d", _class.offset);
12016                exp = QBrackets(MkExpOp(bytePtr, '+', MkExpConstant(string)));
12017             }
12018             else
12019             {
12020                // ([bytePtr] + [className]->offset)
12021                exp = QBrackets(MkExpOp(bytePtr, '+',
12022                   MkExpPointer(QMkExpId(className), MkIdentifier("offset"))));
12023             }
12024
12025             // (this ? [exp] : 0)
12026             exp = QBrackets(QMkExpCond(QMkExpId("this"), exp, MkExpConstant("0")));
12027             exp.expType = Type
12028             {
12029                refCount = 1;
12030                kind = pointerType;
12031                type = Type { refCount = 1, kind = voidType };
12032             };
12033
12034             if(function.body)
12035             {
12036                yylloc = function.body.loc;
12037                // ([structName] *) [exp]
12038                // initializer = MkInitializerAssignment(MkExpCast(QMkType(structName, QMkPtrDecl(null)), exp));
12039                initializer = MkInitializerAssignment(
12040                   MkExpCast(MkTypeName(MkListOne(MkStructOrUnion(structSpecifier, MkIdentifier(structName), null)), MkDeclaratorPointer(MkPointer(null, null), null)), exp));
12041
12042                // [structName] * [pointerName] = [initializer];
12043                // decl = QMkDeclaration(structName, MkInitDeclarator(QMkPtrDecl(pointerName), initializer));
12044
12045                {
12046                   Context prevContext = curContext;
12047                   curContext = function.body.compound.context;
12048
12049                   decl = MkDeclaration(MkListOne(MkStructOrUnion(structSpecifier, MkIdentifier(structName), null)),
12050                      MkListOne(MkInitDeclarator(QMkPtrDecl(pointerName), initializer)));
12051
12052                   curContext = prevContext;
12053                }
12054
12055                // WHY?
12056                decl.symbol = null;
12057
12058                if(!function.body.compound.declarations)
12059                   function.body.compound.declarations = MkList();
12060                function.body.compound.declarations->Insert(null, decl);
12061             }
12062          }
12063       }
12064
12065
12066       // Loop through the function and replace undeclared identifiers
12067       // which are a member of the class (methods, properties or data)
12068       // by "this.[member]"
12069    }
12070    else
12071       thisClass = null;
12072
12073    if(id)
12074    {
12075       FreeSpecifier(id._class);
12076       id._class = null;
12077
12078       if(symbol && symbol.pointerExternal && symbol.pointerExternal.type == declarationExternal)
12079       {
12080          InitDeclarator initDecl = symbol.pointerExternal.declaration.declarators->first;
12081          id = GetDeclId(initDecl.declarator);
12082
12083          FreeSpecifier(id._class);
12084          id._class = null;
12085       }
12086    }
12087    if(function.body)
12088       topContext = function.body.compound.context;
12089    {
12090       FunctionDefinition oldFunction = curFunction;
12091       curFunction = function;
12092       if(function.body)
12093          ProcessStatement(function.body);
12094
12095       // If this is a property set and no firewatchers has been done yet, add one here
12096       if(inCompiler && function.propSet && !function.propSet.fireWatchersDone)
12097       {
12098          Statement prevCompound = curCompound;
12099          Context prevContext = curContext;
12100
12101          Statement fireWatchers = MkFireWatchersStmt(null, null);
12102          if(!function.body.compound.statements) function.body.compound.statements = MkList();
12103          ListAdd(function.body.compound.statements, fireWatchers);
12104
12105          curCompound = function.body;
12106          curContext = function.body.compound.context;
12107
12108          ProcessStatement(fireWatchers);
12109
12110          curContext = prevContext;
12111          curCompound = prevCompound;
12112
12113       }
12114
12115       curFunction = oldFunction;
12116    }
12117
12118    if(function.declarator)
12119    {
12120       ProcessDeclarator(function.declarator);
12121    }
12122
12123    topContext = oldTopContext;
12124    thisClass = oldThisClass;
12125 }
12126
12127 /////////// INSTANTIATIONS / DATA TYPES PASS /////////////////////////////////////////////
12128 static void ProcessClass(OldList definitions, Symbol symbol)
12129 {
12130    ClassDef def;
12131    External external = curExternal;
12132    Class regClass = symbol ? symbol.registered : null;
12133
12134    // Process all functions
12135    for(def = definitions.first; def; def = def.next)
12136    {
12137       if(def.type == functionClassDef)
12138       {
12139          if(def.function.declarator)
12140             curExternal = def.function.declarator.symbol.pointerExternal;
12141          else
12142             curExternal = external;
12143
12144          ProcessFunction((FunctionDefinition)def.function);
12145       }
12146       else if(def.type == declarationClassDef)
12147       {
12148          if(def.decl.type == instDeclaration)
12149          {
12150             thisClass = regClass;
12151             ProcessInstantiationType(def.decl.inst);
12152             thisClass = null;
12153          }
12154          // Testing this
12155          else
12156          {
12157             Class backThisClass = thisClass;
12158             if(regClass) thisClass = regClass;
12159             ProcessDeclaration(def.decl);
12160             thisClass = backThisClass;
12161          }
12162       }
12163       else if(def.type == defaultPropertiesClassDef && def.defProperties)
12164       {
12165          MemberInit defProperty;
12166
12167          // Add this to the context
12168          Symbol thisSymbol = Symbol
12169          {
12170             string = CopyString("this");
12171             type = regClass ? MkClassType(regClass.fullName) : null;
12172          };
12173          globalContext.symbols.Add((BTNode)thisSymbol);
12174
12175          for(defProperty = def.defProperties->first; defProperty; defProperty = defProperty.next)
12176          {
12177             thisClass = regClass;
12178             ProcessMemberInitData(defProperty, regClass, null, null, null, null);
12179             thisClass = null;
12180          }
12181
12182          globalContext.symbols.Remove((BTNode)thisSymbol);
12183          FreeSymbol(thisSymbol);
12184       }
12185       else if(def.type == propertyClassDef && def.propertyDef)
12186       {
12187          PropertyDef prop = def.propertyDef;
12188
12189          // Add this to the context
12190          /*
12191          Symbol thisSymbol = Symbol { string = CopyString("this"), type = MkClassType(regClass.fullName) };
12192          globalContext.symbols.Add(thisSymbol);
12193          */
12194
12195          thisClass = regClass;
12196          if(prop.setStmt)
12197          {
12198             if(regClass)
12199             {
12200                Symbol thisSymbol
12201                {
12202                   string = CopyString("this");
12203                   type = MkClassType(regClass.fullName);
12204                };
12205                prop.setStmt.compound.context.symbols.Add((BTNode)thisSymbol);
12206             }
12207
12208             curExternal = prop.symbol ? prop.symbol.externalSet : null;
12209             ProcessStatement(prop.setStmt);
12210          }
12211          if(prop.getStmt)
12212          {
12213             if(regClass)
12214             {
12215                Symbol thisSymbol
12216                {
12217                   string = CopyString("this");
12218                   type = MkClassType(regClass.fullName);
12219                };
12220                prop.getStmt.compound.context.symbols.Add((BTNode)thisSymbol);
12221             }
12222
12223             curExternal = prop.symbol ? prop.symbol.externalGet : null;
12224             ProcessStatement(prop.getStmt);
12225          }
12226          if(prop.issetStmt)
12227          {
12228             if(regClass)
12229             {
12230                Symbol thisSymbol
12231                {
12232                   string = CopyString("this");
12233                   type = MkClassType(regClass.fullName);
12234                };
12235                prop.issetStmt.compound.context.symbols.Add((BTNode)thisSymbol);
12236             }
12237
12238             curExternal = prop.symbol ? prop.symbol.externalIsSet : null;
12239             ProcessStatement(prop.issetStmt);
12240          }
12241
12242          thisClass = null;
12243
12244          /*
12245          globalContext.symbols.Remove(thisSymbol);
12246          FreeSymbol(thisSymbol);
12247          */
12248       }
12249       else if(def.type == propertyWatchClassDef && def.propertyWatch)
12250       {
12251          PropertyWatch propertyWatch = def.propertyWatch;
12252
12253          thisClass = regClass;
12254          if(propertyWatch.compound)
12255          {
12256             Symbol thisSymbol
12257             {
12258                string = CopyString("this");
12259                type = regClass ? MkClassType(regClass.fullName) : null;
12260             };
12261
12262             propertyWatch.compound.compound.context.symbols.Add((BTNode)thisSymbol);
12263
12264             curExternal = null;
12265             ProcessStatement(propertyWatch.compound);
12266          }
12267          thisClass = null;
12268       }
12269    }
12270 }
12271
12272 void DeclareFunctionUtil(String s)
12273 {
12274    GlobalFunction function = eSystem_FindFunction(privateModule, s);
12275    if(function)
12276    {
12277       char name[1024];
12278       name[0] = 0;
12279       if(function.module.importType != staticImport && (!function.dataType || !function.dataType.dllExport))
12280          strcpy(name, "__ecereFunction_");
12281       FullClassNameCat(name, s, false); // Why is this using FullClassNameCat ?
12282       DeclareFunction(function, name);
12283    }
12284 }
12285
12286 void ComputeDataTypes()
12287 {
12288    External external;
12289    External temp { };
12290    External after = null;
12291
12292    currentClass = null;
12293
12294    containerClass = eSystem_FindClass(GetPrivateModule(), "Container");
12295
12296    for(external = ast->first; external; external = external.next)
12297    {
12298       if(external.type == declarationExternal)
12299       {
12300          Declaration decl = external.declaration;
12301          if(decl)
12302          {
12303             OldList * decls = decl.declarators;
12304             if(decls)
12305             {
12306                InitDeclarator initDecl = decls->first;
12307                if(initDecl)
12308                {
12309                   Declarator declarator = initDecl.declarator;
12310                   if(declarator && declarator.type == identifierDeclarator)
12311                   {
12312                      Identifier id = declarator.identifier;
12313                      if(id && id.string)
12314                      {
12315                         if(!strcmp(id.string, "uintptr_t") || !strcmp(id.string, "intptr_t") || !strcmp(id.string, "size_t") || !strcmp(id.string, "ssize_t"))
12316                         {
12317                            external.symbol.id = -1001, external.symbol.idCode = -1001;
12318                            after = external;
12319                         }
12320                      }
12321                   }
12322                }
12323             }
12324          }
12325        }
12326    }
12327
12328    temp.symbol = Symbol { id = -1000, idCode = -1000 };
12329    ast->Insert(after, temp);
12330    curExternal = temp;
12331
12332    DeclareFunctionUtil("eSystem_New");
12333    DeclareFunctionUtil("eSystem_New0");
12334    DeclareFunctionUtil("eSystem_Renew");
12335    DeclareFunctionUtil("eSystem_Renew0");
12336    DeclareFunctionUtil("eClass_GetProperty");
12337
12338    DeclareStruct("ecere::com::Class", false);
12339    DeclareStruct("ecere::com::Instance", false);
12340    DeclareStruct("ecere::com::Property", false);
12341    DeclareStruct("ecere::com::DataMember", false);
12342    DeclareStruct("ecere::com::Method", false);
12343    DeclareStruct("ecere::com::SerialBuffer", false);
12344    DeclareStruct("ecere::com::ClassTemplateArgument", false);
12345
12346    ast->Remove(temp);
12347
12348    for(external = ast->first; external; external = external.next)
12349    {
12350       afterExternal = curExternal = external;
12351       if(external.type == functionExternal)
12352       {
12353          currentClass = external.function._class;
12354          ProcessFunction(external.function);
12355       }
12356       // There shouldn't be any _class member access here anyways...
12357       else if(external.type == declarationExternal)
12358       {
12359          currentClass = null;
12360          ProcessDeclaration(external.declaration);
12361       }
12362       else if(external.type == classExternal)
12363       {
12364          ClassDefinition _class = external._class;
12365          currentClass = external.symbol.registered;
12366          if(_class.definitions)
12367          {
12368             ProcessClass(_class.definitions, _class.symbol);
12369          }
12370          if(inCompiler)
12371          {
12372             // Free class data...
12373             ast->Remove(external);
12374             delete external;
12375          }
12376       }
12377       else if(external.type == nameSpaceExternal)
12378       {
12379          thisNameSpace = external.id.string;
12380       }
12381    }
12382    currentClass = null;
12383    thisNameSpace = null;
12384
12385    delete temp.symbol;
12386    delete temp;
12387 }