SQLite: Check-in [90602030]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

Comment:	Added option to not clip error output. This is useful for IDEs and other tools that benefit from full path information, so they can jump directly to the error line in the source code.
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| lemon-update-2010
Files:	files \| file ages \| folders
SHA1:	90602030d18152a934644db119a291aa38fe3fd4
User & Date:	icculus 2010-02-14 05:42:46

Context

2010-02-14
17:14		Make Lemon able to compile as C++ code. check-in: 75a1060b user: icculus tags: lemon-update-2010
05:42		Added option to not clip error output. This is useful for IDEs and other tools that benefit from full path information, so they can jump directly to the error line in the source code. check-in: 90602030 user: icculus tags: lemon-update-2010
05:34		Delete output files if this is a failed run. Otherwise, the fail will stop a Makefile from progressing, but if you immediately run the build again, Make will think the output files are up to date, since they are newer (albeit incomplete/incorrect). check-in: e38c08d9 user: icculus tags: lemon-update-2010

Changes

Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to tool/lemon.c.

** The error message is split across multiple lines if necessary.  The
** splits occur at a space, if there is a space available near the end
** of the line.
*/
#define ERRMSGSIZE  10000 /* Hope this is big enough.  No way to error check */
#define LINEWIDTH      79 /* Max width of any output line */
#define PREFIXLIMIT    30 /* Max width of the prefix on each line */

void ErrorMsg(const char *filename, int lineno, const char *format, ...){
  char errmsg[ERRMSGSIZE];
  char prefix[PREFIXLIMIT+10];
  int errmsgsize;
  int prefixsize;
  int availablewidth;
  va_list ap;
  int end, restart, base;



  va_start(ap, format);





  /* Prepare a prefix to be prepended to every output line */
  if( lineno>0 ){
    sprintf(prefix,"%.*s:%d: ",PREFIXLIMIT-10,filename,lineno);
  }else{
    sprintf(prefix,"%.*s: ",PREFIXLIMIT-10,filename);
  }
  prefixsize = lemonStrlen(prefix);
  availablewidth = LINEWIDTH - prefixsize;

  /* Generate the error message */
  vsprintf(errmsg,format,ap);
  va_end(ap);
  errmsgsize = lemonStrlen(errmsg);
  /* Remove trailing '\n's from the error message. */
  while( errmsgsize>0 && errmsg[errmsgsize-1]=='\n' ){
     errmsg[--errmsgsize] = 0;
  }

  /* Print the error message */
  base = 0;
  while( errmsg[base]!=0 ){
    end = restart = findbreak(&errmsg[base],0,availablewidth);
    restart += base;
    while( errmsg[restart]==' ' ) restart++;
    fprintf(stdout,"%s%.*s\n",prefix,end,&errmsg[base]);
    base = restart;

  }
}
/**************** From the file "main.c" ************************************/
/*
** Main program file for the LEMON parser generator.
*/

................................................................................
  static int compress = 0;
  static int quiet = 0;
  static int statistics = 0;
  static int mhflag = 0;
  static int nolinenosflag = 0;
  static struct s_options options[] = {
    {OPT_FLAG, "b", (char*)&basisflag, "Print only the basis in report."},

    {OPT_FLAG, "c", (char*)&compress, "Don't compress the action table."},
    {OPT_FSTR, "D", (char*)handle_D_option, "Define an %ifdef macro."},
    {OPT_FSTR, "T", (char*)handle_T_option, "Specify a template file."},
    {OPT_FLAG, "g", (char*)&rpflag, "Print grammar without actions."},
    {OPT_FLAG, "m", (char*)&mhflag, "Output a makeheaders compatible file."},
    {OPT_FLAG, "l", (char*)&nolinenosflag, "Do not print #line statements."},
    {OPT_FLAG, "q", (char*)&quiet, "(Quiet) Don't print the report file."},








>









>
>
|
>
>
>
>
>
|
|
|
|
|
|
|
|

|
|
|
|
|
|
|
|

|
|
|
|
|
|
|
|
>







 







>

** The error message is split across multiple lines if necessary.  The
** splits occur at a space, if there is a space available near the end
** of the line.
*/
#define ERRMSGSIZE  10000 /* Hope this is big enough.  No way to error check */
#define LINEWIDTH      79 /* Max width of any output line */
#define PREFIXLIMIT    30 /* Max width of the prefix on each line */
static int noerrorclipping = 0;
void ErrorMsg(const char *filename, int lineno, const char *format, ...){
  char errmsg[ERRMSGSIZE];
  char prefix[PREFIXLIMIT+10];
  int errmsgsize;
  int prefixsize;
  int availablewidth;
  va_list ap;
  int end, restart, base;

  if( noerrorclipping ) {
    fprintf(stderr, "%s:%d: ", filename, lineno);
    va_start(ap, format);
    vfprintf(stderr,format,ap);
    va_end(ap);
    fprintf(stderr, "\n");
  }else{
    va_start(ap, format);
    /* Prepare a prefix to be prepended to every output line */
    if( lineno>0 ){
      sprintf(prefix,"%.*s:%d: ",PREFIXLIMIT-10,filename,lineno);
    }else{
      sprintf(prefix,"%.*s: ",PREFIXLIMIT-10,filename);
    }
    prefixsize = lemonStrlen(prefix);
    availablewidth = LINEWIDTH - prefixsize;

    /* Generate the error message */
    vsprintf(errmsg,format,ap);
    va_end(ap);
    errmsgsize = lemonStrlen(errmsg);
    /* Remove trailing '\n's from the error message. */
    while( errmsgsize>0 && errmsg[errmsgsize-1]=='\n' ){
      errmsg[--errmsgsize] = 0;
    }

    /* Print the error message */
    base = 0;
    while( errmsg[base]!=0 ){
      end = restart = findbreak(&errmsg[base],0,availablewidth);
      restart += base;
      while( errmsg[restart]==' ' ) restart++;
      fprintf(stdout,"%s%.*s\n",prefix,end,&errmsg[base]);
      base = restart;
    }
  }
}
/**************** From the file "main.c" ************************************/
/*
** Main program file for the LEMON parser generator.
*/

................................................................................
  static int compress = 0;
  static int quiet = 0;
  static int statistics = 0;
  static int mhflag = 0;
  static int nolinenosflag = 0;
  static struct s_options options[] = {
    {OPT_FLAG, "b", (char*)&basisflag, "Print only the basis in report."},
    {OPT_FLAG, "e", (char*)&noerrorclipping, "Don't clip error output."},
    {OPT_FLAG, "c", (char*)&compress, "Don't compress the action table."},
    {OPT_FSTR, "D", (char*)handle_D_option, "Define an %ifdef macro."},
    {OPT_FSTR, "T", (char*)handle_T_option, "Specify a template file."},
    {OPT_FLAG, "g", (char*)&rpflag, "Print grammar without actions."},
    {OPT_FLAG, "m", (char*)&mhflag, "Output a makeheaders compatible file."},
    {OPT_FLAG, "l", (char*)&nolinenosflag, "Do not print #line statements."},
    {OPT_FLAG, "q", (char*)&quiet, "(Quiet) Don't print the report file."},