tons more renaming of stuff

1 files changed, 16 insertions, 17 deletions

diff --git a/includes/compiler/CScope.h b/includes/compiler/CScope.h
index 7a4c3de..d19a655 100644
--- a/includes/compiler/CScope.h
+++ b/includes/compiler/CScope.h
@@ -20,12 +20,11 @@ struct CScopeSave {
     Boolean is_member_func;
 }; // assumed name
 
-// this might be called NameResult
-typedef struct CScopeParseResult {
+typedef struct NameResult {
     NameSpace *nspace_0;
     HashNameNode *name_4;
-    Type *x8;
-    UInt32 xC; // qual
+    Type *type;
+    UInt32 qual;
     ObjBase *obj_10;
     NameSpaceObjectList *nsol_14;
     BClassList *bcl_18;
@@ -35,12 +34,12 @@ typedef struct CScopeParseResult {
     Boolean x1F;
     Boolean x20;
     Boolean x21;
-} CScopeParseResult;
+} NameResult;
 
 typedef struct CScopeNSIterator {
     NameSpace *nspace;
     NameSpaceLookupList *lookup;
-    CScopeParseResult *result;
+    NameResult *result;
 } CScopeNSIterator;
 
 typedef struct CScopeObjectIterator {
@@ -75,27 +74,27 @@ extern void CScope_MergeNameSpace(NameSpace *dst, NameSpace *src);
 extern void CScope_AddObject(NameSpace *nspace, HashNameNode *name, ObjBase *obj);
 extern void CScope_AddGlobalObject(Object *obj);
 extern NameSpaceLookupList *CScope_BuildNameSpaceLookupList(NameSpace *nspace);
-extern Boolean CScope_FindQualifiedClassMember(CScopeParseResult *result, TypeClass *tclass, HashNameNode *name);
+extern Boolean CScope_FindQualifiedClassMember(NameResult *result, TypeClass *tclass, HashNameNode *name);
 extern Type *CScope_GetType(NameSpace *nspace, HashNameNode *name, UInt32 *qual);
 extern Type *CScope_GetTagType(NameSpace *nspace, HashNameNode *name);
-extern Boolean CScope_ParseExprName(CScopeParseResult *result);
-extern Boolean CScope_ParseDeclName(CScopeParseResult *result);
-extern Boolean CScope_ParseQualifiedNameSpace(CScopeParseResult *result, Boolean flag1, Boolean flag2);
-extern Boolean CScope_ParseElaborateName(CScopeParseResult *result);
-extern Boolean CScope_FindObject(NameSpace *nspace, CScopeParseResult *result, HashNameNode *name);
-extern Boolean CScope_FindNonClassObject(NameSpace *nspace, CScopeParseResult *result, HashNameNode *name);
-extern NameSpaceObjectList *CScope_FindObjectList(CScopeParseResult *result, HashNameNode *name);
+extern Boolean CScope_ParseExprName(NameResult *result);
+extern Boolean CScope_ParseDeclName(NameResult *result);
+extern Boolean CScope_ParseQualifiedNameSpace(NameResult *result, Boolean flag1, Boolean flag2);
+extern Boolean CScope_ParseElaborateName(NameResult *result);
+extern Boolean CScope_FindObject(NameSpace *nspace, NameResult *result, HashNameNode *name);
+extern Boolean CScope_FindNonClassObject(NameSpace *nspace, NameResult *result, HashNameNode *name);
+extern NameSpaceObjectList *CScope_FindObjectList(NameResult *result, HashNameNode *name);
 extern Boolean CScope_PossibleTypeName(HashNameNode *name);
-extern Boolean CScope_FindClassMemberObject(TypeClass *tclass, CScopeParseResult *result, HashNameNode *name);
+extern Boolean CScope_FindClassMemberObject(TypeClass *tclass, NameResult *result, HashNameNode *name);
 extern void CScope_InitObjectIterator(CScopeObjectIterator *iterator, NameSpace *nspace);
 extern ObjBase *CScope_NextObjectIteratorObject(CScopeObjectIterator *iterator);
 extern NameSpaceObjectList *CScope_NextObjectIteratorObjectList(CScopeObjectIterator *iterator);
 extern void CScope_DefineTypeTag(NameSpace *nspace, HashNameNode *name, Type *type);
 extern Type *CScope_GetLocalTagType(NameSpace *nspace, HashNameNode *name);
-extern Boolean CScope_FindTypeName(NameSpace *nspace, HashNameNode *name, CScopeParseResult *result);
+extern Boolean CScope_FindTypeName(NameSpace *nspace, HashNameNode *name, NameResult *result);
 extern NameSpaceObjectList *CScope_GetLocalObject(NameSpace *nspace, HashNameNode *name);
 extern BClassList *CScope_GetClassAccessPath(BClassList *list, TypeClass *tclass);
-extern Boolean CScope_ParseMemberName(TypeClass *tclass, CScopeParseResult *result, Boolean flag);
+extern Boolean CScope_ParseMemberName(TypeClass *tclass, NameResult *result, Boolean flag);
 extern void CScope_AddClassUsingDeclaration(TypeClass *tclass, TypeClass *tclass2, HashNameNode *name, AccessType access);
 extern void CScope_ParseUsingDeclaration(NameSpace *nspace, AccessType access, Boolean flag);
 extern void CScope_ParseNameSpaceAlias(HashNameNode *name);