/[ascend]/trunk/base/generic/compiler/typedef.c
ViewVC logotype

Diff of /trunk/base/generic/compiler/typedef.c

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

revision 1694 by jpye, Thu Nov 22 13:17:06 2007 UTC revision 1695 by jpye, Wed Dec 26 08:23:08 2007 UTC
# Line 72  Line 72 
72  #include "typedef.h"  #include "typedef.h"
73  #include <general/mathmacros.h>  #include <general/mathmacros.h>
74    
 #ifndef lint  
 static CONST char TypeDefinitionRCSid[] ="$Id: typedef.c,v 1.60 1998/04/21 23:50:02 ballan Exp $";  
 #endif  
   
   
75  /*  /*
76   *  To generate a name for a relation, logrelation or when using   *  To generate a name for a relation, logrelation or when using
77   *  the number of the relation, logrelation or when in the model,   *  the number of the relation, logrelation or when in the model,
# Line 3106  enum typelinterr VerifyTypeArgs(CONST st Line 3101  enum typelinterr VerifyTypeArgs(CONST st
3101           * the type might be <= and refined elsewhere to the correct sort.           * the type might be <= and refined elsewhere to the correct sort.
3102           */           */
3103          if (ptype!=atype && MoreRefined(ptype,atype)==NULL) {          if (ptype!=atype && MoreRefined(ptype,atype)==NULL) {
3104            FPRINTF(ASCERR,            ERROR_REPORTER_START_HERE(ASC_USER_ERROR);          
3105              "%sType incompatible %s instance passed where %s expected\n",            FPRINTF(ASCERR,"Instance '");
             StatioLabel(3),SCP(GetName(ptype)),SCP(GetName(atype)));  
           FPRINTF(ASCERR,"  Argument %d: ",argc);  
3106            WriteSetNode(ASCERR,sn);            WriteSetNode(ASCERR,sn);
3107            FPRINTF(ASCERR,"\n");            FPRINTF(ASCERR,"' is of incompatible type '%s' (expected '%s') at argument %d."
3108                  , SCP(GetName(ptype)),SCP(GetName(atype)),argc
3109              );
3110              error_reporter_end_flush();
3111            return DEF_ARGS_INCORRECT;            return DEF_ARGS_INCORRECT;
3112          }          }
3113          /* check the set madness */          /* check the set madness */

Legend:
Removed from v.1694  
changed lines
  Added in v.1695

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