[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-NG] [PATCH 1/4] [ng] automake: don't define many identical 'la
From: |
Stefano Lattarini |
Subject: |
[Automake-NG] [PATCH 1/4] [ng] automake: don't define many identical 'lang_*_rewrite' subroutines |
Date: |
Fri, 8 Jun 2012 10:28:57 +0200 |
This is just a refactoring prompted by future planned changes.
Signed-off-by: Stefano Lattarini <address@hidden>
---
automake.in | 93 ++++-------------------------------------------------------
1 file changed, 5 insertions(+), 88 deletions(-)
diff --git a/automake.in b/automake.in
index 176e882..a787866 100644
--- a/automake.in
+++ b/automake.in
@@ -1683,6 +1683,7 @@ sub handle_single_transform ($$$$$%)
# generates another source file which we must then process
# further.
my $subr = \&{'lang_' . $lang->name . '_rewrite'};
+ defined &$subr or $subr = \&lang_sub_obj;
my ($r, $source_extension)
= &$subr ($directory, $base, $extension,
$obj, $have_per_exec_flags, $var);
@@ -5144,12 +5145,6 @@ sub lang_c_rewrite
return $r;
}
-# Rewrite a single C++ source file.
-sub lang_cxx_rewrite
-{
- return &lang_sub_obj;
-}
-
# Rewrite a single header file.
sub lang_header_rewrite
{
@@ -5166,7 +5161,7 @@ sub lang_vala_rewrite
return (LANG_SUBDIR, $newext);
}
-# Rewrite a single yacc file.
+# Rewrite a single yacc/yacc++ file.
sub lang_yacc_rewrite
{
my ($directory, $base, $ext) = @_;
@@ -5175,18 +5170,9 @@ sub lang_yacc_rewrite
(my $newext = $ext) =~ tr/y/c/;
return ($r, $newext);
}
+sub lang_yaccxx_rewrite { lang_yacc_rewrite (@_); };
-# Rewrite a single yacc++ file.
-sub lang_yaccxx_rewrite
-{
- my ($directory, $base, $ext) = @_;
-
- my $r = &lang_sub_obj;
- (my $newext = $ext) =~ tr/y/c/;
- return ($r, $newext);
-}
-
-# Rewrite a single lex file.
+# Rewrite a single lex/lex++ file.
sub lang_lex_rewrite
{
my ($directory, $base, $ext) = @_;
@@ -5195,76 +5181,7 @@ sub lang_lex_rewrite
(my $newext = $ext) =~ tr/l/c/;
return ($r, $newext);
}
-
-# Rewrite a single lex++ file.
-sub lang_lexxx_rewrite
-{
- my ($directory, $base, $ext) = @_;
-
- my $r = &lang_sub_obj;
- (my $newext = $ext) =~ tr/l/c/;
- return ($r, $newext);
-}
-
-# Rewrite a single assembly file.
-sub lang_asm_rewrite
-{
- return &lang_sub_obj;
-}
-
-# Rewrite a single preprocessed assembly file.
-sub lang_cppasm_rewrite
-{
- return &lang_sub_obj;
-}
-
-# Rewrite a single Fortran 77 file.
-sub lang_f77_rewrite
-{
- return &lang_sub_obj;
-}
-
-# Rewrite a single Fortran file.
-sub lang_fc_rewrite
-{
- return &lang_sub_obj;
-}
-
-# Rewrite a single preprocessed Fortran file.
-sub lang_ppfc_rewrite
-{
- return &lang_sub_obj;
-}
-
-# Rewrite a single preprocessed Fortran 77 file.
-sub lang_ppf77_rewrite
-{
- return &lang_sub_obj;
-}
-
-# Rewrite a single ratfor file.
-sub lang_ratfor_rewrite
-{
- return &lang_sub_obj;
-}
-
-# Rewrite a single Objective C file.
-sub lang_objc_rewrite
-{
- return &lang_sub_obj;
-}
-
-# Rewrite a single Objective C++ file.
-sub lang_objcxx_rewrite
-{
- return &lang_sub_obj;
-}
-
-# Rewrite a single Unified Parallel C file.
-sub lang_upc_rewrite
-{
- return &lang_sub_obj;
-}
+sub lang_lexxx_rewrite { lang_lex_rewrite (@_); };
# Rewrite a single Java file.
sub lang_java_rewrite
--
1.7.9.5