pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/cim Add some missing prototypes and correctly tag...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/407f78884268
branches:  trunk
changeset: 610490:407f78884268
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Oct 26 20:37:15 2012 +0000

description:
Add some missing prototypes and correctly tag functions as void if
needed.

diffstat:

 lang/cim/distinfo                       |   14 +-
 lang/cim/patches/patch-src_dekl.c       |  253 ++++++++++++++++++++++++++++++++
 lang/cim/patches/patch-src_dekl.h       |   26 +++
 lang/cim/patches/patch-src_error.c      |  101 ++++++++++++
 lang/cim/patches/patch-src_expbuilder.c |   13 +
 lang/cim/patches/patch-src_expchecker.c |   15 +
 lang/cim/patches/patch-src_extspec.c    |   26 +++
 lang/cim/patches/patch-src_extspec.h    |   13 +
 lang/cim/patches/patch-src_gen.h        |   18 ++
 lang/cim/patches/patch-src_genexp.c     |   23 ++
 lang/cim/patches/patch-src_genpar.c     |   14 +
 lang/cim/patches/patch-src_genstr.c     |   14 +
 lang/cim/patches/patch-src_lex.c        |   13 +
 13 files changed, 542 insertions(+), 1 deletions(-)

diffs (truncated from 602 to 300 lines):

diff -r d73e0761aafb -r 407f78884268 lang/cim/distinfo
--- a/lang/cim/distinfo Fri Oct 26 20:32:56 2012 +0000
+++ b/lang/cim/distinfo Fri Oct 26 20:37:15 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2007/11/30 20:30:22 rillig Exp $
+$NetBSD: distinfo,v 1.8 2012/10/26 20:37:15 joerg Exp $
 
 SHA1 (cim-3.30.tar.gz) = 8636ac8d1eaee793769051af60140af80b82b22f
 RMD160 (cim-3.30.tar.gz) = d5c07046799dec8840c7c7d9f5c88e552a4c6432
@@ -6,3 +6,15 @@
 SHA1 (patch-aa) = 6e20870f7bf0c2befdc0a73d00827606958e2931
 SHA1 (patch-ab) = e5d14212cbc4fbf956ade6c8b68f1dcc92a0841a
 SHA1 (patch-ac) = e63f63f906a968ef7dc8343e44235916eddf6574
