[Tinyos-commits] CVS: tinyos-1.x/tos/lib/VM/languages/motlle/mate Motlle.h, 1.4, 1.5 MotlleObjectsM.nc, 1.6, 1.7

[David Gay]

Update of /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/motlle/mate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26029/mate

Modified Files:
	Motlle.h MotlleObjectsM.nc 
Log Message:
-s option to mload to specify scheme code


Index: Motlle.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/motlle/mate/Motlle.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Motlle.h	25 Oct 2005 16:54:08 -0000	1.4
--- Motlle.h	25 Oct 2005 22:33:20 -0000	1.5
***************
*** 125,128 ****
--- 125,129 ----
    MOTLLE_INTERPRET_FRAME = unique("MotlleFrame"),
    MOTLLE_MAP_FRAME = unique("MotlleFrame"),
+   MOTLLE_FOREACH_FRAME = unique("MotlleFrame"),
    /* MOTLLE_STACK_ALIGNMENT must be aligned enough for the svalue and all
       stack frame types. */

Index: MotlleObjectsM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/motlle/mate/MotlleObjectsM.nc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MotlleObjectsM.nc	25 Oct 2005 16:54:08 -0000	1.6
--- MotlleObjectsM.nc	25 Oct 2005 22:33:20 -0000	1.7
***************
*** 306,310 ****
      /* Check for valid, non-circular list using marks. Clear marks
         when done. */
!     for (scan = l;; scan = call V.read(&(call T.pair(l))->cdr))
        {
  	if (call T.nullp(scan))
--- 306,310 ----
      /* Check for valid, non-circular list using marks. Clear marks
         when done. */
!     for (scan = l;; scan = call V.read(&(call T.pair(scan))->cdr))
        {
  	if (call T.nullp(scan))
***************
*** 316,321 ****
  	  }
  	call V.mark(scan);
        }
!     for (scan = l;; scan = call V.read(&(call T.pair(l))->cdr))
        {
  	if (call T.nullp(scan) || !call V.marked(scan))
--- 316,322 ----
  	  }
  	call V.mark(scan);
+ 	(*len)++;
        }
!     for (scan = l;; scan = call V.read(&(call T.pair(scan))->cdr))
        {
  	if (call T.nullp(scan) || !call V.marked(scan))