/ Check-in [6f4c0807]
Login

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

Overview
Comment:bug fix in lemon (CVS 136)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 6f4c080739333dbbc3556b5cf96f341f62167646
User & Date: drh 2000-08-20 11:42:46
Context
2000-08-22
13:27
:-) (CVS 137) check-in: 5f6559ee user: drh tags: trunk
2000-08-20
11:42
bug fix in lemon (CVS 136) check-in: 6f4c0807 user: drh tags: trunk
2000-08-18
10:00
Version 1.0.1 (CVS 498) check-in: e8521fc1 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to tool/lemon.c.

   371    371   struct action *ap1;
   372    372   struct action *ap2;
   373    373   {
   374    374     int rc;
   375    375     rc = ap1->sp->index - ap2->sp->index;
   376    376     if( rc==0 ) rc = (int)ap1->type - (int)ap2->type;
   377    377     if( rc==0 ){
   378         -    assert( ap1->type==REDUCE && ap2->type==REDUCE );
          378  +    assert( ap1->type==REDUCE || ap1->type==RD_RESOLVED || ap1->type==CONFLICT);
          379  +    assert( ap2->type==REDUCE || ap2->type==RD_RESOLVED || ap2->type==CONFLICT);
   379    380       rc = ap1->x.rp->index - ap2->x.rp->index;
   380    381     }
   381    382     return rc;
   382    383   }
   383    384   
   384    385   /* Sort parser actions */
   385    386   struct action *Action_sort(ap)