[Tinyos-commits] CVS: tinyos-1.x/tos/lib/VM/languages/tinysql/src lex.mll, 1.1, 1.2 parse.mly, 1.1, 1.2 sql.mli, 1.1, 1.2 sqlgen.ml, 1.1, 1.2 tinysql.in, 1.2, 1.3

[David Gay]

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

Modified Files:
	lex.mll parse.mly sql.mli sqlgen.ml tinysql.in 
Log Message:
copyright notices (yeah!)
misc minor bug fixes
move tsql.vmsf TinySQL VM to TinySQL directory


Index: lex.mll
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/tinysql/src/lex.mll,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** lex.mll	30 Oct 2005 18:23:49 -0000	1.1
--- lex.mll	1 Nov 2005 02:28:11 -0000	1.2
***************
*** 1,2 ****
--- 1,11 ----
+ (*
+  * Copyright (c) 2004-2005 Intel Corporation
+  * All rights reserved.
+  *
+  * This file is distributed under the terms in the attached INTEL-LICENSE     
+  * file. If you do not find these files, copies can be found by writing to
+  * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, 
+  * 94704.  Attention:  Intel License Inquiry.
+  *)
  {
  open Parse

Index: parse.mly
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/tinysql/src/parse.mly,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** parse.mly	30 Oct 2005 18:23:49 -0000	1.1
--- parse.mly	1 Nov 2005 02:28:11 -0000	1.2
***************
*** 1,3 ****
--- 1,12 ----
  %{
+ (*
+  * Copyright (c) 2004-2005 Intel Corporation
+  * All rights reserved.
+  *
+  * This file is distributed under the terms in the attached INTEL-LICENSE     
+  * file. If you do not find these files, copies can be found by writing to
+  * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, 
+  * 94704.  Attention:  Intel License Inquiry.
+  *)
  open Sql
  let newopname = 

Index: sql.mli
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/tinysql/src/sql.mli,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sql.mli	30 Oct 2005 18:23:49 -0000	1.1
--- sql.mli	1 Nov 2005 02:28:11 -0000	1.2
***************
*** 1,2 ****
--- 1,11 ----
+ (*
+  * Copyright (c) 2004-2005 Intel Corporation
+  * All rights reserved.
+  *
+  * This file is distributed under the terms in the attached INTEL-LICENSE     
+  * file. If you do not find these files, copies can be found by writing to
+  * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, 
+  * 94704.  Attention:  Intel License Inquiry.
+  *)
  type 
    value = Attribute of string | 

Index: sqlgen.ml
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/tinysql/src/sqlgen.ml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sqlgen.ml	30 Oct 2005 18:23:49 -0000	1.1
--- sqlgen.ml	1 Nov 2005 02:28:11 -0000	1.2
***************
*** 1,2 ****
--- 1,11 ----
+ (*
+  * Copyright (c) 2004-2005 Intel Corporation
+  * All rights reserved.
+  *
+  * This file is distributed under the terms in the attached INTEL-LICENSE     
+  * file. If you do not find these files, copies can be found by writing to
+  * Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, 
+  * 94704.  Attention:  Intel License Inquiry.
+  *)
  open Sql
  open List

Index: tinysql.in
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/tinysql/src/tinysql.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tinysql.in	30 Oct 2005 20:54:05 -0000	1.2
--- tinysql.in	1 Nov 2005 02:28:11 -0000	1.3
***************
*** 1,3 ****
--- 1,12 ----
  #!@pathperl@
+ #
+ # Copyright (c) 2004-2005 Intel Corporation
+ # All rights reserved.
+ #
+ # This file is distributed under the terms in the attached INTEL-LICENSE     
+ # file. If you do not find these files, copies can be found by writing to
+ # Intel Research Berkeley, 2150 Shattuck Avenue, Suite 1300, Berkeley, CA, 
+ # 94704.  Attention:  Intel License Inquiry.
+ 
  
  use Socket;
***************
*** 108,113 ****
  if ($log) {
      $schema = current_schema();
-     print "#SCHEMA: epoch, $schema\n";
      exit 1 if !$schema;
      tsqllog($schema);
  }
--- 117,123 ----
  if ($log) {
      $schema = current_schema();
      exit 1 if !$schema;
+     $schema = "epoch $schema";
+     print "#SCHEMA: $schema\n";
      tsqllog($schema);
  }
***************
*** 185,196 ****
      for (;;) {
  	my $packet = sf_recv(BASE, undef);
! 	my ($dest, $amid, $group, $length, $msg) = unpack_message $packet;
  	my $offset;
  
  	if ($amid == 0x2b || $amid == 0x2c) {
! 	    $offset = 12;
  	}
  	elsif ($amid == 0x2a) {
! 	    $offset = 5;
  	}
  	else {
--- 195,206 ----
      for (;;) {
  	my $packet = sf_recv(BASE, undef);
! 	my ($dest, $amid, $group, $length, $msg) = unpack_message($packet);
  	my $offset;
  
  	if ($amid == 0x2b || $amid == 0x2c) {
! 	    $offset = 7;
  	}
  	elsif ($amid == 0x2a) {
! 	    $offset = 0;
  	}
  	else {
***************
*** 201,205 ****
  	    next;
  	}
! 	my @fields = unpack ("v" x ($#schema + 1), substr $msg, $offset);
  	print join(" ", @fields);
  	print "\n";
--- 211,215 ----
  	    next;
  	}
! 	my @fields = unpack ("v" x ($#schema + 1), substr($msg, $offset));
  	print join(" ", @fields);
  	print "\n";
***************
*** 220,224 ****
      my ($msg) = @_;
  
!     return unpack "vCCCC*", $msg;
  }
  
--- 230,234 ----
      my ($msg) = @_;
  
!     return unpack "vCCCa*", $msg;
  }