#2013: piraha breaks ThornDoc building ---------------------+------------------------------------------------------ Reporter: rhaas | Owner: Type: defect | Status: new Priority: major | Milestone: Component: Cactus | Version: development version Resolution: | Keywords: ---------------------+------------------------------------------------------
Comment (by rhaas):
This fixes it: {{{ diff --git a/lib/sbin/InterLatex.pl b/lib/sbin/InterLatex.pl index e4b0a460..898b3ed4 100755 --- a/lib/sbin/InterLatex.pl +++ b/lib/sbin/InterLatex.pl @@ -56,6 +56,7 @@ my $sbin_dir = "${cctk_home}lib/sbin"; require "$sbin_dir/ThornUtils.pm";
# for use of create_parametere_database +require "$sbin_dir/Piraha.pm"; require "$sbin_dir/interface_parser.pl"; require "$sbin_dir/CSTUtils.pl";
diff --git a/lib/sbin/ParamLatex.pl b/lib/sbin/ParamLatex.pl index 06f1b011..b1810fdd 100644 --- a/lib/sbin/ParamLatex.pl +++ b/lib/sbin/ParamLatex.pl @@ -62,6 +62,7 @@ my $sbin_dir = "${cctk_home}lib/sbin"; require "$sbin_dir/ThornUtils.pm";
# for use of create_parametere_database +require "$sbin_dir/Piraha.pm"; require "$sbin_dir/parameter_parser.pl"; require "$sbin_dir/CSTUtils.pl";
diff --git a/lib/sbin/SchedLatex.pl b/lib/sbin/SchedLatex.pl index f8b52700..4e1db1f9 100755 --- a/lib/sbin/SchedLatex.pl +++ b/lib/sbin/SchedLatex.pl @@ -53,6 +53,7 @@ if ($h || $help) { $cctk_home .= '/' if (($cctk_home !~ //$/) && defined $cctk_home);
my $sbin_dir = "${cctk_home}lib/sbin"; +require "$sbin_dir/Piraha.pm"; require "$sbin_dir/ScheduleParser.pl"; require "$sbin_dir/CSTUtils.pl";
diff --git a/lib/sbin/parameter_parser.pl b/lib/sbin/parameter_parser.pl index cb39d013..3cdbf9fc 100644 --- a/lib/sbin/parameter_parser.pl +++ b/lib/sbin/parameter_parser.pl @@ -16,6 +16,13 @@ use strict; use Carp; my $ccl_file;
+sub trim_quotes +{ + my $str = shift; + $str =~ s/^(["'])(.*)\1$/$2/s; + return $str; +} + #/*@@ # @routine create_parameter_database # @date Wed Sep 16 11:45:18 1998 }}} however it does not seem to be the "right" solution. Shouldn't require piraha be in the actual parsers? Similarly parameter parser uses a function (trim_spaces) that was originally only defined in interface parser and which has no GRdoc text whatsoever.