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

Fix va_list not necessarily being a pointer #171

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix va_list not necessarily being a pointer #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c34c4f7
Fix va_list in c-xcodeml.c
alexeedm Mar 10, 2021
d25760a
Fix va_list in F-output-xcodeml.c
alexeedm Mar 10, 2021
ac66a29
Fix tabs
alexeedm Mar 10, 2021
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
46 changes: 15 additions & 31 deletions C-FrontEnd/src/c-xcodeml.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,13 +246,9 @@ outxTag(FILE *fp, int indent, CExpr *expr, const char *tag, int xattrFlag,
const char *attrFmt, ...)
{
va_list args;
if(attrFmt) {
va_start(args, attrFmt);
voutxTag(fp, indent, expr, tag, xattrFlag, attrFmt, args);
va_end(args);
} else {
voutxTag(fp, indent, expr, tag, xattrFlag, attrFmt, NULL);
}
va_start(args, attrFmt);
voutxTag(fp, indent, expr, tag, xattrFlag, attrFmt, args);
va_end(args);
}


Expand All @@ -274,37 +270,25 @@ void
outxTagForStmt(FILE *fp, int indent, CExpr *expr, const char *tag, int addXattrFlag,
const char *attrFmt, ...)
{
if(attrFmt) {
va_list args;
va_start(args, attrFmt);
voutxTag(fp, indent, expr, tag,
XATTR_LINENO|XATTR_COMMON|addXattrFlag,
attrFmt, args);
va_end(args);
} else {
voutxTag(fp, indent, expr, tag,
XATTR_LINENO|XATTR_COMMON|addXattrFlag,
attrFmt, NULL);
}
va_list args;
va_start(args, attrFmt);
voutxTag(fp, indent, expr, tag,
XATTR_LINENO|XATTR_COMMON|addXattrFlag,
attrFmt, args);
va_end(args);
}


void
outxTagForExpr(FILE *fp, int indent, CExpr *expr, const char *tag, int addXattrFlag,
const char *attrFmt, ...)
{
if(attrFmt) {
va_list args;
va_start(args, attrFmt);
voutxTag(fp, indent, expr, tag,
XATTR_TYPE|XATTR_IS_GCCEXTENSION|XATTR_COMMON|addXattrFlag,
attrFmt, args);
va_end(args);
} else {
voutxTag(fp, indent, expr, tag,
XATTR_TYPE|XATTR_IS_GCCEXTENSION|XATTR_COMMON|addXattrFlag,
attrFmt, NULL);
}
va_list args;
va_start(args, attrFmt);
voutxTag(fp, indent, expr, tag,
XATTR_TYPE|XATTR_IS_GCCEXTENSION|XATTR_COMMON|addXattrFlag,
attrFmt, args);
va_end(args);
}


Expand Down
35 changes: 21 additions & 14 deletions F-FrontEnd/src/F-output-xcodeml.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1058,16 +1058,23 @@ static void outx_lineno(lineno_info *li)
/**
* output tag with format and lineno attribute
*/
static void outx_vtagLineno_null(int l, const char *tag, lineno_info *li)
{
static char buf1[CHAR_BUF_SIZE], buf2[CHAR_BUF_SIZE];
snprintf(buf1, sizeof(buf1), "<%s", tag);
strncpy(buf2, buf1, sizeof(buf2));

outx_indent(l);
outx_puts(buf2);
outx_lineno(li);
}

static void outx_vtagLineno(int l, const char *tag, lineno_info *li,
va_list args)
Comment on lines 1072 to 1073
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's better to define outx_vtagLineno as follows than add outx_vtagLineno_null.

Suggested change
static void outx_vtagLineno(int l, const char *tag, lineno_info *li,
va_list args)
static void outx_vtagLineno(int l, const char *tag, lineno_info *li, ...)

