Skip to content

Improve CobolFieldAttribute variable names #775

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

Open
yutaro-sakamoto wants to merge 4 commits into
base: develop
Choose a base branch
from
+123 −12
Open

Improve CobolFieldAttribute variable names #775

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d8a4e8b
wip: wip
yutaro-sakamoto Dec 16, 2025
aa343e8
add: append information of digits and scales
yutaro-sakamoto Dec 16, 2025
0047745
fix: when scales are negative
yutaro-sakamoto Dec 16, 2025
378a9c5
Update cobj/codegen.c
yutaro-sakamoto Dec 16, 2025
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
135 changes: 123 additions & 12 deletions cobj/codegen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ static struct attr_list {
int scale;
int flags;
int lenstr;
char *suffix;
} *attr_cache = NULL;

static struct literal_list {
Expand Down Expand Up @@ -150,6 +151,10 @@ enum joutput_stmt_type {
JOUTPUT_STMT_TRIM,
};

/* Forward declarations */
static char *build_attr_suffix(int type, int digits, int scale, int flags);
static const char *lookup_attr_suffix(int id);

static cb_tree call_parameters = NULL;

static const struct system_table system_tab[] = {
Expand Down Expand Up @@ -1057,6 +1062,7 @@ static int lookup_attr(int type, int digits, int scale, int flags,
l->flags = flags;
l->pic = pic;
l->lenstr = lenstr;
l->suffix = build_attr_suffix(type, digits, scale, flags);
l->next = attr_cache;
attr_cache = l;

Expand Down Expand Up @@ -1159,7 +1165,7 @@ static void joutput_attr(cb_tree x) {
fprintf(stderr, "Unexpected tree tag %d\n", CB_TREE_TAG(x));
ABORT();
}
joutput("%s%d", CB_PREFIX_ATTR, id);
joutput("%s%d%s", CB_PREFIX_ATTR, id, lookup_attr_suffix(id));
}

/**
Expand Down Expand Up @@ -5067,6 +5073,108 @@ static const char *get_type_constant_name(int type) {
}
}

/**
* typeの値を変数名用の短縮名に変換する
*/
static const char *get_type_short_name(int type) {
switch (type) {
case COB_TYPE_UNKNOWN:
return "Unknown";
case COB_TYPE_GROUP:
return "Group";
case COB_TYPE_BOOLEAN:
return "Boolean";
case COB_TYPE_NUMERIC_DISPLAY:
return "NumericDisplay";
case COB_TYPE_NUMERIC_BINARY:
return "NumericBinary";
case COB_TYPE_NUMERIC_PACKED:
return "NumericPacked";
case COB_TYPE_NUMERIC_FLOAT:
return "NumericFloat";
case COB_TYPE_NUMERIC_DOUBLE:
return "NumericDouble";
case COB_TYPE_NUMERIC_EDITED:
return "NumericEdited";
case COB_TYPE_ALPHANUMERIC:
return "Alphanumeric";
case COB_TYPE_ALPHANUMERIC_ALL:
return "AlphanumericAll";
case COB_TYPE_ALPHANUMERIC_EDITED:
return "AlphanumericEdited";
case COB_TYPE_NATIONAL:
return "National";
case COB_TYPE_NATIONAL_EDITED:
return "NationalEdited";
case COB_TYPE_NATIONAL_ALL:
return "NationalAll";
default:
return "Unknown";
}
}

/**
* type, digits, scale, flagsから変数名のサフィックスを生成する
*/
static char *build_attr_suffix(int type, int digits, int scale, int flags) {
char buf[256];
char *p = buf;

p += sprintf(p, "_%s", get_type_short_name(type));

/* NUMERIC型の場合はdigitsとscaleを追加 */
if (type == COB_TYPE_NUMERIC_DISPLAY || type == COB_TYPE_NUMERIC_BINARY ||
type == COB_TYPE_NUMERIC_PACKED || type == COB_TYPE_NUMERIC_FLOAT ||
type == COB_TYPE_NUMERIC_DOUBLE || type == COB_TYPE_NUMERIC_EDITED) {
p += sprintf(p, "_Digits%d", digits);
if (scale < 0) {
p += sprintf(p, "_ScaleNeg%d", -scale);
} else {
p += sprintf(p, "_Scale%d", scale);
}
}

if (flags & COB_FLAG_HAVE_SIGN) {
p += sprintf(p, "_HaveSign");
}
if (flags & COB_FLAG_SIGN_SEPARATE) {
p += sprintf(p, "_SignSeparate");
}
if (flags & COB_FLAG_SIGN_LEADING) {
p += sprintf(p, "_SignLeading");
}
if (flags & COB_FLAG_BLANK_ZERO) {
p += sprintf(p, "_BlankZero");
}
if (flags & COB_FLAG_JUSTIFIED) {
p += sprintf(p, "_Justified");
}
if (flags & COB_FLAG_BINARY_SWAP) {
p += sprintf(p, "_BinarySwap");
}
if (flags & COB_FLAG_REAL_BINARY) {
p += sprintf(p, "_RealBinary");
}
if (flags & COB_FLAG_IS_POINTER) {
p += sprintf(p, "_IsPointer");
}

return strdup(buf);
}

/**
* idからattr_listのサフィックスを検索する
*/
static const char *lookup_attr_suffix(int id) {
struct attr_list *l;
for (l = attr_cache; l; l = l->next) {
if (l->id == id) {
return l->suffix ? l->suffix : "";
}
}
return "";
}

/**
* flagsの値をCobolFieldAttributeのフラグ定数名の組み合わせとして出力する
* additional_indent: 2番目以降のフラグの前に付ける追加インデントのスペース数
Expand Down Expand Up @@ -5340,8 +5448,9 @@ static void joutput_init_method(struct cb_program *prog) {
if (gen_native) {
int index = lookup_attr(COB_TYPE_ALPHANUMERIC, 0, 0, 0, NULL, 0);
joutput_line("%snative = CobolFieldFactory.makeCobolField(256, new "
"CobolDataStorage(cob_native), %s%d);\n",
CB_PREFIX_FIELD, CB_PREFIX_ATTR, index);
"CobolDataStorage(cob_native), %s%d%s);\n",
CB_PREFIX_FIELD, CB_PREFIX_ATTR, index,
lookup_attr_suffix(index));
}

joutput_indent_level -= 2;
Expand All @@ -5356,7 +5465,8 @@ static void joutput_init_method(struct cb_program *prog) {
attr_cache = attr_list_reverse(attr_cache);
for (j = attr_cache; j; j = j->next) {
joutput_prefix();
joutput("%s%d = new CobolFieldAttribute(", CB_PREFIX_ATTR, j->id);
joutput("%s%d%s = new CobolFieldAttribute(", CB_PREFIX_ATTR, j->id,
j->suffix);
joutput_newline();
joutput_indent_level += 2;
// type
Expand Down Expand Up @@ -5471,9 +5581,9 @@ static void joutput_alphabet_name_initialization(struct cb_alphabet_name *p) {
joutput("%s%s = new CobolDataStorage(%s_byte_array_%s);", CB_PREFIX_SEQUENCE,
p->cname, CB_PREFIX_SEQUENCE, p->cname);
i = lookup_attr(COB_TYPE_ALPHANUMERIC, 0, 0, 0, NULL, 0);
joutput("%s%s = CobolFieldFactory.makeCobolField(256, %s%s, %s%d);\n",
joutput("%s%s = CobolFieldFactory.makeCobolField(256, %s%s, %s%d%s);\n",
CB_PREFIX_FIELD, p->cname, CB_PREFIX_SEQUENCE, p->cname,
CB_PREFIX_ATTR, i);
CB_PREFIX_ATTR, i, lookup_attr_suffix(i));
joutput("\n");
}

Expand Down Expand Up @@ -5728,7 +5838,8 @@ static void joutput_declare_member_variables(struct cb_program *prog,
joutput_line("/* Attributes */\n");
attr_cache = attr_list_reverse(attr_cache);
for (j = attr_cache; j; j = j->next) {
joutput_line("private CobolFieldAttribute %s%d;", CB_PREFIX_ATTR, j->id);
joutput_line("private CobolFieldAttribute %s%d%s;", CB_PREFIX_ATTR, j->id,
j->suffix);
}
joutput("\n");
}
Expand Down Expand Up @@ -6630,9 +6741,9 @@ void codegen(struct cb_program *prog, const int nested, char **program_id_list,
i = lookup_attr(COB_TYPE_ALPHANUMERIC, 0, 0, 0, NULL, 0);
joutput(" ");
joutput("private static AbstractCobolField %sebcdic = "
"CobolFieldFactori.makeField(256, new "
"CobolDataStorage(cob_ebcdic), %s%d);\n",
CB_PREFIX_FIELD, CB_PREFIX_ATTR, i);
"CobolFieldFactory.makeField(256, new "
"CobolDataStorage(cob_ebcdic), %s%d%s);\n",
CB_PREFIX_FIELD, CB_PREFIX_ATTR, i, lookup_attr_suffix(i));
joutput("\n");
}
if (gen_ebcdic_ascii) {
Expand Down Expand Up @@ -6711,8 +6822,8 @@ void codegen(struct cb_program *prog, const int nested, char **program_id_list,
joutput(" ");
joutput("private static AbstractCobolField %sebcdic_ascii = "
"CobolFieldFactory.makeField(256, new "
"CobolDataStorage(cob_ebcdic_ascii), %s%d);\n",
CB_PREFIX_FIELD, CB_PREFIX_ATTR, i);
"CobolDataStorage(cob_ebcdic_ascii), %s%d%s);\n",
CB_PREFIX_FIELD, CB_PREFIX_ATTR, i, lookup_attr_suffix(i));
joutput("\n");
}
if (gen_native) {
Expand Down