[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
tests: factor the definition of full compilation
From: |
Akim Demaille |
Subject: |
tests: factor the definition of full compilation |
Date: |
Wed, 12 Sep 2018 22:07:44 +0200 |
Installed in master (no dependency on move).
commit e3257f88e270c240e3cf2d47b94ec5e5c0490e99
Author: Akim Demaille <address@hidden>
Date: Wed Sep 12 18:44:11 2018 +0200
tests: factor the definition of full compilation
* tests/local.at (AT_LANG_EXT): New.
(AT_FULL_COMPILE): Simplify.
diff --git a/tests/local.at b/tests/local.at
index 035d7cfd..de3ef80d 100644
--- a/tests/local.at
+++ b/tests/local.at
@@ -807,6 +807,15 @@ m4_define([AT_LANG_COMPILE(c++)], [AT_COMPILE_CXX([$1],
[$2], [$3])])
m4_define([AT_LANG_COMPILE(java)], [AT_JAVA_COMPILE([$1.java], [$2], [$3])])
+# AT_LANG_EXT
+# -----------
+# The file extension corresponding to the language: c, cc, or java.
+m4_define([AT_LANG_EXT], [AT_LANG_DISPATCH([$0], $@)])
+m4_define([AT_LANG_EXT(c)], [c])
+m4_define([AT_LANG_EXT(c++)], [cc])
+m4_define([AT_LANG_EXT(java)], [java])
+
+
# AT_FULL_COMPILE(OUTPUT, [OTHER1], [OTHER2], [EXTRA-COMPILER-FLAGS)
# ------------------------------------------------------------------
# Compile OUTPUT.y to OUTPUT.c, OUTPUT.cc, or OUTPUT.java, and then
@@ -814,35 +823,15 @@ m4_define([AT_LANG_COMPILE(java)],
[AT_JAVA_COMPILE([$1.java], [$2], [$3])])
# OUTPUT-OTHER.c, OUTPUT-OTHER.cc, or OUTPUT-OTHER.java to OUTPUT or
# OUTPUT.java along with it. Relies on AT_SKEL_CC_IF and
# AT_SKEL_JAVA_IF.
-m4_define([AT_FULL_COMPILE], [AT_LANG_DISPATCH([$0], $@)])
-m4_define([AT_FULL_COMPILE(c)],
-[AT_BISON_CHECK([-o $1.c $1.y])
- AT_LANG_COMPILE([$1],
- m4_join([ ],
- [$1.c],
- m4_ifval($2, [[$1-$2.c]]),
- m4_ifval($3, [[$1-$3.c]])),
- [$4])])
-
-m4_define([AT_FULL_COMPILE(c++)],
-[AT_BISON_CHECK([-o $1.cc $1.y])
+m4_define([AT_FULL_COMPILE],
+[AT_BISON_CHECK([-o $1.AT_LANG_EXT $1.y])
AT_LANG_COMPILE([$1],
m4_join([ ],
- [$1.cc],
- m4_ifval($2, [[$1-$2.cc]]),
- m4_ifval($3, [[$1-$3.cc]])),
+ [$1.AT_LANG_EXT],
+ m4_ifval($2, [[$1-$2.]AT_LANG_EXT]),
+ m4_ifval($3, [[$1-$3.]AT_LANG_EXT])),
[$4])])
-m4_define([AT_FULL_COMPILE(java)],
-[AT_BISON_CHECK([-o $1.java $1.y])
- AT_LANG_COMPILE([$1],
- m4_join([ ],
- [$1.java],
- m4_ifval($2, [[$1-$2.java]]),
- m4_ifval($3, [[$1-$3.java]])),
- [$4])])
-
-
# AT_SKIP_IF_CANNOT_LINK_C_AND_CXX
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- tests: factor the definition of full compilation,
Akim Demaille <=