Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Syntax adjustments to avoid editor highlighting bugs #20

Merged
merged 1 commit into from
Nov 11, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile.PL
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ if ($^O eq 'freebsd') {
GetOptions(
"tclsh=s", \(my $tclsh=$tclsh_default),
"tclconfig=s", \ my $tclconfig,
"usestubs!", \(my $usestubs = $^O =~ /^MSWin32|solaris|linux|hpux|darwin|cygwin|aix|freebsd|netbsd|openbsd$/? 1 : 0),
"usestubs!", \(my $usestubs = $^O =~ m/^MSWin32|solaris|linux|hpux|darwin|cygwin|aix|freebsd|netbsd|openbsd$/? 1 : 0),
# we prefer usestubs, but on windows default is to not use them, because
# stubs lib that come with AS TCL is impossible to link with GCC which
# comes with strawberry perl; Have a ticket for this; (XXX) VKON 27-06-2018
Expand Down Expand Up @@ -116,7 +116,7 @@ if (defined($libpath) && defined($incpath)) {

my %tclcfg = $tclcfg =~ /^([^=]+)=(.*?)$/gm;

$defs .= " -DTCLSH_PATH=\\\"".([$tclcfg{tclsh}=~/^(.*)\//]->[0])."\\\""; #haack
$defs .= " -DTCLSH_PATH=\\\"".([$tclcfg{tclsh}=~m/^(.*)\//]->[0])."\\\""; #haack

if ($^O eq 'darwin' && !defined($tclconfig)) {
$tclconfig = $tclcfg{'tclConfig.sh'};
Expand Down Expand Up @@ -266,7 +266,7 @@ sub process_tclconfig {
$hashref->{$k} =~ s{/cygdrive/(\w)/}{$1:/}ig;
}
$hashref->{tcl_version} = $hashref->{TCL_VERSION};
$hashref->{TCL_EXEC_PREFIX}=~y{\\}{/}; # hack for MSWin32; yet we don't go through \->\\ forest;
$hashref->{TCL_EXEC_PREFIX}=~y[\\][/]; # hack for MSWin32; yet we don't go through \->\\ forest;
}

sub MY::libscan {
Expand Down