{
static char buf1[CHAR_BUF_SIZE], buf2[CHAR_BUF_SIZE];
snprintf(buf1, sizeof(buf1), "<%s", tag);
if (args != NULL) {
vsnprintf(buf2, sizeof(buf2), buf1, args);
} else {
strncpy(buf2, buf1, sizeof(buf2));
}
vsnprintf(buf2, sizeof(buf2), buf1, args);

outx_indent(l);
outx_puts(buf2);
Expand All @@ -1076,7 +1083,7 @@ static void outx_vtagLineno(int l, const char *tag, lineno_info *li,

static void outx_tagOfStatement(int l, expv v)
{
outx_vtagLineno(l, XTAG(v), EXPR_LINE(v), NULL);
outx_vtagLineno_null(l, XTAG(v), EXPR_LINE(v));
outx_puts(">\n");
}

Expand All @@ -1092,13 +1099,13 @@ static void outx_tagOfStatement1(int l, expv v, const char *attrs, ...)

static void outx_tagOfStatement2(int l, expv v)
{
outx_vtagLineno(l, XTAG(v), EXPR_LINE(v), NULL);
outx_vtagLineno_null(l, XTAG(v), EXPR_LINE(v));
outx_print(">");
}

static void outx_tagOfStatement3(int l, const char *tag, lineno_info *li)
{
outx_vtagLineno(l, tag, li, NULL);
outx_vtagLineno_null(l, tag, li);
outx_print(">\n");
}

Expand All @@ -1114,7 +1121,7 @@ static void outx_tagOfStatementWithConstructName(int l, expv v, expv cv,
else
strcpy(s_charBuf, XTAG(v));

outx_vtagLineno(l, s_charBuf, EXPR_LINE(v), NULL);
outx_vtagLineno_null(l, s_charBuf, EXPR_LINE(v));
if (hasChild)
outx_puts(">\n");
else
Expand Down Expand Up @@ -1926,7 +1933,7 @@ static void outx_caseLabel(int l, expv v)
static void outx_typeGuard(int l, expv v, int is_class)
{
const int l1 = l + 1;
outx_vtagLineno(l, XTAG(v), EXPR_LINE(v), NULL);
outx_vtagLineno_null(l, XTAG(v), EXPR_LINE(v));
if (EXPR_ARG3(v) != NULL) { // construct name
outx_print(" construct_name=\"%s\"", SYM_NAME(EXPV_NAME(EXPR_ARG3(v))));
}
Expand Down Expand Up @@ -2018,7 +2025,7 @@ static void outx_IFWHERE_Statement(int l, expv v)

if (EXPR_ARG3(v)) {
if (EXPR_ARG5(v)) {
outx_vtagLineno(l1, "else", EXPR_LINE(EXPR_ARG5(v)), NULL);
outx_vtagLineno_null(l1, "else", EXPR_LINE(EXPR_ARG5(v)));
outx_puts(">\n");
} else {
outx_tag(l1, "else");
Expand Down Expand Up @@ -3867,7 +3874,7 @@ static void outx_FORALL_statement(int l, expv v)
expv body = EXPR_ARG2(v);
const char *tid = NULL;

outx_vtagLineno(l, XTAG(v), EXPR_LINE(v), NULL);
outx_vtagLineno_null(l, XTAG(v), EXPR_LINE(v));

if (EXPR_HAS_ARG4(v) && EXPR_ARG4(v) != NULL) {
outx_print(" construct_name=\"%s\"", SYM_NAME(EXPR_SYM(EXPR_ARG4(v))));
Expand Down Expand Up @@ -3934,7 +3941,7 @@ static void outx_DOCONCURRENT_statement(int l, expv v)
expv body = EXPR_ARG2(v);
const char *tid = NULL;

outx_vtagLineno(l, XTAG(v), EXPR_LINE(v), NULL);
outx_vtagLineno_null(l, XTAG(v), EXPR_LINE(v));

if (EXPR_HAS_ARG3(v) && EXPR_ARG3(v) != NULL) {
outx_print(" construct_name=\"%s\"", SYM_NAME(EXPR_SYM(EXPR_ARG3(v))));
Expand Down Expand Up @@ -3974,7 +3981,7 @@ static void outx_ASSOCIATE_statement(int l, expv v)
BLOCK_ENV block = EXPR_BLOCK(v);
expv body = EXPR_ARG1(v);

outx_vtagLineno(l, XTAG(v), EXPR_LINE(v), NULL);
outx_vtagLineno_null(l, XTAG(v), EXPR_LINE(v));
if (EXPR_HAS_ARG2(v) && EXPR_ARG2(v) != NULL) {
outx_print(" construct_name=\"%s\"", SYM_NAME(EXPR_SYM(EXPR_ARG2(v))));
}
Expand Down