fixed some minor problems

diff --git a/lang/m2/comp/LLlex.c b/lang/m2/comp/LLlex.c
index 823b1b0..64d2d80 100644 (file)
--- a/lang/m2/comp/LLlex.c
+++ b/lang/m2/comp/LLlex.c
@@ -560,7 +560,7 @@ noscale:
 
                if (np >= &buf[NUMSIZE]) {
                        tk->TOK_REL = Salloc("0.0", 5);
-                       lexerror("floating constant too long");
+                       lexerror("real constant too long");
                }
                else    tk->TOK_REL = Salloc(buf, (unsigned) (np - buf)) + 1;
                return tk->tk_symb = REAL;

diff --git a/lang/m2/comp/def.c b/lang/m2/comp/def.c
index 1c3e633..ba7b6bc 100644 (file)
--- a/lang/m2/comp/def.c
+++ b/lang/m2/comp/def.c
@@ -270,7 +270,6 @@ DeclProc(type, id)
                        /* C_exp already generated when we saw the definition
                           in the definition module
                        */
-                       df->df_kind = D_PROCEDURE;
                        name = df->for_name;
                        DefInFront(df);
                }
@@ -380,6 +379,7 @@ CheckWithDef(df, tp)
                              df->df_idf->id_text); 
                }
                FreeType(df->df_type);
+               df->df_kind = D_PROCEDURE;
        }
        df->df_type = tp;
 }

diff --git a/lang/m2/comp/typequiv.c b/lang/m2/comp/typequiv.c
index 3e2d721..f021eef 100644 (file)
--- a/lang/m2/comp/typequiv.c
+++ b/lang/m2/comp/typequiv.c
@@ -217,6 +217,8 @@ TstParCompat(parno, formaltype, VARflag, nd, edf)
                      (  !VARflag
                      &&
                         actualtype->tp_size <= word_size
+                     &&
+                        ! IsConformantArray(actualtype)
                      )
                   )
                )