From f31ce372cc4aabe1f4b1f98761cb2443592855df Mon Sep 17 00:00:00 2001 From: Pragmatic Software Date: Fri, 23 Jan 2015 19:24:39 -0800 Subject: [PATCH] Add language-specific comments for cmdline/output --- modules/compiler_vm/languages/bash.pm | 6 ++++++ modules/compiler_vm/languages/ksh.pm | 6 ++++++ modules/compiler_vm/languages/perl.pm | 6 ++++++ modules/compiler_vm/languages/python.pm | 6 ++++++ modules/compiler_vm/languages/python3.pm | 6 ++++++ modules/compiler_vm/languages/sh.pm | 6 ++++++ 6 files changed, 36 insertions(+) diff --git a/modules/compiler_vm/languages/bash.pm b/modules/compiler_vm/languages/bash.pm index 53b174c4..083bb57c 100755 --- a/modules/compiler_vm/languages/bash.pm +++ b/modules/compiler_vm/languages/bash.pm @@ -13,6 +13,12 @@ sub initialize { $self->{execfile} = 'prog.bash'; $self->{default_options} = ''; $self->{cmdline} = 'bash $options $sourcefile'; + + $self->{cmdline_opening_comment} = ": <<'____CMDLINE____'\n"; + $self->{cmdline_closing_comment} = "____CMDLINE____\n"; + + $self->{output_opening_comment} = ": << '____OUTPUT____'\n"; + $self->{output_closing_comment} = "____OUTPUT____\n"; } 1; diff --git a/modules/compiler_vm/languages/ksh.pm b/modules/compiler_vm/languages/ksh.pm index 1c437f03..e89494d0 100755 --- a/modules/compiler_vm/languages/ksh.pm +++ b/modules/compiler_vm/languages/ksh.pm @@ -13,6 +13,12 @@ sub initialize { $self->{execfile} = 'prog.ksh'; $self->{default_options} = ''; $self->{cmdline} = 'ksh $options $sourcefile'; + + $self->{cmdline_opening_comment} = ": <<'____CMDLINE____'\n"; + $self->{cmdline_closing_comment} = "____CMDLINE____\n"; + + $self->{output_opening_comment} = ": << '____OUTPUT____'\n"; + $self->{output_closing_comment} = "____OUTPUT____\n"; } 1; diff --git a/modules/compiler_vm/languages/perl.pm b/modules/compiler_vm/languages/perl.pm index 69f8702e..dab48cab 100755 --- a/modules/compiler_vm/languages/perl.pm +++ b/modules/compiler_vm/languages/perl.pm @@ -21,6 +21,12 @@ sub postprocess_output { $self->{output} =~ s/\s+at $self->{sourcefile} line \d+, near ".*?"//; $self->{output} =~ s/\s*Execution of $self->{sourcefile} aborted due to compilation errors.//; + + $self->{cmdline_opening_comment} = "=cut =============== CMDLINE ===============\n"; + $self->{cmdline_closing_comment} = "=cut\n"; + + $self->{output_opening_comment} = "=cut =============== OUTPUT ===============\n"; + $self->{output_closing_comment} = "=cut\n"; } 1; diff --git a/modules/compiler_vm/languages/python.pm b/modules/compiler_vm/languages/python.pm index 30756daa..fe5d0c2d 100755 --- a/modules/compiler_vm/languages/python.pm +++ b/modules/compiler_vm/languages/python.pm @@ -13,6 +13,12 @@ sub initialize { $self->{execfile} = 'prog.py'; $self->{default_options} = ''; $self->{cmdline} = 'python $options $sourcefile'; + + $self->{cmdline_opening_comment} = "'''\n=============== CMDLINE ===============\n"; + $self->{cmdline_closing_comment} = "=============== CMDLINE ===============\n'''\n"; + + $self->{output_opening_comment} = "'''\n=============== OUTPUT ===============\n"; + $self->{output_closing_comment} = "=============== OUTPUT ===============\n'''\n"; } 1; diff --git a/modules/compiler_vm/languages/python3.pm b/modules/compiler_vm/languages/python3.pm index 69b23515..13aeab8b 100755 --- a/modules/compiler_vm/languages/python3.pm +++ b/modules/compiler_vm/languages/python3.pm @@ -13,6 +13,12 @@ sub initialize { $self->{execfile} = 'prog.py3'; $self->{default_options} = ''; $self->{cmdline} = 'python3 $options $sourcefile'; + + $self->{cmdline_opening_comment} = "'''\n=============== CMDLINE ===============\n"; + $self->{cmdline_closing_comment} = "=============== CMDLINE ===============\n'''\n"; + + $self->{output_opening_comment} = "'''\n=============== OUTPUT ===============\n"; + $self->{output_closing_comment} = "=============== OUTPUT ===============\n'''\n"; } 1; diff --git a/modules/compiler_vm/languages/sh.pm b/modules/compiler_vm/languages/sh.pm index a2165204..2cd57491 100755 --- a/modules/compiler_vm/languages/sh.pm +++ b/modules/compiler_vm/languages/sh.pm @@ -13,6 +13,12 @@ sub initialize { $self->{execfile} = 'prog.sh'; $self->{default_options} = ''; $self->{cmdline} = 'sh $options $sourcefile'; + + $self->{cmdline_opening_comment} = ": <<'____CMDLINE____'\n"; + $self->{cmdline_closing_comment} = "____CMDLINE____\n"; + + $self->{output_opening_comment} = ": << '____OUTPUT____'\n"; + $self->{output_closing_comment} = "____OUTPUT____\n"; } 1;