diff options
| author | Micael Karlberg <[email protected]> | 2011-11-07 16:13:30 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-11-07 16:13:30 +0100 |
| commit | 8149b970814848dc404767d5635529c61cf20b24 (patch) | |
| tree | b829c0cf811b6f230653b75433d01657017c62c7 /lib/stdlib/src/erl_parse.yrl | |
| parent | 55ae4936f1afabc4475139d7d46d655b61e06b3b (diff) | |
| parent | 2c18949bf1edfda523ae15229e94a8400bb1870c (diff) | |
| download | otp-8149b970814848dc404767d5635529c61cf20b24.tar.gz otp-8149b970814848dc404767d5635529c61cf20b24.tar.bz2 otp-8149b970814848dc404767d5635529c61cf20b24.zip | |
Merge branch 'master' of super:otp into bmk/megaco/r15_integration
Diffstat (limited to 'lib/stdlib/src/erl_parse.yrl')
| -rw-r--r-- | lib/stdlib/src/erl_parse.yrl | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/stdlib/src/erl_parse.yrl b/lib/stdlib/src/erl_parse.yrl index 709bd83e6f..928c10f7f2 100644 --- a/lib/stdlib/src/erl_parse.yrl +++ b/lib/stdlib/src/erl_parse.yrl @@ -35,7 +35,7 @@ tuple %struct record_expr record_tuple record_field record_fields if_expr if_clause if_clauses case_expr cr_clause cr_clauses receive_expr -fun_expr fun_clause fun_clauses +fun_expr fun_clause fun_clauses atom_or_var integer_or_var try_expr try_catch try_clause try_clauses query_expr function_call argument_list exprs guard @@ -395,11 +395,17 @@ receive_expr -> 'receive' cr_clauses 'after' expr clause_body 'end' : fun_expr -> 'fun' atom '/' integer : {'fun',?line('$1'),{function,element(3, '$2'),element(3, '$4')}}. -fun_expr -> 'fun' atom ':' atom '/' integer : - {'fun',?line('$1'),{function,element(3, '$2'),element(3, '$4'),element(3,'$6')}}. +fun_expr -> 'fun' atom_or_var ':' atom_or_var '/' integer_or_var : + {'fun',?line('$1'),{function,'$2','$4','$6'}}. fun_expr -> 'fun' fun_clauses 'end' : build_fun(?line('$1'), '$2'). +atom_or_var -> atom : '$1'. +atom_or_var -> var : '$1'. + +integer_or_var -> integer : '$1'. +integer_or_var -> var : '$1'. + fun_clauses -> fun_clause : ['$1']. fun_clauses -> fun_clause ';' fun_clauses : ['$1' | '$3']. |