/[ascend]/trunk/ascend/compiler/mergeinst.c
ViewVC logotype

Diff of /trunk/ascend/compiler/mergeinst.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2687 by jpye, Wed Dec 12 12:39:25 2012 UTC revision 2688 by jpye, Mon Mar 4 08:11:49 2013 UTC
# Line 767  struct Instance *MergeModels(struct Mode Line 767  struct Instance *MergeModels(struct Mode
767  {  {
768    char *n1 = WriteInstanceNameString(i1,NULL);    char *n1 = WriteInstanceNameString(i1,NULL);
769    char *n2 = WriteInstanceNameString(i2,NULL);    char *n2 = WriteInstanceNameString(i2,NULL);
770    CONSOLE_DEBUG("Merging models '%s' and '%s'",n2,n2);    CONSOLE_DEBUG("Merging models '%s' and '%s'",n1,n2);
771    ASC_FREE(n1);    ASC_FREE(n1);
772    ASC_FREE(n2);    ASC_FREE(n2);
773    
   
774    switch(KeepWhichInstance(i1->desc,i2->desc,INST(i1),INST(i2))){    switch(KeepWhichInstance(i1->desc,i2->desc,INST(i1),INST(i2))){
775    case 1:    case 1:
776      if (InterfacePtrATS!=NULL) {      if (InterfacePtrATS!=NULL) {
# Line 1090  struct Instance *RecursiveMergeInstance( Line 1089  struct Instance *RecursiveMergeInstance(
1089  #if 0  #if 0
1090    char *n1 = WriteInstanceNameString(i1,NULL);    char *n1 = WriteInstanceNameString(i1,NULL);
1091    char *n2 = WriteInstanceNameString(i2,NULL);    char *n2 = WriteInstanceNameString(i2,NULL);
1092    CONSOLE_DEBUG("Merging '%s' and '%s'",n2,n2);    CONSOLE_DEBUG("Merging '%s' and '%s'",n1,n2);
1093    ASC_FREE(n1);    ASC_FREE(n1);
1094    ASC_FREE(n2);    ASC_FREE(n2);
1095  #endif  #endif

Legend:
Removed from v.2687  
changed lines
  Added in v.2688

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22