delinted somewhat

diff --git a/lang/m2/comp/error.c b/lang/m2/comp/error.c
index 37ba8d6..e3f4041 100644 (file)
--- a/lang/m2/comp/error.c
+++ b/lang/m2/comp/error.c
@@ -60,7 +60,7 @@ extern char *symbol2str();
 */
 
 #ifdef DEBUG
-/*VARARGS1*/
+/*VARARGS*/
 debug(va_alist)
        va_dcl
 {
@@ -74,7 +74,7 @@ debug(va_alist)
 }
 #endif DEBUG
 
-/*VARARGS1*/
+/*VARARGS*/
 error(va_alist)
        va_dcl
 {
@@ -87,7 +87,7 @@ error(va_alist)
        va_end(ap);
 }
 
-/*VARARGS2*/
+/*VARARGS*/
 node_error(va_alist)
        va_dcl
 {
@@ -102,7 +102,7 @@ node_error(va_alist)
        va_end(ap);
 }
 
-/*VARARGS2*/
+/*VARARGS*/
 warning(va_alist)
        va_dcl
 {
@@ -115,7 +115,7 @@ warning(va_alist)
        va_end(ap);
 }
 
-/*VARARGS3*/
+/*VARARGS*/
 node_warning(va_alist)
        va_dcl
 {
@@ -129,7 +129,7 @@ node_warning(va_alist)
        va_end(ap);
 }
 
-/*VARARGS1*/
+/*VARARGS*/
 lexerror(va_alist)
        va_dcl
 {
@@ -142,7 +142,7 @@ lexerror(va_alist)
        va_end(ap);
 }
 
-/*VARARGS2*/
+/*VARARGS*/
 lexwarning(va_alist)
        va_dcl
 {
@@ -155,7 +155,7 @@ lexwarning(va_alist)
        va_end(ap);
 }
 
-/*VARARGS1*/
+/*VARARGS*/
 fatal(va_alist)
        va_dcl
 {
@@ -169,7 +169,7 @@ fatal(va_alist)
        sys_stop(S_EXIT);
 }
 
-/*VARARGS1*/
+/*VARARGS*/
 crash(va_alist)
        va_dcl
 {

diff --git a/lang/m2/comp/options.c b/lang/m2/comp/options.c
index eb7dc08..14c71e3 100644 (file)
--- a/lang/m2/comp/options.c
+++ b/lang/m2/comp/options.c
@@ -156,7 +156,7 @@ DoOption(text)
 #ifndef NOCROSS
        {
                register int size;
-               register int align;
+               register int algn;
                char c;
                char *t;
 
@@ -165,10 +165,10 @@ DoOption(text)
 
                        t = text;
                        size = txt2int(&t);
-                       align = 0;
+                       algn = 0;
                        if (*(text = t) == '.') {
                                t = text + 1;
-                               align = txt2int(&t);
+                               algn = txt2int(&t);
                                text = t;
                        }
                        if (! strindex("wislfdpS", c)) {
@@ -199,31 +199,31 @@ DoOption(text)
                                pointer_size = size;
                                break;
                        }
-                       if (align != 0) switch (c)      {
+                       if (algn != 0) switch (c)       {
 
                        case 'w':       /* word         */
-                               word_align = align;
+                               word_align = algn;
                                break;
                        case 'i':       /* int          */
-                               int_align = align;
+                               int_align = algn;
                                break;
                        case 's':       /* short (subranges) */
-                               short_align = align;
+                               short_align = algn;
                                break;
                        case 'l':       /* longint      */
-                               long_align = align;
+                               long_align = algn;
                                break;
                        case 'f':       /* real         */
-                               float_align = align;
+                               float_align = algn;
                                break;
                        case 'd':       /* longreal     */
-                               double_align = align;
+                               double_align = algn;
                                break;
                        case 'p':       /* pointer      */
-                               pointer_align = align;
+                               pointer_align = algn;
                                break;
                        case 'S':       /* initial record alignment     */
-                               struct_align = align;
+                               struct_align = algn;
                                break;
                        }
                }

diff --git a/lang/m2/comp/scope.C b/lang/m2/comp/scope.C
index 4a3eb82..b31479f 100644 (file)
--- a/lang/m2/comp/scope.C
+++ b/lang/m2/comp/scope.C
@@ -26,7 +26,6 @@
 t_scope *PervasiveScope;
 t_scopelist *CurrVis, *GlobalVis;
 extern int proclevel;
-static t_scopelist *PervVis;
 extern char options[];
 
 /* STATICALLOCDEF "scope" 10 */
@@ -71,7 +70,6 @@ InitScope()
        sc->sc_level = proclevel;
        PervasiveScope = sc;
        ls->sc_scope = PervasiveScope;
-       PervVis = ls;
        CurrVis = ls;
 }
 

diff --git a/lang/m2/comp/type.c b/lang/m2/comp/type.c
index 7127643..be11142 100644 (file)
--- a/lang/m2/comp/type.c
+++ b/lang/m2/comp/type.c
@@ -123,15 +123,15 @@ align(pos, al)
 }
 
 t_type *
-standard_type(fund, align, size)
+standard_type(fund, algn, size)
        int fund;
-       int align;
+       int algn;
        arith size;
 {
        register t_type *tp = new_type();
 
        tp->tp_fund = fund;
-       tp->tp_align = align;
+       tp->tp_align = algn;
        tp->tp_size = size;
        if (fund == T_ENUMERATION || fund == T_CHAR) {
                tp->tp_value.tp_enum = new_enume();

diff --git a/lang/m2/comp/typequiv.c b/lang/m2/comp/typequiv.c
index d7dbe64..45ac255 100644 (file)
--- a/lang/m2/comp/typequiv.c
+++ b/lang/m2/comp/typequiv.c
@@ -139,7 +139,6 @@ TstAssCompat(tp1, tp2)
        /*      Test if two types are assignment compatible.
                See Def 9.1.
        */
-       register t_type *tp;
 
        if (TstCompat(tp1, tp2)) return 1;