# HG changeset patch
# User Mike Kinghan <mikek@symbian.org>
# Date 1277139907 -3600
# Node ID 949d0e782de18a9af6e9817f4923baea2653eed8
# Parent  abc8110ed7af9afded758283b2d5aa6b2923b2ce
Make armasm2as.pl handle parentheses in macro IF conditions - Bug 3054

diff -r abc8110ed7af -r 949d0e782de1 sbsv1_os/e32toolp/e32util/armasm2as.pl
--- a/sbsv1_os/e32toolp/e32util/armasm2as.pl	Fri Jun 11 16:27:38 2010 +0100
+++ b/sbsv1_os/e32toolp/e32util/armasm2as.pl	Mon Jun 21 18:05:07 2010 +0100
@@ -9,6 +9,7 @@
 # Nokia Corporation - initial contribution.
 #
 # Contributors:
+# Mike Kinghan, mikek@symbian.org, for Symbian Foundation
 #
 # Description:
 # e32toolp\e32util\armasm2as.pl
@@ -288,7 +289,8 @@
 	$val =~ s/\{TRUE\}/(1)/g;
 	$val =~ s/\{FALSE\}/(0)/g;
 
-	my @lops = split( /(\s*\:LAND\:\s*|\s*\:LOR\:\s*|\s*\:LNOT\:\s*|\s*\:DEF\:\s*)/, $val );
+	my @lops = split( /(\s*\:LAND\:\s*|\s*\:LOR\:\s*|\s*\:LNOT\:\s*|\s*\:DEF\:\s*|\s*\(\s*|\s*\)\s*)/, $val );
+	my @lops2;
 	foreach (@lops) {
 		s/\s*\:LAND\:\s*/\:LAND\:/go;
 		s/\s*\:LOR\:\s*/\:LOR\:/go;
@@ -306,7 +308,7 @@
 				push @$outref, "\t.ifdef $sym\n\t.set __defined__$sym, 1\n\t.else\n\t.set __defined__$sym, 0\n\t.endif\n";
 				push @lops2, " __defined__$sym ";
 			} else {
-				die "Bad :DEF: operand\n";
+				die "Bad :DEF: operand $sym\n";
 			}
 		} elsif ($x eq ':LAND:') {
 			push @lops2, ' && ';