Commit 7e2e225a authored by johnvg@science.ru.nl's avatar johnvg@science.ru.nl
Browse files

change type of field im_name, remove allocation of Symbol and Ident of name

parent ab6766f3
...@@ -387,7 +387,6 @@ BEDeclareIclModule (CleanString name, CleanString modificationTime, int nFunctio ...@@ -387,7 +387,6 @@ BEDeclareIclModule (CleanString name, CleanString modificationTime, int nFunctio
{ {
int i; int i;
char *cName; char *cName;
SymbolP moduleNameSymbol;
ImpMod iclModule; ImpMod iclModule;
BEIclP icl; BEIclP icl;
...@@ -396,9 +395,6 @@ BEDeclareIclModule (CleanString name, CleanString modificationTime, int nFunctio ...@@ -396,9 +395,6 @@ BEDeclareIclModule (CleanString name, CleanString modificationTime, int nFunctio
if (cName == NULL) if (cName == NULL)
cName = ConvertCleanString (name); cName = ConvertCleanString (name);
moduleNameSymbol = ConvertAllocType (SymbolS);
moduleNameSymbol->symb_ident = Identifier (cName);
/* Assert (strcmp (gBEState.be_modules [main_dcl_module_n].bem_name, cName) == 0); */ /* Assert (strcmp (gBEState.be_modules [main_dcl_module_n].bem_name, cName) == 0); */
Assert (strncmp (cName, name->chars, name->length) == 0); Assert (strncmp (cName, name->chars, name->length) == 0);
...@@ -414,7 +410,7 @@ BEDeclareIclModule (CleanString name, CleanString modificationTime, int nFunctio ...@@ -414,7 +410,7 @@ BEDeclareIclModule (CleanString name, CleanString modificationTime, int nFunctio
DeclareModule (main_dcl_module_n, cName, False, nFunctions, nTypes, nConstructors, nFields); DeclareModule (main_dcl_module_n, cName, False, nFunctions, nTypes, nConstructors, nFields);
iclModule = icl->beicl_module; iclModule = icl->beicl_module;
iclModule->im_name = moduleNameSymbol; iclModule->im_name = cName;
iclModule->im_modification_time = ConvertCleanString (modificationTime); iclModule->im_modification_time = ConvertCleanString (modificationTime);
iclModule->im_def_module = im_def_module; iclModule->im_def_module = im_def_module;
iclModule->im_rules = NULL; iclModule->im_rules = NULL;
...@@ -744,7 +740,7 @@ BESpecialArrayFunctionSymbol (BEArrayFunKind arrayFunKind, int functionIndex, in ...@@ -744,7 +740,7 @@ BESpecialArrayFunctionSymbol (BEArrayFunKind arrayFunKind, int functionIndex, in
newRuleType->rule_type_rule = newTypeAlt; newRuleType->rule_type_rule = newTypeAlt;
newsdef->sdef_ident = newIdent; newsdef->sdef_ident = newIdent;
newsdef->sdef_module = gBEState.be_icl.beicl_module->im_name->symb_ident->ident_name; newsdef->sdef_module = gBEState.be_icl.beicl_module->im_name;
newsdef->sdef_mark = 0; newsdef->sdef_mark = 0;
newsdef->sdef_isused = True; newsdef->sdef_isused = True;
newsdef->sdef_exported = False; newsdef->sdef_exported = False;
......
...@@ -670,7 +670,7 @@ typedef FileTime ModuleFileTime; ...@@ -670,7 +670,7 @@ typedef FileTime ModuleFileTime;
#endif #endif
typedef struct { typedef struct {
Symbol im_name; char * im_name;
Symbol im_symbols; Symbol im_symbols;
ImpRules im_rules; ImpRules im_rules;
struct symbol_def * im_start; struct symbol_def * im_start;
......
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