Commit 4493aade authored by rdubner's avatar rdubner

Renamed and simplified.

parent 975e781e
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
using namespace std; using namespace std;
//#define DUMPING #define DUMPING
void void
scan_test(const string &filename) scan_test(const string &filename)
...@@ -335,7 +335,7 @@ main(int argc, char *argv[]) ...@@ -335,7 +335,7 @@ main(int argc, char *argv[])
//program_labels.Dump(); //program_labels.Dump();
//cob_pic_symbols.Dump(); //cob_pic_symbols.Dump();
cob_data.Dump(); cob_data.Dump();
//cob_field_attributes.Dump(); cob_field_attributes.Dump();
cob_fields.Dump(); cob_fields.Dump();
#endif #endif
// We now have a nice complete list of COB_DATA, COB_FIELD_ATTRIBUTES, COB_FIELDS // We now have a nice complete list of COB_DATA, COB_FIELD_ATTRIBUTES, COB_FIELDS
......
...@@ -281,13 +281,13 @@ ProcessDataStorage(ifstream &ifs, ...@@ -281,13 +281,13 @@ ProcessDataStorage(ifstream &ifs,
nfound += strlen(SZ_COB_FIELD_F); nfound += strlen(SZ_COB_FIELD_F);
// Pick up the c_symbol // Pick up the c_symbol
string c_symbol="f_"; string f_name = "f_" ;
while( nfound < input.length() ) { while( nfound < input.length() ) {
char ch = input[nfound++]; char ch = input[nfound++];
if( !isdigit(ch) ) { if( !isdigit(ch) ) {
break; break;
} }
c_symbol += ch; f_name += ch;
} }
// Skip past the '{' // Skip past the '{'
...@@ -385,10 +385,10 @@ ProcessDataStorage(ifstream &ifs, ...@@ -385,10 +385,10 @@ ProcessDataStorage(ifstream &ifs,
mapped_program_id = it->second; mapped_program_id = it->second;
} }
cob_fields.Insert(c_symbol, cob_fields.Insert(f_name,
size,
name_of_data, name_of_data,
offset, offset,
size,
name_of_attr, name_of_attr,
mapped_program_id, mapped_program_id,
cbl_name); cbl_name);
...@@ -674,7 +674,7 @@ ScanForLinkage(ifstream &ifs, ...@@ -674,7 +674,7 @@ ScanForLinkage(ifstream &ifs,
nfound = param2.find(" + ",nfound+3); nfound = param2.find(" + ",nfound+3);
} }
} }
cob_fields.Modify(f_symbol,base,offset); cob_fields.Modify(f_symbol,"NULL",offset);
} }
// Go see if there are more on this line // Go see if there are more on this line
...@@ -699,64 +699,25 @@ DATA_DESCRIPTIONS::Flatten(const COB_FIELDS &cob_fields, ...@@ -699,64 +699,25 @@ DATA_DESCRIPTIONS::Flatten(const COB_FIELDS &cob_fields,
) { ) {
COB_FIELD field = *it; COB_FIELD field = *it;
DATA_DESCRIPTION ds; DATA_DESCRIPTION ds;
ds.field_data_name = field.name ; ds.f_name = field.f_name ;
ds.field_size = field.size ; ds.size = field.size ;
ds.c_symbol = field.name_of_data; ds.b_name = field.b_name;
ds.field_data_offset = field.offset ; ds.offset = field.offset ;
ds.field_attr_name = field.name_of_attr;
ds.program_id = field.program_id ; ds.program_id = field.program_id ;
ds.cbl_symbol = field.cbl_name ; ds.cobol_symbol = field.cbl_name ;
const COB_FIELD_ATTRIBUTE *cfa = cob_field_attributes.GetFieldAttribute(field.name_of_attr);
if( cfa ) {
ds.attr_type = cfa->type;
ds.attr_digits = cfa->digits;
ds.attr_scale = cfa->scale;
ds.attr_flags = cfa->flags;
ds.attr_pic_name = cfa->name_of_pic;
const COB_PIC_SYMBOL *pic_pointer = cob_pic_symbols.GetPicSymbol(ds.attr_pic_name);
if( pic_pointer ) {
ds.picture_string = pic_pointer->pic_symbol;
}
}
const COB_DATUM *cd = cob_data.GetCobDatum(ds.c_symbol); const COB_DATUM *cd = cob_data.GetCobDatum(ds.b_name);
if( cd ) { if( cd ) {
ds.storage_size = cd->size; ds.size = cd->size;
ds.storage_type = cd->storage_type; ds.storage_type = cd->storage_type;
} }
if( ds.storage_type.empty() AND ds.c_symbol.empty() ) { if( ds.storage_type.empty() AND ds.b_name.empty() ) {
ds.storage_type = "Local"; ds.storage_type = "Local";
} }
DsInsert(ds); DsInsert(ds);
} }
// Now walk through the b_ data fields. In general, these will already
// be in the symbols array. But in cases where a working-storage variable
// is declared, but never used, there won't be an f_ entry. This means that
// the debugger won't be able to show you properly formatted data, but it
// will, at least, know where it is and show you the byte values.
for(V_COB_DATUM::const_iterator it=cob_data.v_data.begin();
it != cob_data.v_data.end();
it++
) {
COB_DATUM cob_data = *it;
if( !IsInDs(cob_data.program_id,cob_data.name) ) {
// It's not already there. So, put it there.
DATA_DESCRIPTION ds;
ds.program_id = cob_data.program_id;
ds.cbl_symbol = cob_data.cbl_name;
ds.c_symbol = cob_data.name;
ds.storage_size = cob_data.size;
ds.storage_type = cob_data.storage_type;
DsInsert(ds);
}
}
} }
void void
...@@ -813,19 +774,14 @@ void ...@@ -813,19 +774,14 @@ void
DATA_DESCRIPTIONS::Dump() const DATA_DESCRIPTIONS::Dump() const
{ {
cout << "DATA_DESCRIPTION:" << endl ; cout << "DATA_DESCRIPTION:" << endl ;
cout << setw(20) << "program_id" ; cout << setw(20) << "program_id" ;
cout << setw(20) << "cbl_symbol" ; cout << setw(20) << "cobol_symbol" ;
cout << setw( 9) << "c_symbol" ; cout << setw(13) << "storage_type" ;
cout << setw( 9) << "f_symbol" ; cout << setw( 9) << "b_name" ;
cout << setw( 7) << "offset" ; cout << setw( 7) << "offset" ;
cout << setw(13) << "storage_type" ; cout << setw( 6) << "size" ;
cout << setw( 9) << "f_symbol" ;
cout << setw(16) << "picture" ; cout << setw(16) << "picture" ;
cout << setw( 6) << "ssize" ;
cout << setw( 6) << "fsize" ;
cout << setw(10) << "attr_type" ;
cout << setw(12) << "attr_digits" ;
cout << setw(11) << "attr_scale" ;
cout << setw(11) << "attr_flags" ;
cout << endl; cout << endl;
for(VDATA_DESCRIPTION::const_iterator it=symbols.begin(); for(VDATA_DESCRIPTION::const_iterator it=symbols.begin();
...@@ -833,18 +789,13 @@ DATA_DESCRIPTIONS::Dump() const ...@@ -833,18 +789,13 @@ DATA_DESCRIPTIONS::Dump() const
it++ ) { it++ ) {
DATA_DESCRIPTION symbol = *it; DATA_DESCRIPTION symbol = *it;
cout << setw(20) << symbol.program_id ; cout << setw(20) << symbol.program_id ;
cout << setw(20) << symbol.cbl_symbol ; cout << setw(20) << symbol.cobol_symbol ;
cout << setw( 9) << symbol.c_symbol ;
cout << setw( 9) << symbol.field_data_name ;
cout << setw( 7) << symbol.field_data_offset ;
cout << setw(13) << symbol.storage_type ; cout << setw(13) << symbol.storage_type ;
cout << setw( 9) << symbol.b_name ;
cout << setw( 7) << symbol.offset ;
cout << setw( 6) << symbol.size ;
cout << setw( 9) << symbol.f_name ;
cout << setw(16) << symbol.picture_string ; cout << setw(16) << symbol.picture_string ;
cout << setw( 6) << symbol.storage_size ;
cout << setw( 6) << symbol.field_size ;
cout << setw(10) << symbol.attr_type ;
cout << setw(12) << symbol.attr_digits ;
cout << setw(11) << symbol.attr_scale ;
cout << setw(11) << symbol.attr_flags ;
cout << endl; cout << endl;
} }
cout << endl; cout << endl;
......
This diff is collapsed.
...@@ -1120,9 +1120,10 @@ VARIABLE_TREE::Consolidive(VAR_NODE *node,const DATA_DESCRIPTIONS &data_descript ...@@ -1120,9 +1120,10 @@ VARIABLE_TREE::Consolidive(VAR_NODE *node,const DATA_DESCRIPTIONS &data_descript
int offset = node->GetOffset(); int offset = node->GetOffset();
size_t index = NO_INDEX; size_t index = NO_INDEX;
if( node->level <= 1 OR node->level EQ 77 ) { if(node->section != "LOCAL-STORAGE" AND node->level <= 1 OR node->level EQ 77 ) {
// We're starting work on a brand-new level-one(ish) variable. // We're starting work on a brand-new level-one(ish) variable.
// Let's check to see if there is a b_ buffer for this 01/77 symbol // Let's check to see if there is a b_ buffer for this 01/77 symbol
base_symbol = "";
const COB_DATUM *pdatum = cob_data.GetCobDatumFromProgAndName(program_id,cbl_symbol); const COB_DATUM *pdatum = cob_data.GetCobDatumFromProgAndName(program_id,cbl_symbol);
if( pdatum ) { if( pdatum ) {
// Pick up the base symbol // Pick up the base symbol
...@@ -1130,55 +1131,17 @@ VARIABLE_TREE::Consolidive(VAR_NODE *node,const DATA_DESCRIPTIONS &data_descript ...@@ -1130,55 +1131,17 @@ VARIABLE_TREE::Consolidive(VAR_NODE *node,const DATA_DESCRIPTIONS &data_descript
} }
} }
if( base_symbol.empty() ) {
}
if( !base_symbol.empty() ) { if( !base_symbol.empty() ) {
// See if we have a data_descriptions entry for that cbl_symbol // See if we have a data_descriptions entry for that cbl_symbol
if( data_description.IsInDs(program_id,base_symbol,offset) ) { if( data_description.IsInDs(program_id,base_symbol,offset) ) {
// We do! Save the index // We do! Save the index
index = data_description.GetIndex(program_id,base_symbol,offset); index = data_description.GetIndex(program_id,base_symbol,offset);
node->data_description_index = index; node->data_description_index = index;
DATA_DESCRIPTION symbol = data_description[index];
// Here is where we combine the VARIABLE_TREE data with the DATA_DESCRIPTIONS
// data to create everything we need:
node->base_symbol = base_symbol;
if( symbol.storage_size EQ 0 ) {
node->best_size = symbol.field_size;
} else if( symbol.field_size EQ 0 ) {
node->best_size = symbol.storage_size;
} else {
node->best_size = symbol.field_size;
}
if( node->picture.empty() ) {
node->best_picture = symbol.picture_string;
} else if ( symbol.picture_string.empty() ) {
node->best_picture = node->picture;
} else {
// If they're both on, go with the one from the listing file
node->best_picture = node->picture;
}
if( node->level EQ 66 ) {
// The .cbl.lst file doesn't have good offset information
// for 66 REDEFINES. But the symbol *might* have good information,
// which it gets from the f_ field_attribute record when the 66
// variable is referenced in the code.
node->offset = symbol.field_data_offset ;
}
node->base_symbol = symbol.c_symbol ;
node->attr_type = symbol.attr_type ;
node->attr_digits = symbol.attr_digits ;
node->attr_scale = symbol.attr_scale ;
node->attr_flags = symbol.attr_flags ;
} else {
node->best_size = node->size;
node->best_picture = node->picture;
} }
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment