Fixed wrong assertion, and fixed bug in distance routine: it did not check

that each stackpattern token that does not exactly match can be made from the
stack

diff --git a/mach/proto/ncg/codegen.c b/mach/proto/ncg/codegen.c
index 0e54d1e..e7c64ef 100644 (file)
--- a/mach/proto/ncg/codegen.c
+++ b/mach/proto/ncg/codegen.c
@@ -152,7 +152,7 @@ unsigned codegen(codep,ply,toplevel,costlimit,forced) byte *codep; unsigned cost
                        int j, nargs;
                        getint(i,bp);
                        getint(nargs,bp);
-                       assert(nargs < MAXPROCARG);
+                       assert(nargs <= MAXPROCARG);
                        for (j = 0; j < nargs; j++) {
                                getint(procarg[j],bp);
                        }

diff --git a/mach/proto/ncg/subr.c b/mach/proto/ncg/subr.c
index e5f6cca..c25cb0b 100644 (file)
--- a/mach/proto/ncg/subr.c
+++ b/mach/proto/ncg/subr.c
@@ -324,6 +324,14 @@ distance(cindex) {
                                return(100);
                        if (expsize<toksize)
                                return(99-i);
+
+                       /* Now we have a match in size, but it is not exact.
+                          Therefore, make sure that we can at least
+                          create it from the stack!
+                       */
+                       if (! from_stack(&machsets[tokexp])) {
+                               return MAXINT;
+                       }
                } else
                        exact++;
        }