return count;
}
+void __ecereNameSpace__ecere__sys__ChangeChars(char * string, const char * chars, char alt)
+{
+int c;
+
+for(c = 0; string[c]; c++)
+if(strchr(chars, string[c]))
+string[c] = alt;
+}
+
int __ecereNameSpace__ecere__sys__GetValue(char ** buffer)
{
char string[20];
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ecere::sys::TrimLSpaces", "char * ecere::sys::TrimLSpaces(const char * string, char * output)", __ecereNameSpace__ecere__sys__TrimLSpaces, module, 4);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ecere::sys::TrimRSpaces", "char * ecere::sys::TrimRSpaces(const char * string, char * output)", __ecereNameSpace__ecere__sys__TrimRSpaces, module, 4);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ecere::sys::ChangeCh", "void ecere::sys::ChangeCh(char * string, char ch1, char ch2)", __ecereNameSpace__ecere__sys__ChangeCh, module, 4);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ecere::sys::ChangeChars", "void ecere::sys::ChangeChars(char * string, const char * chars, char alt)", __ecereNameSpace__ecere__sys__ChangeChars, module, 4);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ecere::sys::RepeatCh", "void ecere::sys::RepeatCh(char * string, int count, char ch)", __ecereNameSpace__ecere__sys__RepeatCh, module, 4);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ecere::sys::CopyString", "char * ecere::sys::CopyString(const char * string)", __ecereNameSpace__ecere__sys__CopyString, module, 4);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("ecere::sys::GetString", "bool ecere::sys::GetString(char * * buffer, char * string, int max)", __ecereNameSpace__ecere__sys__GetString, module, 4);
class = __ecereNameSpace__ecere__com__eSystem_RegisterClass(5, "ClassDefine", "Definition", sizeof(struct ClassDefine), 0, (void *)0, (void *)0, module, 2, 1);
if(((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->application == ((struct __ecereNameSpace__ecere__com__Module *)(((char *)__thisModule + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->application && class)
__ecereClass_ClassDefine = class;
-__ecereNameSpace__ecere__com__eClass_AddDataMember(class, "base", "char *", sizeof(void *), 0, 1);
-__ecereNameSpace__ecere__com__eClass_AddDataMember(class, "propertiesAndMembers", "ecere::sys::OldList", 32, 8, 1);
-__ecereNameSpace__ecere__com__eClass_AddDataMember(class, "classProperties", "ecere::sys::OldList", 32, 8, 1);
-__ecereNameSpace__ecere__com__eClass_AddDataMember(class, "methods", "ecere::sys::OldList", 32, 8, 1);
+__ecereNameSpace__ecere__com__eClass_AddDataMember(class, "base", "char *", sizeof(void *), 0xF000F000, 1);
+__ecereNameSpace__ecere__com__eClass_AddDataMember(class, "propertiesAndMembers", "ecere::sys::OldList", sizeof(struct __ecereNameSpace__ecere__sys__OldList), 0xF000F000, 1);
+__ecereNameSpace__ecere__com__eClass_AddDataMember(class, "classProperties", "ecere::sys::OldList", sizeof(struct __ecereNameSpace__ecere__sys__OldList), 0xF000F000, 1);
+__ecereNameSpace__ecere__com__eClass_AddDataMember(class, "methods", "ecere::sys::OldList", sizeof(struct __ecereNameSpace__ecere__sys__OldList), 0xF000F000, 1);
__ecereNameSpace__ecere__com__eClass_AddDataMember(class, "isRemote", "bool", 4, 4, 1);
__ecereNameSpace__ecere__com__eClass_AddDataMember(class, "isWatchable", "bool", 4, 4, 1);
__ecereNameSpace__ecere__com__eClass_AddDataMember(class, "fixed", "bool", 4, 4, 1);
class = __ecereNameSpace__ecere__com__eSystem_RegisterClass(5, "Define", "Definition", sizeof(struct Define), 0, (void *)0, (void *)0, module, 2, 1);
if(((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->application == ((struct __ecereNameSpace__ecere__com__Module *)(((char *)__thisModule + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->application && class)
__ecereClass_Define = class;
-__ecereNameSpace__ecere__com__eClass_AddDataMember(class, "exp", "Expression", sizeof(void *), 0, 1);
+__ecereNameSpace__ecere__com__eClass_AddDataMember(class, "exp", "Expression", sizeof(void *), 0xF000F000, 1);
class = __ecereNameSpace__ecere__com__eSystem_RegisterClass(5, "FunctionDefine", "Definition", sizeof(struct FunctionDefine), 0, (void *)0, (void *)0, module, 2, 1);
if(((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->application == ((struct __ecereNameSpace__ecere__com__Module *)(((char *)__thisModule + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->application && class)
__ecereClass_FunctionDefine = class;
-__ecereNameSpace__ecere__com__eClass_AddDataMember(class, "dataType", "char *", sizeof(void *), 0, 1);
+__ecereNameSpace__ecere__com__eClass_AddDataMember(class, "dataType", "char *", sizeof(void *), 0xF000F000, 1);
class = __ecereNameSpace__ecere__com__eSystem_RegisterClass(5, "DataDefine", "Definition", sizeof(struct DataDefine), 0, (void *)0, (void *)0, module, 2, 1);
if(((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->application == ((struct __ecereNameSpace__ecere__com__Module *)(((char *)__thisModule + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->application && class)
__ecereClass_DataDefine = class;
-__ecereNameSpace__ecere__com__eClass_AddDataMember(class, "dataType", "char *", sizeof(void *), 0, 1);
+__ecereNameSpace__ecere__com__eClass_AddDataMember(class, "dataType", "char *", sizeof(void *), 0xF000F000, 1);
class = __ecereNameSpace__ecere__com__eSystem_RegisterClass(5, "MethodDefine", 0, sizeof(struct MethodDefine), 0, (void *)0, (void *)0, module, 2, 1);
if(((struct __ecereNameSpace__ecere__com__Module *)(((char *)module + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->application == ((struct __ecereNameSpace__ecere__com__Module *)(((char *)__thisModule + sizeof(struct __ecereNameSpace__ecere__com__Instance))))->application && class)
__ecereClass_MethodDefine = class;
struct DBTableEntry;
-struct Symbol * _DeclClass(int symbolID, const char * name);
+struct Symbol * _DeclClass(const char * name);
-struct Symbol * DeclClassAddNameSpace(int symbolID, const char * className)
+struct Symbol * DeclClassAddNameSpace(const char * className)
{
char name[1024];
int len = 0, stringLen;
memcpy(name + len, className, stringLen);
len += stringLen;
name[len] = (char)0;
-return _DeclClass(symbolID, name);
+return _DeclClass(name);
}
-struct Symbol * DeclClass(int symbolID, const char * name)
+struct Symbol * DeclClass(const char * name)
{
if(strchr(name, ':'))
-return _DeclClass(symbolID, name);
+return _DeclClass(name);
else
-return DeclClassAddNameSpace(symbolID, name);
+return DeclClassAddNameSpace(name);
}
struct MemberInit;
symbol = FindClass(templateString);
if(!symbol && spec->__anon1.__anon1.symbol)
{
-symbol = _DeclClass((((int)0x7fffffff)), templateString);
+symbol = _DeclClass(templateString);
symbol->notYetDeclared = 1;
}
if(spec->__anon1.__anon1.symbol)
FreeList(templateArgs, (void *)(FreeTemplateArgument));
}
-struct Symbol * _DeclClass(int symbolID, const char * name)
+struct Symbol * _DeclClass(const char * name)
{
struct Symbol * symbol = FindClass(name);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkClassDefDesignerDefaultProperty", "ClassDef MkClassDefDesignerDefaultProperty(Identifier id)", MkClassDefDesignerDefaultProperty, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkClassDefDefaultProperty", "ClassDef MkClassDefDefaultProperty(ecere::sys::OldList defProperties)", MkClassDefDefaultProperty, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkClassDefFunction", "ClassDef MkClassDefFunction(ClassFunction function)", MkClassDefFunction, module, 2);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("DeclClassAddNameSpace", "Symbol DeclClassAddNameSpace(int symbolID, const char * className)", DeclClassAddNameSpace, module, 2);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("DeclClass", "Symbol DeclClass(int symbolID, const char * name)", DeclClass, module, 2);
-__ecereNameSpace__ecere__com__eSystem_RegisterFunction("_DeclClass", "Symbol _DeclClass(int symbolID, const char * name)", _DeclClass, module, 2);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("DeclClassAddNameSpace", "Symbol DeclClassAddNameSpace(const char * className)", DeclClassAddNameSpace, module, 2);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("DeclClass", "Symbol DeclClass(const char * name)", DeclClass, module, 2);
+__ecereNameSpace__ecere__com__eSystem_RegisterFunction("_DeclClass", "Symbol _DeclClass(const char * name)", _DeclClass, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("SetupBaseSpecs", "void SetupBaseSpecs(Symbol symbol, ecere::sys::OldList baseSpecs)", SetupBaseSpecs, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkClass", "ClassDefinition MkClass(Symbol symbol, ecere::sys::OldList baseSpecs, ecere::sys::OldList definitions)", MkClass, module, 2);
__ecereNameSpace__ecere__com__eSystem_RegisterFunction("MkExpInstance", "Expression MkExpInstance(Instantiation inst)", MkExpInstance, module, 2);
int declMode;
} __attribute__ ((gcc_struct));
-extern struct Symbol * DeclClass(int symbolID, const char * name);
+extern struct Symbol * DeclClass(const char * name);
struct PropertyDef;
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*inheritanceSpecs), MkSpecifier(PRIVATE));
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*inheritanceSpecs), MkSpecifierName("Row"));
PushContext();
-_class = MkClass(DeclClass(0, rowClassName), inheritanceSpecs, rowClassDefs);
+_class = MkClass(DeclClass(rowClassName), inheritanceSpecs, rowClassDefs);
PopContext(curContext);
def = MkClassDefDefaultProperty(MkListOne(MkMemberInitExp(MkExpIdentifier(MkIdentifier("tbl")), MkInitializerAssignment(MkExpIdentifier(MkIdentifier(tableID))))));
__ecereMethod___ecereNameSpace__ecere__sys__OldList_Add((&*rowClassDefs), def);
curContext = globalContext;
if(inCompiler)
PrePreProcessClassDefinitions();
-DeclClass(0, "Field");
-DeclClass(0, "Table");
-DeclClass(0, "Row");
-DeclClass(0, "Id");
+DeclClass("Field");
+DeclClass("Table");
+DeclClass("Row");
+DeclClass("Id");
numIndexes = 0;
if(ast != (((void *)0)))
{
extern struct ExtDecl * MkExtDeclString(char * s);
-extern struct Symbol * DeclClass(int symbolID, const char * name);
+extern struct Symbol * DeclClass(const char * name);
struct Location
{
{
yyval.specifier = MkStructOrUnion(yyvsp[(1) - (5)].specifierType, yyvsp[(2) - (5)].id, yyvsp[(4) - (5)].list);
if(declMode)
-DeclClass(0, yyvsp[(2) - (5)].id->string);
+DeclClass(yyvsp[(2) - (5)].id->string);
;
}
break;
{
yyval.specifier = MkStructOrUnion(yyvsp[(1) - (4)].specifierType, yyvsp[(2) - (4)].id, (((void *)0)));
if(declMode)
-DeclClass(0, yyvsp[(2) - (4)].id->string);
+DeclClass(yyvsp[(2) - (4)].id->string);
;
}
break;
{
yyval.specifier = MkStructOrUnion(yyvsp[(1) - (5)].specifierType, MkIdentifier(yyvsp[(2) - (5)].specifier->__anon1.__anon1.name), yyvsp[(4) - (5)].list);
if(declMode)
-DeclClass(0, yyvsp[(2) - (5)].specifier->__anon1.__anon1.name);
+DeclClass(yyvsp[(2) - (5)].specifier->__anon1.__anon1.name);
FreeSpecifier(yyvsp[(2) - (5)].specifier);
;
}
yyval.specifier = MkStructOrUnion(yyvsp[(1) - (6)].specifierType, yyvsp[(3) - (6)].id, yyvsp[(5) - (6)].list);
yyval.specifier->__anon1.__anon2.extDeclStruct = yyvsp[(2) - (6)].extDecl;
if(declMode)
-DeclClass(0, yyvsp[(3) - (6)].id->string);
+DeclClass(yyvsp[(3) - (6)].id->string);
;
}
break;
yyval.specifier = MkStructOrUnion(yyvsp[(1) - (5)].specifierType, yyvsp[(3) - (5)].id, (((void *)0)));
yyval.specifier->__anon1.__anon2.extDeclStruct = yyvsp[(2) - (5)].extDecl;
if(declMode)
-DeclClass(0, yyvsp[(3) - (5)].id->string);
+DeclClass(yyvsp[(3) - (5)].id->string);
;
}
break;
yyval.specifier = MkStructOrUnion(yyvsp[(1) - (6)].specifierType, MkIdentifier(yyvsp[(3) - (6)].specifier->__anon1.__anon1.name), yyvsp[(5) - (6)].list);
yyval.specifier->__anon1.__anon2.extDeclStruct = yyvsp[(2) - (6)].extDecl;
if(declMode)
-DeclClass(0, yyvsp[(3) - (6)].specifier->__anon1.__anon1.name);
+DeclClass(yyvsp[(3) - (6)].specifier->__anon1.__anon1.name);
FreeSpecifier(yyvsp[(3) - (6)].specifier);
;
}
{
yyval.specifier = MkStructOrUnion(yyvsp[(1) - (2)].specifierType, yyvsp[(2) - (2)].id, (((void *)0)));
if(declMode)
-DeclClass(0, yyvsp[(2) - (2)].id->string);
+DeclClass(yyvsp[(2) - (2)].id->string);
;
}
break;
{
yyval.specifier = MkStructOrUnion(yyvsp[(1) - (2)].specifierType, MkIdentifier(yyvsp[(2) - (2)].specifier->__anon1.__anon1.name), (((void *)0)));
if(declMode)
-DeclClass(0, yyvsp[(2) - (2)].specifier->__anon1.__anon1.name);
+DeclClass(yyvsp[(2) - (2)].specifier->__anon1.__anon1.name);
FreeSpecifier(yyvsp[(2) - (2)].specifier);
;
}
yyval.specifier = MkStructOrUnion(yyvsp[(1) - (3)].specifierType, yyvsp[(3) - (3)].id, (((void *)0)));
yyval.specifier->__anon1.__anon2.extDeclStruct = yyvsp[(2) - (3)].extDecl;
if(declMode)
-DeclClass(0, yyvsp[(3) - (3)].id->string);
+DeclClass(yyvsp[(3) - (3)].id->string);
;
}
break;
yyval.specifier = MkStructOrUnion(yyvsp[(1) - (3)].specifierType, MkIdentifier(yyvsp[(3) - (3)].specifier->__anon1.__anon1.name), (((void *)0)));
yyval.specifier->__anon1.__anon2.extDeclStruct = yyvsp[(2) - (3)].extDecl;
if(declMode)
-DeclClass(0, yyvsp[(3) - (3)].specifier->__anon1.__anon1.name);
+DeclClass(yyvsp[(3) - (3)].specifier->__anon1.__anon1.name);
FreeSpecifier(yyvsp[(3) - (3)].specifier);
;
}
{
yyval.specifier = MkEnum(yyvsp[(2) - (2)].id, (((void *)0)));
if(declMode)
-DeclClass(0, yyvsp[(2) - (2)].id->string);
+DeclClass(yyvsp[(2) - (2)].id->string);
;
}
break;
{
yyval.specifier = MkEnum(MkIdentifier(yyvsp[(2) - (2)].specifier->__anon1.__anon1.name), (((void *)0)));
if(declMode)
-DeclClass(0, yyvsp[(2) - (2)].specifier->__anon1.__anon1.name);
+DeclClass(yyvsp[(2) - (2)].specifier->__anon1.__anon1.name);
FreeSpecifier(yyvsp[(2) - (2)].specifier);
;
}
{
yyval.specifier = MkEnum(yyvsp[(2) - (5)].id, yyvsp[(4) - (5)].list);
if(declMode)
-DeclClass(0, yyvsp[(2) - (5)].id->string);
+DeclClass(yyvsp[(2) - (5)].id->string);
;
}
break;
yyval.specifier = MkEnum(yyvsp[(2) - (7)].id, yyvsp[(4) - (7)].list);
yyval.specifier->__anon1.__anon2.definitions = yyvsp[(6) - (7)].list;
if(declMode)
-DeclClass(0, yyvsp[(2) - (7)].id->string);
+DeclClass(yyvsp[(2) - (7)].id->string);
;
}
break;
yyval.specifier = MkEnum(MkIdentifier(yyvsp[(2) - (7)].specifier->__anon1.__anon1.name), yyvsp[(4) - (7)].list);
yyval.specifier->__anon1.__anon2.definitions = yyvsp[(6) - (7)].list;
if(declMode)
-DeclClass(0, yyvsp[(2) - (7)].specifier->__anon1.__anon1.name);
+DeclClass(yyvsp[(2) - (7)].specifier->__anon1.__anon1.name);
FreeSpecifier(yyvsp[(2) - (7)].specifier);
;
}
{
yyval.specifier = MkEnum(MkIdentifier(yyvsp[(2) - (5)].specifier->__anon1.__anon1.name), yyvsp[(4) - (5)].list);
if(declMode)
-DeclClass(0, yyvsp[(2) - (5)].specifier->__anon1.__anon1.name);
+DeclClass(yyvsp[(2) - (5)].specifier->__anon1.__anon1.name);
FreeSpecifier(yyvsp[(2) - (5)].specifier);
;
}
} __attribute__ ((gcc_struct)) __anon1;
} __attribute__ ((gcc_struct));
-extern struct Symbol * _DeclClass(int symbolID, const char * name);
+extern struct Symbol * _DeclClass(const char * name);
struct ClassFunction
{
int declMode;
} __attribute__ ((gcc_struct));
-extern struct Symbol * DeclClassAddNameSpace(int symbolID, const char * className);
+extern struct Symbol * DeclClassAddNameSpace(const char * className);
-extern struct Symbol * DeclClass(int symbolID, const char * name);
+extern struct Symbol * DeclClass(const char * name);
struct ClassDefinition
{
strcpy(name, yyvsp[(1) - (2)].id->_class->__anon1.__anon1.name ? yyvsp[(1) - (2)].id->_class->__anon1.__anon1.name : "");
strcat(name, "::");
strcat(name, yyvsp[(1) - (2)].id->string);
-_DeclClass(0, name);
+_DeclClass(name);
}
else
-_DeclClass(0, yyvsp[(1) - (2)].id->string);
+_DeclClass(yyvsp[(1) - (2)].id->string);
FreeIdentifier(yyvsp[(1) - (2)].id);
((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, int pos, int mode))__extension__ ({
struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = fileInput;
strcpy(name, yyvsp[(1) - (2)].id->_class->__anon1.__anon1.name ? yyvsp[(1) - (2)].id->_class->__anon1.__anon1.name : "");
strcat(name, "::");
strcat(name, yyvsp[(1) - (2)].id->string);
-_DeclClass(0, name);
+_DeclClass(name);
}
else
-_DeclClass(0, yyvsp[(1) - (2)].id->string);
+_DeclClass(yyvsp[(1) - (2)].id->string);
FreeIdentifier(yyvsp[(1) - (2)].id);
((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, int pos, int mode))__extension__ ({
struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = fileInput;
strcpy(name, yyvsp[(1) - (2)].id->_class->__anon1.__anon1.name ? yyvsp[(1) - (2)].id->_class->__anon1.__anon1.name : "");
strcat(name, "::");
strcat(name, yyvsp[(1) - (2)].id->string);
-_DeclClass(0, name);
+_DeclClass(name);
}
else
-_DeclClass(0, yyvsp[(1) - (2)].id->string);
+_DeclClass(yyvsp[(1) - (2)].id->string);
FreeIdentifier(yyvsp[(1) - (2)].id);
FreeIdentifier(yyvsp[(2) - (2)].id);
((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, int pos, int mode))__extension__ ({
case 236:
{
(void)yyvsp[(1) - (2)].context;
-yyval.symbol = DeclClassAddNameSpace(0, yyvsp[(2) - (2)].id->string);
+yyval.symbol = DeclClassAddNameSpace(yyvsp[(2) - (2)].id->string);
FreeIdentifier(yyvsp[(2) - (2)].id);
yyval.symbol->nameLoc = (yylsp[(2) - (2)]);
memberAccessStack[++defaultMemberAccess] = 2;
case 237:
{
(void)yyvsp[(1) - (2)].context;
-yyval.symbol = DeclClass(0, yyvsp[(2) - (2)].specifier->__anon1.__anon1.name);
+yyval.symbol = DeclClass(yyvsp[(2) - (2)].specifier->__anon1.__anon1.name);
yyval.symbol->nameLoc = (yylsp[(2) - (2)]);
FreeSpecifier(yyvsp[(2) - (2)].specifier);
++defaultMemberAccess;
case 238:
{
(void)yyvsp[(2) - (3)].context;
-yyval.symbol = DeclClassAddNameSpace(0, yyvsp[(3) - (3)].id->string);
+yyval.symbol = DeclClassAddNameSpace(yyvsp[(3) - (3)].id->string);
FreeIdentifier(yyvsp[(1) - (3)].id);
FreeIdentifier(yyvsp[(3) - (3)].id);
yyval.symbol->nameLoc = (yylsp[(3) - (3)]);
case 239:
{
(void)yyvsp[(2) - (3)].context;
-yyval.symbol = DeclClass(0, yyvsp[(3) - (3)].specifier->__anon1.__anon1.name);
+yyval.symbol = DeclClass(yyvsp[(3) - (3)].specifier->__anon1.__anon1.name);
FreeIdentifier(yyvsp[(1) - (3)].id);
yyval.symbol->nameLoc = (yylsp[(3) - (3)]);
yyval.symbol->isRemote = 1;
case 240:
{
(void)yyvsp[(1) - (5)].context;
-yyval.symbol = DeclClassAddNameSpace(0, yyvsp[(2) - (5)].id->string);
+yyval.symbol = DeclClassAddNameSpace(yyvsp[(2) - (5)].id->string);
yyval.symbol->templateParams = yyvsp[(4) - (5)].list;
FreeIdentifier(yyvsp[(2) - (5)].id);
yyval.symbol->nameLoc = (yylsp[(2) - (5)]);
case 241:
{
(void)yyvsp[(1) - (5)].context;
-yyval.symbol = DeclClass(0, yyvsp[(2) - (5)].specifier->__anon1.__anon1.name);
+yyval.symbol = DeclClass(yyvsp[(2) - (5)].specifier->__anon1.__anon1.name);
yyval.symbol->templateParams = yyvsp[(4) - (5)].list;
yyval.symbol->nameLoc = (yylsp[(2) - (5)]);
FreeSpecifier(yyvsp[(2) - (5)].specifier);
case 242:
{
(void)yyvsp[(2) - (6)].context;
-yyval.symbol = DeclClassAddNameSpace(0, yyvsp[(3) - (6)].id->string);
+yyval.symbol = DeclClassAddNameSpace(yyvsp[(3) - (6)].id->string);
yyval.symbol->templateParams = yyvsp[(5) - (6)].list;
FreeIdentifier(yyvsp[(1) - (6)].id);
FreeIdentifier(yyvsp[(3) - (6)].id);
case 243:
{
(void)yyvsp[(2) - (6)].context;
-yyval.symbol = DeclClass(0, yyvsp[(3) - (6)].specifier->__anon1.__anon1.name);
+yyval.symbol = DeclClass(yyvsp[(3) - (6)].specifier->__anon1.__anon1.name);
yyval.symbol->templateParams = yyvsp[(5) - (6)].list;
FreeIdentifier(yyvsp[(1) - (6)].id);
yyval.symbol->nameLoc = (yylsp[(3) - (6)]);
case 248:
{
(void)yyvsp[(1) - (3)].context;
-yyval._class = MkClass(DeclClassAddNameSpace(0, yyvsp[(2) - (3)].id->string), (((void *)0)), (((void *)0)));
+yyval._class = MkClass(DeclClassAddNameSpace(yyvsp[(2) - (3)].id->string), (((void *)0)), (((void *)0)));
FreeIdentifier(yyvsp[(2) - (3)].id);
if(defaultMemberAccess > -1)
defaultMemberAccess--;
case 249:
{
(void)yyvsp[(1) - (3)].context;
-yyval._class = MkClass(DeclClass(0, yyvsp[(2) - (3)].specifier->__anon1.__anon1.name), (((void *)0)), (((void *)0)));
+yyval._class = MkClass(DeclClass(yyvsp[(2) - (3)].specifier->__anon1.__anon1.name), (((void *)0)), (((void *)0)));
FreeSpecifier(yyvsp[(2) - (3)].specifier);
if(defaultMemberAccess > -1)
defaultMemberAccess--;
strcpy(name, "::");
strcat(name, yyvsp[(1) - (2)].exp->__anon1.__anon1.identifier->string);
-_DeclClass(0, name);
+_DeclClass(name);
}
else
-_DeclClass(0, yyvsp[(1) - (2)].exp->__anon1.__anon1.identifier->string);
+_DeclClass(yyvsp[(1) - (2)].exp->__anon1.__anon1.identifier->string);
skipErrors = 0;
FreeExpression(yyvsp[(1) - (2)].exp);
FreeExpression(yyvsp[(2) - (2)].exp);
{
yyval.id = yyvsp[(2) - (2)].id;
if(declMode)
-DeclClassAddNameSpace(0, yyvsp[(2) - (2)].id->string);
+DeclClassAddNameSpace(yyvsp[(2) - (2)].id->string);
;
}
break;
{
yyval.id = MkIdentifier(yyvsp[(2) - (2)].specifier->__anon1.__anon1.name);
if(declMode)
-DeclClass(0, yyvsp[(2) - (2)].specifier->__anon1.__anon1.name);
+DeclClass(yyvsp[(2) - (2)].specifier->__anon1.__anon1.name);
FreeSpecifier(yyvsp[(2) - (2)].specifier);
;
}
break;
case 677:
{
-_DeclClass(0, yyvsp[(3) - (4)].id->string);
+_DeclClass(yyvsp[(3) - (4)].id->string);
yyval.specifier = MkSpecifierSubClass(MkSpecifierName(yyvsp[(3) - (4)].id->string));
FreeIdentifier(yyvsp[(3) - (4)].id);
;
break;
case 707:
{
-_DeclClass(0, yyvsp[(3) - (4)].id->string);
+_DeclClass(yyvsp[(3) - (4)].id->string);
yyval.specifier = MkSpecifierSubClass(MkSpecifierName(yyvsp[(3) - (4)].id->string));
FreeIdentifier(yyvsp[(3) - (4)].id);
;
yyval.specifier = yyvsp[(1) - (1)].specifier;
if(declMode)
{
-(yyvsp[(1) - (1)].specifier->__anon1.__anon2.addNameSpace ? DeclClassAddNameSpace : DeclClass)(0, yyvsp[(1) - (1)].specifier->__anon1.__anon2.id->string);
+(yyvsp[(1) - (1)].specifier->__anon1.__anon2.addNameSpace ? DeclClassAddNameSpace : DeclClass)(yyvsp[(1) - (1)].specifier->__anon1.__anon2.id->string);
}
;
}
break;
case 740:
{
-struct Symbol * symbol = (yyvsp[(1) - (4)].specifier->__anon1.__anon2.addNameSpace ? DeclClassAddNameSpace : DeclClass)(0, yyvsp[(1) - (4)].specifier->__anon1.__anon2.id->string);
+struct Symbol * symbol = (yyvsp[(1) - (4)].specifier->__anon1.__anon2.addNameSpace ? DeclClassAddNameSpace : DeclClass)(yyvsp[(1) - (4)].specifier->__anon1.__anon2.id->string);
yyval.specifier = yyvsp[(1) - (4)].specifier;
symbol->templateParams = yyvsp[(3) - (4)].list;
break;
case 817:
{
-_DeclClass(0, yyvsp[(1) - (1)].id->string);
+_DeclClass(yyvsp[(1) - (1)].id->string);
yyval.list = MkListOne(MkSpecifierName(yyvsp[(1) - (1)].id->string));
FreeIdentifier(yyvsp[(1) - (1)].id);
;
case 818:
{
yyval.list = yyvsp[(1) - (2)].list;
-_DeclClass(0, yyvsp[(2) - (2)].id->string);
+_DeclClass(yyvsp[(2) - (2)].id->string);
ListAdd(yyvsp[(1) - (2)].list, MkSpecifierName(yyvsp[(2) - (2)].id->string));
FreeIdentifier(yyvsp[(2) - (2)].id);
;
strcpy(name, yyvsp[(1) - (4)].id->_class->__anon1.__anon1.name ? yyvsp[(1) - (4)].id->_class->__anon1.__anon1.name : "");
strcat(name, "::");
strcat(name, yyvsp[(1) - (4)].id->string);
-_DeclClass(0, name);
+_DeclClass(name);
}
else
-_DeclClass(0, yyvsp[(1) - (4)].id->string);
+_DeclClass(yyvsp[(1) - (4)].id->string);
yyval.list = MkList();
ListAdd(yyval.list, MkSpecifierNameArgs(yyvsp[(1) - (4)].id->string, yyvsp[(3) - (4)].list));
FreeIdentifier(yyvsp[(1) - (4)].id);
strcpy(name, "::");
strcat(name, yyvsp[(2) - (5)].id->string);
-_DeclClass(0, name);
+_DeclClass(name);
}
else
-_DeclClass(0, yyvsp[(2) - (5)].id->string);
+_DeclClass(yyvsp[(2) - (5)].id->string);
ListAdd(yyvsp[(1) - (5)].list, MkSpecifierNameArgs(yyvsp[(2) - (5)].id->string, yyvsp[(4) - (5)].list));
FreeIdentifier(yyvsp[(2) - (5)].id);
;
strcpy(name, yyvsp[(1) - (4)].id->_class->__anon1.__anon1.name ? yyvsp[(1) - (4)].id->_class->__anon1.__anon1.name : "");
strcat(name, "::");
strcat(name, yyvsp[(1) - (4)].id->string);
-_DeclClass(0, name);
+_DeclClass(name);
}
else
-_DeclClass(0, yyvsp[(1) - (4)].id->string);
+_DeclClass(yyvsp[(1) - (4)].id->string);
yyval.list = MkList();
ListAdd(yyval.list, MkSpecifierNameArgs(yyvsp[(1) - (4)].id->string, yyvsp[(3) - (4)].list));
FreeIdentifier(yyvsp[(1) - (4)].id);
strcpy(name, "::");
strcat(name, yyvsp[(2) - (5)].id->string);
-_DeclClass(0, name);
+_DeclClass(name);
}
else
-_DeclClass(0, yyvsp[(2) - (5)].id->string);
+_DeclClass(yyvsp[(2) - (5)].id->string);
ListAdd(yyvsp[(1) - (5)].list, MkSpecifierNameArgs(yyvsp[(2) - (5)].id->string, yyvsp[(4) - (5)].list));
FreeIdentifier(yyvsp[(2) - (5)].id);
;
strcpy(name, yyvsp[(1) - (4)].id->_class->__anon1.__anon1.name ? yyvsp[(1) - (4)].id->_class->__anon1.__anon1.name : "");
strcat(name, "::");
strcat(name, yyvsp[(1) - (4)].id->string);
-_DeclClass(0, name);
+_DeclClass(name);
}
else
-_DeclClass(0, yyvsp[(1) - (4)].id->string);
+_DeclClass(yyvsp[(1) - (4)].id->string);
yyval.list = MkList();
ListAdd(yyval.list, MkSpecifierNameArgs(yyvsp[(1) - (4)].id->string, yyvsp[(3) - (4)].list));
FreeIdentifier(yyvsp[(1) - (4)].id);
strcpy(name, "::");
strcat(name, yyvsp[(2) - (5)].id->string);
-_DeclClass(0, name);
+_DeclClass(name);
}
else
-_DeclClass(0, yyvsp[(2) - (5)].id->string);
+_DeclClass(yyvsp[(2) - (5)].id->string);
ListAdd(yyvsp[(1) - (5)].list, MkSpecifierNameArgs(yyvsp[(2) - (5)].id->string, yyvsp[(4) - (5)].list));
FreeIdentifier(yyvsp[(2) - (5)].id);
;
strcpy(name, yyvsp[(1) - (4)].id->_class->__anon1.__anon1.name ? yyvsp[(1) - (4)].id->_class->__anon1.__anon1.name : "");
strcat(name, "::");
strcat(name, yyvsp[(1) - (4)].id->string);
-_DeclClass(0, name);
+_DeclClass(name);
}
else
-_DeclClass(0, yyvsp[(1) - (4)].id->string);
+_DeclClass(yyvsp[(1) - (4)].id->string);
yyval.list = MkList();
ListAdd(yyval.list, MkSpecifierNameArgs(yyvsp[(1) - (4)].id->string, yyvsp[(3) - (4)].list));
FreeIdentifier(yyvsp[(1) - (4)].id);
strcpy(name, "::");
strcat(name, yyvsp[(2) - (5)].id->string);
-_DeclClass(0, name);
+_DeclClass(name);
}
else
-_DeclClass(0, yyvsp[(2) - (5)].id->string);
+_DeclClass(yyvsp[(2) - (5)].id->string);
ListAdd(yyvsp[(1) - (5)].list, MkSpecifierNameArgs(yyvsp[(2) - (5)].id->string, yyvsp[(4) - (5)].list));
FreeIdentifier(yyvsp[(2) - (5)].id);
;
break;
case 1290:
{
-struct Symbol * symbol = DeclClassAddNameSpace(0, yyvsp[(3) - (6)].id->string);
+struct Symbol * symbol = DeclClassAddNameSpace(yyvsp[(3) - (6)].id->string);
FreeIdentifier(yyvsp[(3) - (6)].id);
yyval.dbtableDef = MkDBTableDef(yyvsp[(2) - (6)].string, symbol, yyvsp[(5) - (6)].list);
break;
case 1291:
{
-struct Symbol * symbol = DeclClass(0, yyvsp[(3) - (6)].specifier->__anon1.__anon1.name);
+struct Symbol * symbol = DeclClass(yyvsp[(3) - (6)].specifier->__anon1.__anon1.name);
FreeSpecifier(yyvsp[(3) - (6)].specifier);
yyval.dbtableDef = MkDBTableDef(yyvsp[(2) - (6)].string, symbol, yyvsp[(5) - (6)].list);
struct Symbol;
-extern struct Symbol * DeclClass(int symbolID, const char * name);
+extern struct Symbol * DeclClass(const char * name);
extern struct Symbol * FindClass(const char * name);
__ecereMethod___ecereNameSpace__ecere__sys__File_GetLine(f, line, sizeof (line));
__ecereNameSpace__ecere__sys__TrimLSpaces(line, line);
if(importType == 3)
-DeclClass(0, name);
+DeclClass(name);
if(isStatic || loadDllOnly || importType == 3 || importType == 4)
regClass = (((void *)0));
else if(regClass = __ecereNameSpace__ecere__com__eSystem_FindClass(privateModule, name), !regClass || regClass->internalDecl || regClass->isRemote)
strcat(className, name);
if(!existingClass)
-existingClass = DeclClass(0, name);
+existingClass = DeclClass(name);
regClass = __ecereNameSpace__ecere__com__eSystem_RegisterClass(classType, className, baseName, 0, 0, (((void *)0)), (((void *)0)), privateModule, ecereCOMModule ? 4 : 1, inheritanceAccess);
}
if(regClass)
extern struct ExtDecl * MkExtDeclString(char * s);
-extern struct Symbol * DeclClass(int symbolID, const char * name);
+extern struct Symbol * DeclClass(const char * name);
-extern struct Symbol * _DeclClass(int symbolID, const char * name);
+extern struct Symbol * _DeclClass(const char * name);
struct Location
{
case 2:
{
yyval.specifier = (((void *)0));
-DeclClass(0, yyvsp[(1) - (2)].id->string);
+DeclClass(yyvsp[(1) - (2)].id->string);
((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, int pos, int mode))__extension__ ({
struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = fileInput;
strcpy(name, yyvsp[(1) - (2)].id->_class->__anon1.__anon1.name ? yyvsp[(1) - (2)].id->_class->__anon1.__anon1.name : "");
strcat(name, "::");
strcat(name, yyvsp[(1) - (2)].id->string);
-_DeclClass(0, name);
+_DeclClass(name);
}
else
-_DeclClass(0, yyvsp[(1) - (2)].id->string);
+_DeclClass(yyvsp[(1) - (2)].id->string);
FreeIdentifier(yyvsp[(1) - (2)].id);
((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, int pos, int mode))__extension__ ({
struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = fileInput;
break;
case 4:
{
-DeclClass(0, yyvsp[(1) - (2)].id->string);
+DeclClass(yyvsp[(1) - (2)].id->string);
((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, int pos, int mode))__extension__ ({
struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = fileInput;
break;
case 6:
{
-DeclClass(0, yyvsp[(1) - (2)].id->string);
+DeclClass(yyvsp[(1) - (2)].id->string);
((unsigned int (*)(struct __ecereNameSpace__ecere__com__Instance *, int pos, int mode))__extension__ ({
struct __ecereNameSpace__ecere__com__Instance * __internal_ClassInst = fileInput;
strcpy(name, yyvsp[(1) - (4)].id->_class->__anon1.__anon1.name ? yyvsp[(1) - (4)].id->_class->__anon1.__anon1.name : "");
strcat(name, "::");
strcat(name, yyvsp[(1) - (4)].id->string);
-_DeclClass(0, name);
+_DeclClass(name);
}
else
-_DeclClass(0, yyvsp[(1) - (4)].id->string);
+_DeclClass(yyvsp[(1) - (4)].id->string);
yyval.list = MkList();
ListAdd(yyval.list, MkSpecifierNameArgs(yyvsp[(1) - (4)].id->string, yyvsp[(3) - (4)].list));
FreeIdentifier(yyvsp[(1) - (4)].id);
strcpy(name, "::");
strcat(name, yyvsp[(2) - (5)].id->string);
-_DeclClass(0, name);
+_DeclClass(name);
}
else
-_DeclClass(0, yyvsp[(2) - (5)].id->string);
+_DeclClass(yyvsp[(2) - (5)].id->string);
ListAdd(yyvsp[(1) - (5)].list, MkSpecifierNameArgs(yyvsp[(2) - (5)].id->string, yyvsp[(4) - (5)].list));
FreeIdentifier(yyvsp[(2) - (5)].id);
;
strcpy(name, yyvsp[(1) - (4)].id->_class->__anon1.__anon1.name ? yyvsp[(1) - (4)].id->_class->__anon1.__anon1.name : "");
strcat(name, "::");
strcat(name, yyvsp[(1) - (4)].id->string);
-_DeclClass(0, name);
+_DeclClass(name);
}
else
-_DeclClass(0, yyvsp[(1) - (4)].id->string);
+_DeclClass(yyvsp[(1) - (4)].id->string);
yyval.list = MkList();
ListAdd(yyval.list, MkSpecifierNameArgs(yyvsp[(1) - (4)].id->string, yyvsp[(3) - (4)].list));
FreeIdentifier(yyvsp[(1) - (4)].id);
strcpy(name, "::");
strcat(name, yyvsp[(2) - (5)].id->string);
-_DeclClass(0, name);
+_DeclClass(name);
}
else
-_DeclClass(0, yyvsp[(2) - (5)].id->string);
+_DeclClass(yyvsp[(2) - (5)].id->string);
ListAdd(yyvsp[(1) - (5)].list, MkSpecifierNameArgs(yyvsp[(2) - (5)].id->string, yyvsp[(4) - (5)].list));
FreeIdentifier(yyvsp[(2) - (5)].id);
;
break;
case 239:
{
-_DeclClass(0, yyvsp[(3) - (4)].id->string);
+_DeclClass(yyvsp[(3) - (4)].id->string);
yyval.specifier = MkSpecifierSubClass(MkSpecifierName(yyvsp[(3) - (4)].id->string));
FreeIdentifier(yyvsp[(3) - (4)].id);
;
break;
case 263:
{
-_DeclClass(0, yyvsp[(3) - (4)].id->string);
+_DeclClass(yyvsp[(3) - (4)].id->string);
yyval.specifier = MkSpecifierSubClass(MkSpecifierName(yyvsp[(3) - (4)].id->string));
FreeIdentifier(yyvsp[(3) - (4)].id);
;
{
yyval.specifier = MkStructOrUnion(yyvsp[(1) - (5)].specifierType, yyvsp[(2) - (5)].id, yyvsp[(4) - (5)].list);
if(declMode)
-DeclClass(0, yyvsp[(2) - (5)].id->string);
+DeclClass(yyvsp[(2) - (5)].id->string);
;
}
break;
{
yyval.specifier = MkStructOrUnion(yyvsp[(1) - (4)].specifierType, yyvsp[(2) - (4)].id, (((void *)0)));
if(declMode)
-DeclClass(0, yyvsp[(2) - (4)].id->string);
+DeclClass(yyvsp[(2) - (4)].id->string);
;
}
break;
{
yyval.specifier = MkStructOrUnion(yyvsp[(1) - (5)].specifierType, MkIdentifier(yyvsp[(2) - (5)].specifier->__anon1.__anon1.name), yyvsp[(4) - (5)].list);
if(declMode)
-DeclClass(0, yyvsp[(2) - (5)].specifier->__anon1.__anon1.name);
+DeclClass(yyvsp[(2) - (5)].specifier->__anon1.__anon1.name);
FreeSpecifier(yyvsp[(2) - (5)].specifier);
;
}
yyval.specifier = MkStructOrUnion(yyvsp[(1) - (6)].specifierType, yyvsp[(3) - (6)].id, yyvsp[(5) - (6)].list);
yyval.specifier->__anon1.__anon2.extDeclStruct = yyvsp[(2) - (6)].extDecl;
if(declMode)
-DeclClass(0, yyvsp[(3) - (6)].id->string);
+DeclClass(yyvsp[(3) - (6)].id->string);
;
}
break;
yyval.specifier = MkStructOrUnion(yyvsp[(1) - (5)].specifierType, yyvsp[(3) - (5)].id, (((void *)0)));
yyval.specifier->__anon1.__anon2.extDeclStruct = yyvsp[(2) - (5)].extDecl;
if(declMode)
-DeclClass(0, yyvsp[(3) - (5)].id->string);
+DeclClass(yyvsp[(3) - (5)].id->string);
;
}
break;
yyval.specifier = MkStructOrUnion(yyvsp[(1) - (6)].specifierType, MkIdentifier(yyvsp[(3) - (6)].specifier->__anon1.__anon1.name), yyvsp[(5) - (6)].list);
yyval.specifier->__anon1.__anon2.extDeclStruct = yyvsp[(2) - (6)].extDecl;
if(declMode)
-DeclClass(0, yyvsp[(3) - (6)].specifier->__anon1.__anon1.name);
+DeclClass(yyvsp[(3) - (6)].specifier->__anon1.__anon1.name);
FreeSpecifier(yyvsp[(3) - (6)].specifier);
;
}
{
yyval.specifier = MkStructOrUnion(yyvsp[(1) - (2)].specifierType, yyvsp[(2) - (2)].id, (((void *)0)));
if(declMode)
-DeclClass(0, yyvsp[(2) - (2)].id->string);
+DeclClass(yyvsp[(2) - (2)].id->string);
;
}
break;
{
yyval.specifier = MkStructOrUnion(yyvsp[(1) - (2)].specifierType, MkIdentifier(yyvsp[(2) - (2)].specifier->__anon1.__anon1.name), (((void *)0)));
if(declMode)
-DeclClass(0, yyvsp[(2) - (2)].specifier->__anon1.__anon1.name);
+DeclClass(yyvsp[(2) - (2)].specifier->__anon1.__anon1.name);
FreeSpecifier(yyvsp[(2) - (2)].specifier);
;
}
yyval.specifier = MkStructOrUnion(yyvsp[(1) - (3)].specifierType, yyvsp[(3) - (3)].id, (((void *)0)));
yyval.specifier->__anon1.__anon2.extDeclStruct = yyvsp[(2) - (3)].extDecl;
if(declMode)
-DeclClass(0, yyvsp[(3) - (3)].id->string);
+DeclClass(yyvsp[(3) - (3)].id->string);
;
}
break;
yyval.specifier = MkStructOrUnion(yyvsp[(1) - (3)].specifierType, MkIdentifier(yyvsp[(3) - (3)].specifier->__anon1.__anon1.name), (((void *)0)));
yyval.specifier->__anon1.__anon2.extDeclStruct = yyvsp[(2) - (3)].extDecl;
if(declMode)
-DeclClass(0, yyvsp[(3) - (3)].specifier->__anon1.__anon1.name);
+DeclClass(yyvsp[(3) - (3)].specifier->__anon1.__anon1.name);
FreeSpecifier(yyvsp[(3) - (3)].specifier);
;
}
{
yyval.specifier = MkEnum(yyvsp[(2) - (2)].id, (((void *)0)));
if(declMode)
-DeclClass(0, yyvsp[(2) - (2)].id->string);
+DeclClass(yyvsp[(2) - (2)].id->string);
;
}
break;
{
yyval.specifier = MkEnum(MkIdentifier(yyvsp[(2) - (2)].specifier->__anon1.__anon1.name), (((void *)0)));
if(declMode)
-DeclClass(0, yyvsp[(2) - (2)].specifier->__anon1.__anon1.name);
+DeclClass(yyvsp[(2) - (2)].specifier->__anon1.__anon1.name);
FreeSpecifier(yyvsp[(2) - (2)].specifier);
;
}
{
yyval.specifier = MkEnum(yyvsp[(2) - (5)].id, yyvsp[(4) - (5)].list);
if(declMode)
-DeclClass(0, yyvsp[(2) - (5)].id->string);
+DeclClass(yyvsp[(2) - (5)].id->string);
;
}
break;
yyval.specifier = MkEnum(yyvsp[(2) - (7)].id, yyvsp[(4) - (7)].list);
yyval.specifier->__anon1.__anon2.definitions = yyvsp[(6) - (7)].list;
if(declMode)
-DeclClass(0, yyvsp[(2) - (7)].id->string);
+DeclClass(yyvsp[(2) - (7)].id->string);
;
}
break;
yyval.specifier = MkEnum(MkIdentifier(yyvsp[(2) - (7)].specifier->__anon1.__anon1.name), yyvsp[(4) - (7)].list);
yyval.specifier->__anon1.__anon2.definitions = yyvsp[(6) - (7)].list;
if(declMode)
-DeclClass(0, yyvsp[(2) - (7)].specifier->__anon1.__anon1.name);
+DeclClass(yyvsp[(2) - (7)].specifier->__anon1.__anon1.name);
FreeSpecifier(yyvsp[(2) - (7)].specifier);
;
}
{
yyval.specifier = MkEnum(MkIdentifier(yyvsp[(2) - (5)].specifier->__anon1.__anon1.name), yyvsp[(4) - (5)].list);
if(declMode)
-DeclClass(0, yyvsp[(2) - (5)].specifier->__anon1.__anon1.name);
+DeclClass(yyvsp[(2) - (5)].specifier->__anon1.__anon1.name);
FreeSpecifier(yyvsp[(2) - (5)].specifier);
;
}
if(!symbol && spec.symbol)
{
// If class was only decl'ed, invoke DeclClass on this templated class as well
- symbol = _DeclClass(MAXINT, templateString);
+ symbol = _DeclClass(templateString);
symbol.notYetDeclared = true;
}
// Add a reference to all templated class to the basic class
return def;
}
-Symbol DeclClassAddNameSpace(int symbolID, const char * className)
+Symbol DeclClassAddNameSpace(const char * className)
{
char name[1024];
int len = 0, stringLen;
memcpy(name + len, className, stringLen);
len += stringLen;
name[len] = 0;
- return _DeclClass(symbolID, name);
+ return _DeclClass(name);
}
-Symbol DeclClass(int symbolID, const char * name)
+Symbol DeclClass(const char * name)
{
if(strchr(name, ':'))
- return _DeclClass(symbolID, name);
+ return _DeclClass(name);
else
- return DeclClassAddNameSpace(symbolID, name);
+ return DeclClassAddNameSpace(name);
}
-Symbol _DeclClass(int symbolID, const char * name)
+Symbol _DeclClass(const char * name)
{
Symbol symbol = FindClass(name);
if(!symbol)
inheritanceSpecs->Add(MkSpecifier(PRIVATE));
inheritanceSpecs->Add(MkSpecifierName("Row"));
PushContext();
- _class = MkClass(DeclClass(0, rowClassName), inheritanceSpecs, rowClassDefs);
+ _class = MkClass(DeclClass(rowClassName), inheritanceSpecs, rowClassDefs);
PopContext(curContext);
def = MkClassDefDefaultProperty(MkListOne(MkMemberInitExp(MkExpIdentifier(MkIdentifier("tbl")), MkInitializerAssignment(MkExpIdentifier(MkIdentifier(tableID))))));
if(inCompiler)
PrePreProcessClassDefinitions();
- DeclClass(0, "Field");
- DeclClass(0, "Table");
- DeclClass(0, "Row");
- DeclClass(0, "Id");
+ DeclClass("Field");
+ DeclClass("Table");
+ DeclClass("Row");
+ DeclClass("Id");
numIndexes = 0;
if(ast != null)
{
/* Line 1464 of yacc.c */
#line 638 "expression.y"
- { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (5)].specifierType), (yyvsp[(2) - (5)].id), (yyvsp[(4) - (5)].list)); if(declMode) DeclClass(0, (yyvsp[(2) - (5)].id).string); ;}
+ { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (5)].specifierType), (yyvsp[(2) - (5)].id), (yyvsp[(4) - (5)].list)); if(declMode) DeclClass((yyvsp[(2) - (5)].id).string); ;}
break;
case 215:
/* Line 1464 of yacc.c */
#line 640 "expression.y"
- { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (4)].specifierType), (yyvsp[(2) - (4)].id), null); if(declMode) DeclClass(0, (yyvsp[(2) - (4)].id).string); ;}
+ { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (4)].specifierType), (yyvsp[(2) - (4)].id), null); if(declMode) DeclClass((yyvsp[(2) - (4)].id).string); ;}
break;
case 217:
/* Line 1464 of yacc.c */
#line 643 "expression.y"
- { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (5)].specifierType), MkIdentifier((yyvsp[(2) - (5)].specifier).name), (yyvsp[(4) - (5)].list)); if(declMode) DeclClass(0, (yyvsp[(2) - (5)].specifier).name); FreeSpecifier((yyvsp[(2) - (5)].specifier)); ;}
+ { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (5)].specifierType), MkIdentifier((yyvsp[(2) - (5)].specifier).name), (yyvsp[(4) - (5)].list)); if(declMode) DeclClass((yyvsp[(2) - (5)].specifier).name); FreeSpecifier((yyvsp[(2) - (5)].specifier)); ;}
break;
case 219:
/* Line 1464 of yacc.c */
#line 645 "expression.y"
- { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (6)].specifierType), (yyvsp[(3) - (6)].id), (yyvsp[(5) - (6)].list)); (yyval.specifier).extDeclStruct = (yyvsp[(2) - (6)].extDecl); if(declMode) DeclClass(0, (yyvsp[(3) - (6)].id).string); ;}
+ { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (6)].specifierType), (yyvsp[(3) - (6)].id), (yyvsp[(5) - (6)].list)); (yyval.specifier).extDeclStruct = (yyvsp[(2) - (6)].extDecl); if(declMode) DeclClass((yyvsp[(3) - (6)].id).string); ;}
break;
case 220:
/* Line 1464 of yacc.c */
#line 647 "expression.y"
- { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (5)].specifierType), (yyvsp[(3) - (5)].id), null); (yyval.specifier).extDeclStruct = (yyvsp[(2) - (5)].extDecl); if(declMode) DeclClass(0, (yyvsp[(3) - (5)].id).string); ;}
+ { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (5)].specifierType), (yyvsp[(3) - (5)].id), null); (yyval.specifier).extDeclStruct = (yyvsp[(2) - (5)].extDecl); if(declMode) DeclClass((yyvsp[(3) - (5)].id).string); ;}
break;
case 222:
/* Line 1464 of yacc.c */
#line 650 "expression.y"
- { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (6)].specifierType), MkIdentifier((yyvsp[(3) - (6)].specifier).name), (yyvsp[(5) - (6)].list)); (yyval.specifier).extDeclStruct = (yyvsp[(2) - (6)].extDecl); if(declMode) DeclClass(0, (yyvsp[(3) - (6)].specifier).name); FreeSpecifier((yyvsp[(3) - (6)].specifier)); ;}
+ { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (6)].specifierType), MkIdentifier((yyvsp[(3) - (6)].specifier).name), (yyvsp[(5) - (6)].list)); (yyval.specifier).extDeclStruct = (yyvsp[(2) - (6)].extDecl); if(declMode) DeclClass((yyvsp[(3) - (6)].specifier).name); FreeSpecifier((yyvsp[(3) - (6)].specifier)); ;}
break;
case 224:
/* Line 1464 of yacc.c */
#line 654 "expression.y"
- { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (2)].specifierType), (yyvsp[(2) - (2)].id), null); if(declMode) DeclClass(0, (yyvsp[(2) - (2)].id).string); ;}
+ { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (2)].specifierType), (yyvsp[(2) - (2)].id), null); if(declMode) DeclClass((yyvsp[(2) - (2)].id).string); ;}
break;
case 225:
/* Line 1464 of yacc.c */
#line 656 "expression.y"
- { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (2)].specifierType), MkIdentifier((yyvsp[(2) - (2)].specifier).name), null); if(declMode) DeclClass(0, (yyvsp[(2) - (2)].specifier).name); FreeSpecifier((yyvsp[(2) - (2)].specifier)); ;}
+ { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (2)].specifierType), MkIdentifier((yyvsp[(2) - (2)].specifier).name), null); if(declMode) DeclClass((yyvsp[(2) - (2)].specifier).name); FreeSpecifier((yyvsp[(2) - (2)].specifier)); ;}
break;
case 226:
/* Line 1464 of yacc.c */
#line 659 "expression.y"
- { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (3)].specifierType), (yyvsp[(3) - (3)].id), null); (yyval.specifier).extDeclStruct = (yyvsp[(2) - (3)].extDecl);if(declMode) DeclClass(0, (yyvsp[(3) - (3)].id).string); ;}
+ { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (3)].specifierType), (yyvsp[(3) - (3)].id), null); (yyval.specifier).extDeclStruct = (yyvsp[(2) - (3)].extDecl);if(declMode) DeclClass((yyvsp[(3) - (3)].id).string); ;}
break;
case 227:
/* Line 1464 of yacc.c */
#line 661 "expression.y"
- { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (3)].specifierType), MkIdentifier((yyvsp[(3) - (3)].specifier).name), null); (yyval.specifier).extDeclStruct = (yyvsp[(2) - (3)].extDecl); if(declMode) DeclClass(0, (yyvsp[(3) - (3)].specifier).name); FreeSpecifier((yyvsp[(3) - (3)].specifier)); ;}
+ { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (3)].specifierType), MkIdentifier((yyvsp[(3) - (3)].specifier).name), null); (yyval.specifier).extDeclStruct = (yyvsp[(2) - (3)].extDecl); if(declMode) DeclClass((yyvsp[(3) - (3)].specifier).name); FreeSpecifier((yyvsp[(3) - (3)].specifier)); ;}
break;
case 228:
/* Line 1464 of yacc.c */
#line 761 "expression.y"
- { (yyval.specifier) = MkEnum((yyvsp[(2) - (2)].id), null); if(declMode) DeclClass(0, (yyvsp[(2) - (2)].id).string); ;}
+ { (yyval.specifier) = MkEnum((yyvsp[(2) - (2)].id), null); if(declMode) DeclClass((yyvsp[(2) - (2)].id).string); ;}
break;
case 271:
/* Line 1464 of yacc.c */
#line 762 "expression.y"
- { (yyval.specifier) = MkEnum(MkIdentifier((yyvsp[(2) - (2)].specifier).name), null); if(declMode) DeclClass(0, (yyvsp[(2) - (2)].specifier).name); FreeSpecifier((yyvsp[(2) - (2)].specifier)); ;}
+ { (yyval.specifier) = MkEnum(MkIdentifier((yyvsp[(2) - (2)].specifier).name), null); if(declMode) DeclClass((yyvsp[(2) - (2)].specifier).name); FreeSpecifier((yyvsp[(2) - (2)].specifier)); ;}
break;
case 272:
/* Line 1464 of yacc.c */
#line 768 "expression.y"
- { (yyval.specifier) = MkEnum((yyvsp[(2) - (5)].id), (yyvsp[(4) - (5)].list)); if(declMode) DeclClass(0, (yyvsp[(2) - (5)].id).string); ;}
+ { (yyval.specifier) = MkEnum((yyvsp[(2) - (5)].id), (yyvsp[(4) - (5)].list)); if(declMode) DeclClass((yyvsp[(2) - (5)].id).string); ;}
break;
case 274:
/* Line 1464 of yacc.c */
#line 769 "expression.y"
- { (yyval.specifier) = MkEnum((yyvsp[(2) - (7)].id), (yyvsp[(4) - (7)].list)); (yyval.specifier).definitions = (yyvsp[(6) - (7)].list); if(declMode) DeclClass(0, (yyvsp[(2) - (7)].id).string); ;}
+ { (yyval.specifier) = MkEnum((yyvsp[(2) - (7)].id), (yyvsp[(4) - (7)].list)); (yyval.specifier).definitions = (yyvsp[(6) - (7)].list); if(declMode) DeclClass((yyvsp[(2) - (7)].id).string); ;}
break;
case 275:
/* Line 1464 of yacc.c */
#line 770 "expression.y"
- { (yyval.specifier) = MkEnum(MkIdentifier((yyvsp[(2) - (7)].specifier).name), (yyvsp[(4) - (7)].list)); (yyval.specifier).definitions = (yyvsp[(6) - (7)].list); if(declMode) DeclClass(0, (yyvsp[(2) - (7)].specifier).name); FreeSpecifier((yyvsp[(2) - (7)].specifier)); ;}
+ { (yyval.specifier) = MkEnum(MkIdentifier((yyvsp[(2) - (7)].specifier).name), (yyvsp[(4) - (7)].list)); (yyval.specifier).definitions = (yyvsp[(6) - (7)].list); if(declMode) DeclClass((yyvsp[(2) - (7)].specifier).name); FreeSpecifier((yyvsp[(2) - (7)].specifier)); ;}
break;
case 276:
/* Line 1464 of yacc.c */
#line 771 "expression.y"
- { (yyval.specifier) = MkEnum(MkIdentifier((yyvsp[(2) - (5)].specifier).name), (yyvsp[(4) - (5)].list)); if(declMode) DeclClass(0, (yyvsp[(2) - (5)].specifier).name); FreeSpecifier((yyvsp[(2) - (5)].specifier)); ;}
+ { (yyval.specifier) = MkEnum(MkIdentifier((yyvsp[(2) - (5)].specifier).name), (yyvsp[(4) - (5)].list)); if(declMode) DeclClass((yyvsp[(2) - (5)].specifier).name); FreeSpecifier((yyvsp[(2) - (5)].specifier)); ;}
break;
case 277:
/* | identifier identifier
{
#ifdef PRECOMPILER
- DeclClass(0, $1.string);
+ DeclClass($1.string);
fileInput.Seek(@1.start.pos, start);
resetScannerPos(&@1.start);
yyclearin;
struct_or_union_specifier_compound:
- struct_or_union identifier '{' struct_declaration_list '}' { $$ = MkStructOrUnion($1, $2, $4); if(declMode) DeclClass(0, $2.string); }
+ struct_or_union identifier '{' struct_declaration_list '}' { $$ = MkStructOrUnion($1, $2, $4); if(declMode) DeclClass($2.string); }
| struct_or_union '{' struct_declaration_list '}' { $$ = MkStructOrUnion($1, null, $3); }
- | struct_or_union identifier '{' '}' { $$ = MkStructOrUnion($1, $2, null); if(declMode) DeclClass(0, $2.string); }
+ | struct_or_union identifier '{' '}' { $$ = MkStructOrUnion($1, $2, null); if(declMode) DeclClass($2.string); }
| struct_or_union '{' '}' { $$ = MkStructOrUnion($1, null, null); }
| struct_or_union strict_type '{' struct_declaration_list '}'
- { $$ = MkStructOrUnion($1, MkIdentifier($2.name), $4); if(declMode) DeclClass(0, $2.name); FreeSpecifier($2); }
+ { $$ = MkStructOrUnion($1, MkIdentifier($2.name), $4); if(declMode) DeclClass($2.name); FreeSpecifier($2); }
- | struct_or_union ext_decl identifier '{' struct_declaration_list '}' { $$ = MkStructOrUnion($1, $3, $5); $$.extDeclStruct = $2; if(declMode) DeclClass(0, $3.string); }
+ | struct_or_union ext_decl identifier '{' struct_declaration_list '}' { $$ = MkStructOrUnion($1, $3, $5); $$.extDeclStruct = $2; if(declMode) DeclClass($3.string); }
| struct_or_union ext_decl '{' struct_declaration_list '}' { $$ = MkStructOrUnion($1, null, $4); $$.extDeclStruct = $2; }
- | struct_or_union ext_decl identifier '{' '}' { $$ = MkStructOrUnion($1, $3, null); $$.extDeclStruct = $2; if(declMode) DeclClass(0, $3.string); }
+ | struct_or_union ext_decl identifier '{' '}' { $$ = MkStructOrUnion($1, $3, null); $$.extDeclStruct = $2; if(declMode) DeclClass($3.string); }
| struct_or_union ext_decl '{' '}' { $$ = MkStructOrUnion($1, null, null); $$.extDeclStruct = $2; }
| struct_or_union ext_decl strict_type '{' struct_declaration_list '}'
- { $$ = MkStructOrUnion($1, MkIdentifier($3.name), $5); $$.extDeclStruct = $2; if(declMode) DeclClass(0, $3.name); FreeSpecifier($3); }
+ { $$ = MkStructOrUnion($1, MkIdentifier($3.name), $5); $$.extDeclStruct = $2; if(declMode) DeclClass($3.name); FreeSpecifier($3); }
;
struct_or_union_specifier_nocompound:
- struct_or_union identifier { $$ = MkStructOrUnion($1, $2, null); if(declMode) DeclClass(0, $2.string); }
+ struct_or_union identifier { $$ = MkStructOrUnion($1, $2, null); if(declMode) DeclClass($2.string); }
| struct_or_union strict_type
- { $$ = MkStructOrUnion($1, MkIdentifier($2.name), null); if(declMode) DeclClass(0, $2.name); FreeSpecifier($2); }
+ { $$ = MkStructOrUnion($1, MkIdentifier($2.name), null); if(declMode) DeclClass($2.name); FreeSpecifier($2); }
| struct_or_union ext_decl identifier
- { $$ = MkStructOrUnion($1, $3, null); $$.extDeclStruct = $2;if(declMode) DeclClass(0, $3.string); }
+ { $$ = MkStructOrUnion($1, $3, null); $$.extDeclStruct = $2;if(declMode) DeclClass($3.string); }
| struct_or_union ext_decl strict_type
- { $$ = MkStructOrUnion($1, MkIdentifier($3.name), null); $$.extDeclStruct = $2; if(declMode) DeclClass(0, $3.name); FreeSpecifier($3); }
+ { $$ = MkStructOrUnion($1, MkIdentifier($3.name), null); $$.extDeclStruct = $2; if(declMode) DeclClass($3.name); FreeSpecifier($3); }
;
struct_or_union:
;
enum_specifier_nocompound:
- ENUM identifier { $$ = MkEnum($2, null); if(declMode) DeclClass(0, $2.string); }
- | ENUM strict_type { $$ = MkEnum(MkIdentifier($2.name), null); if(declMode) DeclClass(0, $2.name); FreeSpecifier($2); }
+ ENUM identifier { $$ = MkEnum($2, null); if(declMode) DeclClass($2.string); }
+ | ENUM strict_type { $$ = MkEnum(MkIdentifier($2.name), null); if(declMode) DeclClass($2.name); FreeSpecifier($2); }
;
enum_specifier_compound:
ENUM '{' enumerator_list '}'
{ $$ = MkEnum(null, $3); }
- | ENUM identifier '{' enumerator_list '}' { $$ = MkEnum($2, $4); if(declMode) DeclClass(0, $2.string); }
- | ENUM identifier '{' enumerator_list ';' struct_declaration_list '}' { $$ = MkEnum($2, $4); $$.definitions = $6; if(declMode) DeclClass(0, $2.string); }
- | ENUM strict_type '{' enumerator_list ';' struct_declaration_list '}' { $$ = MkEnum(MkIdentifier($2.name), $4); $$.definitions = $6; if(declMode) DeclClass(0, $2.name); FreeSpecifier($2); }
- | ENUM strict_type '{' enumerator_list '}' { $$ = MkEnum(MkIdentifier($2.name), $4); if(declMode) DeclClass(0, $2.name); FreeSpecifier($2); }
+ | ENUM identifier '{' enumerator_list '}' { $$ = MkEnum($2, $4); if(declMode) DeclClass($2.string); }
+ | ENUM identifier '{' enumerator_list ';' struct_declaration_list '}' { $$ = MkEnum($2, $4); $$.definitions = $6; if(declMode) DeclClass($2.string); }
+ | ENUM strict_type '{' enumerator_list ';' struct_declaration_list '}' { $$ = MkEnum(MkIdentifier($2.name), $4); $$.definitions = $6; if(declMode) DeclClass($2.name); FreeSpecifier($2); }
+ | ENUM strict_type '{' enumerator_list '}' { $$ = MkEnum(MkIdentifier($2.name), $4); if(declMode) DeclClass($2.name); FreeSpecifier($2); }
;
enumerator_list:
strcpy(name, (yyvsp[(1) - (2)].id)._class.name ? (yyvsp[(1) - (2)].id)._class.name : "");
strcat(name, "::");
strcat(name, (yyvsp[(1) - (2)].id).string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, (yyvsp[(1) - (2)].id).string);
+ _DeclClass((yyvsp[(1) - (2)].id).string);
FreeIdentifier((yyvsp[(1) - (2)].id));
strcpy(name, (yyvsp[(1) - (2)].id)._class.name ? (yyvsp[(1) - (2)].id)._class.name : "");
strcat(name, "::");
strcat(name, (yyvsp[(1) - (2)].id).string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, (yyvsp[(1) - (2)].id).string);
+ _DeclClass((yyvsp[(1) - (2)].id).string);
FreeIdentifier((yyvsp[(1) - (2)].id));
strcpy(name, (yyvsp[(1) - (2)].id)._class.name ? (yyvsp[(1) - (2)].id)._class.name : "");
strcat(name, "::");
strcat(name, (yyvsp[(1) - (2)].id).string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, (yyvsp[(1) - (2)].id).string);
+ _DeclClass((yyvsp[(1) - (2)].id).string);
FreeIdentifier((yyvsp[(1) - (2)].id));
FreeIdentifier((yyvsp[(2) - (2)].id));
/* Line 1464 of yacc.c */
#line 1341 "grammar.y"
- { (void)(yyvsp[(1) - (2)].context); (yyval.symbol) = DeclClassAddNameSpace(0, (yyvsp[(2) - (2)].id).string); FreeIdentifier((yyvsp[(2) - (2)].id)); (yyval.symbol).nameLoc = (yylsp[(2) - (2)]); memberAccessStack[++defaultMemberAccess] = privateAccess; ;}
+ { (void)(yyvsp[(1) - (2)].context); (yyval.symbol) = DeclClassAddNameSpace((yyvsp[(2) - (2)].id).string); FreeIdentifier((yyvsp[(2) - (2)].id)); (yyval.symbol).nameLoc = (yylsp[(2) - (2)]); memberAccessStack[++defaultMemberAccess] = privateAccess; ;}
break;
case 237:
/* Line 1464 of yacc.c */
#line 1343 "grammar.y"
{
- (void)(yyvsp[(1) - (2)].context); (yyval.symbol) = DeclClass(0, (yyvsp[(2) - (2)].specifier).name);
+ (void)(yyvsp[(1) - (2)].context); (yyval.symbol) = DeclClass((yyvsp[(2) - (2)].specifier).name);
(yyval.symbol).nameLoc = (yylsp[(2) - (2)]);
FreeSpecifier((yyvsp[(2) - (2)].specifier));
++defaultMemberAccess;
/* Line 1464 of yacc.c */
#line 1350 "grammar.y"
- { (void)(yyvsp[(2) - (3)].context); (yyval.symbol) = DeclClassAddNameSpace(0, (yyvsp[(3) - (3)].id).string); FreeIdentifier((yyvsp[(1) - (3)].id)); FreeIdentifier((yyvsp[(3) - (3)].id)); (yyval.symbol).nameLoc = (yylsp[(3) - (3)]); (yyval.symbol).isRemote = true; memberAccessStack[++defaultMemberAccess] = privateAccess; ;}
+ { (void)(yyvsp[(2) - (3)].context); (yyval.symbol) = DeclClassAddNameSpace((yyvsp[(3) - (3)].id).string); FreeIdentifier((yyvsp[(1) - (3)].id)); FreeIdentifier((yyvsp[(3) - (3)].id)); (yyval.symbol).nameLoc = (yylsp[(3) - (3)]); (yyval.symbol).isRemote = true; memberAccessStack[++defaultMemberAccess] = privateAccess; ;}
break;
case 239:
/* Line 1464 of yacc.c */
#line 1351 "grammar.y"
- { (void)(yyvsp[(2) - (3)].context); (yyval.symbol) = DeclClass(0, (yyvsp[(3) - (3)].specifier).name); FreeIdentifier((yyvsp[(1) - (3)].id)); (yyval.symbol).nameLoc = (yylsp[(3) - (3)]); (yyval.symbol).isRemote = true; FreeSpecifier((yyvsp[(3) - (3)].specifier)); memberAccessStack[++defaultMemberAccess] = privateAccess; ;}
+ { (void)(yyvsp[(2) - (3)].context); (yyval.symbol) = DeclClass((yyvsp[(3) - (3)].specifier).name); FreeIdentifier((yyvsp[(1) - (3)].id)); (yyval.symbol).nameLoc = (yylsp[(3) - (3)]); (yyval.symbol).isRemote = true; FreeSpecifier((yyvsp[(3) - (3)].specifier)); memberAccessStack[++defaultMemberAccess] = privateAccess; ;}
break;
case 240:
/* Line 1464 of yacc.c */
#line 1353 "grammar.y"
- { (void)(yyvsp[(1) - (5)].context); (yyval.symbol) = DeclClassAddNameSpace(0, (yyvsp[(2) - (5)].id).string); (yyval.symbol).templateParams = (yyvsp[(4) - (5)].list); FreeIdentifier((yyvsp[(2) - (5)].id)); (yyval.symbol).nameLoc = (yylsp[(2) - (5)]); memberAccessStack[++defaultMemberAccess] = privateAccess; ;}
+ { (void)(yyvsp[(1) - (5)].context); (yyval.symbol) = DeclClassAddNameSpace((yyvsp[(2) - (5)].id).string); (yyval.symbol).templateParams = (yyvsp[(4) - (5)].list); FreeIdentifier((yyvsp[(2) - (5)].id)); (yyval.symbol).nameLoc = (yylsp[(2) - (5)]); memberAccessStack[++defaultMemberAccess] = privateAccess; ;}
break;
case 241:
/* Line 1464 of yacc.c */
#line 1355 "grammar.y"
{
- (void)(yyvsp[(1) - (5)].context); (yyval.symbol) = DeclClass(0, (yyvsp[(2) - (5)].specifier).name);
+ (void)(yyvsp[(1) - (5)].context); (yyval.symbol) = DeclClass((yyvsp[(2) - (5)].specifier).name);
(yyval.symbol).templateParams = (yyvsp[(4) - (5)].list);
(yyval.symbol).nameLoc = (yylsp[(2) - (5)]);
FreeSpecifier((yyvsp[(2) - (5)].specifier));
/* Line 1464 of yacc.c */
#line 1363 "grammar.y"
- { (void)(yyvsp[(2) - (6)].context); (yyval.symbol) = DeclClassAddNameSpace(0, (yyvsp[(3) - (6)].id).string); (yyval.symbol).templateParams = (yyvsp[(5) - (6)].list); FreeIdentifier((yyvsp[(1) - (6)].id)); FreeIdentifier((yyvsp[(3) - (6)].id)); (yyval.symbol).nameLoc = (yylsp[(3) - (6)]); (yyval.symbol).isRemote = true; memberAccessStack[++defaultMemberAccess] = privateAccess; ;}
+ { (void)(yyvsp[(2) - (6)].context); (yyval.symbol) = DeclClassAddNameSpace((yyvsp[(3) - (6)].id).string); (yyval.symbol).templateParams = (yyvsp[(5) - (6)].list); FreeIdentifier((yyvsp[(1) - (6)].id)); FreeIdentifier((yyvsp[(3) - (6)].id)); (yyval.symbol).nameLoc = (yylsp[(3) - (6)]); (yyval.symbol).isRemote = true; memberAccessStack[++defaultMemberAccess] = privateAccess; ;}
break;
case 243:
/* Line 1464 of yacc.c */
#line 1364 "grammar.y"
- { (void)(yyvsp[(2) - (6)].context); (yyval.symbol) = DeclClass(0, (yyvsp[(3) - (6)].specifier).name); (yyval.symbol).templateParams = (yyvsp[(5) - (6)].list); FreeIdentifier((yyvsp[(1) - (6)].id)); (yyval.symbol).nameLoc = (yylsp[(3) - (6)]); (yyval.symbol).isRemote = true; FreeSpecifier((yyvsp[(3) - (6)].specifier)); memberAccessStack[++defaultMemberAccess] = privateAccess; ;}
+ { (void)(yyvsp[(2) - (6)].context); (yyval.symbol) = DeclClass((yyvsp[(3) - (6)].specifier).name); (yyval.symbol).templateParams = (yyvsp[(5) - (6)].list); FreeIdentifier((yyvsp[(1) - (6)].id)); (yyval.symbol).nameLoc = (yylsp[(3) - (6)]); (yyval.symbol).isRemote = true; FreeSpecifier((yyvsp[(3) - (6)].specifier)); memberAccessStack[++defaultMemberAccess] = privateAccess; ;}
break;
case 244:
/* Line 1464 of yacc.c */
#line 1396 "grammar.y"
{
- (void)(yyvsp[(1) - (3)].context); (yyval._class) = MkClass(DeclClassAddNameSpace(0, (yyvsp[(2) - (3)].id).string), null, null); FreeIdentifier((yyvsp[(2) - (3)].id));
+ (void)(yyvsp[(1) - (3)].context); (yyval._class) = MkClass(DeclClassAddNameSpace((yyvsp[(2) - (3)].id).string), null, null); FreeIdentifier((yyvsp[(2) - (3)].id));
POP_DEFAULT_ACCESS
PopContext(curContext);
;}
/* Line 1464 of yacc.c */
#line 1402 "grammar.y"
{
- (void)(yyvsp[(1) - (3)].context); (yyval._class) = MkClass(DeclClass(0, (yyvsp[(2) - (3)].specifier).name), null, null); FreeSpecifier((yyvsp[(2) - (3)].specifier));
+ (void)(yyvsp[(1) - (3)].context); (yyval._class) = MkClass(DeclClass((yyvsp[(2) - (3)].specifier).name), null, null); FreeSpecifier((yyvsp[(2) - (3)].specifier));
POP_DEFAULT_ACCESS
PopContext(curContext);
;}
char name[1024];
strcpy(name, "::");
strcat(name, (yyvsp[(1) - (2)].exp).identifier.string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, (yyvsp[(1) - (2)].exp).identifier.string);
+ _DeclClass((yyvsp[(1) - (2)].exp).identifier.string);
// printf("Declaring Class %s\n", $1.identifier.string);
skipErrors = false;
/* Line 1464 of yacc.c */
#line 2210 "grammar.y"
- { (yyval.id) = (yyvsp[(2) - (2)].id); if(declMode) DeclClassAddNameSpace(0, (yyvsp[(2) - (2)].id).string); ;}
+ { (yyval.id) = (yyvsp[(2) - (2)].id); if(declMode) DeclClassAddNameSpace((yyvsp[(2) - (2)].id).string); ;}
break;
case 625:
/* Line 1464 of yacc.c */
#line 2211 "grammar.y"
- { (yyval.id) = MkIdentifier((yyvsp[(2) - (2)].specifier).name); if(declMode) DeclClass(0, (yyvsp[(2) - (2)].specifier).name); FreeSpecifier((yyvsp[(2) - (2)].specifier)); ;}
+ { (yyval.id) = MkIdentifier((yyvsp[(2) - (2)].specifier).name); if(declMode) DeclClass((yyvsp[(2) - (2)].specifier).name); FreeSpecifier((yyvsp[(2) - (2)].specifier)); ;}
break;
case 626:
/* Line 1464 of yacc.c */
#line 2291 "grammar.y"
- { _DeclClass(0, (yyvsp[(3) - (4)].id).string); (yyval.specifier) = MkSpecifierSubClass(MkSpecifierName((yyvsp[(3) - (4)].id).string)); FreeIdentifier((yyvsp[(3) - (4)].id)); ;}
+ { _DeclClass((yyvsp[(3) - (4)].id).string); (yyval.specifier) = MkSpecifierSubClass(MkSpecifierName((yyvsp[(3) - (4)].id).string)); FreeIdentifier((yyvsp[(3) - (4)].id)); ;}
break;
case 678:
/* Line 1464 of yacc.c */
#line 2324 "grammar.y"
- { _DeclClass(0, (yyvsp[(3) - (4)].id).string); (yyval.specifier) = MkSpecifierSubClass(MkSpecifierName((yyvsp[(3) - (4)].id).string)); FreeIdentifier((yyvsp[(3) - (4)].id)); ;}
+ { _DeclClass((yyvsp[(3) - (4)].id).string); (yyval.specifier) = MkSpecifierSubClass(MkSpecifierName((yyvsp[(3) - (4)].id).string)); FreeIdentifier((yyvsp[(3) - (4)].id)); ;}
break;
case 708:
(yyval.specifier) = (yyvsp[(1) - (1)].specifier);
if(declMode)
{
- ((yyvsp[(1) - (1)].specifier).addNameSpace ? DeclClassAddNameSpace : DeclClass)(0, (yyvsp[(1) - (1)].specifier).id.string);
+ ((yyvsp[(1) - (1)].specifier).addNameSpace ? DeclClassAddNameSpace : DeclClass)((yyvsp[(1) - (1)].specifier).id.string);
}
;}
break;
/* Line 1464 of yacc.c */
#line 2422 "grammar.y"
{
- Symbol symbol = ((yyvsp[(1) - (4)].specifier).addNameSpace ? DeclClassAddNameSpace : DeclClass)(0, (yyvsp[(1) - (4)].specifier).id.string);
+ Symbol symbol = ((yyvsp[(1) - (4)].specifier).addNameSpace ? DeclClassAddNameSpace : DeclClass)((yyvsp[(1) - (4)].specifier).id.string);
(yyval.specifier) = (yyvsp[(1) - (4)].specifier);
symbol.templateParams = (yyvsp[(3) - (4)].list);
;}
/* Line 1464 of yacc.c */
#line 2587 "grammar.y"
- { _DeclClass(0, (yyvsp[(1) - (1)].id).string); (yyval.list) = MkListOne(MkSpecifierName((yyvsp[(1) - (1)].id).string)); FreeIdentifier((yyvsp[(1) - (1)].id)); ;}
+ { _DeclClass((yyvsp[(1) - (1)].id).string); (yyval.list) = MkListOne(MkSpecifierName((yyvsp[(1) - (1)].id).string)); FreeIdentifier((yyvsp[(1) - (1)].id)); ;}
break;
case 818:
/* Line 1464 of yacc.c */
#line 2588 "grammar.y"
- { (yyval.list) = (yyvsp[(1) - (2)].list); _DeclClass(0, (yyvsp[(2) - (2)].id).string); ListAdd((yyvsp[(1) - (2)].list), MkSpecifierName((yyvsp[(2) - (2)].id).string)); FreeIdentifier((yyvsp[(2) - (2)].id)); ;}
+ { (yyval.list) = (yyvsp[(1) - (2)].list); _DeclClass((yyvsp[(2) - (2)].id).string); ListAdd((yyvsp[(1) - (2)].list), MkSpecifierName((yyvsp[(2) - (2)].id).string)); FreeIdentifier((yyvsp[(2) - (2)].id)); ;}
break;
case 819:
strcpy(name, (yyvsp[(1) - (4)].id)._class.name ? (yyvsp[(1) - (4)].id)._class.name : "");
strcat(name, "::");
strcat(name, (yyvsp[(1) - (4)].id).string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, (yyvsp[(1) - (4)].id).string);
+ _DeclClass((yyvsp[(1) - (4)].id).string);
(yyval.list) = MkList();
ListAdd((yyval.list), MkSpecifierNameArgs((yyvsp[(1) - (4)].id).string, (yyvsp[(3) - (4)].list)));
char name[1024];
strcpy(name, "::");
strcat(name, (yyvsp[(2) - (5)].id).string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, (yyvsp[(2) - (5)].id).string);
+ _DeclClass((yyvsp[(2) - (5)].id).string);
ListAdd((yyvsp[(1) - (5)].list), MkSpecifierNameArgs((yyvsp[(2) - (5)].id).string, (yyvsp[(4) - (5)].list)));
FreeIdentifier((yyvsp[(2) - (5)].id));
;}
strcpy(name, (yyvsp[(1) - (4)].id)._class.name ? (yyvsp[(1) - (4)].id)._class.name : "");
strcat(name, "::");
strcat(name, (yyvsp[(1) - (4)].id).string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, (yyvsp[(1) - (4)].id).string);
+ _DeclClass((yyvsp[(1) - (4)].id).string);
(yyval.list) = MkList();
ListAdd((yyval.list), MkSpecifierNameArgs((yyvsp[(1) - (4)].id).string, (yyvsp[(3) - (4)].list)));
char name[1024];
strcpy(name, "::");
strcat(name, (yyvsp[(2) - (5)].id).string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, (yyvsp[(2) - (5)].id).string);
+ _DeclClass((yyvsp[(2) - (5)].id).string);
ListAdd((yyvsp[(1) - (5)].list), MkSpecifierNameArgs((yyvsp[(2) - (5)].id).string, (yyvsp[(4) - (5)].list)));
FreeIdentifier((yyvsp[(2) - (5)].id));
;}
strcpy(name, (yyvsp[(1) - (4)].id)._class.name ? (yyvsp[(1) - (4)].id)._class.name : "");
strcat(name, "::");
strcat(name, (yyvsp[(1) - (4)].id).string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, (yyvsp[(1) - (4)].id).string);
+ _DeclClass((yyvsp[(1) - (4)].id).string);
(yyval.list) = MkList();
ListAdd((yyval.list), MkSpecifierNameArgs((yyvsp[(1) - (4)].id).string, (yyvsp[(3) - (4)].list)));
char name[1024];
strcpy(name, "::");
strcat(name, (yyvsp[(2) - (5)].id).string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, (yyvsp[(2) - (5)].id).string);
+ _DeclClass((yyvsp[(2) - (5)].id).string);
ListAdd((yyvsp[(1) - (5)].list), MkSpecifierNameArgs((yyvsp[(2) - (5)].id).string, (yyvsp[(4) - (5)].list)));
FreeIdentifier((yyvsp[(2) - (5)].id));
;}
strcpy(name, (yyvsp[(1) - (4)].id)._class.name ? (yyvsp[(1) - (4)].id)._class.name : "");
strcat(name, "::");
strcat(name, (yyvsp[(1) - (4)].id).string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, (yyvsp[(1) - (4)].id).string);
+ _DeclClass((yyvsp[(1) - (4)].id).string);
(yyval.list) = MkList();
ListAdd((yyval.list), MkSpecifierNameArgs((yyvsp[(1) - (4)].id).string, (yyvsp[(3) - (4)].list)));
char name[1024];
strcpy(name, "::");
strcat(name, (yyvsp[(2) - (5)].id).string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, (yyvsp[(2) - (5)].id).string);
+ _DeclClass((yyvsp[(2) - (5)].id).string);
ListAdd((yyvsp[(1) - (5)].list), MkSpecifierNameArgs((yyvsp[(2) - (5)].id).string, (yyvsp[(4) - (5)].list)));
FreeIdentifier((yyvsp[(2) - (5)].id));
;}
/* Line 1464 of yacc.c */
#line 3773 "grammar.y"
- { Symbol symbol = DeclClassAddNameSpace(0, (yyvsp[(3) - (6)].id).string); FreeIdentifier((yyvsp[(3) - (6)].id)); (yyval.dbtableDef) = MkDBTableDef((yyvsp[(2) - (6)].string), symbol, (yyvsp[(5) - (6)].list)); ;}
+ { Symbol symbol = DeclClassAddNameSpace((yyvsp[(3) - (6)].id).string); FreeIdentifier((yyvsp[(3) - (6)].id)); (yyval.dbtableDef) = MkDBTableDef((yyvsp[(2) - (6)].string), symbol, (yyvsp[(5) - (6)].list)); ;}
break;
case 1291:
/* Line 1464 of yacc.c */
#line 3774 "grammar.y"
- { Symbol symbol = DeclClass(0, (yyvsp[(3) - (6)].specifier).name); FreeSpecifier((yyvsp[(3) - (6)].specifier)); (yyval.dbtableDef) = MkDBTableDef((yyvsp[(2) - (6)].string), symbol, (yyvsp[(5) - (6)].list)); ;}
+ { Symbol symbol = DeclClass((yyvsp[(3) - (6)].specifier).name); FreeSpecifier((yyvsp[(3) - (6)].specifier)); (yyval.dbtableDef) = MkDBTableDef((yyvsp[(2) - (6)].string), symbol, (yyvsp[(5) - (6)].list)); ;}
break;
case 1292:
strcpy(name, $1._class.name ? $1._class.name : "");
strcat(name, "::");
strcat(name, $1.string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, $1.string);
+ _DeclClass($1.string);
FreeIdentifier($1);
strcpy(name, $1._class.name ? $1._class.name : "");
strcat(name, "::");
strcat(name, $1.string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, $1.string);
+ _DeclClass($1.string);
FreeIdentifier($1);
strcpy(name, $1._class.name ? $1._class.name : "");
strcat(name, "::");
strcat(name, $1.string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, $1.string);
+ _DeclClass($1.string);
fileInput.Seek(@1.start.pos, start);
resetScannerPos(&@1.start);
yyclearin;
strcpy(name, $1._class.name ? $1._class.name : "");
strcat(name, "::");
strcat(name, $1.string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, $1.string);
+ _DeclClass($1.string);
FreeIdentifier($1);
FreeIdentifier($2);
strcpy(name, $1._class.name ? $1._class.name : "");
strcat(name, "::");
strcat(name, $1.string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, $1.string);
+ _DeclClass($1.string);
fileInput.Seek(@1.start.pos, start);
resetScannerPos(&@1.start);
yyclearin;
strcpy(name, $1._class.name ? $1._class.name : "");
strcat(name, "::");
strcat(name, $1.string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, $1.string);
+ _DeclClass($1.string);
FreeIdentifier($1);
FreeIdentifier($2);
strcpy(name, $1._class.name ? $1._class.name : "");
strcat(name, "::");
strcat(name, $1.string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, $1.string);
+ _DeclClass($1.string);
yyerrok;
};
class_decl:
- class_entry identifier { (void)$1; $$ = DeclClassAddNameSpace(0, $2.string); FreeIdentifier($2); $$.nameLoc = @2; memberAccessStack[++defaultMemberAccess] = privateAccess; }
+ class_entry identifier { (void)$1; $$ = DeclClassAddNameSpace($2.string); FreeIdentifier($2); $$.nameLoc = @2; memberAccessStack[++defaultMemberAccess] = privateAccess; }
| class_entry base_strict_type
{
- (void)$1; $$ = DeclClass(0, $2.name);
+ (void)$1; $$ = DeclClass($2.name);
$$.nameLoc = @2;
FreeSpecifier($2);
++defaultMemberAccess;
memberAccessStack[defaultMemberAccess] = privateAccess;
}
- | identifier class_entry identifier { (void)$2; $$ = DeclClassAddNameSpace(0, $3.string); FreeIdentifier($1); FreeIdentifier($3); $$.nameLoc = @3; $$.isRemote = true; memberAccessStack[++defaultMemberAccess] = privateAccess; }
- | identifier class_entry base_strict_type { (void)$2; $$ = DeclClass(0, $3.name); FreeIdentifier($1); $$.nameLoc = @3; $$.isRemote = true; FreeSpecifier($3); memberAccessStack[++defaultMemberAccess] = privateAccess; }
+ | identifier class_entry identifier { (void)$2; $$ = DeclClassAddNameSpace($3.string); FreeIdentifier($1); FreeIdentifier($3); $$.nameLoc = @3; $$.isRemote = true; memberAccessStack[++defaultMemberAccess] = privateAccess; }
+ | identifier class_entry base_strict_type { (void)$2; $$ = DeclClass($3.name); FreeIdentifier($1); $$.nameLoc = @3; $$.isRemote = true; FreeSpecifier($3); memberAccessStack[++defaultMemberAccess] = privateAccess; }
- | class_entry identifier '<' template_parameters_list '>' { (void)$1; $$ = DeclClassAddNameSpace(0, $2.string); $$.templateParams = $4; FreeIdentifier($2); $$.nameLoc = @2; memberAccessStack[++defaultMemberAccess] = privateAccess; }
+ | class_entry identifier '<' template_parameters_list '>' { (void)$1; $$ = DeclClassAddNameSpace($2.string); $$.templateParams = $4; FreeIdentifier($2); $$.nameLoc = @2; memberAccessStack[++defaultMemberAccess] = privateAccess; }
| class_entry base_strict_type '<' template_parameters_list '>'
{
- (void)$1; $$ = DeclClass(0, $2.name);
+ (void)$1; $$ = DeclClass($2.name);
$$.templateParams = $4;
$$.nameLoc = @2;
FreeSpecifier($2);
++defaultMemberAccess;
memberAccessStack[defaultMemberAccess] = privateAccess;
}
- | identifier class_entry identifier '<' template_parameters_list '>' { (void)$2; $$ = DeclClassAddNameSpace(0, $3.string); $$.templateParams = $5; FreeIdentifier($1); FreeIdentifier($3); $$.nameLoc = @3; $$.isRemote = true; memberAccessStack[++defaultMemberAccess] = privateAccess; }
- | identifier class_entry base_strict_type '<' template_parameters_list '>' { (void)$2; $$ = DeclClass(0, $3.name); $$.templateParams = $5; FreeIdentifier($1); $$.nameLoc = @3; $$.isRemote = true; FreeSpecifier($3); memberAccessStack[++defaultMemberAccess] = privateAccess; }
+ | identifier class_entry identifier '<' template_parameters_list '>' { (void)$2; $$ = DeclClassAddNameSpace($3.string); $$.templateParams = $5; FreeIdentifier($1); FreeIdentifier($3); $$.nameLoc = @3; $$.isRemote = true; memberAccessStack[++defaultMemberAccess] = privateAccess; }
+ | identifier class_entry base_strict_type '<' template_parameters_list '>' { (void)$2; $$ = DeclClass($3.name); $$.templateParams = $5; FreeIdentifier($1); $$.nameLoc = @3; $$.isRemote = true; FreeSpecifier($3); memberAccessStack[++defaultMemberAccess] = privateAccess; }
;
class:
| class_entry identifier ';'
{
- (void)$1; $$ = MkClass(DeclClassAddNameSpace(0, $2.string), null, null); FreeIdentifier($2);
+ (void)$1; $$ = MkClass(DeclClassAddNameSpace($2.string), null, null); FreeIdentifier($2);
POP_DEFAULT_ACCESS
PopContext(curContext);
}
| class_entry type ';'
{
- (void)$1; $$ = MkClass(DeclClass(0, $2.name), null, null); FreeSpecifier($2);
+ (void)$1; $$ = MkClass(DeclClass($2.name), null, null); FreeSpecifier($2);
POP_DEFAULT_ACCESS
PopContext(curContext);
}
char name[1024];
strcpy(name, "::");
strcat(name, $1.identifier.string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, $1.identifier.string);
+ _DeclClass($1.identifier.string);
// printf("Declaring Class %s\n", $1.identifier.string);
skipErrors = false;
;
enum_decl:
- enum_specifier identifier { $$ = $2; if(declMode) DeclClassAddNameSpace(0, $2.string); }
- | enum_specifier strict_type { $$ = MkIdentifier($2.name); if(declMode) DeclClass(0, $2.name); FreeSpecifier($2); }
+ enum_specifier identifier { $$ = $2; if(declMode) DeclClassAddNameSpace($2.string); }
+ | enum_specifier strict_type { $$ = MkIdentifier($2.name); if(declMode) DeclClass($2.name); FreeSpecifier($2); }
;
enum_class:
| type
| TYPEOF '(' assignment_expression ')' { $$ = MkSpecifierTypeOf($3); }
| SUBCLASS '(' type ')' { $$ = MkSpecifierSubClass($3); }
- | SUBCLASS '(' identifier ')' { _DeclClass(0, $3.string); $$ = MkSpecifierSubClass(MkSpecifierName($3.string)); FreeIdentifier($3); }
+ | SUBCLASS '(' identifier ')' { _DeclClass($3.string); $$ = MkSpecifierSubClass(MkSpecifierName($3.string)); FreeIdentifier($3); }
| THISCLASS { $$ = MkSpecifier(THISCLASS); }
| TYPED_OBJECT { $$ = MkSpecifier(TYPED_OBJECT); }
| ANY_OBJECT { $$ = MkSpecifier(ANY_OBJECT); }
| _IMAGINARY { $$ = MkSpecifier(_IMAGINARY); }
| TYPEOF '(' assignment_expression ')' { $$ = MkSpecifierTypeOf($3); }
| SUBCLASS '(' type ')' { $$ = MkSpecifierSubClass($3); }
- | SUBCLASS '(' identifier ')' { _DeclClass(0, $3.string); $$ = MkSpecifierSubClass(MkSpecifierName($3.string)); FreeIdentifier($3); }
+ | SUBCLASS '(' identifier ')' { _DeclClass($3.string); $$ = MkSpecifierSubClass(MkSpecifierName($3.string)); FreeIdentifier($3); }
| THISCLASS { $$ = MkSpecifier(THISCLASS); }
;
$$ = $1;
if(declMode)
{
- ($1.addNameSpace ? DeclClassAddNameSpace : DeclClass)(0, $1.id.string);
+ ($1.addNameSpace ? DeclClassAddNameSpace : DeclClass)($1.id.string);
}
}
| struct_entry '<' template_parameters_list '>'
{
- Symbol symbol = ($1.addNameSpace ? DeclClassAddNameSpace : DeclClass)(0, $1.id.string);
+ Symbol symbol = ($1.addNameSpace ? DeclClassAddNameSpace : DeclClass)($1.id.string);
$$ = $1;
symbol.templateParams = $3;
}
| strict_type_specifier { $$ = MkList(); ListAdd($$, $1); }
| _inheritance_specifiers strict_type_specifier { $$ = $1; ListAdd($1, $2); }
| identifier
- { _DeclClass(0, $1.string); $$ = MkListOne(MkSpecifierName($1.string)); FreeIdentifier($1); }
- | _inheritance_specifiers identifier { $$ = $1; _DeclClass(0, $2.string); ListAdd($1, MkSpecifierName($2.string)); FreeIdentifier($2); }
+ { _DeclClass($1.string); $$ = MkListOne(MkSpecifierName($1.string)); FreeIdentifier($1); }
+ | _inheritance_specifiers identifier { $$ = $1; _DeclClass($2.string); ListAdd($1, MkSpecifierName($2.string)); FreeIdentifier($2); }
| identifier '<' template_arguments_list '>'
{
strcpy(name, $1._class.name ? $1._class.name : "");
strcat(name, "::");
strcat(name, $1.string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, $1.string);
+ _DeclClass($1.string);
$$ = MkList();
ListAdd($$, MkSpecifierNameArgs($1.string, $3));
char name[1024];
strcpy(name, "::");
strcat(name, $2.string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, $2.string);
+ _DeclClass($2.string);
ListAdd($1, MkSpecifierNameArgs($2.string, $4));
FreeIdentifier($2);
}
strcpy(name, $1._class.name ? $1._class.name : "");
strcat(name, "::");
strcat(name, $1.string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, $1.string);
+ _DeclClass($1.string);
$$ = MkList();
ListAdd($$, MkSpecifierNameArgs($1.string, $3));
char name[1024];
strcpy(name, "::");
strcat(name, $2.string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, $2.string);
+ _DeclClass($2.string);
ListAdd($1, MkSpecifierNameArgs($2.string, $4));
FreeIdentifier($2);
}
strcpy(name, $1._class.name ? $1._class.name : "");
strcat(name, "::");
strcat(name, $1.string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, $1.string);
+ _DeclClass($1.string);
$$ = MkList();
ListAdd($$, MkSpecifierNameArgs($1.string, $3));
char name[1024];
strcpy(name, "::");
strcat(name, $2.string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, $2.string);
+ _DeclClass($2.string);
ListAdd($1, MkSpecifierNameArgs($2.string, $4));
FreeIdentifier($2);
}
strcpy(name, $1._class.name ? $1._class.name : "");
strcat(name, "::");
strcat(name, $1.string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, $1.string);
+ _DeclClass($1.string);
$$ = MkList();
ListAdd($$, MkSpecifierNameArgs($1.string, $3));
char name[1024];
strcpy(name, "::");
strcat(name, $2.string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, $2.string);
+ _DeclClass($2.string);
ListAdd($1, MkSpecifierNameArgs($2.string, $4));
FreeIdentifier($2);
}
;
dbtable_definition:
- DBTABLE string_literal identifier '{' dbfield_definition_list '}' { Symbol symbol = DeclClassAddNameSpace(0, $3.string); FreeIdentifier($3); $$ = MkDBTableDef($2, symbol, $5); }
- | DBTABLE string_literal strict_type '{' dbfield_definition_list '}' { Symbol symbol = DeclClass(0, $3.name); FreeSpecifier($3); $$ = MkDBTableDef($2, symbol, $5); }
+ DBTABLE string_literal identifier '{' dbfield_definition_list '}' { Symbol symbol = DeclClassAddNameSpace($3.string); FreeIdentifier($3); $$ = MkDBTableDef($2, symbol, $5); }
+ | DBTABLE string_literal strict_type '{' dbfield_definition_list '}' { Symbol symbol = DeclClass($3.name); FreeSpecifier($3); $$ = MkDBTableDef($2, symbol, $5); }
| DBTABLE string_literal '{' dbfield_definition_list '}' { $$ = MkDBTableDef($2, null, $4); }
;
TrimLSpaces(line, line);
if(importType == preDeclImport)
- DeclClass(0, name);
+ DeclClass(name);
if(isStatic || loadDllOnly || importType == preDeclImport || importType == comCheckImport)
regClass = null;
else if(regClass = eSystem_FindClass(privateModule, name), !regClass || regClass.internalDecl || regClass.isRemote)
/*if(classType != unitClass && classType != bitClass && classType != enumClass && baseName && !eSystem_FindClass(privateModule, baseName))
{
Compiler_Error($"Base class %s undefined\n", baseName);
- DeclClass(0, name);
+ DeclClass(name);
regClass = null;
continue;
}
char className[1024] = "DCOMClient_";
strcat(className, name);
if(!existingClass)
- existingClass = DeclClass(0, name);
+ existingClass = DeclClass(name);
regClass = eSystem_RegisterClass(classType, className, baseName, 0, 0, null, null, privateModule, ecereCOMModule ? baseSystemAccess : publicAccess, inheritanceAccess);
}
if(regClass)
#line 230 "type.y"
{
(yyval.specifier) = null;
- DeclClass(0, (yyvsp[(1) - (2)].id).string);
+ DeclClass((yyvsp[(1) - (2)].id).string);
fileInput.Seek((yylsp[(1) - (2)]).start.pos, start);
resetScannerPos(&(yylsp[(1) - (2)]).start);
yyclearin;
strcpy(name, (yyvsp[(1) - (2)].id)._class.name ? (yyvsp[(1) - (2)].id)._class.name : "");
strcat(name, "::");
strcat(name, (yyvsp[(1) - (2)].id).string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, (yyvsp[(1) - (2)].id).string);
+ _DeclClass((yyvsp[(1) - (2)].id).string);
FreeIdentifier((yyvsp[(1) - (2)].id));
/* Line 1464 of yacc.c */
#line 282 "type.y"
{
- DeclClass(0, (yyvsp[(1) - (2)].id).string);
+ DeclClass((yyvsp[(1) - (2)].id).string);
fileInput.Seek((yylsp[(1) - (2)]).start.pos, start);
parseTypeError = 0;
resetScannerPos(&(yylsp[(1) - (2)]).start);
#line 333 "type.y"
{
#ifdef PRECOMPILER
- DeclClass(0, (yyvsp[(1) - (2)].id).string);
+ DeclClass((yyvsp[(1) - (2)].id).string);
fileInput.Seek((yylsp[(1) - (2)]).start.pos, start);
resetScannerPos(&(yylsp[(1) - (2)]).start);
yyclearin;
strcpy(name, (yyvsp[(1) - (4)].id)._class.name ? (yyvsp[(1) - (4)].id)._class.name : "");
strcat(name, "::");
strcat(name, (yyvsp[(1) - (4)].id).string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, (yyvsp[(1) - (4)].id).string);
+ _DeclClass((yyvsp[(1) - (4)].id).string);
(yyval.list) = MkList();
ListAdd((yyval.list), MkSpecifierNameArgs((yyvsp[(1) - (4)].id).string, (yyvsp[(3) - (4)].list)));
char name[1024];
strcpy(name, "::");
strcat(name, (yyvsp[(2) - (5)].id).string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, (yyvsp[(2) - (5)].id).string);
+ _DeclClass((yyvsp[(2) - (5)].id).string);
ListAdd((yyvsp[(1) - (5)].list), MkSpecifierNameArgs((yyvsp[(2) - (5)].id).string, (yyvsp[(4) - (5)].list)));
FreeIdentifier((yyvsp[(2) - (5)].id));
;}
strcpy(name, (yyvsp[(1) - (4)].id)._class.name ? (yyvsp[(1) - (4)].id)._class.name : "");
strcat(name, "::");
strcat(name, (yyvsp[(1) - (4)].id).string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, (yyvsp[(1) - (4)].id).string);
+ _DeclClass((yyvsp[(1) - (4)].id).string);
(yyval.list) = MkList();
ListAdd((yyval.list), MkSpecifierNameArgs((yyvsp[(1) - (4)].id).string, (yyvsp[(3) - (4)].list)));
char name[1024];
strcpy(name, "::");
strcat(name, (yyvsp[(2) - (5)].id).string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, (yyvsp[(2) - (5)].id).string);
+ _DeclClass((yyvsp[(2) - (5)].id).string);
ListAdd((yyvsp[(1) - (5)].list), MkSpecifierNameArgs((yyvsp[(2) - (5)].id).string, (yyvsp[(4) - (5)].list)));
FreeIdentifier((yyvsp[(2) - (5)].id));
;}
/* Line 1464 of yacc.c */
#line 881 "type.y"
- { _DeclClass(0, (yyvsp[(3) - (4)].id).string); (yyval.specifier) = MkSpecifierSubClass(MkSpecifierName((yyvsp[(3) - (4)].id).string)); FreeIdentifier((yyvsp[(3) - (4)].id)); ;}
+ { _DeclClass((yyvsp[(3) - (4)].id).string); (yyval.specifier) = MkSpecifierSubClass(MkSpecifierName((yyvsp[(3) - (4)].id).string)); FreeIdentifier((yyvsp[(3) - (4)].id)); ;}
break;
case 240:
/* Line 1464 of yacc.c */
#line 908 "type.y"
- { _DeclClass(0, (yyvsp[(3) - (4)].id).string); (yyval.specifier) = MkSpecifierSubClass(MkSpecifierName((yyvsp[(3) - (4)].id).string)); FreeIdentifier((yyvsp[(3) - (4)].id)); ;}
+ { _DeclClass((yyvsp[(3) - (4)].id).string); (yyval.specifier) = MkSpecifierSubClass(MkSpecifierName((yyvsp[(3) - (4)].id).string)); FreeIdentifier((yyvsp[(3) - (4)].id)); ;}
break;
case 264:
/* Line 1464 of yacc.c */
#line 914 "type.y"
- { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (5)].specifierType), (yyvsp[(2) - (5)].id), (yyvsp[(4) - (5)].list)); if(declMode) DeclClass(0, (yyvsp[(2) - (5)].id).string); ;}
+ { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (5)].specifierType), (yyvsp[(2) - (5)].id), (yyvsp[(4) - (5)].list)); if(declMode) DeclClass((yyvsp[(2) - (5)].id).string); ;}
break;
case 266:
/* Line 1464 of yacc.c */
#line 916 "type.y"
- { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (4)].specifierType), (yyvsp[(2) - (4)].id), null); if(declMode) DeclClass(0, (yyvsp[(2) - (4)].id).string); ;}
+ { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (4)].specifierType), (yyvsp[(2) - (4)].id), null); if(declMode) DeclClass((yyvsp[(2) - (4)].id).string); ;}
break;
case 268:
/* Line 1464 of yacc.c */
#line 919 "type.y"
- { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (5)].specifierType), MkIdentifier((yyvsp[(2) - (5)].specifier).name), (yyvsp[(4) - (5)].list)); if(declMode) DeclClass(0, (yyvsp[(2) - (5)].specifier).name); FreeSpecifier((yyvsp[(2) - (5)].specifier)); ;}
+ { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (5)].specifierType), MkIdentifier((yyvsp[(2) - (5)].specifier).name), (yyvsp[(4) - (5)].list)); if(declMode) DeclClass((yyvsp[(2) - (5)].specifier).name); FreeSpecifier((yyvsp[(2) - (5)].specifier)); ;}
break;
case 270:
/* Line 1464 of yacc.c */
#line 921 "type.y"
- { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (6)].specifierType), (yyvsp[(3) - (6)].id), (yyvsp[(5) - (6)].list)); (yyval.specifier).extDeclStruct = (yyvsp[(2) - (6)].extDecl); if(declMode) DeclClass(0, (yyvsp[(3) - (6)].id).string); ;}
+ { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (6)].specifierType), (yyvsp[(3) - (6)].id), (yyvsp[(5) - (6)].list)); (yyval.specifier).extDeclStruct = (yyvsp[(2) - (6)].extDecl); if(declMode) DeclClass((yyvsp[(3) - (6)].id).string); ;}
break;
case 271:
/* Line 1464 of yacc.c */
#line 923 "type.y"
- { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (5)].specifierType), (yyvsp[(3) - (5)].id), null); (yyval.specifier).extDeclStruct = (yyvsp[(2) - (5)].extDecl); if(declMode) DeclClass(0, (yyvsp[(3) - (5)].id).string); ;}
+ { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (5)].specifierType), (yyvsp[(3) - (5)].id), null); (yyval.specifier).extDeclStruct = (yyvsp[(2) - (5)].extDecl); if(declMode) DeclClass((yyvsp[(3) - (5)].id).string); ;}
break;
case 273:
/* Line 1464 of yacc.c */
#line 926 "type.y"
- { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (6)].specifierType), MkIdentifier((yyvsp[(3) - (6)].specifier).name), (yyvsp[(5) - (6)].list)); (yyval.specifier).extDeclStruct = (yyvsp[(2) - (6)].extDecl); if(declMode) DeclClass(0, (yyvsp[(3) - (6)].specifier).name); FreeSpecifier((yyvsp[(3) - (6)].specifier)); ;}
+ { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (6)].specifierType), MkIdentifier((yyvsp[(3) - (6)].specifier).name), (yyvsp[(5) - (6)].list)); (yyval.specifier).extDeclStruct = (yyvsp[(2) - (6)].extDecl); if(declMode) DeclClass((yyvsp[(3) - (6)].specifier).name); FreeSpecifier((yyvsp[(3) - (6)].specifier)); ;}
break;
case 275:
/* Line 1464 of yacc.c */
#line 930 "type.y"
- { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (2)].specifierType), (yyvsp[(2) - (2)].id), null); if(declMode) DeclClass(0, (yyvsp[(2) - (2)].id).string); ;}
+ { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (2)].specifierType), (yyvsp[(2) - (2)].id), null); if(declMode) DeclClass((yyvsp[(2) - (2)].id).string); ;}
break;
case 276:
/* Line 1464 of yacc.c */
#line 932 "type.y"
- { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (2)].specifierType), MkIdentifier((yyvsp[(2) - (2)].specifier).name), null); if(declMode) DeclClass(0, (yyvsp[(2) - (2)].specifier).name); FreeSpecifier((yyvsp[(2) - (2)].specifier)); ;}
+ { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (2)].specifierType), MkIdentifier((yyvsp[(2) - (2)].specifier).name), null); if(declMode) DeclClass((yyvsp[(2) - (2)].specifier).name); FreeSpecifier((yyvsp[(2) - (2)].specifier)); ;}
break;
case 277:
/* Line 1464 of yacc.c */
#line 935 "type.y"
- { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (3)].specifierType), (yyvsp[(3) - (3)].id), null); (yyval.specifier).extDeclStruct = (yyvsp[(2) - (3)].extDecl);if(declMode) DeclClass(0, (yyvsp[(3) - (3)].id).string); ;}
+ { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (3)].specifierType), (yyvsp[(3) - (3)].id), null); (yyval.specifier).extDeclStruct = (yyvsp[(2) - (3)].extDecl);if(declMode) DeclClass((yyvsp[(3) - (3)].id).string); ;}
break;
case 278:
/* Line 1464 of yacc.c */
#line 937 "type.y"
- { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (3)].specifierType), MkIdentifier((yyvsp[(3) - (3)].specifier).name), null); (yyval.specifier).extDeclStruct = (yyvsp[(2) - (3)].extDecl); if(declMode) DeclClass(0, (yyvsp[(3) - (3)].specifier).name); FreeSpecifier((yyvsp[(3) - (3)].specifier)); ;}
+ { (yyval.specifier) = MkStructOrUnion((yyvsp[(1) - (3)].specifierType), MkIdentifier((yyvsp[(3) - (3)].specifier).name), null); (yyval.specifier).extDeclStruct = (yyvsp[(2) - (3)].extDecl); if(declMode) DeclClass((yyvsp[(3) - (3)].specifier).name); FreeSpecifier((yyvsp[(3) - (3)].specifier)); ;}
break;
case 279:
/* Line 1464 of yacc.c */
#line 1109 "type.y"
- { (yyval.specifier) = MkEnum((yyvsp[(2) - (2)].id), null); if(declMode) DeclClass(0, (yyvsp[(2) - (2)].id).string); ;}
+ { (yyval.specifier) = MkEnum((yyvsp[(2) - (2)].id), null); if(declMode) DeclClass((yyvsp[(2) - (2)].id).string); ;}
break;
case 335:
/* Line 1464 of yacc.c */
#line 1110 "type.y"
- { (yyval.specifier) = MkEnum(MkIdentifier((yyvsp[(2) - (2)].specifier).name), null); if(declMode) DeclClass(0, (yyvsp[(2) - (2)].specifier).name); FreeSpecifier((yyvsp[(2) - (2)].specifier)); ;}
+ { (yyval.specifier) = MkEnum(MkIdentifier((yyvsp[(2) - (2)].specifier).name), null); if(declMode) DeclClass((yyvsp[(2) - (2)].specifier).name); FreeSpecifier((yyvsp[(2) - (2)].specifier)); ;}
break;
case 336:
/* Line 1464 of yacc.c */
#line 1116 "type.y"
- { (yyval.specifier) = MkEnum((yyvsp[(2) - (5)].id), (yyvsp[(4) - (5)].list)); if(declMode) DeclClass(0, (yyvsp[(2) - (5)].id).string); ;}
+ { (yyval.specifier) = MkEnum((yyvsp[(2) - (5)].id), (yyvsp[(4) - (5)].list)); if(declMode) DeclClass((yyvsp[(2) - (5)].id).string); ;}
break;
case 338:
/* Line 1464 of yacc.c */
#line 1117 "type.y"
- { (yyval.specifier) = MkEnum((yyvsp[(2) - (7)].id), (yyvsp[(4) - (7)].list)); (yyval.specifier).definitions = (yyvsp[(6) - (7)].list); if(declMode) DeclClass(0, (yyvsp[(2) - (7)].id).string); ;}
+ { (yyval.specifier) = MkEnum((yyvsp[(2) - (7)].id), (yyvsp[(4) - (7)].list)); (yyval.specifier).definitions = (yyvsp[(6) - (7)].list); if(declMode) DeclClass((yyvsp[(2) - (7)].id).string); ;}
break;
case 339:
/* Line 1464 of yacc.c */
#line 1118 "type.y"
- { (yyval.specifier) = MkEnum(MkIdentifier((yyvsp[(2) - (7)].specifier).name), (yyvsp[(4) - (7)].list)); (yyval.specifier).definitions = (yyvsp[(6) - (7)].list); if(declMode) DeclClass(0, (yyvsp[(2) - (7)].specifier).name); FreeSpecifier((yyvsp[(2) - (7)].specifier)); ;}
+ { (yyval.specifier) = MkEnum(MkIdentifier((yyvsp[(2) - (7)].specifier).name), (yyvsp[(4) - (7)].list)); (yyval.specifier).definitions = (yyvsp[(6) - (7)].list); if(declMode) DeclClass((yyvsp[(2) - (7)].specifier).name); FreeSpecifier((yyvsp[(2) - (7)].specifier)); ;}
break;
case 340:
/* Line 1464 of yacc.c */
#line 1119 "type.y"
- { (yyval.specifier) = MkEnum(MkIdentifier((yyvsp[(2) - (5)].specifier).name), (yyvsp[(4) - (5)].list)); if(declMode) DeclClass(0, (yyvsp[(2) - (5)].specifier).name); FreeSpecifier((yyvsp[(2) - (5)].specifier)); ;}
+ { (yyval.specifier) = MkEnum(MkIdentifier((yyvsp[(2) - (5)].specifier).name), (yyvsp[(4) - (5)].list)); if(declMode) DeclClass((yyvsp[(2) - (5)].specifier).name); FreeSpecifier((yyvsp[(2) - (5)].specifier)); ;}
break;
case 341:
identifier '*'
{
$$ = null;
- DeclClass(0, $1.string);
+ DeclClass($1.string);
fileInput.Seek(@1.start.pos, start);
resetScannerPos(&@1.start);
yyclearin;
strcpy(name, $1._class.name ? $1._class.name : "");
strcat(name, "::");
strcat(name, $1.string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, $1.string);
+ _DeclClass($1.string);
FreeIdentifier($1);
real_guess_type:
identifier error
{
- DeclClass(0, $1.string);
+ DeclClass($1.string);
fileInput.Seek(@1.start.pos, start);
parseTypeError = 0;
resetScannerPos(&@1.start);
strcpy(name, $1._class.name ? $1._class.name : "");
strcat(name, "::");
strcat(name, $1.string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, $1.string);
+ _DeclClass($1.string);
FreeIdentifier($1);
| identifier identifier
{
#ifdef PRECOMPILER
- DeclClass(0, $1.string);
+ DeclClass($1.string);
fileInput.Seek(@1.start.pos, start);
resetScannerPos(&@1.start);
yyclearin;
strcpy(name, $1._class.name ? $1._class.name : "");
strcat(name, "::");
strcat(name, $1.string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, $1.string);
+ _DeclClass($1.string);
$$ = MkList();
ListAdd($$, MkSpecifierNameArgs($1.string, $3));
char name[1024];
strcpy(name, "::");
strcat(name, $2.string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, $2.string);
+ _DeclClass($2.string);
ListAdd($1, MkSpecifierNameArgs($2.string, $4));
FreeIdentifier($2);
}
strcpy(name, $1._class.name ? $1._class.name : "");
strcat(name, "::");
strcat(name, $1.string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, $1.string);
+ _DeclClass($1.string);
$$ = MkList();
ListAdd($$, MkSpecifierNameArgs($1.string, $3));
char name[1024];
strcpy(name, "::");
strcat(name, $2.string);
- _DeclClass(0, name);
+ _DeclClass(name);
}
else
- _DeclClass(0, $2.string);
+ _DeclClass($2.string);
ListAdd($1, MkSpecifierNameArgs($2.string, $4));
FreeIdentifier($2);
}
| type
| TYPEOF '(' assignment_expression ')' { $$ = MkSpecifierTypeOf($3); }
| SUBCLASS '(' type ')' { $$ = MkSpecifierSubClass($3); }
- | SUBCLASS '(' identifier ')' { _DeclClass(0, $3.string); $$ = MkSpecifierSubClass(MkSpecifierName($3.string)); FreeIdentifier($3); }
+ | SUBCLASS '(' identifier ')' { _DeclClass($3.string); $$ = MkSpecifierSubClass(MkSpecifierName($3.string)); FreeIdentifier($3); }
| THISCLASS { $$ = MkSpecifier(THISCLASS); }
| TYPED_OBJECT { $$ = MkSpecifier(TYPED_OBJECT); }
| ANY_OBJECT { $$ = MkSpecifier(ANY_OBJECT); }
| strict_type
| TYPEOF '(' assignment_expression ')' { $$ = MkSpecifierTypeOf($3); }
| SUBCLASS '(' type ')' { $$ = MkSpecifierSubClass($3); }
- | SUBCLASS '(' identifier ')' { _DeclClass(0, $3.string); $$ = MkSpecifierSubClass(MkSpecifierName($3.string)); FreeIdentifier($3); }
+ | SUBCLASS '(' identifier ')' { _DeclClass($3.string); $$ = MkSpecifierSubClass(MkSpecifierName($3.string)); FreeIdentifier($3); }
| THISCLASS { $$ = MkSpecifier(THISCLASS); }
;
struct_or_union_specifier_compound:
- struct_or_union identifier '{' struct_declaration_list '}' { $$ = MkStructOrUnion($1, $2, $4); if(declMode) DeclClass(0, $2.string); }
+ struct_or_union identifier '{' struct_declaration_list '}' { $$ = MkStructOrUnion($1, $2, $4); if(declMode) DeclClass($2.string); }
| struct_or_union '{' struct_declaration_list '}' { $$ = MkStructOrUnion($1, null, $3); }
- | struct_or_union identifier '{' '}' { $$ = MkStructOrUnion($1, $2, null); if(declMode) DeclClass(0, $2.string); }
+ | struct_or_union identifier '{' '}' { $$ = MkStructOrUnion($1, $2, null); if(declMode) DeclClass($2.string); }
| struct_or_union '{' '}' { $$ = MkStructOrUnion($1, null, null); }
| struct_or_union base_strict_type '{' struct_declaration_list '}'
- { $$ = MkStructOrUnion($1, MkIdentifier($2.name), $4); if(declMode) DeclClass(0, $2.name); FreeSpecifier($2); }
+ { $$ = MkStructOrUnion($1, MkIdentifier($2.name), $4); if(declMode) DeclClass($2.name); FreeSpecifier($2); }
- | struct_or_union ext_decl identifier '{' struct_declaration_list '}' { $$ = MkStructOrUnion($1, $3, $5); $$.extDeclStruct = $2; if(declMode) DeclClass(0, $3.string); }
+ | struct_or_union ext_decl identifier '{' struct_declaration_list '}' { $$ = MkStructOrUnion($1, $3, $5); $$.extDeclStruct = $2; if(declMode) DeclClass($3.string); }
| struct_or_union ext_decl '{' struct_declaration_list '}' { $$ = MkStructOrUnion($1, null, $4); $$.extDeclStruct = $2; }
- | struct_or_union ext_decl identifier '{' '}' { $$ = MkStructOrUnion($1, $3, null); $$.extDeclStruct = $2; if(declMode) DeclClass(0, $3.string); }
+ | struct_or_union ext_decl identifier '{' '}' { $$ = MkStructOrUnion($1, $3, null); $$.extDeclStruct = $2; if(declMode) DeclClass($3.string); }
| struct_or_union ext_decl '{' '}' { $$ = MkStructOrUnion($1, null, null); $$.extDeclStruct = $2; }
| struct_or_union ext_decl strict_type '{' struct_declaration_list '}'
- { $$ = MkStructOrUnion($1, MkIdentifier($3.name), $5); $$.extDeclStruct = $2; if(declMode) DeclClass(0, $3.name); FreeSpecifier($3); }
+ { $$ = MkStructOrUnion($1, MkIdentifier($3.name), $5); $$.extDeclStruct = $2; if(declMode) DeclClass($3.name); FreeSpecifier($3); }
;
struct_or_union_specifier_nocompound:
- struct_or_union identifier { $$ = MkStructOrUnion($1, $2, null); if(declMode) DeclClass(0, $2.string); }
+ struct_or_union identifier { $$ = MkStructOrUnion($1, $2, null); if(declMode) DeclClass($2.string); }
| struct_or_union strict_type
- { $$ = MkStructOrUnion($1, MkIdentifier($2.name), null); if(declMode) DeclClass(0, $2.name); FreeSpecifier($2); }
+ { $$ = MkStructOrUnion($1, MkIdentifier($2.name), null); if(declMode) DeclClass($2.name); FreeSpecifier($2); }
| struct_or_union ext_decl identifier
- { $$ = MkStructOrUnion($1, $3, null); $$.extDeclStruct = $2;if(declMode) DeclClass(0, $3.string); }
+ { $$ = MkStructOrUnion($1, $3, null); $$.extDeclStruct = $2;if(declMode) DeclClass($3.string); }
| struct_or_union ext_decl strict_type
- { $$ = MkStructOrUnion($1, MkIdentifier($3.name), null); $$.extDeclStruct = $2; if(declMode) DeclClass(0, $3.name); FreeSpecifier($3); }
+ { $$ = MkStructOrUnion($1, MkIdentifier($3.name), null); $$.extDeclStruct = $2; if(declMode) DeclClass($3.name); FreeSpecifier($3); }
;
template_datatype:
;
enum_specifier_nocompound:
- ENUM identifier { $$ = MkEnum($2, null); if(declMode) DeclClass(0, $2.string); }
- | ENUM strict_type { $$ = MkEnum(MkIdentifier($2.name), null); if(declMode) DeclClass(0, $2.name); FreeSpecifier($2); }
+ ENUM identifier { $$ = MkEnum($2, null); if(declMode) DeclClass($2.string); }
+ | ENUM strict_type { $$ = MkEnum(MkIdentifier($2.name), null); if(declMode) DeclClass($2.name); FreeSpecifier($2); }
;
enum_specifier_compound:
ENUM '{' enumerator_list '}'
{ $$ = MkEnum(null, $3); }
- | ENUM identifier '{' enumerator_list '}' { $$ = MkEnum($2, $4); if(declMode) DeclClass(0, $2.string); }
- | ENUM identifier '{' enumerator_list ';' struct_declaration_list '}' { $$ = MkEnum($2, $4); $$.definitions = $6; if(declMode) DeclClass(0, $2.string); }
- | ENUM strict_type '{' enumerator_list ';' struct_declaration_list '}' { $$ = MkEnum(MkIdentifier($2.name), $4); $$.definitions = $6; if(declMode) DeclClass(0, $2.name); FreeSpecifier($2); }
- | ENUM strict_type '{' enumerator_list '}' { $$ = MkEnum(MkIdentifier($2.name), $4); if(declMode) DeclClass(0, $2.name); FreeSpecifier($2); }
+ | ENUM identifier '{' enumerator_list '}' { $$ = MkEnum($2, $4); if(declMode) DeclClass($2.string); }
+ | ENUM identifier '{' enumerator_list ';' struct_declaration_list '}' { $$ = MkEnum($2, $4); $$.definitions = $6; if(declMode) DeclClass($2.string); }
+ | ENUM strict_type '{' enumerator_list ';' struct_declaration_list '}' { $$ = MkEnum(MkIdentifier($2.name), $4); $$.definitions = $6; if(declMode) DeclClass($2.name); FreeSpecifier($2); }
+ | ENUM strict_type '{' enumerator_list '}' { $$ = MkEnum(MkIdentifier($2.name), $4); if(declMode) DeclClass($2.name); FreeSpecifier($2); }
;
enumerator_list:
Ecere Software / sdk / commitdiff