Skip to content

Commit a3bf9f3

Browse files
committed
fixing numbers
1 parent edaefa2 commit a3bf9f3

13 files changed

+489
-377
lines changed

SRC/dictionaryMore.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
#define BUILD0 0x00100000 // comes from build0 data (marker on functions, concepts, topics)
5454
#define BUILD1 0x00200000 // comes from build1 data
5555
#define HAS_EXCLUDE 0x00400000 // concept/topic has keywords to exclude
56+
#define JSON_REFERENCE HAS_EXCLUDE // json struct is referred to by user variable
5657
#define BUILD2 0x00800000 // comes from dynamic build layer data
5758
#define FUNCTION_NAME 0x01000000 // name of a ^function (has non-zero ->x.codeIndex if system, else is user but can be patternmacro,outputmacro, or plan) only applicable to ^ words
5859
#define CONCEPT 0x02000000 // topic or concept has been read via a definition

SRC/dictionarySystem.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -658,9 +658,9 @@ void RemoveInternalFlag(WORDP D,unsigned int flag)
658658
D->internalBits &= -1 ^ flag;
659659
}
660660

661-
static void PreserveFlags(WORDP D)
661+
static void PreserveSystemFlags(WORDP D)
662662
{
663-
unsigned int* at = (unsigned int*) AllocateHeap (NULL,2, sizeof(uint64),false); // PreserveFlags
663+
unsigned int* at = (unsigned int*) AllocateHeap (NULL,2, sizeof(uint64),false); // PreserveSystemFlags
664664
*at = flagsRedefines;
665665
at[1] = Word2Index(D);
666666
flagsRedefines = Heap2Index((char*)at);
@@ -672,7 +672,7 @@ void AddSystemFlag(WORDP D, uint64 flag)
672672
if (flag & NOCONCEPTLIST && *D->word != '~') flag ^= NOCONCEPTLIST; // not allowed to mark anything but concepts with this
673673
if (flag && flag != D->systemFlags) // prove there is a change - dont use & because if some bits are set is not enough
674674
{
675-
if (D < dictionaryLocked) PreserveFlags(D);
675+
if (D < dictionaryLocked) PreserveSystemFlags(D);
676676
D->systemFlags |= flag;
677677
}
678678
}
@@ -691,7 +691,7 @@ void RemoveSystemFlag(WORDP D, uint64 flags)
691691
{
692692
if (D->systemFlags & flags)
693693
{
694-
if (D < dictionaryLocked) PreserveFlags(D);
694+
if (D < dictionaryLocked) PreserveSystemFlags(D);
695695
D->systemFlags &= -1LL ^ flags;
696696
}
697697
}

0 commit comments

Comments
 (0)