+SHA1 (patch-src_dekl.c) = 3900ef403be2e62eafc4b826504d58eb28fed7b7
+SHA1 (patch-src_dekl.h) = 4a88d45fc715233ed4d56376104149f2299a2177
+SHA1 (patch-src_error.c) = 99a51cd6a779a6626b945df43c31ae05c43e2ad2
+SHA1 (patch-src_expbuilder.c) = e8b34170917105dcad13605c8418b21457818ce3
+SHA1 (patch-src_expchecker.c) = c5ae46c6932fd276b093ff4c149f597f7757162a
+SHA1 (patch-src_extspec.c) = 913d43ffa911e03f260f52c59bec7d3d2ce016b1
+SHA1 (patch-src_extspec.h) = e4a6bf554e045997276589baaa3e7dbc20e72a26
+SHA1 (patch-src_gen.h) = b1a6ec2dce0e518fb5430af5d42530ea82898207
+SHA1 (patch-src_genexp.c) = 1c826b32b490de0c428f8e7d0144a79298fce4ee
+SHA1 (patch-src_genpar.c) = 5675cf1ec69bf5378a709a03c25d981434628540
+SHA1 (patch-src_genstr.c) = c2e1a75636273a8281c4070ff25928e4847753be
+SHA1 (patch-src_lex.c) = c7c5011d24f8abb076b17c132d9b3cbdac816cce
diff -r d73e0761aafb -r 407f78884268 lang/cim/patches/patch-src_dekl.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/cim/patches/patch-src_dekl.c Fri Oct 26 20:37:15 2012 +0000
@@ -0,0 +1,253 @@
+$NetBSD: patch-src_dekl.c,v 1.1 2012/10/26 20:37:15 joerg Exp $
+
+--- src/dekl.c.orig    2012-10-26 12:55:39.000000000 +0000
++++ src/dekl.c
+@@ -522,8 +522,7 @@ subordinate (rda, rdb)
+ 
+ /* Kalles fra  syntakssjekkeren hver gang en ny blokk entres */
+ 
+-beginBlock (kind)
+-     char kind;
++void beginBlock (char kind)
+ {
+   static int cblno = STARTBLNO;
+   static struct BLOCK *lblock;
+@@ -650,9 +649,7 @@ beginBlock (kind)
+ /* Kalles  fra  syntakssjekkeren hver gang en blokk terminerer */
+ 
+ /*VARARGS0 */
+-endBlock (rtname, codeclass)
+-     char *rtname;
+-     char codeclass;
++void endBlock (char *rtname, char codeclass)
+ {
+ #ifdef DEBUG
+   if (option_input)
+@@ -688,8 +685,7 @@ endBlock (rtname, codeclass)
+ /* RegDecl kalles fra syntakssjekkeren
+  * hver gang  vi leser  en deklarasjon */
+ 
+-regDecl (ident, type, kind, categ)
+-     char *ident, type, kind, categ;
++void regDecl (char *ident, char type, char kind, char categ)
+ {
+   struct DECL *pd,
+    *pdx = NULL;
+@@ -858,7 +854,7 @@ regDecl (ident, type, kind, categ)
+       }
+       break;
+     default:
+-      d1error (37);
++      d1error (37, NULL);
+       break;
+     }
+ #ifdef DEBUG
+@@ -881,11 +877,11 @@ regInner ()
+           ,lineno, cblev);
+ #endif
+   if (cblock->quant.kind != KCLASS)
+-    d1error (38);
++    d1error (38, NULL);
+   else
+     {
+       if (cblock->inner)
+-      d1error (39);
++      d1error (39, NULL);
+       else
+       cblock->inner = TRUE;
+     }
+@@ -1233,13 +1229,13 @@ setqualprefchain (rd, param)
+         rd->plev = 0;
+         if (rdx->categ == CNEW)
+           {
+-            d2error (53, rd);
++            d2error (53, rd, NULL);
+             rdx->categ = CERROR;
+           }
+         else if (rdx->kind != KCLASS)
+           {
+             if (rdx->categ != CERROR)
+-              d2error (54, rd);
++              d2error (54, rd, NULL);
+             rdx->categ = CERROR;
+             rd->type = TERROR;
+           }
+@@ -1259,8 +1255,7 @@ setqualprefchain (rd, param)
+  * Prefikskjeden og kvalifikasjoner settes ved kall på setqualprefchain 
+  * den sjekker også konsistensen for type kind og categ */
+ 
+-static sjekkdekl (rb)
+-     struct BLOCK *rb;
++static void sjekkdekl (struct BLOCK *rb)
+ {
+   struct DECL *rd = NULL,
+    *rdx = NULL,
+@@ -1344,11 +1339,11 @@ static sjekkdekl (rb)
+                 obstack_free (&osDecl, s);
+               }
+             else
+-              d2error (55, rd);
++              d2error (55, rd, NULL);
+           }
+       }
+       if (rd->kind == KNOKD && rd->type != TVARARGS)
+-      d2error (63, rd);
++      d2error (63, rd, NULL);
+       if (rd->kind == KARRAY && rd->type == TNOTY)
+       rd->type = TREAL;
+       switch (rd->categ)
+@@ -1369,12 +1364,12 @@ static sjekkdekl (rb)
+         if (rd->type == TVARARGS)
+           {
+             if (rd->next != NULL)
+-              d2error (80, rd);
++              d2error (80, rd, NULL);
+             if (kind != KPROC || rb->quant.categ != CCPROC)
+-              d2error (81, rd);
++              d2error (81, rd, NULL);
+           }
+         if (rd->type == TLABEL && rb->quant.categ == CCPROC)
+-          d2error (82, rd);
++          d2error (82, rd, NULL);
+         break;
+       case CVALUE:
+         /* Sjekker om lovlig valueoverføring */
+@@ -1388,14 +1383,14 @@ static sjekkdekl (rb)
+         else if (rd->type == TVARARGS)
+           {
+             if (rd->next != NULL)
+-              d2error (80, rd);
++              d2error (80, rd, NULL);
+             if (kind != KPROC || rb->quant.categ != CCPROC)
+-              d2error (81, rd);
++              d2error (81, rd, NULL);
+           }
+         else
+-          d2error (57, rd);
++          d2error (57, rd, NULL);
+         if (rd->type == TLABEL && rb->quant.categ == CCPROC)
+-          d2error (82, rd);
++          d2error (82, rd, NULL);
+         break;
+       case CVAR:
+         if (rd->type == TREF && (rd->kind == KSIMPLE | rd->kind == KARRAY))
+@@ -1408,27 +1403,27 @@ static sjekkdekl (rb)
+           d2error (58, rd);*/
+         if (kind == KPROC && rb->quant.categ == CCPROC &&
+             (rd->type == TTEXT || rd->type == TREF))
+-          d2error (77, rd);
++          d2error (77, rd, NULL);
+         if (rd->type == TVARARGS)
+           {
+             if (rd->next != NULL)
+-              d2error (80, rd);
++              d2error (80, rd, NULL);
+             if (kind != KPROC || rb->quant.categ != CCPROC)
+-              d2error (81, rd);
++              d2error (81, rd, NULL);
+           }
+         if (rd->type == TLABEL && rb->quant.categ == CCPROC)
+-          d2error (82, rd);
++          d2error (82, rd, NULL);
+         break;
+       case CEXTR:
+       case CEXTRMAIN:
+         break;
+       case CCPROC:
+         if (rd->type == TREF)
+-          d2error (78, rd);
++          d2error (78, rd, NULL);
+         break;
+       default:
+         /* ULOVLIG CATEG */
+-        d2error (59, rd);
++        d2error (59, rd, NULL);
+       }
+     }
+   if (rb->quant.kind == KCLASS || rb->quant.kind == KPRBLK)
+@@ -1474,7 +1469,7 @@ static sjekkdekl (rb)
+                  va->protected == TRUE; va = va->next);
+             if (va != vc)
+               {
+-                d2error (60, vc);
++                d2error (60, vc, NULL);
+                 while (va->next != vc)
+                   va = va->next;
+                 va->next = vc->next;
+@@ -1485,7 +1480,7 @@ static sjekkdekl (rb)
+                 /* Sjekker om det er lovlig virtuell */
+                 if (vc->kind != KPROC && vc->type != TLABEL)
+                   {
+-                    d2error (61, vc);
++                    d2error (61, vc, NULL);
+                     vc->type = TERROR;
+                     vc->kind = KERROR;
+                   }
+@@ -1560,7 +1555,7 @@ static sjekkdekl (rb)
+             vc->prefqual = va->prefqual;
+           }
+         else
+-          d2error (62, va);
++          d2error (62, va, NULL);
+       }
+       else if (vc->match == vc)
+       vc->match = NULL;
+@@ -1573,11 +1568,11 @@ static sjekkdekl (rb)
+         rdx = findLocal (rd->ident, &rb->quant, TRUE);
+         if (rdx->categ == CNEW)
+           {
+-            d2error (74, rd);
++            d2error (74, rd, NULL);
+             rdx->categ = CERROR;
+           }
+         else if (rd->categ != CHIDEN && rdx->encl != rb)
+-          d2error (75, rd);
++          d2error (75, rd, NULL);
+         else if (rd->categ != CHIDEN && rdx->categ == CVIRT)
+           {
+             if (rb->quant.plev == 0)
+@@ -1587,7 +1582,7 @@ static sjekkdekl (rb)
+             else
+               vno = rb->quant.prefqual->descr->navirtlab;
+             if (rdx->virtno <= vno)
+-              d2error (75, rd);
++              d2error (75, rd, NULL);
+             else
+               rd->match = rdx;
+           }
+@@ -1607,7 +1602,7 @@ static sjekkdekl (rb)
+       for (rd = rb->hiprot; rd != NULL; rd = rd->next)
+       if (rd->categ == CHIDEN && rd->match != NULL &&
+           rd->match->protected == FALSE)
+-        d2error (76, rd);
++        d2error (76, rd, NULL);
+     }
+ }
+ 
+@@ -1710,7 +1705,7 @@ reginsp (rb, rd) struct BLOCK *rb; struc
+ {
+   if (rd == NULL)
+     {
+-      d2error (73, &rb->quant);
++      d2error (73, &rb->quant, NULL);
+       rd = findGlobal (tag ("Noqual"), FALSE);
+       rd->categ = CERROR;
+     }
+@@ -1755,7 +1750,7 @@ regThis (ident)
+               if (rd->ident == ident)
+                 {
+                   if (rd->descr->thisused == MAYBEE)
+-                    d2error (72, rd);
++                    d2error (72, rd, NULL);
+                   rd->descr->thisused |= TRUE;
+ #ifdef DEBUG
+                   if (option_input)
+@@ -1776,7 +1771,7 @@ regThis (ident)
+   if (option_input)
+     printf ("---end\n");
+ #endif
+-  d2error (79, rd = findGlobal (ident, FALSE));
++  d2error (79, rd = findGlobal (ident, FALSE), NULL);
+   return (rd);
+ }
+ 
diff -r d73e0761aafb -r 407f78884268 lang/cim/patches/patch-src_dekl.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/cim/patches/patch-src_dekl.h Fri Oct 26 20:37:15 2012 +0000
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_dekl.h,v 1.1 2012/10/26 20:37:15 joerg Exp $
+
+--- src/dekl.h.orig    2012-10-26 12:56:08.000000000 +0000
++++ src/dekl.h
+@@ -189,9 +189,9 @@ struct BLOCK
+ #define CCCPROC      8                /* Ekstern C-prosedyre */
+ 
+ 
+-extern beginBlock ();
+-extern endBlock ();
+-extern regDecl ();
++void beginBlock (char kind);
++void endBlock (char *rtname, char codeclass);
++void regDecl (char *ident, char type, char kind, char categ);



Home | Main Index | Thread Index | Old Index