Differences From:

File tools/cvs2fossil/lib/c2f_psym.tcl part of check-in [66235f2430] - Updated the copyright information of all files touched in the new year. by aku on 2008-02-06 05:04:12. Also file tools/cvs2fossil/lib/c2f_psym.tcl part of check-in [6b78df3861] - Merge in changes from Andreas's branch. by drh on 2008-02-08 21:52:21. [view]

To:

File tools/cvs2fossil/lib/c2f_psym.tcl part of check-in [f637d42206] - Updated my notes regarding memory usage. Converted more locations to incremental query processing via 'state foreachrow', now throughout the importer. by aku on 2008-02-24 18:01:40. [view]

@@ -250,11 +250,11 @@
 				     # specifying which symbols to
 				     # force to specific types.
 
     typemethod getsymtypes {} {
-	foreach {tid name} [state run {
+	state foreachrow {
 	    SELECT tid, name FROM symtype;
-	}] { set mysymtype($tid) $name }
+	} { set mysymtype($tid) $name }
 	return
     }
 
     # Keep the codes below in sync with 'pass::collrev/setup('symtype').
@@ -300,16 +300,17 @@
 
 	set fmt %[string length $mynum]s
 	set all 0
 
-	foreach {stype splural n} [state run {
-	    SELECT T.name, T.plural, COUNT (s.sid)
+	state foreachrow {
+	    SELECT T.name        AS stype,
+	           T.plural      AS splural,
+	           COUNT (s.sid) AS n
 	    FROM symbol S, symtype T
 	    WHERE S.type = T.tid
 	    GROUP BY T.name
 	    ORDER BY T.name
-	    ;
-	}] {
+	} {
 	    log write 2 symbol "* [format $fmt $n] [sp $n $stype $splural]"
 	    incr all $n
 	}
 
@@ -392,11 +393,10 @@
 
 	# This is stored directly into the database.
 	state run {
 	    UPDATE symbol
-	    SET type = $chosen
-	    WHERE sid = $myid
-	    ;
+	    SET    type = $chosen
+	    WHERE  sid  = $myid
 	}
 	return
     }