21 files changed, 57 insertions, 62 deletions
diff --git a/testsuite/buildok/context_test.stp b/testsuite/buildok/context_test.stp
index c732999d..36bf8ca6 100755
--- a/testsuite/buildok/context_test.stp
+++ b/testsuite/buildok/context_test.stp
@@ -9,14 +9,14 @@ function print_stuff () {
 	print_stack(bt)
 	print("\n\n")
 	log("execname is \"" . execname() . "\"")
-	log("pid is " . string(pid()))
-	log("tid is " . string(tid()))
+	log("pid is " . sprint(pid()))
+	log("tid is " . sprint(tid()))
 	log("pexecname is \"" . pexecname() . "\"")
-	log("ppid is " . string(ppid()))
-	log("uid is " . string(uid()))
-	log("euid is " . string(euid()))
-	log("gid is " . string(gid()))
-	log("egid is " . string(egid()))
+	log("ppid is " . sprint(ppid()))
+	log("uid is " . sprint(uid()))
+	log("euid is " . sprint(euid()))
+	log("gid is " . sprint(gid()))
+	log("egid is " . sprint(egid()))
 	log("pp is '" . pp() . "'")
 }
 
diff --git a/testsuite/buildok/fifteen.stp b/testsuite/buildok/fifteen.stp
index bf4e0af3..cda79805 100755
--- a/testsuite/buildok/fifteen.stp
+++ b/testsuite/buildok/fifteen.stp
@@ -24,8 +24,8 @@ probe kernel.function("schedule")
 probe end
 {
         log("systemtap ending probe")
-        log("count = " . string(count));
-        log("count2 = " . string(count));
+        log("count = " . sprint(count));
+        log("count2 = " . sprint(count));
         if ( count == count2) {
                 if ( (count-1) == count2 ) {
                         log("systemtap test failure");
diff --git a/testsuite/buildok/fourteen.stp b/testsuite/buildok/fourteen.stp
index b7f68afe..8eab2480 100755
--- a/testsuite/buildok/fourteen.stp
+++ b/testsuite/buildok/fourteen.stp
@@ -6,4 +6,4 @@ probe timer.jiffies(100).randomize(100) { j++ }
 probe timer.ms(100) { i++ }
 probe timer.ms(100).randomize(100) { j++ }
 probe timer.profile { i++ }
-probe end { log ("i=" . string(i) . " j=" . string(j)) }
+probe end { printf("i=%d j=%d\n", i, j) }
diff --git a/testsuite/buildok/nineteen.stp b/testsuite/buildok/nineteen.stp
index be12b6f7..2019e209 100755
--- a/testsuite/buildok/nineteen.stp
+++ b/testsuite/buildok/nineteen.stp
@@ -9,13 +9,13 @@ function msg2 (x,y) {
 
 probe begin {
         msg1("55");
-        msg1(string(55))
+        msg1(sprint(55))
 
         msg2("100", "GOOD")
-        msg2("GOOD", string(100))
+        msg2("GOOD", sprint(100))
 
 # the next line caused a compile failure when uncommented; PR 1335
-        msg2(string(100), "GOOD")
+        msg2(sprint(100), "GOOD")
 
         exit()
 }
diff --git a/testsuite/buildok/process_test.stp b/testsuite/buildok/process_test.stp
index c925980d..8da45378 100755
--- a/testsuite/buildok/process_test.stp
+++ b/testsuite/buildok/process_test.stp
@@ -2,7 +2,7 @@
 
 probe process.create {
   log(pp())
-  log(string(task))
+  log(sprint(task))
 }
 
 probe process.start {
@@ -16,25 +16,25 @@ probe process.exec {
 
 probe process.exec.complete {
   log(pp())
-  log(string(errno))
-  log(string(success))
+  log(sprint(errno))
+  log(sprint(success))
 }
 
 probe process.exit {
   log(pp())
-  log(string(code))
+  log(sprint(code))
 }
 
 probe process.release {
   log(pp())
-  log(string(task))
+  log(sprint(task))
 }
 
 probe process.signal.send {
   log(pp())
-  log(string(signal))
+  log(sprint(signal))
   log(signal_name)
-  log(string(task))
-  log(string(shared))
+  log(sprint(task))
+  log(sprint(shared))
 }
 
diff --git a/testsuite/buildok/seven.stp b/testsuite/buildok/seven.stp
index 2ac6bcd7..25508b61 100755
--- a/testsuite/buildok/seven.stp
+++ b/testsuite/buildok/seven.stp
@@ -8,16 +8,16 @@
 
 probe kernel.function("find_pid") 
 {
-  log ("find_pid (" . string($type) . ","
-                    . string($nr) . ")")
+  log ("find_pid (" . sprint($type) . ","
+                    . sprint($nr) . ")")
 }
 
 # second: opaque pointers and enums
 
 probe kernel.function("detach_pid") 
 {
-  log ("detach_pid (" . hexstring($task) . ","
-              	      . string($type) . ")")
+  log ("detach_pid (" . sprintf("0x%x", $task) . ","
+              	      . sprint($type) . ")")
 }
 
 
diff --git a/testsuite/buildok/seventeen.stp b/testsuite/buildok/seventeen.stp
index 6ac87815..9adffa48 100755
--- a/testsuite/buildok/seventeen.stp
+++ b/testsuite/buildok/seventeen.stp
@@ -5,5 +5,5 @@
 
 probe kernel.function("pipe_write")
 {
-	log (hexstring ($write_fifo_fops->llseek))
+	printf("0x%x\n", $write_fifo_fops->llseek)
 }
diff --git a/testsuite/buildok/sixteen.stp b/testsuite/buildok/sixteen.stp
index 26932b8e..0e313fa8 100755
--- a/testsuite/buildok/sixteen.stp
+++ b/testsuite/buildok/sixteen.stp
@@ -13,7 +13,7 @@ probe begin {
   foreach (k in a) {
     log (a[k])
     for (i=0; i<10; i++) {
-      log ("k=" . string(k) . " i=" . string(i))
+      printf("k=%d i=%d\n", k, i)
       if (k % (i+1)) break else continue
     }
     if (k % 3) { foo() ; next }
diff --git a/testsuite/buildok/task_test.stp b/testsuite/buildok/task_test.stp
index 692745f7..17fa7fb3 100755
--- a/testsuite/buildok/task_test.stp
+++ b/testsuite/buildok/task_test.stp
@@ -2,17 +2,17 @@
 
 probe begin {
   c = task_current()
-  log(string(task_parent(c)))
-  log(string(task_state(c)))
+  log(sprint(task_parent(c)))
+  log(sprint(task_state(c)))
   log(task_execname(c))
-  log(string(task_pid(c)))
-  log(string(task_tid(c)))
-  log(string(task_gid(c)))
-  log(string(task_egid(c)))
-  log(string(task_uid(c)))
-  log(string(task_euid(c)))
-  log(string(task_prio(c)))
-  log(string(task_nice(c)))
-  log(string(task_cpu(c)))
+  log(sprint(task_pid(c)))
+  log(sprint(task_tid(c)))
+  log(sprint(task_gid(c)))
+  log(sprint(task_egid(c)))
+  log(sprint(task_uid(c)))
+  log(sprint(task_euid(c)))
+  log(sprint(task_prio(c)))
+  log(sprint(task_nice(c)))
+  log(sprint(task_cpu(c)))
   exit()
 }
diff --git a/testsuite/buildok/thirteen.stp b/testsuite/buildok/thirteen.stp
index 1113913e..4dffc4b9 100755
--- a/testsuite/buildok/thirteen.stp
+++ b/testsuite/buildok/thirteen.stp
@@ -2,5 +2,5 @@
 
 probe kernel.function("sys_read")
 {
- log ("count=" . string($count))
+ printf ("count=%d\n", $count)
 }
diff --git a/testsuite/buildok/timestamp.stp b/testsuite/buildok/timestamp.stp
index f273262f..e071e781 100755
--- a/testsuite/buildok/timestamp.stp
+++ b/testsuite/buildok/timestamp.stp
@@ -1,6 +1,6 @@
 #! stap -p4
 
 probe begin {
-  log(string(get_cycles() + gettimeofday_us() +
+  log(sprint(get_cycles() + gettimeofday_us() +
              gettimeofday_ms() + gettimeofday_s()))
 }
diff --git a/testsuite/buildok/twentyone.stp b/testsuite/buildok/twentyone.stp
index 052c3a17..367dfe73 100755
--- a/testsuite/buildok/twentyone.stp
+++ b/testsuite/buildok/twentyone.stp
@@ -14,14 +14,14 @@ probe begin {
 
 probe end {
   log ("x+ in a")
-  foreach (x+ in a) log ("a[" . string(x) . "]=" . string(a[x]))
+  foreach (x+ in a) log ("a[" . sprint(x) . "]=" . sprint(a[x]))
 
   log ("x- in a")
-  foreach (x- in a) log ("a[" . string(x) . "]=" . string(a[x]))
+  foreach (x- in a) log ("a[" . sprint(x) . "]=" . sprint(a[x]))
 
   log ("x in a+")
-  foreach (x in a+) log ("a[" . string(x) . "]=" . string(a[x]))
+  foreach (x in a+) log ("a[" . sprint(x) . "]=" . sprint(a[x]))
 
   log ("x in a-")
-  foreach (x in a-) log ("a[" . string(x) . "]=" . string(a[x]))
+  foreach (x in a-) log ("a[" . sprint(x) . "]=" . sprint(a[x]))
 }
diff --git a/testsuite/buildok/twentythree.stp b/testsuite/buildok/twentythree.stp
index 95a6f071..4aebe7bc 100755
--- a/testsuite/buildok/twentythree.stp
+++ b/testsuite/buildok/twentythree.stp
@@ -5,5 +5,5 @@
 probe kernel.function("free_task")
 {
 	$tsk->timestamp = 22;
-	log("set to 22 => " . string($tsk->timestamp));
+	printf("set to 22 => %d\n", $tsk->timestamp);
 }
diff --git a/testsuite/buildok/twentytwo.stp b/testsuite/buildok/twentytwo.stp
index fa45f312..88a0b57b 100755
--- a/testsuite/buildok/twentytwo.stp
+++ b/testsuite/buildok/twentytwo.stp
@@ -4,10 +4,10 @@
 
 probe kernel.function("free_task")
 {
-	log("timestamp " . string($tsk->timestamp))
+	printf("timestamp %d\n", $tsk->timestamp)
 }
 
 probe kernel.function("vfs_llseek")
 { 
-	log("offset " . string($offset))
+	printf("offset %d\n", $offset)
 }
diff --git a/testsuite/parseok/three.stp b/testsuite/parseok/three.stp
index a1992b5e..e1158fea 100755
--- a/testsuite/parseok/three.stp
+++ b/testsuite/parseok/three.stp
@@ -3,6 +3,6 @@
 probe syscall ("foo")
 {
   $a = a$a = a$a$ = 0;
-  string = "a" . $a . "b";
+  str = "a" . $a . "b";
 }
 
diff --git a/testsuite/parseok/two.stp b/testsuite/parseok/two.stp
index d18dd3e3..884e285d 100755
--- a/testsuite/parseok/two.stp
+++ b/testsuite/parseok/two.stp
@@ -3,7 +3,7 @@
 probe syscall (231)
 {
   array[idx] <<< value;
-  if (global > 5) { global -- } else ;
+  if (gbl > 5) { gbl -- } else ;
 }
 
 function foo () {
diff --git a/testsuite/semko/nineteen.stp b/testsuite/semko/nineteen.stp
index bd8a4129..8f95d76b 100755
--- a/testsuite/semko/nineteen.stp
+++ b/testsuite/semko/nineteen.stp
@@ -4,5 +4,5 @@
 # the inlines.
 
 probe kernel.function("context_switch") {
-  log ("switch from=" . hexstring($prev) . " to=" . hexstring($next))
+  printf("switch from=0x%x to=0x%x\n", $prev, $next)
 }
diff --git a/testsuite/semok/args.stp b/testsuite/semok/args.stp
index 00475625..98112088 100755
--- a/testsuite/semok/args.stp
+++ b/testsuite/semok/args.stp
@@ -1,3 +1,3 @@
 #! /bin/sh
 
-./stap -p2 -e 'probe begin { log (@1 . string($2)) }' hello 0xdeadbeef
+./stap -p2 -e 'probe begin { log (@1 . sprint($2)) }' hello 0xdeadbeef
diff --git a/testsuite/semok/eleven.stp b/testsuite/semok/eleven.stp
index e5e3c01c..93550bd5 100755
--- a/testsuite/semok/eleven.stp
+++ b/testsuite/semok/eleven.stp
@@ -3,8 +3,6 @@
 global entry_time, my_count, my_fd, read_times
 
 # future built-ins
-function string (v) { return "" }
-function hexstring (v) { return "" }
 function trace (s) { return 0 }
 
 global tid
@@ -16,8 +14,8 @@ probe begin /* kernel.function("read") */ {
       entry_time[tid] = timestamp # "macro" variable
       my_count[tid] = count # function argument
       my_fd[tid] = fd # function argument
-      trace ("my_count = " . string(my_count[tid]) .
-             "my_fd = " . string(my_fd[tid]))
+      trace ("my_count = " . sprint(my_count[tid]) .
+             "my_fd = " . sprint(my_fd[tid]))
 }
 
 probe end /* kernel.function("read").return */ {
@@ -30,13 +28,13 @@ probe end /* kernel.function("read").return */ {
       }
       trace ("syscall " . (syscall_name) .
              " return value = " .
-             hexstring (retvalue))  # function pseudo-argument
+             sprintf ("0x%x", retvalue))  # function pseudo-argument
 }
 
 probe end {
       foreach (syscall in read_times) {
           trace ("syscall " . syscall .
-                 " total-time=" . string (read_times[syscall]))
+                 " total-time=" . sprint (read_times[syscall]))
       }
 }
 
diff --git a/testsuite/semok/seven.stp b/testsuite/semok/seven.stp
index f0b248bd..2ceed4e8 100755
--- a/testsuite/semok/seven.stp
+++ b/testsuite/semok/seven.stp
@@ -2,7 +2,6 @@
 
 global ar1, ar2
 
-function string:string (v:long) { } # to become a built-in
 function printk (s:string) { return 0 } # to become a built-in
 
 function search (key) 
@@ -18,7 +17,7 @@ probe begin /* syscall("zamboni") */
   tgid=0
   pid=0
   tid=0
-  ar2[tid] = string (tgid);
+  ar2[tid] = sprint (tgid);
   search (pid)
 }
 
@@ -26,5 +25,5 @@ probe end
 {
   # for (key in ar2)
   if (key in ar2)
-    printk ("this: " . string (key) . " was " . ar2[key])
+    printk ("this: " . sprint (key) . " was " . ar2[key])
 }
diff --git a/testsuite/transko/two.stp b/testsuite/transko/two.stp
index 5185281a..1ada54a3 100755
--- a/testsuite/transko/two.stp
+++ b/testsuite/transko/two.stp
@@ -1,7 +1,6 @@
 #! stap -p3
 
 function bar () {
-  next
   return 0
 }
 
@@ -9,5 +8,4 @@ probe end {
   break
   for (a=0; a<10; a=a+1) for (b=0; b<10; b=b+1) ;
   continue
-  return 0
 }