From fb8a5f1d1d55ec2db68a2c39c3348fe03b889113 Mon Sep 17 00:00:00 2001 From: Alex Lin Date: Fri, 1 Apr 2016 21:30:50 -0400 Subject: [PATCH] Perl warning about unescaped left curly bracket Found the unescaped "{" and put a blashslash in front of them. refs #213 --- libexec/trick/pm/get_lib_deps.pm | 2 +- libexec/trick/pm/parse_s_define.pm | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libexec/trick/pm/get_lib_deps.pm b/libexec/trick/pm/get_lib_deps.pm index 9209d8c1..489fdc77 100644 --- a/libexec/trick/pm/get_lib_deps.pm +++ b/libexec/trick/pm/get_lib_deps.pm @@ -46,7 +46,7 @@ sub get_lib_deps ($$) { foreach my $l (@lib_list) { my $found = 0 ; $l =~ s/\(|\)|\s+//g ; - $l =~ s/\${(.+?)}/$ENV{$1}/eg ; + $l =~ s/\$\{(.+?)\}/$ENV{$1}/eg ; next if ( $l eq "" ) ; if ( $l =~ /\.a$/ ) { diff --git a/libexec/trick/pm/parse_s_define.pm b/libexec/trick/pm/parse_s_define.pm index f47bc7ca..4ac8f9d1 100644 --- a/libexec/trick/pm/parse_s_define.pm +++ b/libexec/trick/pm/parse_s_define.pm @@ -79,9 +79,9 @@ $vcollect_def = qr/ \s* (?:.*?) # Optional constructor \s* - {\s* # entry + \{\s* # entry (?:.*?) # item list - \s*}\s*; # end args + \s*\}\s*; # end args /sx ; $compiler_directive_def = qr/ @@ -143,9 +143,9 @@ $job_class_order_def = qr/ /sx ; $user_code_def = qr/ - %{\s* + %\{\s* .*? - %} + %\} /sx ; $user_header_def = qr/ @@ -461,7 +461,7 @@ sub handle_user_code ($$) { trick_print($$sim_ref{fh}, "User code: $u\n" , "debug_white" , $$sim_ref{args}{v}); $$sim_ref{line_num} += ($u =~ s/\n/\n/g) ; $u =~ s/^##/#/mg ; - $u =~ /%{(.*?)%}/s ; + $u =~ /%\{(.*?)%\}/s ; $u = $1 ; $u =~ s/ZZZYYYXXX(\d+)ZZZYYYXXX//g ; $$sim_ref{user_code} .= $u ;