merge

util/regress

@@ -41,7 +41,7 @@ optparser.add_option('-v', '--verbose', dest='verbose', action='store_true',
                      help='echo commands before executing')
 optparser.add_option('--builds', dest='builds',
                      default='ALPHA_SE,ALPHA_FS,MIPS_SE,' + \
-                     'SPARC_SE,SPARC_FS,X86_SE,ARM_SE',
+                     'POWER_SE,SPARC_SE,SPARC_FS,X86_SE,ARM_SE',
                      help='comma-separated list of build targets to test  '
                      " (default: '%default')" )
 optparser.add_option('--variants', dest='variants',

util/rundiff

@@ -166,7 +166,11 @@ sub printdiff
     # Set $postcontext to print the next $postcontext_lines matching lines.
     $postcontext = $postcontext_lines;
 
-    STDOUT->flush();
+    # Normally we flush after the postcontext lines are printed, but if
+    # the user has decreed that there aren't any we need to flush now
+    if ($postcontext == 0) {
+        STDOUT->flush();
+    }
 }
 
 
@@ -291,10 +295,12 @@ while (1) {
 	# figure out what to do with this line
 	if ($postcontext > 0) {
 	    # we're in the post-context of a diff: print it
-	    $postcontext--;
 	    print ' ', $l1;
 	    $lineno1++;
 	    $lineno2++;
+            if (--$postcontext == 0) {
+                STDOUT->flush();
+            }
 	}
 	else {
 	    # we're in the middle of a matching region... save this

util/slicc

@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+# Copyright (c) 2009 The Hewlett-Packard Development Company
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met: redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer;
+# redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution;
+# neither the name of the copyright holders nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+if __name__ == "__main__":
+    import sys
+    from os.path import dirname, join
+
+    base = dirname(__file__)
+    sys.path.insert(1, join(base, "../src/mem"))
+    sys.path.insert(1, join(base, "../src/python"))
+    sys.path.insert(1, join(base, "../ext/ply"))
+
+    import slicc.main
+    slicc.main.main()