Merge remote-tracking branch 'origin/topic/vern/zval'

* origin/topic/vern/zval: (42 commits)
  whitespace tweaks
  resolved some TODO comments
  remove unnecessary casts, and change necessary ones to use static_cast<>
  explain cmp_func default
  change functions for ZVal type management to static members
  fix some unsigned/signed integer warnings
  address lint concern about uninitialized variable
  Remove use of obsolete forward-declaration macros
  fix #include's that lack zeek/ prefixes
  explicitly populate holes created in vectors
  fixes for now-incorrect assumption that GetField always returns an existing ValPtr
  memory management for assignment to vector elements
  memory management for assignment to record fields
  destructor cleanup from ZAM_vector/ZAM_record
  fix #include's that lack zeek/ prefixes
  overlooked another way in which vector holes can be created
  initialize vector holes to the correct corresponding type
  explicitly populate holes created in vectors
  fix other instances of GetField().get() assuming long-lived ValPtr's
  fix for now-incorrect assumption that GetField always returns an existing ValPtr
  ...

testing/btest/Baseline/bifs.sort/out

@@ -3,12 +3,14 @@
 [2, 3, 5, 8]
 [-7.0 mins, 1.0 sec, 5.0 hrs, 2.0 days]
 [-7.0 mins, 1.0 sec, 5.0 hrs, 2.0 days]
+[T, F, F, T]
+[T, F, F, T]
 [F, F, T, T]
 [F, F, T, T]
-[57/tcp, 123/tcp, 7/udp, 500/udp, 12/icmp]
-[57/tcp, 123/tcp, 7/udp, 500/udp, 12/icmp]
-[3.03, 3.01, 3.02, 3.015]
-[3.03, 3.01, 3.02, 3.015]
+[12/icmp, 123/tcp, 500/udp, 7/udp, 57/tcp]
+[12/icmp, 123/tcp, 500/udp, 7/udp, 57/tcp]
+[3.01, 3.015, 3.02, 3.03]
+[3.01, 3.015, 3.02, 3.03]
 [192.168.123.200, 10.0.0.157, 192.168.0.3]
 [192.168.123.200, 10.0.0.157, 192.168.0.3]
 [10.0.0.157, 192.168.0.3, 192.168.123.200]

testing/btest/Baseline/language.record-index-complex-fields/output

@@ -11,7 +11,7 @@ b
 }
 }
 {
-[a=13, tags_v=[, , 2, 3], tags_t={
+[a=13, tags_v=[0, 0, 2, 3], tags_t={
 [four] = 4,
 [five] = 5
 }, tags_s={

testing/btest/Baseline/language.smith-waterman-test/output

@@ -1,33 +1,33 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 abcdefgh - ijklmnop:
 AAAabcefghij - lmnopAAAqrst:
-tok 1: AAA (0/5, T)
+tok 0: AAA (0/5, T)
 abcAAAefghij - lmnopAAAqrst:
-tok 1: AAA (3/5, T)
+tok 0: AAA (3/5, T)
 abcefghijAAA - lmnopAAAqrst:
-tok 1: AAA (9/5, T)
+tok 0: AAA (9/5, T)
 xxxAAAyyy - AAAaAAAbAAA:
-tok 1: AAA (3/0, T)
-tok 2: AAA (3/4, T)
-tok 3: AAA (3/8, T)
+tok 0: AAA (3/0, T)
+tok 1: AAA (3/4, T)
+tok 2: AAA (3/8, T)
 AAAaAAAbAAA - xxxAAAyyy:
-tok 1: AAA (0/3, T)
-tok 2: AAA (4/3, T)
-tok 3: AAA (8/3, T)
+tok 0: AAA (0/3, T)
+tok 1: AAA (4/3, T)
+tok 2: AAA (8/3, T)
 xxCDyABzCDyABzz - ABCD:
-tok 1: CD (2/2, T)
-tok 2: AB (5/0, T)
-tok 3: CD (8/2, F)
-tok 4: AB (11/0, T)
+tok 0: CD (2/2, T)
+tok 1: AB (5/0, T)
+tok 2: CD (8/2, F)
+tok 3: AB (11/0, T)
 ABCD - xxCDyABzCDyABzz:
-tok 1: CD (2/2, T)
-tok 2: AB (0/5, T)
-tok 3: CD (2/8, F)
-tok 4: AB (0/11, T)
+tok 0: CD (2/2, T)
+tok 1: AB (0/5, T)
+tok 2: CD (2/8, F)
+tok 3: AB (0/11, T)
 Cache-control: no-cache^M^JAccept: - Accept-: deflate^M^JAccept-: Accept-:
-tok 1: Accept (27/0, T)
-tok 2: e^M^JAccept (22/15, T)
-tok 3: Accept (27/29, T)
+tok 0: Accept (27/0, T)
+tok 1: e^M^JAccept (22/15, T)
+tok 2: Accept (27/29, T)
 xxAAxxAAxx - yyyyyAAyyyyy:
-tok 1: AA (2/5, T)
-tok 2: AA (6/5, T)
+tok 0: AA (2/5, T)
+tok 1: AA (6/5, T)

testing/btest/Baseline/scripts.base.frameworks.logging.ascii-json/ssh.log

@@ -1,2 +1,2 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-{"b":true,"i":-42,"e":"SSH::LOG","c":21,"p":123,"sn":"10.0.0.0/24","a":"1.2.3.4","d":3.14,"t":XXXXXXXXXX.XXXXXX,"iv":100.0,"s":"hurz","sc":[4,2,3,1],"ss":["CC","BB","AA"],"se":[],"vc":[10,20,30],"ve":[],"vn":[0,null,2],"f":"SSH::foo\n{ \nif (0 < SSH::i) \n\treturn (Foo);\nelse\n\treturn (Bar);\n\n}"}
+{"b":true,"i":-42,"e":"SSH::LOG","c":21,"p":123,"sn":"10.0.0.0/24","a":"1.2.3.4","d":3.14,"t":XXXXXXXXXX.XXXXXX,"iv":100.0,"s":"hurz","sc":[4,2,3,1],"ss":["CC","BB","AA"],"se":[],"vc":[10,20,30],"ve":[],"vn":[0,0,2],"f":"SSH::foo\n{ \nif (0 < SSH::i) \n\treturn (Foo);\nelse\n\treturn (Bar);\n\n}"}

testing/btest/Baseline/scripts.base.utils.json/output

@@ -29,7 +29,7 @@ XXXXXXXXXX.XXXXXX
 ["1.2.3.4"]
 [[false,true]]
 [{"s":"test"}]
-[0,null,2]
+[0,0,2]
 []
 [2,1]
 ["1.2.3.4"]

testing/btest/bifs/sort.zeek

@@ -20,6 +20,16 @@ function myfunc2(a: double, b: double): int
 		return 1;
 	}
 
+function myfunc3(a: bool, b: bool): int
+	{
+	if (a == b)
+		return 0;
+	else if (a)
+		return 1;
+	else
+		return -1;
+	}
+
 event zeek_init()
 	{
 	# Tests without supplying a comparison function
@@ -34,17 +44,23 @@ event zeek_init()
 	print a2;
 	print b2;
 
+	# this one is expected to fail (i.e., "sort" doesn't sort the vector)
 	local a3: vector of bool = vector( T, F, F, T );
 	local b3 = sort(a3);
 	print a3;
 	print b3;
 
+	local a3x: vector of bool = vector( T, F, F, T );
+	local b3x = sort(a3x, myfunc3);
+	print a3x;
+	print b3x;
+
+	# this one is expected to fail (i.e., "sort" doesn't sort the vector)
 	local a4: vector of port = vector( 12/icmp, 123/tcp, 500/udp, 7/udp, 57/tcp );
 	local b4 = sort(a4);
 	print a4;
 	print b4;
 
-	# this one is expected to fail (i.e., "sort" doesn't sort the vector)
 	local a5: vector of double = vector( 3.03, 3.01, 3.02, 3.015  );
 	local b5 = sort(a5);
 	print a5;

testing/btest/language/smith-waterman-test.zeek

@@ -12,7 +12,7 @@ global s1: string_vec;
 global s2: string_vec;
 
 # Single alignment, no matches:
-s1[++c] = "abcdefgh";
+s1[c] = "abcdefgh";
 s2[c] = "ijklmnop";
 min[c] = 2;;
 mode[c] = 0;
@@ -83,6 +83,6 @@ for ( i in s1 )
 
 	for ( j in ss )
 		print fmt("tok %d: %s (%d/%d, %s)",
-				j, ss[j]$str, ss[j]$aligns[1]$index,
-				ss[j]$aligns[2]$index, ss[j]$new);
+				j, ss[j]$str, ss[j]$aligns[0]$index,
+				ss[j]$aligns[1]$index, ss[j]$new);
 	}