Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

optlib: allow users to set fields and check extras defined in a foreign language #3960

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
Draft

optlib: allow users to set fields and check extras defined in a foreign language #3960

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3258e84
main: prepare the default implementation for isValueAvailable method …
masatake Feb 7, 2024
e512a73
main: allow to specify data type for a parser specific field
masatake May 14, 2023
ce6c7e9
optscript: verify language consitency between a tag and its field in …
masatake May 15, 2023
7b991c9
main: define operators accessing parser specific fields
masatake May 15, 2023
62467ec
main: implement the setter and getter for parser specific fields defi…
masatake May 18, 2023
c50fcca
[WIP] Tmain: add a case testing operators for boolean fields
masatake Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
main: prepare the default implementation for isValueAvailable method … 
…for newly defined field

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
  • Loading branch information
@masatake
masatake committed Aug 30, 2024
commit 3258e8460916536a6c44e80ae19a476326faac7d
55 changes: 32 additions & 23 deletions main/field.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,17 +75,17 @@ static bool doesContainAnyCharInInput (const tagEntryInfo *const tag, const char
static bool doesContainAnyCharInFieldScope (const tagEntryInfo *const tag, const char *value, const char *chars);
static bool doesContainAnyCharInSignature (const tagEntryInfo *const tag, const char *value, const char *chars);

static bool isTyperefFieldAvailable (const tagEntryInfo *const tag);
static bool isFileFieldAvailable (const tagEntryInfo *const tag);
static bool isInheritsFieldAvailable (const tagEntryInfo *const tag);
static bool isAccessFieldAvailable (const tagEntryInfo *const tag);
static bool isImplementationFieldAvailable (const tagEntryInfo *const tag);
static bool isSignatureFieldAvailable (const tagEntryInfo *const tag);
static bool isExtrasFieldAvailable (const tagEntryInfo *const tag);
static bool isXpathFieldAvailable (const tagEntryInfo *const tag);
static bool isEndFieldAvailable (const tagEntryInfo *const tag);
static bool isEpochAvailable (const tagEntryInfo *const tag);
static bool isNthAvailable (const tagEntryInfo *const tag);
static bool isTyperefFieldAvailable (const tagEntryInfo *const tag, const fieldDefinition *fdef);
static bool isFileFieldAvailable (const tagEntryInfo *const tag, const fieldDefinition *fdef);
static bool isInheritsFieldAvailable (const tagEntryInfo *const tag, const fieldDefinition *fdef);
static bool isAccessFieldAvailable (const tagEntryInfo *const tag, const fieldDefinition *fdef);
static bool isImplementationFieldAvailable (const tagEntryInfo *const tag, const fieldDefinition *fdef);
static bool isSignatureFieldAvailable (const tagEntryInfo *const tag, const fieldDefinition *fdef);
static bool isExtrasFieldAvailable (const tagEntryInfo *const tag, const fieldDefinition *fdef);
static bool isXpathFieldAvailable (const tagEntryInfo *const tag, const fieldDefinition *fdef);
static bool isEndFieldAvailable (const tagEntryInfo *const tag, const fieldDefinition *fdef);
static bool isEpochAvailable (const tagEntryInfo *const tag, const fieldDefinition *fdef);
static bool isNthAvailable (const tagEntryInfo *const tag, const fieldDefinition *fdef);

static EsObject* getFieldValueForName (const tagEntryInfo *, const fieldDefinition *);
static EsObject* setFieldValueForName (tagEntryInfo *, const fieldDefinition *, const EsObject *);
Expand Down Expand Up @@ -614,7 +614,8 @@ extern unsigned char getFieldLetter (fieldType type)
extern bool doesFieldHaveValue (fieldType type, const tagEntryInfo *tag)
{
if (getFieldObject(type)->def->isValueAvailable)
return getFieldObject(type)->def->isValueAvailable(tag);
return getFieldObject(type)->def->isValueAvailable(tag,
getFieldObject(type)->def);
else
return true;
}
Expand Down Expand Up @@ -1164,43 +1165,43 @@ static const char *renderFieldNth (const tagEntryInfo *const tag,
#undef buf_len
}

static bool isTyperefFieldAvailable (const tagEntryInfo *const tag)
static bool isTyperefFieldAvailable (const tagEntryInfo *const tag, const fieldDefinition *fdef CTAGS_ATTR_UNUSED)
{
return (tag->extensionFields.typeRef [0] != NULL
&& tag->extensionFields.typeRef [1] != NULL)? true: false;
}

static bool isFileFieldAvailable (const tagEntryInfo *const tag)
static bool isFileFieldAvailable (const tagEntryInfo *const tag, const fieldDefinition *fdef CTAGS_ATTR_UNUSED)
{
return tag->isFileScope? true: false;
}

static bool isInheritsFieldAvailable (const tagEntryInfo *const tag)
static bool isInheritsFieldAvailable (const tagEntryInfo *const tag, const fieldDefinition *fdef CTAGS_ATTR_UNUSED)
{
return (tag->extensionFields.inheritance != NULL)? true: false;
}

static bool isAccessFieldAvailable (const tagEntryInfo *const tag)
static bool isAccessFieldAvailable (const tagEntryInfo *const tag, const fieldDefinition *fdef CTAGS_ATTR_UNUSED)
{
return (tag->extensionFields.access != NULL)? true: false;
}

static bool isImplementationFieldAvailable (const tagEntryInfo *const tag)
static bool isImplementationFieldAvailable (const tagEntryInfo *const tag, const fieldDefinition *fdef CTAGS_ATTR_UNUSED)
{
return (tag->extensionFields.implementation != NULL)? true: false;
}

static bool isSignatureFieldAvailable (const tagEntryInfo *const tag)
static bool isSignatureFieldAvailable (const tagEntryInfo *const tag, const fieldDefinition *fdef CTAGS_ATTR_UNUSED)
{
return (tag->extensionFields.signature != NULL)? true: false;
}

static bool isExtrasFieldAvailable (const tagEntryInfo *const tag)
static bool isExtrasFieldAvailable (const tagEntryInfo *const tag, const fieldDefinition *fdef CTAGS_ATTR_UNUSED)
{
return isTagExtra (tag);
}

static bool isXpathFieldAvailable (const tagEntryInfo *const tag)
static bool isXpathFieldAvailable (const tagEntryInfo *const tag, const fieldDefinition *fdef CTAGS_ATTR_UNUSED)
{
#ifdef HAVE_LIBXML
return (tag->extensionFields.xpath != NULL)? true: false;
Expand All @@ -1209,19 +1210,19 @@ static bool isXpathFieldAvailable (const tagEntryInfo *const tag)
#endif
}

static bool isEndFieldAvailable (const tagEntryInfo *const tag)
static bool isEndFieldAvailable (const tagEntryInfo *const tag, const fieldDefinition *fdef CTAGS_ATTR_UNUSED)
{
return (tag->extensionFields._endLine != 0)? true: false;
}

static bool isEpochAvailable (const tagEntryInfo *const tag)
static bool isEpochAvailable (const tagEntryInfo *const tag, const fieldDefinition *fdef CTAGS_ATTR_UNUSED)
{
return (tag->kindIndex == KIND_FILE_INDEX)
? true
: false;
}

static bool isNthAvailable (const tagEntryInfo *const tag)
static bool isNthAvailable (const tagEntryInfo *const tag, const fieldDefinition *fdef CTAGS_ATTR_UNUSED)
{
Assert (tag->langType >= NO_NTH_FIELD);
return (tag->extensionFields.nth != NO_NTH_FIELD)? true: false;
Expand Down Expand Up @@ -1315,6 +1316,11 @@ static const char* defaultRenderer (const tagEntryInfo *const tag CTAGS_ATTR_UNU
return renderEscapedString (value, tag, buffer);
}

static bool isValueAvailableGeneric (const tagEntryInfo *const e, const fieldDefinition *fdef)
{
return getParserFieldValueForType(e, fdef->ftype)? true: false;
}

extern int defineField (fieldDefinition *def, langType language)
{
fieldObject *fobj;
Expand Down Expand Up @@ -1347,6 +1353,9 @@ extern int defineField (fieldDefinition *def, langType language)
if (! def->dataType)
def->dataType = FIELDTYPE_STRING;

if (def->isValueAvailable == NULL)
def->isValueAvailable = isValueAvailableGeneric;

fobj->def = def;

fobj->buffer = NULL;
Expand Down
2 changes: 1 addition & 1 deletion main/field.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ struct sFieldDefinition {
fieldRenderer renderNoEscaping;
bool (* doesContainAnyChar) (const tagEntryInfo *const, const char*, const char *);

bool (* isValueAvailable) (const tagEntryInfo *const);
bool (* isValueAvailable) (const tagEntryInfo *const, const fieldDefinition *);

const char * getterValueType;
struct _EsObject * (* getValueObject) (const tagEntryInfo *, const fieldDefinition *);
Expand Down