[Tinyos-commits] CVS: tinyos-1.x/tos/lib/VM/languages/motlle/tools motllevm-build, 1.3, 1.4

[David Gay]

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

Modified Files:
	motllevm-build 
Log Message:
pick default language for mload
more scheme-like lexing (chars, #t, #f, number-radix prefixes)
more scheme-like constants


Index: motllevm-build
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/motlle/tools/motllevm-build,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** motllevm-build	11 Dec 2004 02:07:19 -0000	1.3
--- motllevm-build	25 Oct 2005 23:08:52 -0000	1.4
***************
*** 27,32 ****
  grep MVIRUS /tmp/motlle$$.tmp | sed -e 's/^.*MVIRUS_/any MVIRUS_/' >>conf.mt
  rm -f /tmp/motlle$$.tmp
! grep '^CST ' vm.vmdf | sed -e 's/^CST \([a-zA-Z_0-9$_?!]*\)=\([-0-9]*\).*/motecst("\1", \2);/' >>conf.mt
! echo 'motecst("null", null);' >>conf.mt
  if test $float -eq 0; then
    echo "value_size = 4;" >>conf.mt
--- 27,43 ----
  grep MVIRUS /tmp/motlle$$.tmp | sed -e 's/^.*MVIRUS_/any MVIRUS_/' >>conf.mt
  rm -f /tmp/motlle$$.tmp
! 
! # language and constants
! if grep -q '^<VM .*language="tinyscheme"' vm.vmdf; then
!   echo "is_scheme = true;" >>conf.mt
!   grep '^CST ' vm.vmdf | sed -e 's/^CST \([-a-zA-Z_0-9$_?!]*\)=\([-0-9]*\).*/motecst("\1", \2);/' | tr _ - >>conf.mt
! else
!   grep '^CST ' vm.vmdf | sed -e 's/^CST \([-a-zA-Z_0-9$_?!]*\)=\([-0-9]*\).*/motecst("\1", \2);/' >>conf.mt
!   echo 'motecst("true", 1);' >>conf.mt
!   echo 'motecst("false", 0);' >>conf.mt
!   echo 'motecst("null", null);' >>conf.mt
! fi
! 
! # value representation
  if test $float -eq 0; then
    echo "value_size = 4;" >>conf.mt
***************
*** 36,38 ****
    echo "any new_mate_state = new_imate_state;" >>conf.mt
  fi
- 
--- 47,48 ----