File 3631-Handle-feature-attribute-in-epp_dodger.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 3631-Handle-feature-attribute-in-epp_dodger.patch of Package erlang (Revision 877ed1ba0ccb1ec39b610352f04989aa)

Currently displaying revision 877ed1ba0ccb1ec39b610352f04989aa , Show latest

From 83c8428e6b00d7255e67a19dd007cc1938d47458 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@fb.com>
Date: Wed, 26 Apr 2023 16:36:55 +0200
Subject: [PATCH] Handle feature attribute in epp_dodger

---
 lib/edoc/test/edoc_SUITE.erl                      | 15 +++++++++++++--
 .../test/edoc_SUITE_data/module_with_feature.erl  |  2 ++
 lib/syntax_tools/src/epp_dodger.erl               |  2 ++
 3 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 lib/edoc/test/edoc_SUITE_data/module_with_feature.erl

diff --git a/lib/edoc/test/edoc_SUITE.erl b/lib/edoc/test/edoc_SUITE.erl
index c150ace008..d09e9a2ecb 100644
--- a/lib/edoc/test/edoc_SUITE.erl
+++ b/lib/edoc/test/edoc_SUITE.erl
@@ -24,13 +24,14 @@
 
 %% Test cases
 -export([app/1,appup/1,build_std/1,build_map_module/1,otp_12008/1,
-         build_app/1, otp_14285/1, infer_module_app_test/1]).
+         build_app/1, otp_14285/1, infer_module_app_test/1,
+         module_with_feature/1]).
 
 suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() ->
     [app,appup,build_std,build_map_module,otp_12008, build_app, otp_14285,
-     infer_module_app_test].
+     infer_module_app_test, module_with_feature].
 
 groups() -> 
     [].
@@ -159,3 +160,13 @@ infer_module_app_test_({M, Beam}) ->
 	    R2 = filelib:is_regular(BeamPath2),
 	    R1 orelse R2
     end.
+
+module_with_feature(Config) ->
+    DataDir = ?config(data_dir, Config),
+    PrivDir = ?config(priv_dir, Config),
+    Source = filename:join(DataDir, "module_with_feature.erl"),
+    DodgerOpts = [{dir, PrivDir}],
+    ok = edoc:files([Source], DodgerOpts),
+    PreprocessOpts = [{preprocess, true}, {dir, PrivDir}],
+    ok = edoc:files([Source], PreprocessOpts),
+    ok.
diff --git a/lib/edoc/test/edoc_SUITE_data/module_with_feature.erl b/lib/edoc/test/edoc_SUITE_data/module_with_feature.erl
new file mode 100644
index 0000000000..0091b704b4
--- /dev/null
+++ b/lib/edoc/test/edoc_SUITE_data/module_with_feature.erl
@@ -0,0 +1,2 @@
+-module(module_with_feature).
+-feature(maybe_expr, enable).
diff --git a/lib/syntax_tools/src/epp_dodger.erl b/lib/syntax_tools/src/epp_dodger.erl
index 2e0694c2cf..40f67b5660 100644
--- a/lib/syntax_tools/src/epp_dodger.erl
+++ b/lib/syntax_tools/src/epp_dodger.erl
@@ -517,6 +517,8 @@ quickscan_form([{'-', _Anno}, {'else', AnnoA} | _Ts]) ->
     kill_form(AnnoA);
 quickscan_form([{'-', _Anno}, {atom, AnnoA, endif} | _Ts]) ->
     kill_form(AnnoA);
+quickscan_form([{'-', _Anno}, {atom, AnnoA, feature} | _Ts]) ->
+   kill_form(AnnoA);
 quickscan_form([{'-', Anno}, {'?', _}, {Type, _, _}=N | [{'(', _} | _]=Ts])
   when Type =:= atom; Type =:= var ->
     %% minus, macro and open parenthesis at start of form - assume that
-- 
2.35.3

Places

File 3631-Handle-feature-attribute-in-epp_dodger.patch of Package erlang (Revision 877ed1ba0ccb1ec39b610352f04989aa)

Places