[java] Remove Access parameter from fillReferenceItem()

thoni56 · May 29, 2024 · a2f68b3 · a2f68b3
1 parent 11d511d
commit a2f68b3
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 24 deletions.
diff --git a/src/completion.c b/src/completion.c
@@ -62,15 +62,14 @@ Completion *completionListPrepend(Completion *completions, char *name, char *ful
         ss = olcxAlloc(slen+1);
         strcpy(ss, referenceItem->linkName);
         fillReferenceItem(&sri, ss, referenceItem->vApplClass, referenceItem->vFunClass,
-                          referenceItem->type, referenceItem->storage, referenceItem->scope,
-                          0, referenceItem->category);
+                          referenceItem->type, referenceItem->storage, referenceItem->scope, referenceItem->category);
 
         completion = newCompletion(name, fullName, 1, referenceItem->category, cType, *reference, sri);
     } else if (symbol==NULL) {
         Reference r = *reference;
         r.next = NULL;
         fillReferenceItem(&sri, "", NO_FILE_NUMBER, NO_FILE_NUMBER, TypeUnknown, StorageDefault,
-                          ScopeAuto, 0, CategoryLocal);
+                          ScopeAuto, CategoryLocal);
         completion = newCompletion(name, fullName, 1, CategoryLocal, cType, r, sri);
     } else {
         Reference r;
@@ -83,7 +82,7 @@ Completion *completionListPrepend(Completion *completions, char *name, char *ful
         fillReference(&r, r.usage, symbol->pos, NULL);
         fillReferenceItem(&sri, ss,
                           vFunClass, vFunClass, symbol->type, storage,
-                          scope, 0, category);
+                          scope, category);
         completion = newCompletion(name, fullName, 1, category, cType, r, sri);
     }
     if (fullName!=NULL) {

diff --git a/src/cxfile.c b/src/cxfile.c
@@ -398,7 +398,7 @@ static void writeReferenceItem(ReferenceItem *referenceItem) {
     fillReferenceItem(&lastOutgoingInfo.cachedReferenceItem[symbolIndex],
                        lastOutgoingInfo.cachedSymbolName[symbolIndex],
                        referenceItem->vApplClass, referenceItem->vFunClass, referenceItem->type,
-                       referenceItem->storage, referenceItem->scope, 0,
+                       referenceItem->storage, referenceItem->scope,
                        referenceItem->category);
     lastOutgoingInfo.symbolTab[symbolIndex]       = &lastOutgoingInfo.cachedReferenceItem[symbolIndex];
     lastOutgoingInfo.symbolIsWritten[symbolIndex] = false;
@@ -791,15 +791,14 @@ static void scanFunction_SymbolNameForFullUpdateSchedule(int size,
 
     ReferenceItem *referenceItem = &lastIncomingInfo.cachedReferenceItem[symbolIndex];
     lastIncomingInfo.symbolTab[symbolIndex] = referenceItem;
-    fillReferenceItem(referenceItem, id, vApplClass, vFunClass, symbolType, storage, ScopeGlobal,
-                      0, CategoryGlobal);
+    fillReferenceItem(referenceItem, id, vApplClass, vFunClass, symbolType, storage, ScopeGlobal, CategoryGlobal);
     if (!isMemberInReferenceTable(referenceItem, NULL, &memb)) {
         // TODO: This is more or less the body of a newReferenceItem()
         char *ss = cxAlloc(len+1);
         strcpy(ss,id);
         memb = cxAlloc(sizeof(ReferenceItem));
         fillReferenceItem(memb, ss, vApplClass, vFunClass, symbolType, storage,
-                          ScopeGlobal, 0, CategoryGlobal);
+                          ScopeGlobal, CategoryGlobal);
         addToReferencesTable(memb);
     }
     lastIncomingInfo.symbolTab[symbolIndex] = memb;
@@ -868,8 +867,7 @@ static void scanFunction_SymbolName(int size,
 
     referencesItem = &lastIncomingInfo.cachedReferenceItem[symbolIndex];
     lastIncomingInfo.symbolTab[symbolIndex] = referencesItem;
-    fillReferenceItem(referencesItem, id, vApplClass, vFunClass, symbolType, storage, ScopeGlobal,
-                      0, CategoryGlobal);
+    fillReferenceItem(referencesItem, id, vApplClass, vFunClass, symbolType, storage, ScopeGlobal, CategoryGlobal);
     bool isMember = isMemberInReferenceTable(referencesItem, NULL, &member);
     while (isMember && member->category!=CategoryGlobal)
         isMember = refTabNextMember(referencesItem, &member);

diff --git a/src/cxref.c b/src/cxref.c
@@ -262,8 +262,7 @@ Reference *addNewCxReference(Symbol *symbol, Position *position, Usage usage,
     ReferenceItem  referenceItem;
     ReferenceItem *foundMember;
 
-    fillReferenceItem(&referenceItem, symbol->linkName, vApplCl, vFunCl, symbol->type, storage, scope,
-                       symbol->access, category);
+    fillReferenceItem(&referenceItem, symbol->linkName, vApplCl, vFunCl, symbol->type, storage, scope, category);
     if (options.mode==ServerMode && options.serverOperation==OLO_TAG_SEARCH && options.searchKind==SEARCH_FULL) {
         fillUsage(&reference.usage, usage.kind);
         fillReference(&reference, reference.usage, *position, NULL);
@@ -278,7 +277,7 @@ Reference *addNewCxReference(Symbol *symbol, Position *position, Usage usage,
         strcpy(linkName, symbol->linkName);
         ReferenceItem *r = cxAlloc(sizeof(ReferenceItem));
         fillReferenceItem(r, linkName, vApplCl, vFunCl, symbol->type,
-                           storage, scope, 0, category);
+                           storage, scope, category);
         pushReferenceItem(r, index);
         foundMember = r;
     }
@@ -1167,8 +1166,7 @@ SymbolsMenu *olCreateSpecialMenuItem(char *fieldName, int cfi, Storage storage){
     SymbolsMenu     *res;
     ReferenceItem     ss;
 
-    fillReferenceItem(&ss, fieldName, cfi, cfi, TypeDefault, storage, ScopeGlobal,
-                      0, CategoryGlobal);
+    fillReferenceItem(&ss, fieldName, cfi, cfi, TypeDefault, storage, ScopeGlobal, CategoryGlobal);
     res = olCreateNewMenuItem(&ss, ss.vApplClass, ss.vFunClass, &noPosition, UsageNone,
                               1, 1, OOC_VIRT_SAME_APPL_FUN_CLASS,
                               UsageUsed, 0);

diff --git a/src/menu.c b/src/menu.c
@@ -96,7 +96,7 @@ SymbolsMenu *olCreateNewMenuItem(ReferenceItem *symbol, int vApplClass, int vFun
     allocatedNameCopy = olcxStringCopy(symbol->linkName);
 
     fillReferenceItem(&refItem, allocatedNameCopy, vApplClass, vFunCl,
-                       symbol->type, symbol->storage, symbol->scope, 0,
+                       symbol->type, symbol->storage, symbol->scope,
                        symbol->category);
 
     symbolsMenu = olcxAlloc(sizeof(SymbolsMenu));

diff --git a/src/reference.c b/src/reference.c
@@ -29,7 +29,7 @@ Reference *duplicateReference(Reference *original) {
 }
 
 void fillReferenceItem(ReferenceItem *referencesItem, char *name, int vApplClass,
-                        int vFunClass, Type symType, Storage storage, ReferenceScope scope, Access accessFlags,
+                        int vFunClass, Type symType, Storage storage, ReferenceScope scope,
                         ReferenceCategory category) {
     referencesItem->linkName = name;
     referencesItem->fileHash = cxFileHashNumber(name);

diff --git a/src/reference.h b/src/reference.h
@@ -40,8 +40,7 @@ typedef struct referenceItem {
 
 extern void fillReference(Reference *reference, Usage usage, Position position, Reference *next);
 extern void fillReferenceItem(ReferenceItem *referencesItem, char *name, int vApplClass,
-                              int vFunClass, Type symType, Storage storage, ReferenceScope scope,
-                              Access accessFlags, ReferenceCategory category);
+                              int vFunClass, Type symType, Storage storage, ReferenceScope scope, ReferenceCategory category);
 extern Reference *duplicateReference(Reference *r);
 extern void freeReferences(Reference *references);
 extern void resetReferenceUsage(Reference *reference, UsageKind usageKind);

diff --git a/src/reference.mock b/src/reference.mock
@@ -11,7 +11,7 @@ void fillReference(Reference *reference, Usage usage, Position position,
 }
 
 void fillReferenceItem(ReferenceItem *referencesItem, char *name, int vApplClass,
-                        int vFunClass, Type symType, Storage storage, ReferenceScope scope, Access accessFlags,
+                        int vFunClass, Type symType, Storage storage, ReferenceScope scope,
                         ReferenceCategory category) {
     referencesItem->linkName = name;
     referencesItem->fileHash = 0; // Should really be: cxFileHashNumber(name);

diff --git a/src/server.c b/src/server.c
@@ -101,7 +101,7 @@ static int scheduleFileUsingTheMacro(void) {
     tmpc = NULL;
     fillReferenceItem(&references, olstringInMacroBody,
                       NO_FILE_NUMBER, NO_FILE_NUMBER, TypeMacro, StorageExtern,
-                      ScopeGlobal, 0, CategoryGlobal);
+                      ScopeGlobal, CategoryGlobal);
 
     fillSymbolsMenu(&menu, references, 1, true, 0, UsageUsed, 0, UsageNone, noPosition);
     if (sessionData.browserStack.top==NULL) {

diff --git a/src/xref.c b/src/xref.c
@@ -84,7 +84,7 @@ static FileItem *createListOfInputFileItems(void) {
 static void fillReferenceItemForIncludeFile(ReferenceItem *referencesItem, int fileNumber) {
     fillReferenceItem(referencesItem, LINK_NAME_INCLUDE_REFS,
                       fileNumber, fileNumber, TypeCppInclude, StorageExtern,
-                      ScopeGlobal, 0, CategoryGlobal);
+                      ScopeGlobal, CategoryGlobal);
 }
 
 static void makeIncludeClosureOfFilesToUpdate(void) {

diff --git a/src/yylex.c b/src/yylex.c
@@ -1830,8 +1830,7 @@ static void addMacroBaseUsageRef(Symbol *macroSymbol) {
 
     basePos = makePosition(inputFileNumber, 0, 0);
     fillReferenceItem(&ppp, macroSymbol->linkName,
-                      NO_FILE_NUMBER, NO_FILE_NUMBER, TypeMacro, StorageDefault, ScopeGlobal,
-                      0, CategoryGlobal);
+                      NO_FILE_NUMBER, NO_FILE_NUMBER, TypeMacro, StorageDefault, ScopeGlobal, CategoryGlobal);
     isMember = isMemberInReferenceTable(&ppp, NULL, &memb);
     r = NULL;
     if (isMember) {