Fixed problems with -I and with value conformant arrays

diff --git a/lang/m2/comp/options.c b/lang/m2/comp/options.c
index d45e8b5..453ff23 100644 (file)
--- a/lang/m2/comp/options.c
+++ b/lang/m2/comp/options.c
@@ -140,10 +140,10 @@ DoOption(text)
                                  Realloc(DEFPATH,(mDEF+=10)*sizeof(char *));
                        }
 
-                       for (i = ndirs++; i <= nDEF; i++) {
+                       for (i = ndirs++; i < nDEF; i++) {
                                char *tmp = DEFPATH[i];
        
-                               DEFPATH[i++] = new;
+                               DEFPATH[i] = new;
                                new = tmp;
                        }
                }

diff --git a/lang/m2/comp/program.g b/lang/m2/comp/program.g
index 96ca2fc..44c19ef 100644 (file)
--- a/lang/m2/comp/program.g
+++ b/lang/m2/comp/program.g
@@ -13,7 +13,9 @@
 #include       "debug.h"
 
 #include       <alloc.h>
-#include       <em.h>
+#include       <em_arith.h>
+#include       <em_label.h>
+#include       <em_code.h>
 #include       <stb.h>
 
 #include       "strict3rd.h"

diff --git a/lang/m2/comp/stab.c b/lang/m2/comp/stab.c
index deca994..aad9a0a 100644 (file)
--- a/lang/m2/comp/stab.c
+++ b/lang/m2/comp/stab.c
@@ -10,7 +10,9 @@
 /* $Header$ */
 
 #include       <alloc.h>
-#include       <em.h>
+#include       <em_arith.h>
+#include       <em_label.h>
+#include       <em_code.h>
 #include       <flt_arith.h>
 #include       <stb.h>
 

diff --git a/lang/m2/comp/walk.c b/lang/m2/comp/walk.c
index 8eb4c97..1f7a87b 100644 (file)
--- a/lang/m2/comp/walk.c
+++ b/lang/m2/comp/walk.c
@@ -354,7 +354,10 @@ WalkProcedure(procedure)
                                }
                                continue;
                        }
-                       if (param->par_def->df_flags & D_DEFINED) {
+#ifdef PASS_BIG_VAL_AS_VAR
+                       if (param->par_def->df_flags & D_DEFINED)
+#endif
+                       {
                                /* Here, we have to make a copy of the
                                   array. We must also remember how much
                                   room is reserved for copies, because