X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=36.pl;h=a94e60b1a9eb72d90e3c1651b77616f56910815d;hb=7a9b53e9740a2be6eac4410c791a6100a116ac3c;hp=68eb4f95dc33626fb93fd8d5918d7fc797f22442;hpb=ad27dd52fd6e2e560706e17376bdf609e9bcc8a1;p=aoc2020.git

diff --git a/36.pl b/36.pl
index 68eb4f9..a94e60b 100755
--- a/36.pl
+++ b/36.pl
@@ -4,13 +4,12 @@ use strict;
 
 my $sum = 0;
 while (<>) {
-	chomp;
+	s/\s//g;
+	$_ = "($_)";
 	1 while
 		s/\((\d+)\)/$1/ ||
-		s/(\([^\(\)]*?)(\d+)\s*\+\s*(\d+)([^\(\)]*\))/$1.($2+$3).$4/e ||
-		s/(\([^\(\)]*?)(\d+)\s*\*\s*(\d+)([^\(\)]*\))/$1.($2*$3).$4/e ||
-		s/(\d+)\s*([\+])\s*(\d+)/"$1$2$3"/ee ||
-		s/(\d+)\s*([\*])\s*(\d+)/"$1$2$3"/ee;
+		s/(\([^\(\)]*?)(\d+)\+(\d+)([^\(\)]*\))/$1.($2+$3).$4/e ||
+		s/(\([^\(\)]*?)(\d+)\*(\d+)([^\(\)]*\))/$1.($2*$3).$4/e;
 	$sum += $_;
 }
 print "sum=$sum\n";