aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2014-02-21 11:41:28 +0100
committerBjörn-Egil Dahlberg <[email protected]>2014-02-21 11:41:28 +0100
commit687d9c05f94e807537ee397157b68653d1ddf231 (patch)
tree283326ba1be129511974f9f8f640b98b6e623b49 /lib
parent2d3c60dbd941ac4408488414b6e8434405ad24a5 (diff)
parent3a511021e7d0a720b222d61a255352bd261671c0 (diff)
downloadotp-687d9c05f94e807537ee397157b68653d1ddf231.tar.gz
otp-687d9c05f94e807537ee397157b68653d1ddf231.tar.bz2
otp-687d9c05f94e807537ee397157b68653d1ddf231.zip
Merge branch 'nox/maps-erl_syntax-fix-docs'
* nox/maps-erl_syntax-fix-docs: Mention map trees in erl_syntax:type/1 documentation
Diffstat (limited to 'lib')
-rw-r--r--lib/syntax_tools/src/erl_syntax.erl18
1 files changed, 13 insertions, 5 deletions
diff --git a/lib/syntax_tools/src/erl_syntax.erl b/lib/syntax_tools/src/erl_syntax.erl
index 2f4c9ac309..ed9decd4b5 100644
--- a/lib/syntax_tools/src/erl_syntax.erl
+++ b/lib/syntax_tools/src/erl_syntax.erl
@@ -453,33 +453,38 @@
%% </tr><tr>
%% <td>list_comp</td>
%% <td>macro</td>
+%% <td>map_expr</td>
+%% <td>map_field_assoc</td>
+%% </tr><tr>
+%% <td>map_field_exact</td>
%% <td>match_expr</td>
%% <td>module_qualifier</td>
-%% </tr><tr>
%% <td>named_fun_expr</td>
+%% </tr><tr>
%% <td>nil</td>
%% <td>operator</td>
%% <td>parentheses</td>
-%% </tr><tr>
%% <td>prefix_expr</td>
+%% </tr><tr>
%% <td>receive_expr</td>
%% <td>record_access</td>
%% <td>record_expr</td>
-%% </tr><tr>
%% <td>record_field</td>
+%% </tr><tr>
%% <td>record_index_expr</td>
%% <td>rule</td>
%% <td>size_qualifier</td>
-%% </tr><tr>
%% <td>string</td>
+%% </tr><tr>
%% <td>text</td>
%% <td>try_expr</td>
%% <td>tuple</td>
-%% </tr><tr>
%% <td>underscore</td>
+%% </tr><tr>
%% <td>variable</td>
%% <td>warning_marker</td>
%% <td></td>
+%% <td></td>
%% </tr>
%% </table></center>
%%
@@ -520,6 +525,9 @@
%% @see list/2
%% @see list_comp/2
%% @see macro/2
+%% @see map_expr/2
+%% @see map_field_assoc/2
+%% @see map_field_exact/2
%% @see match_expr/2
%% @see module_qualifier/2
%% @see named_fun_expr/2