"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "layer0/Word.h" between
pymol-open-source-2.2.0.tar.gz and pymol-open-source-2.3.0.tar.gz

About: PyMOL is a Python-enhanced molecular graphics tool. It excels at 3D visualization of proteins, small molecules, density, surfaces, and trajectories. It also includes molecular editing, ray tracing, and movies. Open Source version.

Word.h  (pymol-open-source-2.2.0)	:	Word.h  (pymol-open-source-2.3.0)
skipping to change at line 79		skipping to change at line 79
CWordList *WordListNew(PyMOLGlobals * G, const char *st);		CWordList *WordListNew(PyMOLGlobals * G, const char *st);
void WordListFreeP(CWordList * I);		void WordListFreeP(CWordList * I);
void WordListDump(CWordList * I, const char *prefix);		void WordListDump(CWordList * I, const char *prefix);
int WordListIterate(PyMOLGlobals * G, CWordList * I, const char **ptr, int *hidd en);		int WordListIterate(PyMOLGlobals * G, CWordList * I, const char **ptr, int *hidd en);
int WordListMatch(PyMOLGlobals * G, CWordList * I, const char *name, int ignore_ case);		int WordListMatch(PyMOLGlobals * G, CWordList * I, const char *name, int ignore_ case);
int WordInit(PyMOLGlobals * G);		int WordInit(PyMOLGlobals * G);
void WordFree(PyMOLGlobals * G);		void WordFree(PyMOLGlobals * G);
void WordSetWildcard(PyMOLGlobals * G, char wc);
int WordMatch(PyMOLGlobals * G, const char *p, const char *q, int ignCase);		int WordMatch(PyMOLGlobals * G, const char *p, const char *q, int ignCase);
int WordMatchExact(PyMOLGlobals * G, const char *p, const char *q, int ignCase);		int WordMatchExact(PyMOLGlobals * G, const char *p, const char *q, int ignCase);
void WordPrimeCommaMatch(PyMOLGlobals * G, char *p);		void WordPrimeCommaMatch(PyMOLGlobals * G, char *p);
int WordMatchComma(PyMOLGlobals * G, const char *p, const char *q, int ignCase);		int WordMatchComma(PyMOLGlobals * G, const char *p, const char *q, int ignCase);
int WordMatchCommaInt(PyMOLGlobals * G, const char *p, int number);		int WordMatchCommaInt(PyMOLGlobals * G, const char *p, int number);
int WordMatchCommaExact(PyMOLGlobals * G, const char *p, const char *q, int ignC ase);		int WordMatchCommaExact(PyMOLGlobals * G, const char *p, const char *q, int ignC ase);
/* (<0) exact match, (>0) inexact match, =0 no match */		/* (<0) exact match, (>0) inexact match, =0 no match */
int WordIndex(PyMOLGlobals * G, WordType * list, const char *word, int minMatch, int ignCase);		int WordIndex(PyMOLGlobals * G, WordType * list, const char *word, int minMatch, int ignCase);
skipping to change at line 138		skipping to change at line 137
return -1;		return -1;
else if((!result) && (*p) && (!*q))		else if((!result) && (*p) && (!*q))
return 1;		return 1;
return 0;		return 0;
}		}
#else		#else
int WordCompare(PyMOLGlobals * G, const char *p, const char *q, int ignCase);		int WordCompare(PyMOLGlobals * G, const char *p, const char *q, int ignCase);
#endif		#endif
inline int WordCompare(PyMOLGlobals * G, lexidx_t s1, lexidx_t s2, int ignCase) {		inline int WordCompare(PyMOLGlobals * G, const lexidx_t& s1, const lexidx_t& s2, int ignCase) {
if (s1 == s2)		if (s1 == s2)
return 0;		return 0;
return WordCompare(G, LexStr(G, s1), LexStr(G, s2), ignCase);		return WordCompare(G, LexStr(G, s1), LexStr(G, s2), ignCase);
}		}
inline int WordMatch(PyMOLGlobals * G, lexidx_t s1, lexidx_t s2, int ignCase) {		inline int WordMatch(PyMOLGlobals * G, const lexidx_t& s1, const lexidx_t& s2, i nt ignCase) {
if (s1 == s2)		if (s1 == s2)
return -1; // negative = perfect match		return -1; // negative = perfect match
return WordMatch(G, LexStr(G, s1), LexStr(G, s2), ignCase);		return WordMatch(G, LexStr(G, s1), LexStr(G, s2), ignCase);
}		}
inline int WordMatchNoWild(PyMOLGlobals * G, lexidx_t s1, lexidx_t s2, int ignCa se) {		inline int WordMatchNoWild(PyMOLGlobals * G, const lexidx_t& s1, const lexidx_t& s2, int ignCase) {
if (s1 == s2)		if (s1 == s2)
return -1; // negative = perfect match		return -1; // negative = perfect match
return WordMatchNoWild(G, LexStr(G, s1), LexStr(G, s2), ignCase);		return WordMatchNoWild(G, LexStr(G, s1), LexStr(G, s2), ignCase);
}		}
inline int WordMatchExact(PyMOLGlobals * G, lexidx_t s1, lexidx_t s2, int ignCas e) {		inline int WordMatchExact(PyMOLGlobals * G, const lexidx_t& s1, const lexidx_t& s2, int ignCase) {
if (s1 == s2)		if (s1 == s2)
return 1; // non-zero = perfect match		return 1; // non-zero = perfect match
if (!ignCase)		if (!ignCase)
return 0; // 0 = no match		return 0; // 0 = no match
return WordMatchExact(G, LexStr(G, s1), LexStr(G, s2), ignCase);		return WordMatchExact(G, LexStr(G, s1), LexStr(G, s2), ignCase);
}		}
inline int WordMatchExact(PyMOLGlobals * G, char c1, char c2, int ignCase) {		inline int WordMatchExact(PyMOLGlobals * G, char c1, char c2, int ignCase) {
if (c1 == c2)		if (c1 == c2)
return 1; // non-zero = perfect match		return 1; // non-zero = perfect match
End of changes. 5 change blocks.
5 lines changed or deleted		4 lines changed or added

---