diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-01-22 10:28:53 +0100 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-01-22 10:28:53 +0100 |
| commit | 2db94d0e84729a8f2a474a7cf02e9c94853a1bbe (patch) | |
| tree | cbf84d3a25f47ff351d77073744504a8fecd6a81 /lib/stdlib/src/erl_parse.yrl | |
| parent | 4bc96ac57616e089d8508e64973e49b6f8db97ea (diff) | |
| parent | 13d4a8d4e69a8965ab66685e751d11cda5f29567 (diff) | |
| download | otp-2db94d0e84729a8f2a474a7cf02e9c94853a1bbe.tar.gz otp-2db94d0e84729a8f2a474a7cf02e9c94853a1bbe.tar.bz2 otp-2db94d0e84729a8f2a474a7cf02e9c94853a1bbe.zip | |
Merge branch 'lh/forget-mnemosyne/OTP-10729'
* lh/forget-mnemosyne/OTP-10729:
Remove what remains of the Mnemosyne code
Remove support for the query keyword and query expressions
Diffstat (limited to 'lib/stdlib/src/erl_parse.yrl')
| -rw-r--r-- | lib/stdlib/src/erl_parse.yrl | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/stdlib/src/erl_parse.yrl b/lib/stdlib/src/erl_parse.yrl index 002abc11e8..8316462989 100644 --- a/lib/stdlib/src/erl_parse.yrl +++ b/lib/stdlib/src/erl_parse.yrl @@ -36,7 +36,7 @@ tuple 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 atom_or_var integer_or_var -try_expr try_catch try_clause try_clauses query_expr +try_expr try_catch try_clause try_clauses function_call argument_list exprs guard atomic strings @@ -54,7 +54,7 @@ char integer float atom string var '(' ')' ',' '->' ':-' '{' '}' '[' ']' '|' '||' '<-' ';' ':' '#' '.' 'after' 'begin' 'case' 'try' 'catch' 'end' 'fun' 'if' 'of' 'receive' 'when' -'andalso' 'orelse' 'query' +'andalso' 'orelse' 'bnot' 'not' '*' '/' 'div' 'rem' 'band' 'and' '+' '-' 'bor' 'bxor' 'bsl' 'bsr' 'or' 'xor' @@ -272,7 +272,6 @@ expr_max -> case_expr : '$1'. expr_max -> receive_expr : '$1'. expr_max -> fun_expr : '$1'. expr_max -> try_expr : '$1'. -expr_max -> query_expr : '$1'. list -> '[' ']' : {nil,?line('$1')}. @@ -432,9 +431,6 @@ try_clause -> var ':' expr clause_guard clause_body : L = ?line('$1'), {clause,L,[{tuple,L,['$1','$3',{var,L,'_'}]}],'$4','$5'}. -query_expr -> 'query' list_comprehension 'end' : - {'query',?line('$1'),'$2'}. - argument_list -> '(' ')' : {[],?line('$1')}. argument_list -> '(' exprs ')' : {'$2',?line('$1')}. |