};
+public class eCONParser : JSONParser
+{
+ eCON = true;
+}
+
public class JSONParser
{
public:
File f;
- char pch;
+private:
char ch;
bool eCON;
if(type.type != structClass)
value.p = 0;
}
- else if(isSubclass(string, type))
+ else if(isSubclass(type, string))
{
void * object = value.p;
- Class subtype = eSystem_SuperFindClass(string, type.module);
+ Class subtype = superFindClass(string, type.module);
SkipEmpty();
result = GetObject(subtype, &object);
if(result)
offset = member._class.offset + member.offset;
}
else if(prop)
- type = eSystem_SuperFindClass(prop.dataTypeString, objectType.module);
+ type = superFindClass(prop.dataTypeString, objectType.module);
else if(member)
{
- type = eSystem_SuperFindClass(member.dataTypeString, objectType.module);
+ type = superFindClass(member.dataTypeString, objectType.module);
offset = member._class.offset + member.offset;
}
}
member = eClass_FindDataMember(objectType, string, objectType.module, null, null);
if(member)
{
- type = eSystem_SuperFindClass(member.dataTypeString, objectType.module);
+ type = superFindClass(member.dataTypeString, objectType.module);
offset = member._class.offset + member.offset;
}
else if(!member)
{
prop = eClass_FindProperty(objectType, string, objectType.module);
if(prop)
- type = eSystem_SuperFindClass(prop.dataTypeString, objectType.module);
+ type = superFindClass(prop.dataTypeString, objectType.module);
else
PrintLn("Warning: member ", string, " not found in class ", (String)objectType.name);
}
else if(type.type == bitClass)
{
Class dataType;
- dataType = eSystem_SuperFindClass(type.dataTypeString, type.module);
+ dataType = superFindClass(type.dataTypeString, type.module);
WriteNumber(f, dataType, value, indent, eCON);
}
else if(type.type == systemClass || type.type == unitClass)
type = mapDataClass;
}
else
- type = eSystem_SuperFindClass(prop.dataTypeString, _class.module);
+ type = superFindClass(prop.dataTypeString, _class.module);
if(!type)
PrintLn("warning: Unresolved data type ", (String)prop.dataTypeString);
DataMember member = (DataMember)prop;
DataValue value { };
uint offset;
- Class type = eSystem_SuperFindClass(member.dataTypeString, _class.module);
+ Class type = superFindClass(member.dataTypeString, _class.module);
offset = member._class.offset + member.offset;
if(type)
return true;
}
-static Class eSystem_SuperFindClass(const String name, Module alternativeModule)
+static Class superFindClass(const String name, Module alternativeModule)
{
Class _class = eSystem_FindClass(__thisModule, name);
if(!_class && alternativeModule)
return _class;
}
-static bool isSubclass(const String name, Class type)
+static bool isSubclass(Class type, const String name)
{
- Class _class = eSystem_SuperFindClass(name, type.module);
+ Class _class = superFindClass(name, type.module);
if(eClass_IsDerived(_class, type))
return true;
return false;