Skip to content

make file i/o UTF-8 compatible. #5

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.

Sign up for GitHub

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

Open
lukasmueller wants to merge 2 commits into
base: master
Choose a base branch
from
Open

make file i/o UTF-8 compatible. #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82db779
make file i/o UTF-8 compatible.
lukasmueller Jul 13, 2020
f793998
make yapri utf8 compatible. The system call in particular needs to be…
lukasmueller Dec 8, 2021
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
14 changes: 8 additions & 6 deletions lib/R/YapRI/Base.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ use File::stat;
use R::YapRI::Interpreter::Perl qw( r_var );
use R::YapRI::Block;

use utf8;

###############
### PERLDOC ###
###############
Expand Down Expand Up @@ -907,7 +909,7 @@ sub add_command {
my $cmdfile = $block->get_command_file();
if (defined $cmdfile && length($cmdfile) > 0 && -f $cmdfile) {

open my $cmdfh, '>>', $cmdfile; ## open and append
open(my $cmdfh, '>> :encoding(UTF-8)', $cmdfile) || die "Can't open cmdfile $cmdfile"; ## open and append
print $cmdfh "$command\n"; ## write it with breakline
close($cmdfh); ## close it
}
Expand Down Expand Up @@ -952,7 +954,7 @@ sub get_commands {
my $cmdfile = $block->get_command_file();
if (defined $cmdfile && length($cmdfile) > 0 && -f $cmdfile) {

open my $cmdfh, '+<', $cmdfile; ## open for read
open(my $cmdfh, '+< :encoding(UTF-8)', $cmdfile) || die "Can't open cmdfile $cmdfile"; ## open for read
while(<$cmdfh>) { ## read it
chomp($_);
push @commands, $_;
Expand Down Expand Up @@ -1043,7 +1045,7 @@ sub run_commands {
print STDERR "RUNNING COMMAND:\n$base_cmd\n";
}

my $run = system($base_cmd);
my $run = system("export LC_ALL=en_US.UTF-8; $base_cmd ");

if ($run == 0) { ## It means success
$block->set_result_file($resultfile);
Expand Down Expand Up @@ -1274,7 +1276,7 @@ sub r_object_class {
## Open the result file and parse it

my $resultfile = $self->get_blocks($cblock)->get_result_file();
open my $rfh, '<', $resultfile;
open(my $rfh, '< :encoding(UTF-8)', $resultfile) || die "Can't open resultfile $resultfile";

my $init = 0;
while (<$rfh>) {
Expand Down Expand Up @@ -1351,7 +1353,7 @@ sub r_function_args {
$self->run_commands($block1);
my $rfile1 = $self->get_blocks($block1)->get_result_file();

open my $rfh1, '<', $rfile1;
open(my $rfh1, '< :encoding(UTF-8)', $rfile1) || die "Can't open rfile1 $rfile1";
while(<$rfh1>) {
if ($_ =~ m/<environment:\snamespace:(.+)>/) {
$env = $1;
Expand All @@ -1374,7 +1376,7 @@ sub r_function_args {
$self->run_commands($block2);
my $rfile2 = $self->get_blocks($block2)->get_result_file();

open my $rfh2, '<', $rfile2;
open(my $rfh2, '< :encoding(UTF-8)', $rfile2) || die "Can't open rfile2 $rfile2";

## Catch the defaults
my $fline = '';
Expand Down
4 changes: 2 additions & 2 deletions lib/R/YapRI/Block.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use File::Path qw( make_path remove_tree);
use File::stat;

use R::YapRI::Interpreter::Perl qw( r_var );

use utf8;

###############
### PERLDOC ###
Expand Down Expand Up @@ -525,7 +525,7 @@ sub read_results {
my $resultfile = $self->get_result_file();

if (defined $resultfile) {
open my $rfh, '<', $resultfile;
open(my $rfh, '< :encoding(UTF-8)', $resultfile) || die "Can't open resultfile $resultfile";
while(<$rfh>) {
chomp($_);
push @results, $_;
Expand Down
3 changes: 2 additions & 1 deletion lib/R/YapRI/Data/Matrix.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ use Carp qw(croak cluck carp);
use R::YapRI::Base;
use R::YapRI::Interpreter::Perl qw( r_var );

use utf8;

###############
### PERLDOC ###
Expand Down Expand Up @@ -2088,7 +2089,7 @@ sub read_rbase {
matrix => [],
);

open my $rfh, '<', $rfile;
open(my $rfh, '< :encoding(UTF-8)', $rfile) || die "Can't open rfile $rfile";
while(<$rfh>) {
chomp($_);
if ($_ =~ m/"end_catch_matrix_$r_obj"/) {
Expand Down
3 changes: 2 additions & 1 deletion lib/R/YapRI/Graph/Simple.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ use R::YapRI::Interpreter::Perl qw( r_var );

use R::YapRI::Data::Matrix;

use utf8;

###############
### PERLDOC ###
Expand Down Expand Up @@ -765,7 +766,7 @@ sub is_device_enabled {
$rbase->add_command('print("end.dev.list")', $cblock);
$rbase->run_commands($cblock);
my $rfile = $rbase->get_blocks($cblock)->get_result_file();
open my $rfh, '<', $rfile;
open(my $rfh, '< :encoding(UTF-8)', $rfile) || die "Can't open rfile $rfile";

my $match_region = 0;
my $enab = 0;
Expand Down