[Tinyos-commits] CVS: tinyos-1.x/tos/lib/VM/languages/motlle/src mload.mt, 1.3, 1.4 vmconf.mt, 1.2, 1.3

[David Gay]

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

Modified Files:
	mload.mt vmconf.mt 
Log Message:
-s option to mload to specify scheme code


Index: mload.mt
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/motlle/src/mload.mt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mload.mt	14 Oct 2005 00:21:21 -0000	1.3
--- mload.mt	25 Oct 2005 22:33:21 -0000	1.4
***************
*** 1,9 ****
  any usage()
  {
!   pformat(stderr(), "Usage: mload [-h/--help] [-e] [-c] <file or command>\n");
  }
  
  any injector, mate_compile;
  
  any motlle_debug = getenv("MOTLLEDEBUG");
  any display_error = motlle_debug != 0;
--- 1,10 ----
  any usage()
  {
!   pformat(stderr(), "Usage: mload [-h/--help] [-s] [-e] [-c] <file or command>\n");
  }
  
  any injector, mate_compile;
  
+ any is_scheme = false;
  any motlle_debug = getenv("MOTLLEDEBUG");
  any display_error = motlle_debug != 0;
***************
*** 29,32 ****
--- 30,35 ----
        else if (!string_cmp("-c", argv[i]))
  	doinject = mate_compile;
+       else if (!string_cmp("-s", argv[i]))
+ 	is_scheme = true;
        else if (!string_cmp("-h", argv[i]) ||
  	       !string_cmp("--help", argv[i]))
***************
*** 51,54 ****
  if (!file_or_cmd)
    usage();
! else if (!doinject(compiler, file_or_cmd))
    error(error_bad_value);
--- 54,57 ----
  if (!file_or_cmd)
    usage();
! else if (!doinject(fn (g, s) compiler(g, s, is_scheme), file_or_cmd))
    error(error_bad_value);

Index: vmconf.mt
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/motlle/src/vmconf.mt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** vmconf.mt	30 Nov 2004 18:52:43 -0000	1.2
--- vmconf.mt	25 Oct 2005 22:33:21 -0000	1.3
***************
*** 135,139 ****
    any handlervars = "", vhandlers = make_vector(handlercount);
    any define_mate_handler(handler)
!     remote_save(mstate, string_compile(mstate[0], string_append("any ", string_append(handler, " = 0;"))))[1];
    
    lforeach(fn (handler) vhandlers[cdr(handler)] = car(handler), handlers);
--- 135,139 ----
    any handlervars = "", vhandlers = make_vector(handlercount);
    any define_mate_handler(handler)
!     remote_save(mstate, string_compile(mstate[0], string_append("any ", string_append(handler, " = 0;")), false))[1];
    
    lforeach(fn (handler) vhandlers[cdr(handler)] = car(handler), handlers);